From 5e100747059d6148199a91dfae13217e89dd4344 Mon Sep 17 00:00:00 2001 From: andi Date: Sun, 1 May 2005 20:23:48 +0200 Subject: quoting now uses semantically correct blockquote darcs-hash:20050501182348-9977f-a0653d07936820a7e1c251537f4b93556d88d4c8.gz --- inc/parser/parser.php | 2 +- inc/parser/xhtml.php | 10 ++-------- tpl/default/design.css | 8 +++++++- 3 files changed, 10 insertions(+), 10 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 .= '
' . $this->_xmlEntities($text). '
'. DOKU_LF; } - /** - * @TODO Shouldn't this output
? - */ function quote_open() { - $this->doc .= '
'.DOKU_LF; + $this->doc .= '
'.DOKU_LF; } - /** - * @TODO Shouldn't this output
? - */ function quote_close() { - $this->doc .= '
'.DOKU_LF; + $this->doc .= '
'.DOKU_LF; } /** diff --git a/tpl/default/design.css b/tpl/default/design.css index 4b1e05bfc..716ef5212 100644 --- a/tpl/default/design.css +++ b/tpl/default/design.css @@ -341,6 +341,11 @@ span.li { font-weight: normal; } +ol {list-style-type: decimal} +ol ol {list-style-type: upper-roman} +ol ol ol {list-style-type: lower-alpha} +ol ol ol ol {list-style-type: lower-greek} + li.open { list-style-image: url(images/open.gif); } @@ -349,9 +354,10 @@ li.closed { list-style-image: url(images/closed.gif); } -.quote { +blockquote { border-left: 2px solid #8cacbb; padding-left: 3px; + margin-left: 0; } /* code blocks by indention */ -- cgit v1.2.3