Comment and punctuation tweaks in the sample nanorc files.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4598 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 9294b942fe69d066c1a448665ba6f1f6c0540f5d..d0e50c081cbf4ab963237eecdcdd9e7f231c5855 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-02-23  Benno Schulenberg  <bensberg@justemail.net>
+       * doc/syntax/*.nanorc - Comment and punctuation tweaks.
+
 2014-02-23  Benno Schulenberg  <bensberg@justemail.net>
        * src/text.c (do_undo, do_redo, add_undo) - Make warning
        sentences in the status bar consistently end in a period.

diff --git a/doc/syntax/awk.nanorc b/doc/syntax/awk.nanorc
index b84d2fdcd3cac823d804077b5be47b442416fe35..48b3db11a1ac88e779c5a39f0f25777c7d42e43c 100644 (file)
--- a/doc/syntax/awk.nanorc
+++ b/doc/syntax/awk.nanorc
@@ -26,7 +26,6 @@ color magenta "\<(mktime|strftime|systime)\>"
 color magenta "\<(and|compl|lshift|or|rshift|xor)\>"
 color magenta "\<(bindtextdomain|dcgettext|dcngettext)\>"
 
-##
 ## String highlighting.  You will in general want your comments and
 ## strings to come last, because syntax highlighting rules will be
 ## applied in the order they are read in.

diff --git a/doc/syntax/c.nanorc b/doc/syntax/c.nanorc
index e7b854158ebbd445d628c9d4933e49643732603a..d85fee9e2ac912db097209a5113cdaeacb71b12c 100644 (file)
--- a/doc/syntax/c.nanorc
+++ b/doc/syntax/c.nanorc
@@ -11,15 +11,15 @@ color brightyellow "\<(try|throw|catch|operator|new|delete)\>"
 color magenta "\<(goto|continue|break|return)\>"
 color brightcyan "^[[:space:]]*#[[:space:]]*(define|include(_next)?|(un|ifn?)def|endif|el(if|se)|if|warning|error|pragma)"
 color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
-##
+
 ## GCC builtins
 color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
-##
+
 ## String highlighting.  You will in general want your comments and
 ## strings to come last, because syntax highlighting rules will be
 ## applied in the order they are read in.
 color brightyellow "<[^=       ]*>" ""(\\.|[^"])*""
-##
+
 ## This string is VERY resource intensive!
 color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
 

diff --git a/doc/syntax/cmake.nanorc b/doc/syntax/cmake.nanorc
index 3c52f7deb28c53c60c5ec35102cef85765336cdc..77a8a18c3648b66f3fac527e1996996850f7f6d6 100644 (file)
--- a/doc/syntax/cmake.nanorc
+++ b/doc/syntax/cmake.nanorc
@@ -1,4 +1,4 @@
-## CMake syntax highlighter for GNU Nano
+## Syntax highlighting for CMake files.
 ##
 syntax "cmake" "(CMakeLists\.txt|\.cmake)$"
 

diff --git a/doc/syntax/css.nanorc b/doc/syntax/css.nanorc
index 98eea180d3a81be1412b87a0289d862fc22243a2..9347b13eee40df44e8e7156eb4f30b6a95de988d 100644 (file)
--- a/doc/syntax/css.nanorc
+++ b/doc/syntax/css.nanorc
@@ -1,4 +1,4 @@
-## Here is an example for css files.
+## Here is an example for CSS files.
 ##
 syntax "css" "\.css$"
 color brightred     "."

diff --git a/doc/syntax/debian.nanorc b/doc/syntax/debian.nanorc
index a945deeac94c0d0d253ec4351981ef00bfea3877..0803fd0d65adf970efd6658a3e1dc7e3bdd8037b 100644 (file)
--- a/doc/syntax/debian.nanorc
+++ b/doc/syntax/debian.nanorc
@@ -1,6 +1,5 @@
-## Here is an exmaple for apt's sources.list
-## Adapted from http://milianw.de/blog/Syntax-Highlighting-in-Nano
-## (mail@milianw.de).
+## Here is an exmaple for apt's sources.list.
+## (adapted from http://milianw.de/blog/Syntax-Highlighting-in-Nano)
 ##
 syntax "apt/sources.list" "sources\.list(\.old|~)?$"
 # component

diff --git a/doc/syntax/fortran.nanorc b/doc/syntax/fortran.nanorc
index cc0c726a1c8ab1bd28b98ab1189485798b06176a..575dd31a437c5e882af08a30f3e10f126eb2bf20 100644 (file)
--- a/doc/syntax/fortran.nanorc
+++ b/doc/syntax/fortran.nanorc
@@ -1,4 +1,4 @@
-## Here is an example for Fortran 90/95
+## Here is an example for Fortran 90/95.
 
 syntax "fortran" "\.(f|f90|f95)$" 
 

diff --git a/doc/syntax/gentoo.nanorc b/doc/syntax/gentoo.nanorc
index 2ad159714c63a8529d3e655778b4873a87dd3bc8..bbedfe2ffae21791c91d8a7eb3c5c370b5620d0b 100644 (file)
--- a/doc/syntax/gentoo.nanorc
+++ b/doc/syntax/gentoo.nanorc
@@ -1,4 +1,4 @@
-## Here is an example for Gentoo ebuilds/eclasses
+## Here is an example for Gentoo ebuilds/eclasses.
 ##
 syntax "ebuild" "\.e(build|class)$"
 ## All the standard portage functions
@@ -33,7 +33,7 @@ color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
 ## Trailing space is bad!
 color ,green "[[:space:]]+$"
 
-## Here is an example for Portage control files
+## Here is an example for Portage control files.
 ##
 syntax "/etc/portage" "\.(keywords|mask|unmask|use)(/.+)?$"
 ## Base text:

diff --git a/doc/syntax/lua.nanorc b/doc/syntax/lua.nanorc
index af9d1402ecb4b529c3bcb030c82b197900d834a5..3f5b7be86c437a842ecc48bddcd1c59b2597674f 100644 (file)
--- a/doc/syntax/lua.nanorc
+++ b/doc/syntax/lua.nanorc
@@ -51,7 +51,6 @@ color red "\<([0-9]+)\>"
 # Symbols
 color brightmagenta "(\(|\)|\[|\]|\{|\})"
 
-
 # Shebang
 color brightcyan   "^#!.*"
 
@@ -61,16 +60,9 @@ color green        "\-\-.*$"
 # Multiline comments
 color green         start="\-\-\[\[" end="\]\]"
 
-# Strings
-#color green "\"(\\.|[^\\\"])*\"|'(\\.|[^\\'])*'"
-
 # Strings
 color red "\"(\\.|[^\\\"])*\"|'(\\.|[^\\'])*'"
-
-# color red         start="\[\[" end="\]\]"
-
+##color red         start="\[\[" end="\]\]"
 
 # Hex literals
 color red "0x[0-9a-fA-F]*"
-
-

diff --git a/doc/syntax/makefile.nanorc b/doc/syntax/makefile.nanorc
index 93a1e76d9c132a650819bef3e776fac4d2a89e81..bac672acbefeaa709af63164ad4704d055ccd7fa 100644 (file)
--- a/doc/syntax/makefile.nanorc
+++ b/doc/syntax/makefile.nanorc
@@ -1,4 +1,5 @@
-# unattributed syntax highlighting example from wiki.linuxhelp.net/
+## Syntax highlighting for Makefiles.
+## (unattributed example from http://wiki.linuxhelp.net/)
 
 syntax "makefile" "Makefile[^/]*$"
 color red "[:=]"

diff --git a/doc/syntax/mgp.nanorc b/doc/syntax/mgp.nanorc
index daba28275c169c154c5e6ed089a95a00bfc6e52b..8f2bc7443cc3d5b938e8e3b84fb86ba941871982 100644 (file)
--- a/doc/syntax/mgp.nanorc
+++ b/doc/syntax/mgp.nanorc
@@ -1,4 +1,4 @@
-## Here is an example for Magicpoint presentations
+## Here is an example for Magicpoint presentations.
 ##
 syntax "mgp" "\.mgp$"
 header "^%include.*"

diff --git a/doc/syntax/objc.nanorc b/doc/syntax/objc.nanorc
index cdf6e485f13d8e382a709b7b2f627c73eb1bcdc0..2dddf02c68b074ed328c43ce86fa21f080ff71a4 100644 (file)
--- a/doc/syntax/objc.nanorc
+++ b/doc/syntax/objc.nanorc
@@ -2,7 +2,6 @@
 ##
 syntax "m" "\.m$"
 
-
 ## Stuffs
 color brightwhite "\<[A-Z_][0-9A-Z_]+\>" 
 color green "\<(float|double|BOOL|bool|char|int|short|long|id|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
@@ -12,7 +11,7 @@ color brightgreen "\<(for|if|while|do|else|case|default|switch)\>"
 color brightgreen "\<(try|throw|catch|operator|new|delete)\>"
 color brightgreen "\<(goto|continue|break|return)\>"
 color brightgreen "@\<(en(code|d)|i(mplementation|nterface)|selector)\>"
-##
+
 ## GCC builtins
 color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
 
@@ -22,14 +21,12 @@ color white ":[[:alnum:]]*"
 color magenta "[[:alnum:]]*:"
 color white "\[[^][:space:]]*\]"
 
-##
 ## String highlighting.  You will in general want your comments and
 ## strings to come last, because syntax highlighting rules will be
 ## applied in the order they are read in.
 color brightblack "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
 color brightblack "<[^=        ]*>" ""(\\.|[^"])*""
 color brightblue "@"(\\.|[^"])*""
-##
 ## This string is VERY resource intensive!
 ## color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
 

diff --git a/doc/syntax/ocaml.nanorc b/doc/syntax/ocaml.nanorc
index fc71ae23800f2f5558ffe5cee1f5a480edb73bb5..3d07e1a11c5fb3792552f649c1958c3df9032d09 100644 (file)
--- a/doc/syntax/ocaml.nanorc
+++ b/doc/syntax/ocaml.nanorc
@@ -1,5 +1,5 @@
-# OCaml sample nanorc
-#
+## Syntax highlighting for OCaml.
+
 syntax "ocaml" "\.mli?$"
 #uid
 color red "\<[A-Z][0-9a-z_]{2,}\>"

diff --git a/doc/syntax/php.nanorc b/doc/syntax/php.nanorc
index 9cf54412de97d1a870cbb9c7b4ba305efbac2e47..44d3cf4dd4d5817641c43fc2749fb5cc4976acdd 100644 (file)
--- a/doc/syntax/php.nanorc
+++ b/doc/syntax/php.nanorc
@@ -1,4 +1,4 @@
-## Here is an example for PHP
+## Here is an example for PHP.
 ##
 syntax "php" "\.php[2345s~]?$"
 magic "PHP script text"
@@ -27,5 +27,5 @@ color brightblue start="/\*" end="\*/"
 #color blue start="<" end=">"
 #color red "&[^;[[:space:]]]*;"
 
-## Trailing whitespace
+## trailing whitespace
 color ,green "[[:space:]]+$"

diff --git a/doc/syntax/spec.nanorc b/doc/syntax/spec.nanorc
index f4afb1b31633f6a880d044fb4c652de37b8125a2..1a5d2f9d148e0519fb391e3a75a16fdd77cdc4ce 100644 (file)
--- a/doc/syntax/spec.nanorc
+++ b/doc/syntax/spec.nanorc
@@ -1,6 +1,6 @@
-# RPM spec files syntax highlighting
-# Parts taken from kate (KDE) syntax highlighting
-# Asterios Dramis
+## Syntax highlighting for RPM spec files.
+## Parts were taken from Kate's (KDE) syntax highlighting.
+## Asterios Dramis
 syntax "spec" "\.(spec$|spec\.*)"
 # Main tags
 color brightblue "((Icon|ExclusiveOs|ExcludeOs)[[:space:]]*:)"
@@ -13,7 +13,7 @@ color brightblue "((Name|Version|Release|Url|URL)[[:space:]]*:)"
 color brightblue start="^Source" end=":" start="^Patch" end=":"
 # Architectures
 color brightred "(i386|i486|i586|i686|athlon|ia64|alpha|alphaev5|alphaev56|alphapca56|alphaev6|alphaev67|sparc|sparcv9|sparc64armv3l|armv4b|armv4lm|ips|mipsel|ppc|ppc|iseries|ppcpseries|ppc64|m68k|m68kmint|Sgi|rs6000|i370|s390x|s390|noarch)"
-# Architectures conditionals
+# Architecture conditionals
 color brightred "(ifarch|ifnarch)"
 # OS conditionals
 color brightred "(ifos|ifnos)"

diff --git a/doc/syntax/tcl.nanorc b/doc/syntax/tcl.nanorc
index ad3401fbd73ad48da2b0840d8ab91edf9e0481c6..8bcec2467542b115752005f3bb4b00941f6faa4d 100644 (file)
--- a/doc/syntax/tcl.nanorc
+++ b/doc/syntax/tcl.nanorc
@@ -1,13 +1,15 @@
+## Syntax highlighting for Tcl files.
+
 syntax "tcl" "\.tcl$"
 
-## Standard Tcl [info commands]
+# Standard Tcl [info commands]:
 color green "\<(after|append|array|auto_execok|auto_import|auto_load|auto_load_index|auto_qualify|binary|break|case|catch|cd|clock|close|concat|continue|encoding|eof|error|eval|exec|exit|expr|fblocked|fconfigure|fcopy|file|fileevent|flush|for|foreach|format|gets|glob|global|history|if|incr|info|interp|join|lappend|lindex|linsert|list|llength|load|lrange|lreplace|lsearch|lset|lsort|namespace|open|package|pid|puts|pwd|read|regexp|regsub|rename|return|scan|seek|set|socket|source|split|string|subst|switch|tclLog|tell|time|trace|unknown|unset|update|uplevel|upvar|variable|vwait|while)\>"
-## Basic Tcl sub commands.
+# Basic Tcl subcommands:
 color green "\<(array anymore|array donesearch|array exists|array get|array names|array nextelement|array set|array size|array startsearch|array statistics|array unset)\>"
 color green "\<(string bytelength|string compare|string equal|string first|string index|string is|string last|string length|string map|string match|string range|string repeat|string replace|string to|string tolower|string totitle|string toupper|string trim|string trimleft|string trimright|string will|string wordend|string wordstart)\>"
-## Extended TclX [info commands]
+# Extended TclX [info commands]:
 color green "\<(alarm|auto_load_pkg|bsearch|catclose|catgets|catopen|ccollate|cconcat|cequal|chgrp|chmod|chown|chroot|cindex|clength|cmdtrace|commandloop|crange|csubstr|ctoken|ctype|dup|echo|execl|fcntl|flock|fork|fstat|ftruncate|funlock|host_info|id|infox|keyldel|keylget|keylkeys|keylset|kill|lassign|lcontain|lempty|lgets|link|lmatch|loadlibindex|loop|lvarcat|lvarpop|lvarpush|max|min|nice|pipe|profile|random|readdir|replicate|scancontext|scanfile|scanmatch|select|server_accept|server_create|signal|sleep|sync|system|tclx_findinit|tclx_fork|tclx_load_tndxs|tclx_sleep|tclx_system|tclx_wait|times|translit|try_eval|umask|wait)\>"
-## Syntax.
+# Syntax:
 color brightblue "proc[[:space:]]" "(\{|\})"
 color green "(\(|\)|\;|`|\\|\$|<|>|!|=|&|\|)"
 color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"

diff --git a/doc/syntax/xml.nanorc b/doc/syntax/xml.nanorc
index 9005d61471903a34a5c321d2228d683ad06de753..1445a6505e953b5cef101e1d29aaf5989181172e 100644 (file)
--- a/doc/syntax/xml.nanorc
+++ b/doc/syntax/xml.nanorc
@@ -1,4 +1,4 @@
-## Here is an example for xml files.
+## Here is an example for XML files.
 ##
 syntax "xml" "\.([jrs]html?|sgml?|xml|xslt?)$"
 magic "XML.*document text"