Changeset 30324 for documentation

Timestamp:

2015-11-25T16:50:29+13:00 (8 years ago)

Author:

jmt12

Message:

Attempting a different fix to the issue with the plugin eating HTML comments when it shouldn't and subsequently screwing up the tabbed area. Replaced the pattern matching lookahead with a simple test to see whether we have encountered the comment tag inside a tabbed area but outside of a specific tab (which is the only time we suppress the HTML comment completely).

File:

• documentation/trunk/wiki/plugins/simpletabs/syntax.php (modified) (5 diffs)

documentation/trunk/wiki/plugins/simpletabs/syntax.php

@@ -54 +54 @@
                                           $PARSER_MODES['paragraphs']);
         // Init
-        $this->debug = false;
+        $this->debug = true; //false;
         $this->divide_edit_section = false;
         $this->tab_area_counter = 0;
@@ -134 +134 @@
     $this->Lexer->addPattern('</TAB>', 'plugin_simpletabs');
     // Hide comments always (sometimes used as separator)
-    $this->Lexer->addPattern('^<!--.*?-->(?=\n)', 'plugin_simpletabs');
+    $this->Lexer->addPattern('<!--.*?-->', 'plugin_simpletabs');
     // Special things inside the content we want to manually handle.
     $this->Lexer->addPattern( '^[ \t]*={2,6}\s?[^\n]+={2,6}[ \t]*(?=\n)', 'plugin_simpletabs');
@@ -232 +232 @@
                                    'bytepos' => $pos + strlen($match)));
       }
-      if (preg_match('/^<!--(.*)?-->(?=\n)/s', $match, $matches))
+      // note: we only handle comments inside tabbed area but outside of tabs
+      if (empty($this->current_tab) && preg_match('/<!--(.*)?-->/s', $match, $matches))
       {
           $this->_debugPrint("Handler=>comment: " . htmlspecialchars($matches[1]));
@@ -242 +243 @@
       if (preg_match('/(={2,6})\s*(.+?)\s*={2,6}/', $match, $matches))
       {
+          $this->_debugPrint("Handler=>header: " . htmlspecialchars($match));
           $params = array();
           $params['action'] = 'heading';
@@ -264 +266 @@
     }
 
-    return array();
+    $this->_debugPrint("Unhandled: " . htmlspecialchars($match));
+    return array(DOKU_LEXER_UNMATCHED, $match);
   }