Removed automake.lang, added some stuff in def.lang

master
Yevgen Muntyan 2006-08-29 00:08:18 -05:00
parent 37f67cc758
commit 49ac2ab247
6 changed files with 37 additions and 22 deletions

View File

@ -12,7 +12,6 @@ langs2 = \
langs1 = \ langs1 = \
ada.lang \ ada.lang \
automake.lang \
changelog.lang \ changelog.lang \
check.sh \ check.sh \
csharp.lang \ csharp.lang \

View File

@ -20,12 +20,10 @@
<include> <include>
<!-- Comments --> <!-- Comments -->
<context id="comment" style-ref="comment"> <context id="comment" style-ref="comment" end-at-line-end="true">
<start>\/\/</start> <start>\/\/</start>
<end>$</end>
<include> <include>
<context ref="def:line-continue"/> <context ref="def:line-comment"/>
<context ref="def:comment:*"/>
</include> </include>
</context> </context>

View File

@ -3,7 +3,7 @@
# "./check.sh" without arguments will validate lang and styles files # "./check.sh" without arguments will validate lang and styles files
# specified here. # specified here.
langs="automake.lang c.lang cpp.lang changelog.lang def.lang \ langs="c.lang cpp.lang changelog.lang def.lang \
html.lang javascript.lang latex.lang makefile.lang \ html.lang javascript.lang latex.lang makefile.lang \
xml.lang yacc.lang" xml.lang yacc.lang"

View File

@ -107,6 +107,23 @@
<end>^</end> <end>^</end>
</context> </context>
<!-- this is intended to be used from line comments starting not with #,
see shell-like-comment below -->
<context id="line-comment">
<include>
<context ref="line-continue" ignore-style="true"/>
<context ref="comment:*"/>
</include>
</context>
<!-- A line comment starting with #, with \ as escape-new-line char -->
<context id="shell-like-comment" style-ref="comment" end-at-line-end="true">
<start>#</start>
<include>
<context ref="line-comment"/>
</include>
</context>
<context id="shebang" style-ref="shebang" first-line-only="true"> <context id="shebang" style-ref="shebang" first-line-only="true">
<start>^#!</start> <start>^#!</start>
<end>$</end> <end>$</end>

View File

@ -43,4 +43,6 @@
<style name="latex:command" foreground="#008000"/> <style name="latex:command" foreground="#008000"/>
<style name="changelog:release" foreground="#0095ff" bold="true"/> <style name="changelog:release" foreground="#0095ff" bold="true"/>
<style name="makefile:trailing-tab" background="pink"/>
</style-scheme> </style-scheme>

View File

@ -2,12 +2,13 @@
<language id="makefile" _name="Makefile" version="2.0" _section="Sources" <language id="makefile" _name="Makefile" version="2.0" _section="Sources"
mimetypes="text/x-makefile" globs="Makefile*"> mimetypes="text/x-makefile" globs="Makefile*">
<styles> <styles>
<style id="comment" name="Comment" map-to="def:comment"/> <style id="comment" name="Comment" map-to="def:comment"/>
<style id="function" name="Function" map-to="def:function"/> <style id="function" name="Function" map-to="def:function"/>
<style id="string" name="String" map-to="def:string"/> <style id="string" name="String" map-to="def:string"/>
<style id="keyword" name="Keyword" map-to="def:keyword"/> <style id="keyword" name="Keyword" map-to="def:keyword"/>
<style id="variable" name="Variable" map-to="def:data-type"/> <style id="variable" name="Variable" map-to="def:data-type"/>
<style id="target" name="Target" map-to="def:function"/> <style id="target" name="Target" map-to="def:function"/>
<style id="trailing-tab" name="Trailing Tab"/>
</styles> </styles>
<definitions> <definitions>
@ -23,15 +24,7 @@
<context id="makefile"> <context id="makefile">
<include> <include>
<context ref="def:shebang"/> <context ref="def:shebang"/>
<context ref="def:shell-like-comment"/>
<context id="line-comment" style-ref="comment" end-at-line-end="true">
<start>#</start>
<include>
<context ref="def:line-continue"/>
<context ref="def:comment:*"/>
</include>
</context>
<context ref="def:string"/> <context ref="def:string"/>
<context ref="def:single-quoted-string"/> <context ref="def:single-quoted-string"/>
@ -54,21 +47,27 @@
</context> </context>
<context id="targets"> <context id="targets">
<match>^\s*([^\s]+)\s*\:</match> <match>^([^\t\:][^\:]*)\:</match>
<include> <include>
<context sub-pattern="1" style-ref="target"/> <context sub-pattern="1" style-ref="target"/>
</include> </include>
</context> </context>
<context id="trailing-tab" style-ref="trailing-tab">
<match>^\t+$</match>
</context>
<context id="directives" style-ref="keyword"> <context id="directives" style-ref="keyword">
<keyword>define</keyword> <keyword>define</keyword>
<keyword>else</keyword> <keyword>else</keyword>
<keyword>endef</keyword> <keyword>endef</keyword>
<keyword>endif</keyword> <keyword>endif</keyword>
<keyword>if</keyword>
<keyword>ifdef</keyword> <keyword>ifdef</keyword>
<keyword>ifeq</keyword> <keyword>ifeq</keyword>
<keyword>ifndef</keyword> <keyword>ifndef</keyword>
<keyword>ifneq</keyword> <keyword>ifneq</keyword>
<keyword>include</keyword>
<keyword>override</keyword> <keyword>override</keyword>
<keyword>unexport</keyword> <keyword>unexport</keyword>
</context> </context>