Revision: 1074
http://geshi.svn.sourceforge.net/geshi/?rev=1074&view=rev
Author: benbe
Date: 2008-04-26 05:26:04 -0700 (Sat, 26 Apr 2008)
Log Message:
-----------
mrg: Merged changes from trunk into the release tree
del: cvsignore files as they are no longer needed in SVN
Modified Paths:
--------------
branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/CHANGES
branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/THANKS
branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/geshi-doc.html
branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/asp.php
branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/delphi.php
branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/ocaml.php
branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/oobas.php
branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi.php
Added Paths:
-----------
branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/glsl.php
Removed Paths:
-------------
branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/.cvsignore
trunk/geshi-1.0.X/src/docs/.cvsignore
Deleted: branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/.cvsignore
===================================================================
--- branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/.cvsignore 2008-04-26 12:03:29 UTC (rev 1073)
+++ branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/.cvsignore 2008-04-26 12:26:04 UTC (rev 1074)
@@ -1 +0,0 @@
-api
Modified: branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/CHANGES
===================================================================
--- branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/CHANGES 2008-04-26 12:03:29 UTC (rev 1073)
+++ branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/CHANGES 2008-04-26 12:26:04 UTC (rev 1074)
@@ -12,6 +12,19 @@
Please send any bug reports to BenBE@..., or use the bug report tracker
at sourceforge (http://sourceforge.net/tracker/?group_id=114997&atid=670231)
+Version 1.0.7.22
+ - Added language files
+ * glSlang (BenBE)
+ - Fixed a problem not yet addressed in 1.0.7.21 regarding highlighting of
+ symbols that caused some extra characters to be added in the output or
+ broke highlighting and standard compliance due to missing escaping of
+ internally used characters (SF#192320 and SF#1926259, BenBE)
+ - Fixed missing style information for ocaml language file (The_PHP_Jedi)
+ - Fixed a bug causing masses of warnings in rendered output if language file
+ miss style information (The_PHP_Jedi, BenBE)
+ - Missing tab width information could lead to warnings (BenBE)
+ - Missing symbol information for ASP (SF#1952038, nfsupport, BenBE)
+ - Empty delimiter message with OOoBasic (BenBE, Ccornell)
Version 1.0.7.21
- Added language files
* Basic4GL (Matthew Webb)
Modified: branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/THANKS
===================================================================
--- branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/THANKS 2008-04-26 12:03:29 UTC (rev 1073)
+++ branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/THANKS 2008-04-26 12:26:04 UTC (rev 1074)
@@ -69,6 +69,7 @@
- Eiffel Zoran Simic
- FreeBasic Roberto Rossi
- Fortran Cedric Arrabie
+- glSlang Benny Baumann
- GML Jos� Jorge Enr�quez Rodr�guez
- Groovy Ivan F. Villanueva B.
- Haskell Dagit
Modified: branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/geshi-doc.html
===================================================================
--- branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/geshi-doc.html 2008-04-26 12:03:29 UTC (rev 1073)
+++ branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/geshi-doc.html 2008-04-26 12:26:04 UTC (rev 1074)
@@ -1289,7 +1289,7 @@
</ul>
<p>In case all highlighting should be disabled or reenabled GeSHi provides two methods called
-<strong><tt>disnable_highlighting()</tt></strong> and <strong><tt>enable_highlighting(<var>$flag</var>)</tt></strong>.
+<strong><tt>disable_highlighting()</tt></strong> and <strong><tt>enable_highlighting(<var>$flag</var>)</tt></strong>.
The optional paramter <var>$flag</var> has been added in 1.0.7.21 and specifies the desired state,
i.e. <strong>true</strong> (default) to turn all highlighting on, or <strong>false</strong> to turn all highlighting off.
Since 1.0.7.21 the method <strong><tt>disnable_highlighting()</tt></strong> has become deprecated.</p>
Modified: branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/asp.php
===================================================================
--- branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/asp.php 2008-04-26 12:03:29 UTC (rev 1073)
+++ branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/asp.php 2008-04-26 12:26:04 UTC (rev 1074)
@@ -77,6 +77,10 @@
'MoveNext', 'LBound', 'UBound', 'Transfer', 'Open', 'Close', 'MapPath', 'FileExists', 'OpenTextFile', 'ReadAll'
)
),
+ 'SYMBOLS' => array(
+ '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>',
+ ';', ':', '?', '='
+ ),
'CASE_SENSITIVE' => array(
GESHI_COMMENTS => false,
1 => false,
Modified: branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/delphi.php
===================================================================
--- branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/delphi.php 2008-04-26 12:03:29 UTC (rev 1073)
+++ branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/delphi.php 2008-04-26 12:26:04 UTC (rev 1074)
@@ -48,7 +48,7 @@
'COMMENT_SINGLE' => array(1 => '//'),
'COMMENT_MULTI' => array('(*' => '*)', '{' => '}'),
'CASE_KEYWORDS' => 0,
- 'QUOTEMARKS' => array("'", '"'),
+ 'QUOTEMARKS' => array("'"),
'ESCAPE_CHAR' => '',
'KEYWORDS' => array(
1 => array(
@@ -231,13 +231,13 @@
'ESCAPE_CHAR' => array(
),
'BRACKETS' => array(
- 0 => 'color: #66cc66;'
+ 0 => 'color: #000066;'
),
'STRINGS' => array(
0 => 'color: #ff0000;'
),
'NUMBERS' => array(
- 0 => 'color: #cc66cc;'
+ 0 => 'color: #0000ff;'
),
'METHODS' => array(
1 => 'color: #006600;'
@@ -247,10 +247,10 @@
1 => 'color: #ff0000;'
),
'SYMBOLS' => array(
- 0 => 'color: #66cc66;',
- 1 => 'color: #66cc66;',
- 2 => 'color: #66cc66;',
- 3 => 'color: #66cc66;'
+ 0 => 'color: #000066;',
+ 1 => 'color: #000066;',
+ 2 => 'color: #000066;',
+ 3 => 'color: #000066;'
),
'SCRIPT' => array(
)
Copied: branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/glsl.php (from rev 1073, trunk/geshi-1.0.X/src/geshi/glsl.php)
===================================================================
--- branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/glsl.php (rev 0)
+++ branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/glsl.php 2008-04-26 12:26:04 UTC (rev 1074)
@@ -0,0 +1,193 @@
+<?php
+/*************************************************************************************
+ * glsl.php
+ * -----
+ * Author: Benny Baumann (BenBE@...)
+ * Copyright: (c) 2008 Benny Baumann (BenBE@...)
+ * Release Version: 1.0.7.21
+ * Date Started: 2008/03/20
+ *
+ * glSlang language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/03/20 (1.0.7.21)
+ * - First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ * This file is part of GeSHi.
+ *
+ * GeSHi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GeSHi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GeSHi; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+ 'LANG_NAME' => 'glSlang',
+ 'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+ 'COMMENT_MULTI' => array('/*' => '*/'),
+ 'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+ 'QUOTEMARKS' => array("'", '"'),
+ 'ESCAPE_CHAR' => '\\',
+ 'KEYWORDS' => array(
+ 1 => array(
+ 'if', 'else', 'for', 'while', 'do', 'break', 'continue', 'asm',
+ 'switch', 'case', 'default', 'return', 'discard',
+ 'namespace', 'using', 'sizeof', 'cast'
+ ),
+ 2 => array(
+ 'const', 'uniform', 'attribute', 'centroid', 'varying', 'invariant',
+ 'in', 'out', 'inout', 'input', 'output', 'typedef', 'volatile',
+ 'public', 'static', 'extern', 'external', 'packed',
+ 'inline', 'noinline'
+ ),
+ 3 => array(
+ 'void', 'bool', 'int', 'long', 'short', 'float', 'half', 'fixed',
+ 'unsigned', 'lowp', 'mediump', 'highp', 'precision',
+ 'vec2', 'vec3', 'vec4', 'bvec2', 'bvec3', 'bvec4',
+ 'dvec2', 'dvec3', 'dvec4', 'fvec2', 'fvec3', 'fvec4',
+ 'hvec2', 'hvec3', 'hvec4', 'ivec2', 'ivec3', 'ivec4',
+ 'mat2', 'mat3', 'mat4', 'mat2x2', 'mat3x2', 'mat4x2',
+ 'mat2x3', 'mat3x3', 'mat4x3', 'mat2x4', 'mat3x4', 'mat4x4',
+ 'sampler1D', 'sampler2D', 'sampler3D', 'samplerCube',
+ 'sampler1DShadow', 'sampler2DShadow',
+ 'struct', 'class', 'union', 'enum', 'interface', 'template'
+ ),
+ 4 => array(
+ 'this', 'false', 'true'
+ ),
+ 5 => array(
+ 'radians', 'degrees', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan',
+ 'pow', 'exp2', 'log2', 'sqrt', 'inversesqrt', 'abs', 'sign', 'ceil',
+ 'floor', 'fract', 'mod', 'min', 'max', 'clamp', 'mix', 'step',
+ 'smoothstep', 'length', 'distance', 'dot', 'cross', 'normalize',
+ 'ftransform', 'faceforward', 'reflect', 'matrixCompMult', 'equal',
+ 'lessThan', 'lessThanEqual', 'greaterThan', 'greaterThanEqual',
+ 'notEqual', 'any', 'all', 'not', 'texture1D', 'texture1DProj',
+ 'texture1DLod', 'texture1DProjLod', 'texture2D', 'texture2DProj',
+ 'texture2DLod', 'texture2DProjLod', 'texture3D', 'texture3DProj',
+ 'texture3DLod', 'texture3DProjLod', 'textureCube', 'textureCubeLod',
+ 'shadow1D', 'shadow1DProj', 'shadow1DLod', 'shadow1DProjLod',
+ 'shadow2D', 'shadow2DProj', 'shadow2DLod', 'shadow2DProjLod',
+ 'noise1', 'noise2', 'noise3', 'noise4'
+ ),
+ 6 => array(
+ 'gl_Position', 'gl_PointSize', 'gl_ClipVertex', 'gl_FragColor',
+ 'gl_FragData', 'gl_FragDepth', 'gl_FragCoord', 'gl_FrontFacing',
+ 'gl_Color', 'gl_SecondaryColor', 'gl_Normal', 'gl_Vertex',
+ 'gl_MultiTexCoord0', 'gl_MultiTexCoord1', 'gl_MultiTexCoord2',
+ 'gl_MultiTexCoord3', 'gl_MultiTexCoord4', 'gl_MultiTexCoord5',
+ 'gl_MultiTexCoord6', 'gl_MultiTexCoord7', 'gl_FogCoord',
+ 'gl_MaxLights', 'gl_MaxClipPlanes', 'gl_MaxTextureUnits',
+ 'gl_MaxTextureCoords', 'gl_MaxVertexAttribs', 'gl_MaxVaryingFloats',
+ 'gl_MaxVertexUniformComponents', 'gl_MaxVertexTextureImageUnits',
+ 'gl_MaxCombinedTextureImageUnits', 'gl_MaxTextureImageUnits',
+ 'gl_MaxFragmentUniformComponents', 'gl_MaxDrawBuffers', 'gl_Point',
+ 'gl_ModelViewMatrix', 'gl_ProjectionMatrix', 'gl_FrontMaterial',
+ 'gl_ModelViewProjectionMatrix', 'gl_TextureMatrix', 'gl_ClipPlane',
+ 'gl_NormalMatrix', 'gl_ModelViewMatrixInverse', 'gl_BackMaterial',
+ 'gl_ProjectionMatrixInverse', 'gl_ModelViewProjectionMatrixInverse',
+ 'gl_TextureMatrixInverse', 'gl_ModelViewMatrixTranspose', 'gl_Fog',
+ 'gl_ProjectionMatrixTranspose', 'gl_NormalScale', 'gl_DepthRange',
+ 'gl_odelViewProjectionMatrixTranspose', 'gl_TextureMatrixTranspose',
+ 'gl_ModelViewMatrixInverseTranspose', 'gl_LightSource',
+ 'gl_ProjectionMatrixInverseTranspose', 'gl_LightModel',
+ 'gl_ModelViewProjectionMatrixInverseTranspose', 'gl_TexCoord',
+ 'gl_TextureMatrixInverseTranspose', 'gl_TextureEnvColor',
+ 'gl_FrontLightModelProduct', 'gl_BackLightModelProduct',
+ 'gl_FrontLightProduct', 'gl_BackLightProduct', 'gl_ObjectPlaneS',
+ 'gl_ObjectPlaneT', 'gl_ObjectPlaneR', 'gl_ObjectPlaneQ',
+ 'gl_EyePlaneS', 'gl_EyePlaneT', 'gl_EyePlaneR', 'gl_EyePlaneQ',
+ 'gl_FrontColor', 'gl_BackColor', 'gl_FrontSecondaryColor',
+ 'gl_BackSecondaryColor', 'gl_FogFragCoord', 'gl_PointCoord'
+ )
+ ),
+ 'SYMBOLS' => array(
+ '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^',
+ '&', '?', ':', '|', ';', ','
+ ),
+ 'CASE_SENSITIVE' => array(
+ GESHI_COMMENTS => true,
+ 1 => true,
+ 2 => true,
+ 3 => true,
+ 4 => true,
+ 5 => true,
+ 6 => true,
+ ),
+ 'STYLES' => array(
+ 'KEYWORDS' => array(
+ 1 => 'color: #000000; font-weight: bold;',
+ 2 => 'color: #333399; font-weight: bold;',
+ 3 => 'color: #000066; font-weight: bold;',
+ 4 => 'color: #333399; font-weight: bold;',
+ 5 => 'color: #993333; font-weight: bold;',
+ 6 => 'color: #551111;'
+ ),
+ 'COMMENTS' => array(
+ 1 => 'color: #808080; font-style: italic;',
+ 2 => 'color: #009900;',
+ 'MULTI' => 'color: #808080; font-style: italic;'
+ ),
+ 'ESCAPE_CHAR' => array(
+ 0 => 'color: #000099; font-weight: bold;'
+ ),
+ 'BRACKETS' => array(
+ 0 => 'color: #000066;'
+ ),
+ 'STRINGS' => array(
+ 0 => 'color: #ff0000;'
+ ),
+ 'NUMBERS' => array(
+ 0 => 'color: #0000ff;'
+ ),
+ 'METHODS' => array(
+ 1 => 'color: #009900;',
+ 2 => 'color: #663300;'
+ ),
+ 'SYMBOLS' => array(
+ 0 => 'color: #000066;'
+ ),
+ 'REGEXPS' => array(
+ ),
+ 'SCRIPT' => array(
+ )
+ ),
+ 'URLS' => array(
+ 1 => '',
+ 2 => '',
+ 3 => '',
+ 4 => '',
+ 5 => '',
+ 6 => ''
+ ),
+ 'OOLANG' => false,
+ 'OBJECT_SPLITTERS' => array(
+ 1 => '.'
+ ),
+ 'REGEXPS' => array(
+ ),
+ 'STRICT_MODE_APPLIES' => GESHI_NEVER,
+ 'SCRIPT_DELIMITERS' => array(
+ ),
+ 'HIGHLIGHT_STRICT_BLOCK' => array(
+ ),
+ 'TAB_WIDTH' => 4
+);
+
+?>
Modified: branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/ocaml.php
===================================================================
--- branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/ocaml.php 2008-04-26 12:03:29 UTC (rev 1073)
+++ branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/ocaml.php 2008-04-26 12:26:04 UTC (rev 1074)
@@ -11,6 +11,8 @@
*
* CHANGES
* -------
+ * 2008/03/29 (1.0.7.22)
+ * - Fixed warnings resulting from missing style information
* 2005/08/27 (1.0.0)
* - First Release
*
@@ -106,8 +108,11 @@
),
'STYLES' => array(
'KEYWORDS' => array(
- 1 => 'color: #06c; font-weight: bold;' /* nice blue */
- ),
+ 1 => 'color: #06c; font-weight: bold;', /* nice blue */
+ 2 => 'color: #06c; font-weight: bold;', /* nice blue */
+ 3 => 'color: #06c; font-weight: bold;', /* nice blue */
+ 4 => 'color: #06c; font-weight: bold;', /* nice blue */
+ 5 => 'color: #06c; font-weight: bold;' /* nice blue */ ),
'COMMENTS' => array(
'MULTI' => 'color: #5d478b; font-style: italic;' /* light purple */
),
Modified: branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/oobas.php
===================================================================
--- branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/oobas.php 2008-04-26 12:03:29 UTC (rev 1073)
+++ branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi/oobas.php 2008-04-26 12:26:04 UTC (rev 1074)
@@ -41,15 +41,14 @@
$language_data = array (
'LANG_NAME' => 'OpenOffice.org Basic',
- 'COMMENT_SINGLE' => array(1 => "'"),
+ 'COMMENT_SINGLE' => array(1 => "'", 2 => 'REM'),
'COMMENT_MULTI' => array(),
'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
'QUOTEMARKS' => array('"'),
'ESCAPE_CHAR' => '',
'KEYWORDS' => array(
1 => array(
- 'dim','private','public','global','as','if','redim','true','set',
- 'byval',
+ 'dim','private','public','global','as','if','redim','true','set','byval',
'false','bool','double','integer','long','object','single','variant',
'msgbox','print','inputbox','green','blue','red','qbcolor',
'rgb','open','close','reset','freefile','get','input','line',
@@ -59,9 +58,9 @@
'dateserial','datevalue','day','month','weekday','year','cdatetoiso',
'cdatefromiso','hour','minute','second','timeserial','timevalue',
'date','now','time','timer','erl','err','error','on','error','goto','resume',
- 'and','eqv','imp','not','or','xor','mod','','atn','cos','sin','tan','log',
+ 'and','eqv','imp','not','or','xor','mod','atn','cos','sin','tan','log',
'exp','rnd','randomize','sqr','fix','int','abs','sgn','hex','oct',
- 'it','then','else','select','case','iif','do','loop','for','next',
+ 'it','then','else','select','case','iif','do','loop','for','next','to',
'while','wend','gosub','return','goto','on','goto','call','choose','declare',
'end','exit','freelibrary','function','rem','stop','sub','switch','with',
'cbool','cdate','cdbl','cint','clng','const','csng','cstr','defbool',
@@ -87,7 +86,8 @@
1 => 'color: #b1b100;'
),
'COMMENTS' => array(
- 1 => 'color: #808080;'
+ 1 => 'color: #808080;',
+ 2 => 'color: #808080;'
),
'BRACKETS' => array(
0 => 'color: #66cc66;'
Modified: branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi.php
===================================================================
--- branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi.php 2008-04-26 12:03:29 UTC (rev 1073)
+++ branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/geshi.php 2008-04-26 12:26:04 UTC (rev 1074)
@@ -702,6 +702,9 @@
else {
$this->language_data['STYLES']['KEYWORDS'][$key] .= $style;
}
+ if(!isset($this->lexic_permissions['KEYWORDS'][$key])) {
+ $this->lexic_permissions['KEYWORDS'][$key] = true;
+ }
}
/**
@@ -1031,7 +1034,8 @@
* @since 1.0.7.20
*/
function get_real_tab_width() {
- if (!$this->use_language_tab_width || !isset($this->language_data['TAB_WIDTH'])) {
+ if (!$this->use_language_tab_width ||
+ !isset($this->language_data['TAB_WIDTH'])) {
return $this->tab_width;
} else {
return $this->language_data['TAB_WIDTH'];
@@ -1920,6 +1924,10 @@
}
}
+ //This fix is related to SF#1923020, but has to be applied regardless of
+ //actually highlighting symbols.
+ $result = str_replace(array('<SEMI>', '<PIPE>'), array(';', '|'), $result);
+
// Parse the last stuff (redundant?)
$result .= $this->parse_non_string_part($stuff_to_parse);
@@ -2159,7 +2167,8 @@
// if there is a couple of alpha symbols there *might* be a keyword
if (preg_match('#[a-zA-Z]{2,}#', $stuff_to_parse)) {
foreach ($this->language_data['KEYWORDS'] as $k => $keywordset) {
- if ($this->lexic_permissions['KEYWORDS'][$k]) {
+ if (!isset($this->lexic_permissions['KEYWORDS'][$k]) ||
+ $this->lexic_permissions['KEYWORDS'][$k]) {
foreach ($keywordset as $keyword) {
$keyword = preg_quote($keyword, '/');
//
@@ -2177,7 +2186,7 @@
$modifiers = ($this->language_data['CASE_SENSITIVE'][$k]) ? "e" : "ie";
$disallowed_before = "a-zA-Z0-9\$_\|\#;>|^";
- $disallowed_after = "a-zA-Z0-9_<\|%\\-&";
+ $disallowed_after = "a-zA-Z0-9_\|%\\-&";
if(isset($this->language_data['PARSER_CONTROL'])) {
if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'])) {
if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_BEFORE'])) {
@@ -2206,7 +2215,9 @@
//
foreach ($this->language_data['KEYWORDS'] as $k => $kws) {
if (!$this->use_classes) {
- $attributes = ' style="' . $this->language_data['STYLES']['KEYWORDS'][$k] . '"';
+ $attributes = ' style="' .
+ (isset($this->language_data['STYLES']['KEYWORDS'][$k]) ?
+ $this->language_data['STYLES']['KEYWORDS'][$k] : "") . '"';
}
else {
$attributes = ' class="kw' . $k . '"';
@@ -2870,6 +2881,15 @@
$aTransSpecchar["'"] = '''; // (apos) htmlspecialchars() uses '''
}
+ //This fix is related to SF#1923020, but has to be applied regardless of
+ //actually highlighting symbols.
+
+ //Circumvent a bug with symbol highlighting
+ //This is required as ; would produce undesirable side-effects if it
+ //was not to be processed as an entity.
+ $aTransSpecchar[';'] = '<SEMI>'; // Force ; to be processed as entity
+ $aTransSpecchar['|'] = '<PIPE>'; // Force | to be processed as entity
+
// return translated string
return strtr($string,$aTransSpecchar);
}
Deleted: trunk/geshi-1.0.X/src/docs/.cvsignore
===================================================================
--- trunk/geshi-1.0.X/src/docs/.cvsignore 2008-04-26 12:03:29 UTC (rev 1073)
+++ trunk/geshi-1.0.X/src/docs/.cvsignore 2008-04-26 12:26:04 UTC (rev 1074)
@@ -1 +0,0 @@
-api
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|