Added detection for Tea templates, see http://teatrove.org #129

Merged
merged 4 commits into from Mar 19, 2012

Projects

None yet
@jaxzin
Contributor
jaxzin commented Feb 25, 2012

Uses the Java Server Page lexer (closest match) until a Tea lexer is added to Pygments.
https://bitbucket.org/birkenfeld/pygments-main/pull-request/56

@jaxzin jaxzin Added detection for Tea templates, see http://teatrove.org
Uses the Java Server Page lexer (closest match) until a Tea lexer is added to Pygments.
https://bitbucket.org/birkenfeld/pygments-main/pull-request/56
842b507
@jaxzin
Contributor
jaxzin commented Mar 10, 2012

The Tea lexer was accepted to pygments.

@jappy
jappy commented Mar 12, 2012

+1

@gilgm12
gilgm12 commented Mar 12, 2012

+1

@jflo
jflo commented Mar 12, 2012

+1

@haihuang2012

+1

@bhoule
bhoule commented Mar 13, 2012

+1

@jaxzin jaxzin referenced this pull request Mar 15, 2012
Closed

Upgrade to Pygments 1.5 #136

@darrowf
darrowf commented Mar 15, 2012

+1

@prasincs

+1

@jappy
jappy commented Mar 19, 2012

+1

@gilgm12
gilgm12 commented Mar 19, 2012

+1

@josh josh and 1 other commented on an outdated diff Mar 19, 2012
lib/linguist/languages.yml
@@ -987,6 +987,12 @@ Tcsh:
- .csh
- .tcsh
+Tea:
+ type: programming
@josh
josh Mar 19, 2012 Member

For now, are we categorizing templating languages as markup.

@jaxzin
jaxzin Mar 19, 2012 Contributor

I pushed the suggested change. Thanks @josh

@josh
Member
josh commented Mar 19, 2012

@jaxzin looks good, but could you please merge master again into this branch. Theres a merge conflict somewhere.

@jaxzin
Contributor
jaxzin commented Mar 19, 2012

Sure. Should I rebase or will that hose the pull request?

@josh
Member
josh commented Mar 19, 2012

Nah, just do git merge github/master into your branch.

@jaxzin
Contributor
jaxzin commented Mar 19, 2012

@josh merged and pushed.

@josh josh merged commit 79f16ca into github:master Mar 19, 2012
@josh josh added a commit that referenced this pull request Mar 19, 2012
@josh josh Revert "Merge pull request #129 from jaxzin/detect-tea"
This reverts commit 79f16ca, reversing
changes made to 0872058.

No "Tea" lexer
777f5a3
@josh
Member
josh commented Mar 19, 2012

Sorry, tried to merge but the build fail because we don't have the Tea lexer.

@jaxzin
Contributor
jaxzin commented Mar 19, 2012

Sorry if that wasn't clear. This depends on my other pull request: tmm1/pygments.rb#15

@jaxzin
Contributor
jaxzin commented Mar 19, 2012

@josh Is there a way to reopen this or do I need a new pull request?

@josh
Member
josh commented Mar 19, 2012

Yeah, I can't seem to reopen it myself, heh. I guess you can't if the pull is already merged.

I guess you could create a new one that just reverts the "revert".

@jaxzin
Contributor
jaxzin commented Mar 19, 2012

I reopened this with #142.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment