From: <be...@us...> - 2007-09-01 11:49:48
|
Revision: 1030 http://geshi.svn.sourceforge.net/geshi/?rev=1030&view=rev Author: benbe Date: 2007-09-01 04:49:41 -0700 (Sat, 01 Sep 2007) Log Message: ----------- mrg: Merged inconsistencies between trunk and the release branch upd: Updated HTML documentation and merged changes back to release @Nigel: Sorry for that ugly patch ... Modified Paths: -------------- branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/README branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/geshi-doc.html trunk/geshi-1.0.X/src/docs/THANKS trunk/geshi-1.0.X/src/docs/geshi-doc.html trunk/geshi-1.0.X/src/geshi/m68k.php Modified: branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/README =================================================================== --- branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/README 2007-09-01 11:25:22 UTC (rev 1029) +++ branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/README 2007-09-01 11:49:41 UTC (rev 1030) @@ -1,6 +1,6 @@ - GeSHi - GEneric Syntax HIlighter - -------------------------------- + GeSHi - GEneric Syntax HIghlighter + ---------------------------------- Version 1.0.7.20 Author: Nigel McNie 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 2007-09-01 11:25:22 UTC (rev 1029) +++ branches/RELEASE_1_0_7_STABLE/geshi-1.0.X/src/docs/geshi-doc.html 2007-09-01 11:49:41 UTC (rev 1030) @@ -33,6 +33,9 @@ background-color: #e0e8ef; color: #002; } + code, tt, kbd { + font-size: 11px; + } hr { height: 0; border: none; @@ -43,7 +46,7 @@ color: blue; font-style: normal; font-family: monospace; } li { - padding-bottom: 2px; + padding-top: 2px; } ul li { font-size: 12px; @@ -138,6 +141,9 @@ a { color: #7777ff; } + sup a { + text-decoration: none; + } --> </style> </head> @@ -160,105 +166,105 @@ <h2 id="contents">Contents</h2> <ul> - <li><a href="#introduction">1. Introduction</a></li> + <li><a href="#introduction">1. Introduction</a> <ul> <li><a href="#features">1.1 Features</a></li> <li><a href="#about-geshi">1.2 About GeSHi</a></li> <li><a href="#credits">1.3 Credits</a></li> <li><a href="#feedback">1.4 Feedback</a></li> - </ul> + </ul></li> - <li><a href="#the-basics">2. The Basics</a></li> + <li><a href="#the-basics">2. The Basics</a> <ul> <li><a href="#getting-geshi">2.1 Getting GeSHi</a></li> - <li><a href="#installing-geshi">2.2 Installing GeSHi</a></li> + <li><a href="#installing-geshi">2.2 Installing GeSHi</a> <ul> <li><a href="#requirements">2.2.1 Requirements</a></li> <li><a href="#extracting-geshi">2.2.2 Extracting GeSHi</a></li> <li><a href="#installation">2.2.3 Installation</a></li> - </ul> + </ul></li> <li><a href="#basic-usage">2.3 Basic Usage</a></li> - </ul> + </ul></li> - <li><a href="#advanced-features">3. Advanced Features</a></li> + <li><a href="#advanced-features">3. Advanced Features</a> <ul> <li><a href="#the-code-container">3.1 The Code Container</a></li> - <li><a href="#line-numbers">3.2 Line Numbers</a></li> + <li><a href="#line-numbers">3.2 Line Numbers</a> <ul> <li><a href="#enabling-line-numbers">3.2.1 Enabling Line Numbers</a></li> <li><a href="#styling-line-numbers">3.2.2 Styling Line Numbers</a></li> <li><a href="#starting-line-numbers">3.2.3 Choosing a Start Number</a></li> - </ul> - <li><a href="#using-css-classes">3.3 Using <acronym>CSS</acronym> Classes</a></li> + </ul></li> + <li><a href="#using-css-classes">3.3 Using <acronym>CSS</acronym> Classes</a> <ul> <li><a href="#enabling-css-classes">3.3.1 Enabling CSS Classes</a></li> <li><a href="#setting-css-class-id">3.3.2 Setting the CSS Class/ID</a></li> <li><a href="#getting-stylesheet">3.3.3 Getting the Stylesheet</a></li> <li><a href="#using-an-external-stylesheet">3.3.4 Using an External Stylesheet</a></li> - </ul> - <li><a href="#changing-styles">3.4 Changing Styles</a></li> + </ul></li> + <li><a href="#changing-styles">3.4 Changing Styles</a> <ul> <li><a href="#the-overall-styles">3.4.1 The Overall Styles</a></li> <li><a href="#line-number-styles">3.4.2 Line Number Styles</a></li> <li><a href="#setting-keyword-styles">3.4.3 Setting Keyword Styles</a></li> <li><a href="#setting-comment-styles">3.4.4 Setting Comment Styles</a></li> <li><a href="#setting-other-styles">3.4.5 Setting Other Styles</a></li> - </ul> - <li><a href="#case-caps">3.5 Case Sensitivity and Auto Casing</a></li> + </ul></li> + <li><a href="#case-caps">3.5 Case Sensitivity and Auto Casing</a> <ul> <li><a href="#auto-caps-nocaps">3.5.1 Auto Caps/Nocaps</a></li> <li><a href="#setting-case-sensitivity">3.5.2 Setting Case Sensitivity</a></li> - </ul> - <li><a href="#changing-config">3.6 Changing the Source/Language/Path/Charset</a></li> + </ul></li> + <li><a href="#changing-config">3.6 Changing the Source/Language/Path/Charset</a> <ul> <li><a href="#changing-the-source">3.6.1 Changing the Source Code</a></li> <li><a href="#changing-the-language">3.6.2 Changing the Language</a></li> <li><a href="#changing-the-path">3.6.3 Changing the Path</a></li> <li><a href="#changing-the-charset">3.6.4 Changing the Character Set</a></li> <li><a href="#changing-using-load-from-file">3.6.5 Using <tt>load_from_file</tt> to change the language and source code</a></li> - </ul> + </ul></li> <li><a href="#error-handling">3.7 Error Handling</a></li> <li><a href="#disabling-lexics">3.8 Disabling Styling of Some Lexics</a></li> <li><a href="#setting-tab-width">3.9 Setting the Tab Width</a></li> <li><a href="#using-strict-mode">3.10 Using Strict Mode</a></li> - <li><a href="#adding-removing-keywords">3.11 Adding/Removing Keywords</a></li> + <li><a href="#adding-removing-keywords">3.11 Adding/Removing Keywords</a> <ul> <li><a href="#adding-a-keyword">3.11.1 Adding a Keyword</a></li> <li><a href="#removing-a-keyword">3.11.2 Removing a Keyword</a></li> <li><a href="#adding-a-keyword-group">3.11.3 Adding a Keyword Group</a></li> <li><a href="#removing-a-keyword-group">3.11.4 Removing a Keyword Group</a></li> - </ul> - <li><a href="#headers-and-footers">3.12 Headers and Footers for your code</a></li> + </ul></li> + <li><a href="#headers-and-footers">3.12 Headers and Footers for your code</a> <ul> <li><a href="#keyword-substitution">3.12.1 Keyword Substitution</a></li> <li><a href="#setting-header-content">3.12.2 Setting Header Content</a></li> <li><a href="#setting-footer-content">3.12.3 Setting Footer Content</a></li> <li><a href="#styling-header-content">3.12.4 Styling Header Content</a></li> <li><a href="#styling-footer-content">3.12.5 Styling Footer Content</a></li> - </ul> - <li><a href="#keyword-urls">3.13 Keyword URLs</a></li> + </ul></li> + <li><a href="#keyword-urls">3.13 Keyword URLs</a> <ul> <li><a href="#setting-a-url">3.13.1 Setting a URL for a Keyword Group</a></li> <li><a href="#disabling-urls">3.13.2 Disabling URLs for a Keyword Group</a></li> <li><a href="#disabling-all-urls">3.13.3 Disabling all URLs for Keywords</a></li> <li><a href="#styling-links">3.13.4 Styling Links</a></li> <li><a href="#using-targets">3.13.5 Setting the Link Target</a></li> - </ul> + </ul></li> <li><a href="#using-contextual-importance">3.14 Using Contextual Importance</a></li> - <li><a href="#highlighting-special-lines-extra">3.15 Highlighting Special Lines "Extra"</a></li> + <li><a href="#highlighting-special-lines-extra">3.15 Highlighting Special Lines "Extra"</a> <ul> <li><a href="#specifying-lines-to-highlight-extra">Specifying the Lines to Highlight Extra</a></li> <li><a href="#styles-for-highlighted-lines">Styles for the Highlighted Lines</a></li> - </ul> + </ul></li> <li><a href="#adding-ids-to-each-line">3.16 Adding IDs to Each Line</a></li> <li><a href="#getting-the-time-of-styling">3.17 Getting the Time of Styling</a></li> - </ul> + </ul></li> - <li><a href="#language-files">4 Language Files</a></li> + <li><a href="#language-files">4 Language Files</a> <ul> <li><a href="#language-file-example">4.1 An Example Language File</a></li> <li><a href="#language-file-conventions">4.2 Language File Conventions</a></li> - <li><a href="#language-file-sections">4.3 Language File Sections</a></li> + <li><a href="#language-file-sections">4.3 Language File Sections</a> <ul> <li><a href="#language-file-header">4.3.1 The Header</a></li> <li><a href="#language-file-start-indices">4.3.2 The First Indices</a></li> @@ -270,8 +276,8 @@ <li><a href="#language-file-regexps">4.3.8 Using Regular Expressions</a></li> <li><a href="#language-file-strict-mode">4.3.9 Contextual Highlighting and Strict Mode</a></li> <li><a href="#language-file-tidying-up">4.3.10 Tidying Up</a></li> - </ul> - </ul> + </ul></li> + </ul></li> <li><a href="#method-constant-reference">5 Method/Constant Reference</a></li> </ul> @@ -421,7 +427,7 @@ <li>Open a shell</li> <li><kbd>cd</kbd> to the directory where the archive lies</li> <li>Type <kbd>tar -xzvf [filename]</kbd> where <tt>[filename]</tt> is the name of the archive (typically <tt>GeSHi-1.X.X.tar.gz</tt>)</li> - <li>GeSHi will be extracted to its own directory</tt> + <li>GeSHi will be extracted to its own directory</li> </ol> <p>To extract GeSHi in Windows (<tt>.zip</tt>):</p> @@ -597,6 +603,10 @@ <p>As of GeSHi 1.0.7.2 there is a new header type, that specifies that the code should not be wrapped in anything at all.</p> +<p>Another requested addition has been made in GeSHi 1.0.7.20 to force GeSHi to create a block around the +highlighted source even if this wasn't necessary, thus styles that are applied to the output of GeSHi +can directly influence the code only even if headers and footers are present.</p> + <p>To change/set the header to use, you call the <strong><tt>set_header_type()</tt></strong> method:</p> <code><span style="color: #0000ff;">$geshi</span>-><span style="color: #006600;">set_header_type</span><span style="color: #66cc66;">(</span>GESHI_HEADER_DIV<span style="color: #66cc66;">)</span>;<br /> @@ -752,7 +762,7 @@ <p>If you want to turn classes OFF for some reason later:</p> -<code><span style="color: #0000ff;">$geshi</span>-><span style="color: #006600;">enable_classes</span><span style="color: #66cc66;">(</span><span style="font-weight: bold;">false</span><span style="color: #66cc66;">)</span>; +<code><span style="color: #0000ff;">$geshi</span>-><span style="color: #006600;">enable_classes</span><span style="color: #66cc66;">(</span><span style="font-weight: bold;">false</span><span style="color: #66cc66;">)</span>;</code> <p>If classes are enabled when <strong><tt>parse_code()</tt></strong> is called, then the resultant source will use CSS classes in the output, otherwise it will in-line the styles. The advantages @@ -1048,19 +1058,25 @@ <span style="color: #0000ff;">$geshi</span>-><span style="color: #006600;">set_strings_style</span><span style="color: #66cc66;">(</span><span style="color: #0000ff;">$styles</span><span style="color: #66cc66;">[</span>, <span style="color: #0000ff;">$preserve_defaults</span><span style="color: #66cc66;">]</span><span style="color: #66cc66;">)</span>;<br /> <span style="color: #0000ff;">$geshi</span>-><span style="color: #006600;">set_numbers_style</span><span style="color: #66cc66;">(</span><span style="color: #0000ff;">$styles</span><span style="color: #66cc66;">[</span>, <span style="color: #0000ff;">$preserve_defaults</span><span style="color: #66cc66;">]</span><span style="color: #66cc66;">)</span>;<br /> -<span style="color: #0000ff;">$geshi</span>-><span style="color: #006600;">set_methods_style</span><span style="color: #66cc66;">(</span><span style="color: #0000ff;">$key</span>, <span style="color: #0000ff;">$styles</span>, <span style="color: #66cc66;">[</span>, <span style="color: #0000ff;">$preserve_defaults</span><span style="color: #66cc66;">]</span><span style="color: #66cc66;">)</span>;</code> +<span style="color: #0000ff;">$geshi</span>-><span style="color: #006600;">set_methods_style</span><span style="color: #66cc66;">(</span><span style="color: #0000ff;">$key</span>, <span style="color: #0000ff;">$styles</span><span style="color: #66cc66;">[</span>, <span style="color: #0000ff;">$preserve_defaults</span><span style="color: #66cc66;">]</span><span style="color: #66cc66;">)</span>;</code> <p><var>$styles</var> is a string containing valid stylesheet declarations, while <var>$preserve_defaults</var> should be set to true if you want your styles to be merged with the previous styles. In the case of <strong><tt>set_methods_style</tt></strong>, you should select a group to set the styles of, check the language files for the number used for each "object splitter".</p> -<h4 id="case-caps">3.5: Case Sensitivity and Auto Casing</h3> +<p>Like this was possible for set_method_style a new parameter has been introduced for +<strong><tt>set_symbols_style</tt></strong> to which allows you to select the group of +symbols for which you'd like to change your style. +<code><span style="color: #0000ff;">$geshi</span>-><span style="color: #006600;">set_symbols_style</span><span style="color: #66cc66;">(</span><span style="color: #0000ff;">$styles</span><span style="color: #66cc66;">[</span>, <span style="color: #0000ff;">$preserve_defaults</span><span style="color: #66cc66;">[</span>, <span style="color: #0000ff;">$group</span><span style="color: #66cc66;">]</span><span style="color: #66cc66;">]</span><span style="color: #66cc66;">)</span>;<br /></code> +If the third parameter is not given, group 0 is assumed. Furthermore you should note that any changes to group 0 are also reflected in the bracket style, i.e. a pass-through call to <strong><tt>set_bracket_style</tt></strong> is made.</p> + +<h4 id="case-caps">3.5: Case Sensitivity and Auto Casing</h4> <div class="nav"><a href="#top">Top</a> | <a href="#contents">Contents</a> | <a href="#auto-caps-nocaps">Next</a> | <a href="#setting-other-styles">Previous</a></div> <p>Controlling the case of the outputted source is an easy job with GeSHi. You can control which keywords are converted in case, and also control whether keywords are checked in a case sensitive manner.</p> -<h5 id="auto-caps-nocaps">3.5.1: Auto-Caps/Nocaps</h4> +<h5 id="auto-caps-nocaps">3.5.1: Auto-Caps/Nocaps</h5> <div class="nav"><a href="#top">Top</a> | <a href="#contents">Contents</a> | <a href="#setting-case-sensitivity">Next</a> | <a href="#case-caps">Previous</a></div> <p>Auto-Caps/Nocaps is a nifty little feature that capitalises or lowercases automatically @@ -1096,7 +1112,7 @@ <span style="color: #0000ff;">$geshi</span>-><span style="color: #006600;">set_case_keywords</span><span style="color: #66cc66;">(</span>GESHI_CAPS_LOWER<span style="color: #66cc66;">)</span>;<br /> <span style="color: #808080; font-style: italic;">// No *way* the source will look right now ;) </span></code> -<h5 id="setting-case-sensitivity">3.5.2: Setting Case Sensitivity</h4> +<h5 id="setting-case-sensitivity">3.5.2: Setting Case Sensitivity</h5> <div class="nav"><a href="#top">Top</a> | <a href="#contents">Contents</a> | <a href="#changing-config">Next</a> | <a href="#auto-caps-nocaps">Previous</a></div> <p>Some languages, like PHP, don't mind what case function names and keywords are in, while others, like Java, depend @@ -1225,7 +1241,7 @@ out if GeSHi itself found anything wrong with what you tried to do. After highlighting, you can call the <strong><tt>error()</tt></strong> method:</p> -<code><span style="color: #0000ff;">$geshi</span> = <span style="color: #000000; font-weight: bold;">new</span> GeSHi<span style="color: #66cc66;">(</span><span style="color: #ff0000;">'hi'</span>, <span style="color: #ff0000;">'thisLangIsNotSupported'</span><span style="color: #66cc66;">)</span>;<br /> +<code><span style="color: #0000ff;">$geshi</span> = <span style="color: #000000; font-weight: bold;">new</span> GeSHi<span style="color: #66cc66;">(</span><span style="color: #ff0000;">'hi'</span>, <span style="color: #ff0000;">'thisLangIsNotSupported'</span><span style="color: #66cc66;">)</span>;</code><br /> <br /> <a href="http://www.php.net/echo"><span style="color: #000066;">echo</span></a> <span style="color: #0000ff;">$geshi</span>-><span style="color: #006600;">error</span><span style="color: #66cc66;">(</span><span style="color: #66cc66;">)</span>; <span style="color: #808080; font-style: italic;">// echoes error message</span><br /> @@ -1272,6 +1288,12 @@ means no HTML will surround the lexic like usual, saving on time and bandwidth.</li> </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>. +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> + <h4 id="setting-tab-width">3.9: Setting the Tab Width</h4> <div class="nav"><a href="#top">Top</a> | <a href="#contents">Contents</a> | <a href="#using-strict-mode">Next</a> | <a href="#disabling-lexics">Previous</a></div> @@ -1486,7 +1508,7 @@ <code><span style="color: #0000ff;">$geshi</span>-><span style="color: #006600;">set_url_for_keyword_group</span><span style="color: #66cc66;">(</span><span style="color: #0000ff;">$group</span>, <span style="color: #ff0000;">''</span><span style="color: #66cc66;">)</span>;</code> -<h5 id="disabling-all-urls">3.13.3 Disabling all URLs for Keywords</h6> +<h5 id="disabling-all-urls">3.13.3 Disabling all URLs for Keywords</h5> <div class="nav"><a href="#top">Top</a> | <a href="#contents">Contents</a> | <a href="#styling-links">Next</a> | <a href="#disabling-urls">Previous</a></div> <p>As of GeSHi 1.0.7.18, you can disable all URL linking for keywords:</p> @@ -1644,7 +1666,7 @@ <a href="http://www.php.net/mysql_query"><span style="color: #000066;">mysql_query</span></a><span style="color: #66cc66;">(</span><span style="color: #ff0000;">"INSERT INTO code VALUES ('$code', '$time')"</span><span style="color: #66cc66;">)</span>;</code> -<h3 id="language-files">4: Language Files</a></h3> +<h3 id="language-files">4: Language Files</h3> <div class="nav"><a href="#top">Top</a> | <a href="#contents">Contents</a> | <a href="#language-file-example">Next</a> | <a href="#">Previous</a></div> <p>So now you know what features GeSHi offers, and perhaps you've even meddled with the source. Or perhaps @@ -2230,25 +2252,51 @@ <div class="nav"><a href="#top">Top</a> | <a href="#contents">Contents</a> | <a href="#language-file-styles">Next</a> | <a href="#language-file-keywords">Previous</a></div> <p>So you've put all the keywords for your language in? Now for a breather before we style them :). Symbols define -what symbols your language uses, these are things like colons, brackets/braces, and other such general punctuation (it's -important to note that in the 1.0.X series these will <em>not</em> be used), and case sensitivity alludes to the previous -section: here you can set which keyword groups are case sensitive.</p> +what symbols your language uses, these are things like colons, brackets/braces, and other such general punctuation, +and case sensitivity alludes to the previous section: here you can set which keyword groups are case sensitive.</p> -<p>Here's an example:</p> +<p>As of GeSHi version 1.0.7.21 the symbols section is used in two ways:</p> +<ul> + <li>Flat usage:<br /> + This mode is the suggested way for existing language files and languages that only need few symbols + where no further differentiation is needed or desired. You simply put all the characters in an array + under symbols as shown in the first example below. All symbols in flat usage belong to symbol style group 0.</li> + <li>Group usage:<br /> + This is a slightly more enhanced way to provide GeSHi symbol information. To use group you create + several subarrays each containing only a subset of the symbols to highlight. Every array will need to have + an unique index thus you can assign the appropriate styles later.</li> +</ul> +<p>Here's an example for flat symbol usage</p> + <pre> 'SYMBOLS' => array( - '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>' + '(', ')', '[', ']', '{', '}', '!', '@', '|', '&', '+', '-', '*', '/', '%', '=', '<', '>' ), 'CASE_SENSITIVE' => array( GESHI_COMMENTS => false, + 1 => false, + 2 => false, + 3 => false, + ),</pre> + +<p>which is not too different from the newly introduced group usage shown below:</p> + +<pre> 'SYMBOLS' => array( + 0 => array('(', ')', '[', ']', '{', '}'), + 1 => array('!', '@', '|', '&'), + 2 => array('+', '-', '*', '/', '%'), + 3 => array('=', '<', '>') + ), + 'CASE_SENSITIVE' => array( + GESHI_COMMENTS => false, 1 => false, 2 => false, 3 => false, ),</pre> <ul> - <li><strong>'SYMBOLS':</strong> An array of the symbols used in your language. <em>Please note that in 1.0.X these - are not used.</em> Hopefully they will be used in 1.2.X.</li> + <li><strong>'SYMBOLS':</strong> An array of the symbols, or - as of 1.0.7.21 - an array of symbol groups, + used in your language. <em>Please note that versions before 1.0.7.21 will silently ignore this setting.</em></li> <li><strong>'CASE_SENSITIVE':</strong> Note the <tt>GESHI_COMMENTS</tt>! This is used to set whether comments are case sensitive or not (for example, BASIC has the REM statement which while not being case sensitive is still alphanumeric, and as in the example given before about the Java language file using "import" as a single line comment, @@ -2535,7 +2583,7 @@ ?></pre> -<h3 id="method-constant-reference">5: Method/Constant Reference</a></h3> +<h3 id="method-constant-reference">5: Method/Constant Reference</h3> <div class="nav"><a href="#top">Top</a> | <a href="#contents">Contents</a> | <a>Next</a> | <a href="#language-file-tidying-up">Previous</a></div> <p>I'm afraid I have been lying for a little while about this now! Since 1.0.7 I have been including a phpdoc API for Modified: trunk/geshi-1.0.X/src/docs/THANKS =================================================================== --- trunk/geshi-1.0.X/src/docs/THANKS 2007-09-01 11:25:22 UTC (rev 1029) +++ trunk/geshi-1.0.X/src/docs/THANKS 2007-09-01 11:49:41 UTC (rev 1030) @@ -70,6 +70,7 @@ - Fortran Cedric Arrabie - GML Jos� Jorge Enr�quez Rodr�guez - Groovy Ivan F. Villanueva B. +- Haskell Dagit - Ini Deguix - Inno Thomas Klinger - Java 5 Clemens Bruckmann @@ -77,6 +78,7 @@ - LaTeX Matthais Pospiech - Lisp Roberto Rossi - Lua Roberto Rossi +- m86k Benny Baumann - mIRC Alberto de Areba Sánchez - MPASM Bakalex - MySQL Carl F�rstenberg Modified: trunk/geshi-1.0.X/src/docs/geshi-doc.html =================================================================== --- trunk/geshi-1.0.X/src/docs/geshi-doc.html 2007-09-01 11:25:22 UTC (rev 1029) +++ trunk/geshi-1.0.X/src/docs/geshi-doc.html 2007-09-01 11:49:41 UTC (rev 1030) @@ -1288,6 +1288,12 @@ means no HTML will surround the lexic like usual, saving on time and bandwidth.</li> </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>. +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> + <h4 id="setting-tab-width">3.9: Setting the Tab Width</h4> <div class="nav"><a href="#top">Top</a> | <a href="#contents">Contents</a> | <a href="#using-strict-mode">Next</a> | <a href="#disabling-lexics">Previous</a></div> Modified: trunk/geshi-1.0.X/src/geshi/m68k.php =================================================================== --- trunk/geshi-1.0.X/src/geshi/m68k.php 2007-09-01 11:25:22 UTC (rev 1029) +++ trunk/geshi-1.0.X/src/geshi/m68k.php 2007-09-01 11:49:41 UTC (rev 1030) @@ -1,7 +1,7 @@ <?php /************************************************************************************* - * asm.php - * ------- + * m68k.php + * -------- * Author: Benny Baumann (Be...@om...) * Copyright: (c) 2007 Benny Baumann (http://www.omorphia.de/), Nigel McNie (http://qbnz.com/highlighter) * Release Version: 1.0.7.20 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |