diff options
Diffstat (limited to 'inc/parser')
| -rw-r--r-- | inc/parser/handler.php | 4 | ||||
| -rw-r--r-- | inc/parser/lexer.php | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/inc/parser/handler.php b/inc/parser/handler.php index c92dbe3d5..9527fd710 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -1117,7 +1117,7 @@ class Doku_Handler_Quote { } } else { if ($call[0] != 'quote_start') $this->quoteCalls[] = array('linebreak',array(),$call[2]); - } + } $quoteDepth = $quoteLength; @@ -1623,7 +1623,7 @@ class Doku_Handler_Block { $cname_plusone = $calls[$key+1][0]; if ($cname_plusone == 'plugin') { $cname_plusone = 'plugin'.$calls[$key+1][1][0]; - + // plugin test, true if plugin has a state which precludes it requiring blockOpen or blockClose $plugin_plusone = true; $plugin_test = ($call[$key+1][1][2] == DOKU_LEXER_MATCHED) || ($call[$key+1][1][2] == DOKU_LEXER_MATCHED); diff --git a/inc/parser/lexer.php b/inc/parser/lexer.php index d2aaf407b..afd260a05 100644 --- a/inc/parser/lexer.php +++ b/inc/parser/lexer.php @@ -156,11 +156,11 @@ class Doku_LexerParallelRegex { for ($i = 0; $i < $cnt; $i++) { /* - * decompose the input pattern into "(", "(?", ")", - * "[...]", "[]..]", "[^]..]", "[...[:...:]..]", "\x"... + * decompose the input pattern into "(", "(?", ")", + * "[...]", "[]..]", "[^]..]", "[...[:...:]..]", "\x"... * elements. - */ - preg_match_all('/\\\\.|' . + */ + preg_match_all('/\\\\.|' . '\(\?|' . '[()]|' . '\[\^?\]?(?:\\\\.|\[:[^]]*:\]|[^]\\\\])*\]|' . @@ -171,7 +171,7 @@ class Doku_LexerParallelRegex { foreach ($elts[0] as $elt) { /* - * for "(", ")" remember the nesting level, add "\" + * for "(", ")" remember the nesting level, add "\" * only to the non-"(?" ones. */ |