New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from Mar 19, 2012

Conversation

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

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
@jaxzin

This comment has been minimized.

Show comment
Hide comment
@jaxzin

jaxzin Mar 10, 2012

Contributor

The Tea lexer was accepted to pygments.

Contributor

jaxzin commented Mar 10, 2012

The Tea lexer was accepted to pygments.

@nicholashagen

This comment has been minimized.

Show comment
Hide comment

nicholashagen commented Mar 12, 2012

+1

@jappy

This comment has been minimized.

Show comment
Hide comment
@jappy

jappy commented Mar 12, 2012

+1

@gilgm12

This comment has been minimized.

Show comment
Hide comment
@gilgm12

gilgm12 commented Mar 12, 2012

+1

@jflo

This comment has been minimized.

Show comment
Hide comment
@jflo

jflo commented Mar 12, 2012

+1

@haihuang2012

This comment has been minimized.

Show comment
Hide comment

haihuang2012 commented Mar 12, 2012

+1

@bhoule

This comment has been minimized.

Show comment
Hide comment
@bhoule

bhoule commented Mar 13, 2012

+1

@ESPNMichaelKidd

This comment has been minimized.

Show comment
Hide comment

ESPNMichaelKidd commented Mar 14, 2012

+1

@jaxzin jaxzin referenced this pull request Mar 15, 2012

Closed

Upgrade to Pygments 1.5 #136

@darrowf

This comment has been minimized.

Show comment
Hide comment
@darrowf

darrowf commented Mar 15, 2012

+1

@prasincs

This comment has been minimized.

Show comment
Hide comment
@prasincs

prasincs commented Mar 15, 2012

+1

@jappy

This comment has been minimized.

Show comment
Hide comment
@jappy

jappy commented Mar 19, 2012

+1

@gilgm12

This comment has been minimized.

Show comment
Hide comment
@gilgm12

gilgm12 commented Mar 19, 2012

+1

Show outdated Hide outdated lib/linguist/languages.yml
@@ -987,6 +987,12 @@ Tcsh:
- .csh
- .tcsh
Tea:
type: programming

This comment has been minimized.

@josh

josh Mar 19, 2012

Member

For now, are we categorizing templating languages as markup.

@josh

josh Mar 19, 2012

Member

For now, are we categorizing templating languages as markup.

This comment has been minimized.

@jaxzin

jaxzin Mar 19, 2012

Contributor

I pushed the suggested change. Thanks @josh

@jaxzin

jaxzin Mar 19, 2012

Contributor

I pushed the suggested change. Thanks @josh

@josh

This comment has been minimized.

Show comment
Hide comment
@josh

josh Mar 19, 2012

Member

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

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

This comment has been minimized.

Show comment
Hide comment
@jaxzin

jaxzin Mar 19, 2012

Contributor

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

Contributor

jaxzin commented Mar 19, 2012

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

@josh

This comment has been minimized.

Show comment
Hide comment
@josh

josh Mar 19, 2012

Member

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

Member

josh commented Mar 19, 2012

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

@jaxzin

This comment has been minimized.

Show comment
Hide comment
@jaxzin

jaxzin Mar 19, 2012

Contributor

@josh merged and pushed.

Contributor

jaxzin commented Mar 19, 2012

@josh merged and pushed.

josh added a commit that referenced this pull request Mar 19, 2012

Merge pull request #129 from jaxzin/detect-tea
Added detection for Tea templates, see http://teatrove.org

@josh josh merged commit 79f16ca into github:master Mar 19, 2012

josh added a commit that referenced this pull request Mar 19, 2012

Revert "Merge pull request #129 from jaxzin/detect-tea"
This reverts commit 79f16ca, reversing
changes made to 0872058.

No "Tea" lexer
@josh

This comment has been minimized.

Show comment
Hide comment
@josh

josh Mar 19, 2012

Member

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

Member

josh commented Mar 19, 2012

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

@jaxzin

This comment has been minimized.

Show comment
Hide comment
@jaxzin

jaxzin Mar 19, 2012

Contributor

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

Contributor

jaxzin commented Mar 19, 2012

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

@jaxzin

This comment has been minimized.

Show comment
Hide comment
@jaxzin

jaxzin Mar 19, 2012

Contributor

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

Contributor

jaxzin commented Mar 19, 2012

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

@josh

This comment has been minimized.

Show comment
Hide comment
@josh

josh Mar 19, 2012

Member

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".

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

This comment has been minimized.

Show comment
Hide comment
@jaxzin

jaxzin Mar 19, 2012

Contributor

I reopened this with #142.

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