GeSHi update to 1.0.8

darcs-hash:20080912202334-7ad00-ee4e69ad5516c38729955e8919d55f3b940caf1a.gz

1 files changed, 27 insertions, 30 deletions

diff --git a/inc/geshi/latex.php b/inc/geshi/latex.php
index bba951cd3..14238aea4 100644
--- a/inc/geshi/latex.php
+++ b/inc/geshi/latex.php
@@ -4,7 +4,7 @@
  * -----
  * Author: efi, Matthias Pospiech (mail@matthiaspospiech.de)
  * Copyright: (c) 2006 efi, Matthias Pospiech (mail@matthiaspospiech.de), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.7.22
+ * Release Version: 1\.0\.8
  * Date Started: 2006/09/23
  *
  * LaTeX language file for GeSHi.
@@ -20,7 +20,7 @@
  *
  *************************************************************************************
  *
- *   This file is not yet part of GeSHi. (and is not compatible to the 1.1+ branch)
+ *     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
@@ -38,14 +38,11 @@
  *
  ************************************************************************************/
 
-if (isset($this) && is_a($this, 'GeSHi')) {
-    $this->set_symbols_highlighting(false);
-    $this->set_numbers_highlighting(false);
-}
-
 $language_data = array (
     'LANG_NAME' => 'LaTeX',
-    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_SINGLE' => array(
+        1 => '%'
+        ),
     'COMMENT_MULTI' => array(),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array(),
@@ -56,11 +53,7 @@ $language_data = array (
         '.', ',','\\',"~", "{", "}", "[", "]", "$"
         ),
     'CASE_SENSITIVE' => array(
-        GESHI_COMMENTS => true,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
+        GESHI_COMMENTS => false,
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
@@ -108,13 +101,13 @@ $language_data = array (
     'REGEXPS' => array(
         // Math inner
         1 => array(
-            GESHI_SEARCH => "(\\\\begin\\{)(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|alignat|flalign )(\\})(.*)(\\\\end\\{)(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|alignat|flalign)(\\})",
-            GESHI_REPLACE => '\\4',
-            GESHI_MODIFIERS => 's',
+            GESHI_SEARCH => "(\\\\begin\\{)(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|alignat|flalign)(\\})(.*)(\\\\end\\{)(\\2)(\\})",
+            GESHI_REPLACE => '\4',
+            GESHI_MODIFIERS => 'Us',
             GESHI_BEFORE => '\1\2\3',
             GESHI_AFTER => '\5\6\7'
             ),
-        //  \keywords
+        // \keywords
         2 => array(
             GESHI_SEARCH => "(\\\\)([a-zA-Z]+)",
             GESHI_REPLACE => '\1\2',
@@ -126,23 +119,23 @@ $language_data = array (
         3 => array(
             GESHI_SEARCH => "(\\{)(.*)(\\})",
             GESHI_REPLACE => '\2',
-            GESHI_MODIFIERS => 'U',
+            GESHI_MODIFIERS => 'Us',
             GESHI_BEFORE => '\1',
             GESHI_AFTER => '\3'
             ),
-        // [Option]
+        // [options]
         4 => array(
             GESHI_SEARCH => "(\[)(.+)(\])",
             GESHI_REPLACE => '\2',
-            GESHI_MODIFIERS => 'U',
+            GESHI_MODIFIERS => 'Us',
             GESHI_BEFORE => '\1',
             GESHI_AFTER => '\3'
             ),
-        // Mathe  mit $ ... $
+        // Math mode with $ ... $
         5 => array(
             GESHI_SEARCH => "(\\$)(.+)(\\$)",
             GESHI_REPLACE => '\1\2\3',
-            GESHI_MODIFIERS => 'U',
+            GESHI_MODIFIERS => 'Us',
             GESHI_BEFORE => '',
             GESHI_AFTER => ''
             ),
@@ -152,7 +145,7 @@ $language_data = array (
             GESHI_REPLACE => '\\1',
             GESHI_MODIFIERS => '',
             GESHI_BEFORE => '',
-            GESHI_AFTER => '\\2'
+            GESHI_AFTER => ''
             ),
         // Structure end
         7 => array(
@@ -160,15 +153,15 @@ $language_data = array (
             GESHI_REPLACE => '\\1',
             GESHI_MODIFIERS => '',
             GESHI_BEFORE => '',
-            GESHI_AFTER => '\\2'
+            GESHI_AFTER => ''
             ),
-        //Structure: Label
+        // Structure: Label
         8 => array(
             GESHI_SEARCH => "(\\\\)(label|pageref|ref|cite)(?=[^a-zA-Z])",
             GESHI_REPLACE => '\\1\\2',
             GESHI_MODIFIERS => '',
             GESHI_BEFORE => '',
-            GESHI_AFTER => '\\3'
+            GESHI_AFTER => ''
             ),
         // Structure: sections
         /*9 => array(
@@ -203,7 +196,7 @@ $language_data = array (
             GESHI_MODIFIERS => '',
             GESHI_BEFORE => '',
             GESHI_AFTER => ''
-            ),
+            )
 
 // ---------------------------------------------
         ),
@@ -212,9 +205,13 @@ $language_data = array (
         ),
     'HIGHLIGHT_STRICT_BLOCK' => array(
         ),
-	'PARSER_CONTROL' => array(
-	    'COMMENTS' => array(
-	       'DISALLOWED_BEFORE' => '\\'
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '\\'
+        ),
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER,
         )
     )
 );