diff options
Diffstat (limited to 'inc/parser')
| -rw-r--r-- | inc/parser/parser.php | 2 | ||||
| -rw-r--r-- | inc/parser/xhtml.php | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/inc/parser/parser.php b/inc/parser/parser.php index ac1830a23..8c6b7329b 100644 --- a/inc/parser/parser.php +++ b/inc/parser/parser.php @@ -201,7 +201,7 @@ class Doku_Parser_Mode_NoToc extends Doku_Parser_Mode { class Doku_Parser_Mode_Linebreak extends Doku_Parser_Mode { function connectTo($mode) { - $this->Lexer->addSpecialPattern('\x5C{2}\s',$mode,'linebreak'); + $this->Lexer->addSpecialPattern('\x5C{2}(?=\s)',$mode,'linebreak'); } } diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 41a07e0a9..dba7cb426 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -307,18 +307,12 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $this->doc .= '<pre class="file">' . $this->_xmlEntities($text). '</pre>'. DOKU_LF; } - /** - * @TODO Shouldn't this output <blockquote>? - */ function quote_open() { - $this->doc .= '<div class="quote">'.DOKU_LF; + $this->doc .= '<blockquote>'.DOKU_LF; } - /** - * @TODO Shouldn't this output </blockquote>? - */ function quote_close() { - $this->doc .= '</div>'.DOKU_LF; + $this->doc .= '</blockquote>'.DOKU_LF; } /** |