syntaxes: remove quotes from each syntax name, and color it differently

The different color will make the name stand out, as it should, instead
of looking the same as all the regex strings.
This commit is contained in:
Benno Schulenberg 2018-02-07 11:25:46 +01:00
parent 544cda6a62
commit 3e1fc6385b
45 changed files with 47 additions and 47 deletions

View File

@ -271,7 +271,7 @@ void parse_syntax(char *ptr)
ptr = parse_next_word(ptr); ptr = parse_next_word(ptr);
/* Check that there are no quotes or that they are paired. */ /* Check that quotes around the name are either paired or absent. */
if ((*nameptr == '\x22') ^ (nameptr[strlen(nameptr) - 1] == '\x22')) { if ((*nameptr == '\x22') ^ (nameptr[strlen(nameptr) - 1] == '\x22')) {
rcfile_error(N_("Unpaired quote in syntax name")); rcfile_error(N_("Unpaired quote in syntax name"));
return; return;

View File

@ -1,6 +1,6 @@
## Here is an example for assembler. ## Here is an example for assembler.
syntax "asm" "\.(S|s|asm)$" syntax asm "\.(S|s|asm)$"
magic "assembler source" magic "assembler source"
comment "//" comment "//"

View File

@ -1,6 +1,6 @@
## Here is an example for Autoconf. ## Here is an example for Autoconf.
syntax "autoconf" "\.(ac|m4)$" syntax autoconf "\.(ac|m4)$"
comment "#" comment "#"
# Keywords: # Keywords:

View File

@ -1,6 +1,6 @@
## Here is an example for awk. ## Here is an example for awk.
syntax "awk" "\.awk$" syntax awk "\.awk$"
magic "awk script" magic "awk script"
comment "#" comment "#"

View File

@ -1,6 +1,6 @@
## Here is an example for C/C++. ## Here is an example for C/C++.
syntax "c" "\.(c(c|pp|xx|\+\+)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$" syntax c "\.(c(c|pp|xx|\+\+)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$"
magic "^(C|C\+\+) (source|program)" magic "^(C|C\+\+) (source|program)"
comment "//" comment "//"

View File

@ -1,6 +1,6 @@
## Colouring for Changelogs. ## Colouring for Changelogs.
syntax "changelog" "Change[Ll]og.*" syntax changelog "Change[Ll]og.*"
# Author lines. # Author lines.
color green "^(19|20).*$" color green "^(19|20).*$"

View File

@ -1,6 +1,6 @@
## Syntax highlighting for CMake files. ## Syntax highlighting for CMake files.
syntax "cmake" "(CMakeLists\.txt|\.cmake)$" syntax cmake "(CMakeLists\.txt|\.cmake)$"
comment "#" comment "#"
icolor green "^[[:space:]]*[A-Z0-9_]+" icolor green "^[[:space:]]*[A-Z0-9_]+"

View File

@ -1,6 +1,6 @@
## Here is an example for CSS files. ## Here is an example for CSS files.
syntax "css" "\.css$" syntax css "\.css$"
comment "/*|*/" comment "/*|*/"
color brightred "." color brightred "."

View File

@ -1,6 +1,6 @@
## Here is an example for apt's sources.list. ## Here is an example for apt's sources.list.
syntax "sources.list" "sources\.list(~|\.old|\.save)?$" "sources\.list\.d/.*\.list(~|\.old|\.save)?$" syntax sources.list "sources\.list(~|\.old|\.save)?$" "sources\.list\.d/.*\.list(~|\.old|\.save)?$"
comment "#" comment "#"
# Coloring the deb lines, working from tail to head. First the # Coloring the deb lines, working from tail to head. First the

View File

@ -1,7 +1,7 @@
## An example of a default syntax. The default syntax is used for ## An example of a default syntax. The default syntax is used for
## files that do not match any other syntax. ## files that do not match any other syntax.
syntax "default" syntax default
comment "#" comment "#"
# Comments. # Comments.

View File

@ -1,6 +1,6 @@
## Here is an example for Emacs Lisp. ## Here is an example for Emacs Lisp.
syntax "elisp" "\.el$" syntax elisp "\.el$"
magic "Lisp/Scheme program" magic "Lisp/Scheme program"
comment ";" comment ";"

View File

@ -1,6 +1,6 @@
## Here is an example for Fortran 90/95. ## Here is an example for Fortran 90/95.
syntax "fortran" "\.(f|f90|f95)$" syntax fortran "\.(f|f90|f95)$"
comment "!" comment "!"
color red "\<[0-9]+\>" color red "\<[0-9]+\>"

View File

@ -1,7 +1,7 @@
## Here is an example for Gentoo ebuilds/eclasses, ## Here is an example for Gentoo ebuilds/eclasses,
## and (further down) one for Portage control files. ## and (further down) one for Portage control files.
syntax "ebuild" "\.e(build|class|blit)$" syntax ebuild "\.e(build|class|blit)$"
comment "#" comment "#"
## All the standard portage functions: ## All the standard portage functions:
@ -48,7 +48,7 @@ color ,green "[[:space:]]+$"
color ,green " " color ,green " "
syntax "/etc/portage" "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$" syntax /etc/portage "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
comment "#" comment "#"
## Base text: ## Base text:

View File

@ -1,6 +1,6 @@
## Here is an example for Go. ## Here is an example for Go.
syntax "go" "\.go$" syntax go "\.go$"
comment "//" comment "//"
# Set up a formatter since spelling is probably useless... # Set up a formatter since spelling is probably useless...

View File

@ -1,6 +1,6 @@
## Here is an example for groff. ## Here is an example for groff.
syntax "groff" "\.m[ems]$" "\.rof" "\.tmac$" "^tmac." syntax groff "\.m[ems]$" "\.rof" "\.tmac$" "^tmac."
comment ".\"" comment ".\""
# The argument of .ds or .nr # The argument of .ds or .nr

View File

@ -1,6 +1,6 @@
## Here is an example for Guile Scheme. ## Here is an example for Guile Scheme.
syntax "guile" "\.scm$" syntax guile "\.scm$"
header "^#!.*guile" header "^#!.*guile"
comment ";" comment ";"

View File

@ -1,6 +1,6 @@
## Here is an example for HTML. ## Here is an example for HTML.
syntax "html" "\.html?$" syntax html "\.html?$"
magic "HTML document" magic "HTML document"
comment "<!--|-->" comment "<!--|-->"

View File

@ -1,6 +1,6 @@
## Here is an example for Java. ## Here is an example for Java.
syntax "java" "\.java$" syntax java "\.java$"
magic "Java " magic "Java "
comment "//" comment "//"

View File

@ -1,6 +1,6 @@
## Syntax highlighting for Javascript. ## Syntax highlighting for Javascript.
syntax "javascript" "\.js$" syntax javascript "\.js$"
comment "//" comment "//"
# Declarational stuff. # Declarational stuff.

View File

@ -4,7 +4,7 @@
# Original author: Aapo Rantalainen # Original author: Aapo Rantalainen
# License: GPLv3 or newer # License: GPLv3 or newer
syntax "json" "\.json$" syntax json "\.json$"
# No comments are permitted in JSON. # No comments are permitted in JSON.
comment "" comment ""

View File

@ -3,7 +3,7 @@
## Original author: Matthew Wild <mwild1 (at) gmail.com> ## Original author: Matthew Wild <mwild1 (at) gmail.com>
## License: GPL 3 or later ## License: GPL 3 or later
syntax "lua" "\.lua$" syntax lua "\.lua$"
magic "Lua script" magic "Lua script"
comment "--" comment "--"

View File

@ -1,6 +1,6 @@
## Here is an example for Makefiles. ## Here is an example for Makefiles.
syntax "makefile" "Makefile[^/]*$" "\.(make|mk)$" syntax makefile "Makefile[^/]*$" "\.(make|mk)$"
magic "makefile script" magic "makefile script"
comment "#" comment "#"

View File

@ -1,6 +1,6 @@
## Here is an example for manpages. ## Here is an example for manpages.
syntax "man" "\.[1-9]x?$" syntax man "\.[1-9]x?$"
magic "troff or preprocessor input" magic "troff or preprocessor input"
comment ".\"" comment ".\""

View File

@ -1,6 +1,6 @@
## Here is an example for Magicpoint presentations. ## Here is an example for Magicpoint presentations.
syntax "mgp" "\.mgp$" syntax mgp "\.mgp$"
header "^%include.*" header "^%include.*"
comment "#" comment "#"

View File

@ -1,6 +1,6 @@
## Here is an example for quoted emails (under e.g. mutt). ## Here is an example for quoted emails (under e.g. mutt).
syntax "mutt" syntax mutt
# Quoted lines. # Quoted lines.
color green "^>.*" color green "^>.*"

View File

@ -1,7 +1,7 @@
## This is meant for highlighting key combos in a nano help text. ## This is meant for highlighting key combos in a nano help text.
# It should not apply to any normal file, so no fileregex. # It should not apply to any normal file, so no fileregex.
syntax "nanohelp" syntax nanohelp
# Key combos: # Key combos:
color cyan "\^[]4-8A-Z^\_◀▶▲▼]" "[◀▶▲▼]" "(\^|M-)Space" "\<M-." "\<F1?[0-9]" color cyan "\^[]4-8A-Z^\_◀▶▲▼]" "[◀▶▲▼]" "(\^|M-)Space" "\<M-." "\<F1?[0-9]"

View File

@ -1,6 +1,6 @@
## Here is an example for nanorc files. ## Here is an example for nanorc files.
syntax "nanorc" "\.?nanorc$" syntax nanorc "\.?nanorc$"
comment "#" comment "#"
# Possible errors and parameters # Possible errors and parameters
@ -13,7 +13,7 @@ icolor brightgreen "^[[:space:]]*set[[:space:]]+(backupdir|brackets|functioncolo
icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^([[:alpha:]]|[]0-9\^_]|Space)|M-([[:alpha:]]|[]!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+[[:alpha:]]+[[:space:]]+(all|main|search|replace(with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)" icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^([[:alpha:]]|[]0-9\^_]|Space)|M-([[:alpha:]]|[]!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+[[:alpha:]]+[[:space:]]+(all|main|search|replace(with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)"
icolor brightgreen "^[[:space:]]*unbind[[:space:]]+((\^([[:alpha:]]|[]0-9\^_]|Space)|M-([[:alpha:]]|[]!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+(all|main|search|replace(with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)" icolor brightgreen "^[[:space:]]*unbind[[:space:]]+((\^([[:alpha:]]|[]0-9\^_]|Space)|M-([[:alpha:]]|[]!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+(all|main|search|replace(with)?|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)"
icolor brightgreen "^[[:space:]]*extendsyntax[[:space:]]+[[:alpha:]]+[[:space:]]+(i?color|header|magic|comment|linter|formatter)[[:space:]]+.*$" icolor brightgreen "^[[:space:]]*extendsyntax[[:space:]]+[[:alpha:]]+[[:space:]]+(i?color|header|magic|comment|linter|formatter)[[:space:]]+.*$"
icolor brightgreen "^[[:space:]]*(linter|formatter)[[:space:]]+[[:alpha:]]+" icolor brightgreen "^[[:space:]]*(syntax|linter|formatter)[[:space:]]+[^[:blank:]]+"
icolor green "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|comment|linter|formatter|extendsyntax)\>" icolor green "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|comment|linter|formatter|extendsyntax)\>"
# Strings # Strings

View File

@ -1,6 +1,6 @@
## Here is an example for nftables. ## Here is an example for nftables.
syntax "nftables" "\.(nft|nftables)$" syntax nftables "\.(nft|nftables)$"
header "^#!.*(nft|nftables)" header "^#!.*(nft|nftables)"
comment "#" comment "#"

View File

@ -1,6 +1,6 @@
## Here is an example for C/C++/Obj-C. ## Here is an example for C/C++/Obj-C.
syntax "m" "\.m$" syntax m "\.m$"
magic "Objective-C source" magic "Objective-C source"
comment "//" comment "//"

View File

@ -1,6 +1,6 @@
## Syntax highlighting for OCaml. ## Syntax highlighting for OCaml.
syntax "ocaml" "\.mli?$" syntax ocaml "\.mli?$"
magic "OCaml" magic "OCaml"
comment "(*|*)" comment "(*|*)"

View File

@ -1,6 +1,6 @@
## Here is an example for patch files. ## Here is an example for patch files.
syntax "patch" "\.(patch|diff|debdiff)$" syntax patch "\.(patch|diff|debdiff)$"
magic "diff output" magic "diff output"
# There is no official support for comments in patch files. # There is no official support for comments in patch files.
comment "" comment ""

View File

@ -1,6 +1,6 @@
## Here is an example for Perl. ## Here is an example for Perl.
syntax "perl" "\.p[lm]$" syntax perl "\.p[lm]$"
header "^#!.*perl[-0-9._]*" header "^#!.*perl[-0-9._]*"
magic "Perl script" magic "Perl script"
comment "#" comment "#"

View File

@ -1,6 +1,6 @@
## Here is an example for PHP. ## Here is an example for PHP.
syntax "php" "\.ph(p[23457s~]?|tml)$" syntax php "\.ph(p[23457s~]?|tml)$"
magic "PHP script" magic "PHP script"
comment "//" comment "//"

View File

@ -1,6 +1,6 @@
## Colouring for PO files. ## Colouring for PO files.
syntax "po" "\.pot?$" syntax po "\.pot?$"
comment "#" comment "#"
# Comments. # Comments.

View File

@ -1,6 +1,6 @@
## Here is an example for PostgreSQL. ## Here is an example for PostgreSQL.
syntax "sql" "\.sql[2345s~]?$" syntax sql "\.sql[2345s~]?$"
comment "-- " comment "-- "
# Functions. # Functions.

View File

@ -1,6 +1,6 @@
## Here is an example for POV-Ray. ## Here is an example for POV-Ray.
syntax "pov" "\.(pov|POV|povray|POVRAY)$" syntax pov "\.(pov|POV|povray|POVRAY)$"
comment "//" comment "//"
color brightcyan "^[[:space:]]*#[[:space:]]*(declare)" color brightcyan "^[[:space:]]*#[[:space:]]*(declare)"

View File

@ -1,6 +1,6 @@
## Here is an example for Python. ## Here is an example for Python.
syntax "python" "\.py$" syntax python "\.py$"
header "^#!.*python[-0-9._]*" header "^#!.*python[-0-9._]*"
magic "Python script" magic "Python script"
linter pyflakes linter pyflakes

View File

@ -1,6 +1,6 @@
## Here is an example for Ruby. ## Here is an example for Ruby.
syntax "ruby" "\.rb$" syntax ruby "\.rb$"
header "^#!.*ruby[-0-9._]*" header "^#!.*ruby[-0-9._]*"
magic "Ruby script" magic "Ruby script"
linter ruby -w -c linter ruby -w -c

View File

@ -4,7 +4,7 @@
## NOTE: Rules are applied in order: later rules re-colorize matching text. ## NOTE: Rules are applied in order: later rules re-colorize matching text.
syntax "rust" "\.rs" syntax rust "\.rs"
comment "//" comment "//"
# Function definitions # Function definitions

View File

@ -1,6 +1,6 @@
## Here is an example for Bourne shell scripts. ## Here is an example for Bourne shell scripts.
syntax "sh" "\.sh$" syntax sh "\.sh$"
header "^#!.*((ba|da|k|pdk)?sh[-0-9_]*|openrc-run|runscript)" header "^#!.*((ba|da|k|pdk)?sh[-0-9_]*|openrc-run|runscript)"
magic "(POSIX|Bourne-Again) shell script.*text" magic "(POSIX|Bourne-Again) shell script.*text"
linter dash -n linter dash -n

View File

@ -1,6 +1,6 @@
## Syntax highlighting for RPM spec files. ## Syntax highlighting for RPM spec files.
syntax "spec" "\.(spec$|spec\.*)" syntax spec "\.(spec$|spec\.*)"
comment "#" comment "#"
# Main tags. # Main tags.

View File

@ -1,6 +1,6 @@
## Syntax highlighting for Tcl files. ## Syntax highlighting for Tcl files.
syntax "tcl" "\.tcl$" syntax tcl "\.tcl$"
magic "Tcl(/Tk)? script" magic "Tcl(/Tk)? script"
comment "#" comment "#"

View File

@ -1,6 +1,6 @@
## Here is a short example for TeX files. ## Here is a short example for TeX files.
syntax "tex" "\.tex$" syntax tex "\.tex$"
magic "(La)?TeX document" magic "(La)?TeX document"
linter chktex -v0 -q -I linter chktex -v0 -q -I
comment "%" comment "%"

View File

@ -1,6 +1,6 @@
## Here is an example for Texinfo files. ## Here is an example for Texinfo files.
syntax "texinfo" "\.texi$" syntax texinfo "\.texi$"
header "^\\input texinfo" header "^\\input texinfo"
magic "Texinfo source" magic "Texinfo source"
comment "@c " comment "@c "

View File

@ -1,6 +1,6 @@
## Here is an example for XML files. ## Here is an example for XML files.
syntax "xml" "\.([jrsx]html?|jnlp|mml|pom|rng|sgml?|svg|w[as]dl|wsdd|xjb|xml|xs(d|lt?)|xul)$" syntax xml "\.([jrsx]html?|jnlp|mml|pom|rng|sgml?|svg|w[as]dl|wsdd|xjb|xml|xs(d|lt?)|xul)$"
header "<\?xml.*version=.*\?>" header "<\?xml.*version=.*\?>"
magic "(XML|SGML) (sub)?document" magic "(XML|SGML) (sub)?document"
comment "<!--|-->" comment "<!--|-->"