From: <be...@us...> - 2008-07-27 16:06:54
|
Revision: 1643 http://geshi.svn.sourceforge.net/geshi/?rev=1643&view=rev Author: benbe Date: 2008-07-27 16:07:01 +0000 (Sun, 27 Jul 2008) Log Message: ----------- fix: Bunch of languages having superfluous or missing COMMENT style entries fix: Some languages containing tabs Modified Paths: -------------- trunk/geshi-1.0.X/src/geshi/d.php trunk/geshi-1.0.X/src/geshi/dos.php trunk/geshi-1.0.X/src/geshi/groovy.php trunk/geshi-1.0.X/src/geshi/java5.php trunk/geshi-1.0.X/src/geshi/kixtart.php trunk/geshi-1.0.X/src/geshi/klonec.php trunk/geshi-1.0.X/src/geshi/klonecpp.php trunk/geshi-1.0.X/src/geshi/oracle8.php trunk/geshi-1.0.X/src/geshi/pascal.php trunk/geshi-1.0.X/src/geshi/rails.php trunk/geshi-1.0.X/src/geshi/sas.php trunk/geshi-1.0.X/src/geshi/scala.php trunk/geshi-1.0.X/src/geshi/typoscript.php trunk/geshi-1.0.X/src/geshi/verilog.php Modified: trunk/geshi-1.0.X/src/geshi/d.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/d.php 2008-07-27 16:05:28 UTC (rev 1642) +++ trunk/geshi-1.0.X/src/geshi/d.php 2008-07-27 16:07:01 UTC (rev 1643) @@ -236,7 +236,6 @@ ), 'COMMENTS' => array( 1=> 'color: #808080; font-style: italic;', - 2=> 'color: #a1a100;', 'MULTI' => 'color: #808080; font-style: italic;' ), 'ESCAPE_CHAR' => array( Modified: trunk/geshi-1.0.X/src/geshi/dos.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/dos.php 2008-07-27 16:05:28 UTC (rev 1642) +++ trunk/geshi-1.0.X/src/geshi/dos.php 2008-07-27 16:07:01 UTC (rev 1643) @@ -113,8 +113,7 @@ 4 => 'color: #0000ff; font-weight: bold;' ), 'COMMENTS' => array( - 1 => 'color: #808080; font-style: italic;', - 2 => 'color: #808080; font-style: italic;' + 1 => 'color: #808080; font-style: italic;' ), 'ESCAPE_CHAR' => array( 0 => 'color: #ff0000; font-weight: bold;' Modified: trunk/geshi-1.0.X/src/geshi/groovy.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/groovy.php 2008-07-27 16:05:28 UTC (rev 1642) +++ trunk/geshi-1.0.X/src/geshi/groovy.php 2008-07-27 16:07:01 UTC (rev 1643) @@ -2042,6 +2042,7 @@ 'COMMENTS' => array( 1=> 'color: #808080; font-style: italic;', 2=> 'color: #a1a100;', + 3=> 'color: #808080; font-style: italic;', 'MULTI' => 'color: #808080; font-style: italic;' ), 'ESCAPE_CHAR' => array( Modified: trunk/geshi-1.0.X/src/geshi/java5.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/java5.php 2008-07-27 16:05:28 UTC (rev 1642) +++ trunk/geshi-1.0.X/src/geshi/java5.php 2008-07-27 16:07:01 UTC (rev 1643) @@ -814,7 +814,7 @@ ), 'COMMENTS' => array( 1 => 'color: #666666; font-style: italic;', - 1 => 'color: #006699;', + 2 => 'color: #006699;', 'MULTI' => 'color: #666666; font-style: italic;' ), 'ESCAPE_CHAR' => array( Modified: trunk/geshi-1.0.X/src/geshi/kixtart.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/kixtart.php 2008-07-27 16:05:28 UTC (rev 1642) +++ trunk/geshi-1.0.X/src/geshi/kixtart.php 2008-07-27 16:07:01 UTC (rev 1643) @@ -277,7 +277,6 @@ ), 'COMMENTS' => array( 1 => 'color: #808080; font-style: italic;', - 2 => 'color: #808080; font-style: italic;', 'MULTI' => 'color: #808080; font-style: italic;' ), 'ESCAPE_CHAR' => array( Modified: trunk/geshi-1.0.X/src/geshi/klonec.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/klonec.php 2008-07-27 16:05:28 UTC (rev 1642) +++ trunk/geshi-1.0.X/src/geshi/klonec.php 2008-07-27 16:07:01 UTC (rev 1643) @@ -51,7 +51,7 @@ 'null', 'false', 'break', 'true', 'enum', 'extern', 'inline', 'false' ), 2 => array(//mots-cles KLone - '<%=', '<%!', '<%', '%>', 'out', 'request', 'response', + '<%=', '<%!', '<%', '%>', 'out', 'request', 'response', ), 3 => array(//fonctions C usuelles 'printf', 'malloc', 'fopen', 'fclose', 'free', 'fputs', 'fgets', 'feof', 'fwrite', @@ -84,13 +84,13 @@ 'io_get_until', 'io_gets', 'io_codec_add_head', 'io_codec_add_tail', 'io_codecs_remove', 'io_name_set', 'io_name_get' ), - 5 => array(//types C - 'auto', 'char', 'const', 'double', 'float', 'int', 'long', - 'register', 'short', 'signed', 'sizeof', 'static', 'string', 'struct', - 'typedef', 'union', 'unsigned', 'void', 'volatile', - 'wchar_t', 'time_t', 'FILE' - ), - 6 => array(//mots-cles HTML + 5 => array(//types C + 'auto', 'char', 'const', 'double', 'float', 'int', 'long', + 'register', 'short', 'signed', 'sizeof', 'static', 'string', 'struct', + 'typedef', 'union', 'unsigned', 'void', 'volatile', + 'wchar_t', 'time_t', 'FILE' + ), + 6 => array(//mots-cles HTML 'a', 'abbr', 'acronym', 'address', 'applet', 'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b', @@ -128,28 +128,28 @@ 'ul', 'u', 'var', - ), - 7 => array(//autres mots-cles HTML - 'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis', - 'background', 'bgcolor', 'border', - 'cellpadding', 'cellspacing', 'char', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords', - 'data', 'datetime', 'declare', 'defer', 'dir', 'disabled', - 'enctype', - 'face', 'for', 'frame', 'frameborder', - 'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv', - 'id', 'ismap', - 'label', 'lang', 'language', 'link', 'longdesc', - 'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple', - 'name', 'nohref', 'noresize', 'noshade', 'nowrap', - 'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload', - 'profile', 'prompt', - 'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules', - 'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary', - 'tabindex', 'target', 'text', 'title', 'type', - 'usemap', - 'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace', - 'width' - ) + ), + 7 => array(//autres mots-cles HTML + 'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis', + 'background', 'bgcolor', 'border', + 'cellpadding', 'cellspacing', 'char', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords', + 'data', 'datetime', 'declare', 'defer', 'dir', 'disabled', + 'enctype', + 'face', 'for', 'frame', 'frameborder', + 'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv', + 'id', 'ismap', + 'label', 'lang', 'language', 'link', 'longdesc', + 'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple', + 'name', 'nohref', 'noresize', 'noshade', 'nowrap', + 'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload', + 'profile', 'prompt', + 'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules', + 'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary', + 'tabindex', 'target', 'text', 'title', 'type', + 'usemap', + 'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace', + 'width' + ) ), 'SYMBOLS' => array( '(', ')', '[', ']', '{', '}', @@ -208,8 +208,8 @@ 1 => '', 2 => '', 3 => 'color: #00bbdd; font-weight: bold;', - 4 => 'color: #ddbb00;', - 5 => 'color: #009900;' + 4 => 'color: #ddbb00;', + 5 => 'color: #009900;' ) ), 'URLS' => array( @@ -231,7 +231,7 @@ 'STRICT_MODE_APPLIES' => GESHI_ALWAYS, 'SCRIPT_DELIMITERS' => array( //delimiteurs pour KLone - 0 => array( + 0 => array( '<%=' => '%>' ), 1 => array( @@ -242,22 +242,22 @@ ), //delimiteur pour HTML 3 => array( - '<!DOCTYPE' => '>' - ), - 4 => array( - '&' => ';' - ), - 5 => array( - '<' => '>' - ) + '<!DOCTYPE' => '>' + ), + 4 => array( + '&' => ';' + ), + 5 => array( + '<' => '>' + ) ), 'HIGHLIGHT_STRICT_BLOCK' => array( 0 => false, 1 => true, 2 => true, 3 => false, - 4 => false, - 5 => true + 4 => false, + 5 => true ), 'TAB_WIDTH' => 4, 'PARSER_CONTROL' => array( Modified: trunk/geshi-1.0.X/src/geshi/klonecpp.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/klonecpp.php 2008-07-27 16:05:28 UTC (rev 1642) +++ trunk/geshi-1.0.X/src/geshi/klonecpp.php 2008-07-27 16:07:01 UTC (rev 1643) @@ -66,7 +66,7 @@ 'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC' ), 2 => array(//mots-cles KLone - '<%=', '<%!', '<%', '%>', 'out', 'request', 'response', + '<%=', '<%!', '<%', '%>', 'out', 'request', 'response', ), 3 => array(//fonctions C++ usuelles 'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this', @@ -110,15 +110,15 @@ 'io_get_until', 'io_gets', 'io_codec_add_head', 'io_codec_add_tail', 'io_codecs_remove', 'io_name_set', 'io_name_get' ), - 5 => array(//types C++ - 'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint', - 'register', 'short', 'shortint', 'signed', 'static', 'struct', - 'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf', - 'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t', - 'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', - 'string', 'wchar_t', 'time_t', 'FILE' - ), - 6 => array(//mots-cles HTML + 5 => array(//types C++ + 'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint', + 'register', 'short', 'shortint', 'signed', 'static', 'struct', + 'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf', + 'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t', + 'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', + 'string', 'wchar_t', 'time_t', 'FILE' + ), + 6 => array(//mots-cles HTML 'a', 'abbr', 'acronym', 'address', 'applet', 'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b', @@ -156,28 +156,28 @@ 'ul', 'u', 'var', - ), - 7 => array(//autres mots-cles HTML - 'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis', - 'background', 'bgcolor', 'border', - 'cellpadding', 'cellspacing', 'char', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords', - 'data', 'datetime', 'declare', 'defer', 'dir', 'disabled', - 'enctype', - 'face', 'for', 'frame', 'frameborder', - 'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv', - 'id', 'ismap', - 'label', 'lang', 'language', 'link', 'longdesc', - 'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple', - 'name', 'nohref', 'noresize', 'noshade', 'nowrap', - 'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload', - 'profile', 'prompt', - 'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules', - 'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary', - 'tabindex', 'target', 'text', 'title', 'type', - 'usemap', - 'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace', - 'width' - ) + ), + 7 => array(//autres mots-cles HTML + 'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis', + 'background', 'bgcolor', 'border', + 'cellpadding', 'cellspacing', 'char', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords', + 'data', 'datetime', 'declare', 'defer', 'dir', 'disabled', + 'enctype', + 'face', 'for', 'frame', 'frameborder', + 'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv', + 'id', 'ismap', + 'label', 'lang', 'language', 'link', 'longdesc', + 'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple', + 'name', 'nohref', 'noresize', 'noshade', 'nowrap', + 'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload', + 'profile', 'prompt', + 'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules', + 'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary', + 'tabindex', 'target', 'text', 'title', 'type', + 'usemap', + 'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace', + 'width' + ) ), 'SYMBOLS' => array( '(', ')', '[', ']', '{', '}', @@ -236,8 +236,8 @@ 1 => '', 2 => '', 3 => 'color: #00bbdd; font-weight: bold;', - 4 => 'color: #ddbb00;', - 5 => 'color: #009900;' + 4 => 'color: #ddbb00;', + 5 => 'color: #009900;' ) ), 'URLS' => array( @@ -259,7 +259,7 @@ 'STRICT_MODE_APPLIES' => GESHI_ALWAYS, 'SCRIPT_DELIMITERS' => array( //delimiteurs pour KLone - 0 => array( + 0 => array( '<%=' => '%>' ), 1 => array( @@ -270,22 +270,22 @@ ), //delimiteur pour HTML 3 => array( - '<!DOCTYPE' => '>' - ), - 4 => array( - '&' => ';' - ), - 5 => array( - '<' => '>' - ) + '<!DOCTYPE' => '>' + ), + 4 => array( + '&' => ';' + ), + 5 => array( + '<' => '>' + ) ), 'HIGHLIGHT_STRICT_BLOCK' => array( 0 => false, 1 => true, 2 => true, 3 => false, - 4 => false, - 5 => true + 4 => false, + 5 => true ), 'TAB_WIDTH' => 4, 'PARSER_CONTROL' => array( Modified: trunk/geshi-1.0.X/src/geshi/oracle8.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/oracle8.php 2008-07-27 16:05:28 UTC (rev 1642) +++ trunk/geshi-1.0.X/src/geshi/oracle8.php 2008-07-27 16:07:01 UTC (rev 1643) @@ -448,8 +448,7 @@ //Add the styles for groups 3-6 here when used ), 'COMMENTS' => array( - 1 => 'color: #808080; font-style: italic;', - 2 => 'color: #808080; font-style: italic;' + 1 => 'color: #808080; font-style: italic;' ), 'ESCAPE_CHAR' => array( 0 => 'color: #000099; font-weight: bold;' Modified: trunk/geshi-1.0.X/src/geshi/pascal.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/pascal.php 2008-07-27 16:05:28 UTC (rev 1642) +++ trunk/geshi-1.0.X/src/geshi/pascal.php 2008-07-27 16:07:01 UTC (rev 1643) @@ -98,8 +98,7 @@ 4 => 'color: #000066; font-weight: bold;' ), 'COMMENTS' => array( - 1 => 'color: #666666; font-style: italic;', - 2 => 'color: #339933;', + 1 => 'color: #666666; font-style: italic;' 'MULTI' => 'color: #666666; font-style: italic;' ), 'ESCAPE_CHAR' => array( Modified: trunk/geshi-1.0.X/src/geshi/rails.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/rails.php 2008-07-27 16:05:28 UTC (rev 1642) +++ trunk/geshi-1.0.X/src/geshi/rails.php 2008-07-27 16:07:01 UTC (rev 1643) @@ -7,7 +7,7 @@ * Release Version: 1.0.7.22 * Date Started: 2007/03/21 * - * Ruby (with Ruby on Rails Framework) language file for GeSHi + * Ruby (with Ruby on Rails Framework) language file for GeSHi. * ************************************************************************************* * Modified: trunk/geshi-1.0.X/src/geshi/sas.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/sas.php 2008-07-27 16:05:28 UTC (rev 1642) +++ trunk/geshi-1.0.X/src/geshi/sas.php 2008-07-27 16:07:01 UTC (rev 1643) @@ -176,7 +176,7 @@ 9 => 'color: #0000ff;' ), 'COMMENTS' => array( - 1 => 'color: #006400; font-style: italic;', +// 1 => 'color: #006400; font-style: italic;', 'MULTI' => 'color: #006400; font-style: italic;' ), 'ESCAPE_CHAR' => array( Modified: trunk/geshi-1.0.X/src/geshi/scala.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/scala.php 2008-07-27 16:05:28 UTC (rev 1642) +++ trunk/geshi-1.0.X/src/geshi/scala.php 2008-07-27 16:07:01 UTC (rev 1643) @@ -76,7 +76,6 @@ ), 'COMMENTS' => array( 1=> 'color: #008000; font-style: italic;', - 2=> 'color: #008000; font-style: italic;', 'MULTI' => 'color: #00ff00; font-style: italic;' ), 'ESCAPE_CHAR' => array( Modified: trunk/geshi-1.0.X/src/geshi/typoscript.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/typoscript.php 2008-07-27 16:05:28 UTC (rev 1642) +++ trunk/geshi-1.0.X/src/geshi/typoscript.php 2008-07-27 16:07:01 UTC (rev 1643) @@ -44,7 +44,7 @@ 'LANG_NAME' => 'TypoScript', 'COMMENT_SINGLE' => array(1 => '//'), 'COMMENT_MULTI' => array('/*' => '*/'), - 'COMMENT_REGEXP' => array(1 => '/(?<!(#|\'|"))(?:#(?!(?:[a-fA-F0-9]{6}|[a-fA-F0-9]{3}))[^\n#]+|#{2}[^\n#]+|#{7,999}[^\n]+)/'), + 'COMMENT_REGEXP' => array(2 => '/(?<!(#|\'|"))(?:#(?!(?:[a-fA-F0-9]{6}|[a-fA-F0-9]{3}))[^\n#]+|#{2}[^\n#]+|#{7,999}[^\n]+)/'), 'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE, 'QUOTEMARKS' => array(), 'ESCAPE_CHAR' => '', @@ -168,7 +168,6 @@ 'COMMENTS' => array( 1 => 'color: #aaa; font-style: italic;', 2 => 'color: #aaa; font-style: italic;', - 3 => 'color: #aaa; font-style: italic;', 'MULTI' => 'color: #aaa; font-style: italic;' ), 'STRINGS' => array( Modified: trunk/geshi-1.0.X/src/geshi/verilog.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/verilog.php 2008-07-27 16:05:28 UTC (rev 1642) +++ trunk/geshi-1.0.X/src/geshi/verilog.php 2008-07-27 16:07:01 UTC (rev 1643) @@ -110,7 +110,6 @@ ), 'COMMENTS' => array( 1 => 'color: #00008B; font-style: italic;', - 2 => 'color: #00008B;', 'MULTI' => 'color: #00008B; font-style: italic;' ), 'ESCAPE_CHAR' => array( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |