Difference between revisions of "Dokuwiki"

From ThorstensHome
Jump to: navigation, search
(→‎See also)
(→‎All)
Line 42: Line 42:
 
= All =
 
= All =
 
<pre>
 
<pre>
−
diff -rup parser.org//parser.php parser/parser.php                          
+
tweedleburg:/srv/www/htdocs/dokuwiki/inc # diff -rup parser.org/ parser                 
−
--- parser.org//parser.php      2009-10-23 08:44:18.000000000 +0200          
+
diff -rup parser.org//parser.php parser/parser.php                                      
−
+++ parser/parser.php  2009-10-23 09:32:27.000000000 +0200                  
+
--- parser.org//parser.php      2009-10-23 08:44:18.000000000 +0200                      
−
@@ -221,7 +221,7 @@ class Doku_Parser_Mode_header extends Do                
+
+++ parser/parser.php  2009-10-23 09:42:24.000000000 +0200                              
−
     function preConnect() {
+
@@ -221,7 +221,7 @@ class Doku_Parser_Mode_header extends Do                            
−
         //we're not picky about the closing ones, two are enough
+
     function preConnect() {                                                            
−
         $this->Lexer->addSpecialPattern(
+
         //we're not picky about the closing ones, two are enough                        
−
-                            '[ \t]*={2,}[^\n]+={2,}[ \t]*(?=\n)',
+
         $this->Lexer->addSpecialPattern(                                                
−
+                            '[ \t]*={1,}[^\n]+={1,}[ \t]*(?=\n)',
+
-                            '[ \t]*={2,}[^\n]+={2,}[ \t]*(?=\n)',                      
−
                             'base',
+
+                            '[ \t]*={1,}[^\n]+={1,}[ \t]*(?=\n)',                      
−
                             'header'
+
                             'base',                                                    
−
                         );
+
                             'header'                                                    
−
@@ -523,11 +523,11 @@ class Doku_Parser_Mode_preformatted exte
+
                         );                                                              
−
 
+
@@ -523,11 +523,11 @@ class Doku_Parser_Mode_preformatted exte                          
−
     function connectTo($mode) {
+
                                                                                         
−
         // Has hard coded awareness of lists...
+
     function connectTo($mode) {                                                        
−
-        $this->Lexer->addEntryPattern('\n  (?![\*\-])',$mode,'preformatted');
+
         // Has hard coded awareness of lists...                                        
−
+        $this->Lexer->addEntryPattern('\n (?![\*\-])',$mode,'preformatted');
+
-        $this->Lexer->addEntryPattern('\n  (?![\*\-])',$mode,'preformatted');          
 +
+        $this->Lexer->addEntryPattern('\n (?![\*\-])',$mode,'preformatted');            
 
         $this->Lexer->addEntryPattern('\n\t(?![\*\-])',$mode,'preformatted');
 
         $this->Lexer->addEntryPattern('\n\t(?![\*\-])',$mode,'preformatted');
  
Line 68: Line 69:
  
 
     }
 
     }
 +
@@ -545,11 +545,11 @@ class Doku_Parser_Mode_preformatted exte
 +
class Doku_Parser_Mode_code extends Doku_Parser_Mode {
 +
 +
    function connectTo($mode) {
 +
-        $this->Lexer->addEntryPattern('<code(?=.*</code>)',$mode,'code');
 +
+        $this->Lexer->addEntryPattern('<pre(?=.*</pre>)',$mode,'code');
 +
    }
 +
 +
    function postConnect() {
 +
-        $this->Lexer->addExitPattern('</code>','code');
 +
+        $this->Lexer->addExitPattern('</pre>','code');
 +
    }
 +
 +
    function getSort() {
 
Only in parser: parser.php~
 
Only in parser: parser.php~
 
diff -rup parser.org//xhtml.php parser/xhtml.php
 
diff -rup parser.org//xhtml.php parser/xhtml.php

Revision as of 09:38, 23 October 2009

This describes my patches to adapt Dokuwiki for my needs

Contents

allow h6 headings

This is a little patch for dokuwiki to allow h6 headings. 

/srv/www/htdocs/dokuwiki/inc/parser # diff -rup parser-org.php parser.php
--- parser-org.php      2009-10-20 15:49:57.000000000 +0200
+++ parser.php  2009-10-20 15:48:25.000000000 +0200
@@ -223,7 +223,7 @@ class Doku_Parser_Mode_header extends Do
     function preConnect() {
         //we're not picky about the closing ones, two are enough
         $this->Lexer->addSpecialPattern(
-                            '[ \t]*={2,}[^\n]+={2,}[ \t]*(?=\n)',
+                            '[ \t]*={1,}[^\n]+={1,}[ \t]*(?=\n)',
                             'base',
                             'header'
                         );

use mediawiki syntax in dokuwiki

Take a look at inc/parser/handler.php, function header().

preformatted 

@@ -522,12 +523,13 @@ class Doku_Parser_Mode_html extends Doku
 class Doku_Parser_Mode_preformatted extends Doku_Parser_Mode {

     function connectTo($mode) {
+    echo "hi";
         // Has hard coded awareness of lists...
-        $this->Lexer->addEntryPattern('\n  (?![\*\-])',$mode,'preformatted');
+        $this->Lexer->addEntryPattern('\n (?![\*\-])',$mode,'preformatted');
         $this->Lexer->addEntryPattern('\n\t(?![\*\-])',$mode,'preformatted');

         // How to effect a sub pattern with the Lexer!
-        $this->Lexer->addPattern('\n  ','preformatted');
+        $this->Lexer->addPattern('\n ','preformatted');
         $this->Lexer->addPattern('\n\t','preformatted');

     }

All 

tweedleburg:/srv/www/htdocs/dokuwiki/inc # diff -rup parser.org/ parser                   
diff -rup parser.org//parser.php parser/parser.php                                        
--- parser.org//parser.php      2009-10-23 08:44:18.000000000 +0200                       
+++ parser/parser.php   2009-10-23 09:42:24.000000000 +0200                               
@@ -221,7 +221,7 @@ class Doku_Parser_Mode_header extends Do                              
     function preConnect() {                                                              
         //we're not picky about the closing ones, two are enough                         
         $this->Lexer->addSpecialPattern(                                                 
-                            '[ \t]*={2,}[^\n]+={2,}[ \t]*(?=\n)',                        
+                            '[ \t]*={1,}[^\n]+={1,}[ \t]*(?=\n)',                        
                             'base',                                                      
                             'header'                                                     
                         );                                                               
@@ -523,11 +523,11 @@ class Doku_Parser_Mode_preformatted exte                            
                                                                                          
     function connectTo($mode) {                                                          
         // Has hard coded awareness of lists...                                          
-        $this->Lexer->addEntryPattern('\n  (?![\*\-])',$mode,'preformatted');            
+        $this->Lexer->addEntryPattern('\n (?![\*\-])',$mode,'preformatted');             
         $this->Lexer->addEntryPattern('\n\t(?![\*\-])',$mode,'preformatted');

         // How to effect a sub pattern with the Lexer!
-        $this->Lexer->addPattern('\n  ','preformatted');
+        $this->Lexer->addPattern('\n ','preformatted');
         $this->Lexer->addPattern('\n\t','preformatted');

     }
@@ -545,11 +545,11 @@ class Doku_Parser_Mode_preformatted exte
 class Doku_Parser_Mode_code extends Doku_Parser_Mode {

     function connectTo($mode) {
-        $this->Lexer->addEntryPattern('<code(?=.*</code>)',$mode,'code');
+        $this->Lexer->addEntryPattern('<pre(?=.*
)',$mode,'code'); 
    }

    function postConnect() {

- $this->Lexer->addExitPattern('</code>','code'); + $this->Lexer->addExitPattern('</pre>','code'); 

    }

    function getSort() {

Only in parser: parser.php~ diff -rup parser.org//xhtml.php parser/xhtml.php --- parser.org//xhtml.php 2009-10-23 08:44:18.000000000 +0200 +++ parser/xhtml.php 2009-10-23 09:38:15.000000000 +0200 @@ -99,7 +99,7 @@ class Doku_Renderer_xhtml extends Doku_R 

        //handle TOC
        if($level >= $conf['toptoclevel'] && $level <= $conf['maxtoclevel']){

- $this->toc[] = html_mktocitem($id, $text, $level-$conf['toptoclevel']+1); + $this->toc[] = html_mktocitem($id, $text, (7-$level)-$conf['toptoclevel']+1); 

        }
    }

@@ -112,7 +112,7 @@ class Doku_Renderer_xhtml extends Doku_R 

        $this->toc_additem($hid, $text, $level);

        // write the header

- $this->doc .= DOKU_LF.'<h'.$level.'><a name="'.$hid.'" id="'.$hid.'">'; + $this->doc .= DOKU_LF.'<h'.(7-$level).'><a name="'.$hid.'" id="'.$hid.'">'; 

        $this->doc .= $this->_xmlEntities($text);
        $this->doc .= "</a></h$level>".DOKU_LF;
    }

</pre>

See also

Retrieved from "http://www.staerk.de/thorsten/index.php?title=Dokuwiki&oldid=1526"