removed closing php tag for includes

darcs-hash:20050413175338-9977f-c969db6f86df5df175db9a39b4fabb9f072f8f67.gz

8 files changed, 326 insertions, 316 deletions

diff --git a/inc/parser/action.php b/inc/parser/action.php
index ed85f5cf9..4e971ed4a 100644
--- a/inc/parser/action.php
+++ b/inc/parser/action.php
@@ -145,4 +145,5 @@ function resolve_pageid(&$page,&$exists){
   if(!empty($hash)) $page.'#'.$hash;
 }
 
-?>
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 72880736d..75020059e 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -1496,4 +1496,5 @@ class Doku_Handler_Toc {
     
 }
 
-?>
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/parser/lexer.php b/inc/parser/lexer.php
index 13c7a181d..b625ccacc 100644
--- a/inc/parser/lexer.php
+++ b/inc/parser/lexer.php
@@ -552,4 +552,5 @@ function Doku_Lexer_Escape($str) {
     return preg_replace($chars, $escaped, $str);
 }
 
-?>
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 25da10f9b..d1d039ad7 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -825,4 +825,5 @@ function Doku_Parser_Disabled() {
     return $modes;
 }
 
-?>
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 60462a2b4..2fd5bfe6f 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -166,4 +166,5 @@ class Doku_Renderer {
 
 }
 
-?>
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/parser/spamcheck.php b/inc/parser/spamcheck.php
index 1c2958e6f..65a1ba060 100644
--- a/inc/parser/spamcheck.php
+++ b/inc/parser/spamcheck.php
@@ -69,4 +69,5 @@ class Doku_Renderer_SpamCheck extends Doku_Renderer {
     }
 }
 
-?>
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/parser/wiki.php b/inc/parser/wiki.php
index 132c5332c..2b24d2539 100644
--- a/inc/parser/wiki.php
+++ b/inc/parser/wiki.php
@@ -1,317 +1,319 @@
-<?php

+<?php
 /**
 * Basis for converting to Dokuwiki syntax
 * This is not yet complete but useable for converting
 * phpWiki syntax.
 * Main issues lie with lists, quote and tables
-*/

-class Doku_Renderer_Wiki extends Doku_Renderer {

-    

-    var $doc = '';

-    

-    // This should be eliminated

-    var $listMarker = '*';

-    

-    function document_start() {

-        ob_start();

-    }

-    

-    function document_end() {

-        

-        $this->doc .= ob_get_contents();

-        ob_end_clean();

-

-    }

-    

-    function header($text, $level) {

-        $levels = array(

-            1=>'======',

-            2=>'=====',

-            3=>'====',

-            4=>'===',

-            5=>'==',

-        );

-        

-        if ( isset($levels[$level]) ) {

-            $token = $levels[$level];

-        } else {

-            $token = $levels[1];

-        }

-        echo "\n{$token} ";

-        echo trim($text);

-        echo " {$token}\n";

-    }

-    

-    function cdata($text) {

-        echo $text;

-    }

-    

-    function linebreak() {

-        echo '\\\\ ';

-    }

-    

-    function hr() {

-        echo "\n----\n";

-    }

-    

-    function strong_open() {

-        echo '**';

-    }

-    

-    function strong_close() {

-        echo '**';

-    }

-    

-    function emphasis_open() {

-        echo '//';

-    }

-    

-    function emphasis_close() {

-        echo '//';

-    }

-    

-    function underline_open() {

-        echo '__';

-    }

-    

-    function underline_close() {

-        echo '__';

-    }

-    

-    function monospace_open() {

-        echo "''";

-    }

-    

-    function monospace_close() {

-        echo "''";

-    }

-    

-    function subscript_open() {

-        echo '<sub>';

-    }

-    

-    function subscript_close() {

-        echo '</sub>';

-    }

-    

-    function superscript_open() {

-        echo '<sup>';

-    }

-    

-    function superscript_close() {

-        echo '</sup>';

-    }

-    

-    function deleted_open() {

-        echo '<del>';

-    }

-    

-    function deleted_close() {

-        echo '</del>';

-    }

-    

-    function footnote_open() {

-        echo '((';

-    }

-    

-    function footnote_close() {

-        echo '))';

-    }

-    

-    function listu_open() {

+*/
+class Doku_Renderer_Wiki extends Doku_Renderer {
+    
+    var $doc = '';
+    
+    // This should be eliminated
+    var $listMarker = '*';
+    
+    function document_start() {
+        ob_start();
+    }
+    
+    function document_end() {
+        
+        $this->doc .= ob_get_contents();
+        ob_end_clean();
+
+    }
+    
+    function header($text, $level) {
+        $levels = array(
+            1=>'======',
+            2=>'=====',
+            3=>'====',
+            4=>'===',
+            5=>'==',
+        );
+        
+        if ( isset($levels[$level]) ) {
+            $token = $levels[$level];
+        } else {
+            $token = $levels[1];
+        }
+        echo "\n{$token} ";
+        echo trim($text);
+        echo " {$token}\n";
+    }
+    
+    function cdata($text) {
+        echo $text;
+    }
+    
+    function linebreak() {
+        echo '\\\\ ';
+    }
+    
+    function hr() {
+        echo "\n----\n";
+    }
+    
+    function strong_open() {
+        echo '**';
+    }
+    
+    function strong_close() {
+        echo '**';
+    }
+    
+    function emphasis_open() {
+        echo '//';
+    }
+    
+    function emphasis_close() {
+        echo '//';
+    }
+    
+    function underline_open() {
+        echo '__';
+    }
+    
+    function underline_close() {
+        echo '__';
+    }
+    
+    function monospace_open() {
+        echo "''";
+    }
+    
+    function monospace_close() {
+        echo "''";
+    }
+    
+    function subscript_open() {
+        echo '<sub>';
+    }
+    
+    function subscript_close() {
+        echo '</sub>';
+    }
+    
+    function superscript_open() {
+        echo '<sup>';
+    }
+    
+    function superscript_close() {
+        echo '</sup>';
+    }
+    
+    function deleted_open() {
+        echo '<del>';
+    }
+    
+    function deleted_close() {
+        echo '</del>';
+    }
+    
+    function footnote_open() {
+        echo '((';
+    }
+    
+    function footnote_close() {
+        echo '))';
+    }
+    
+    function listu_open() {
         $this->listMarker = '*';
-        echo "\n";

-    }

-    

-    function listo_open() {

+        echo "\n";
+    }
+    
+    function listo_open() {
         $this->listMarker = '-';
-        echo "\n";

-    }
-    
-    /**

-    * @TODO Problem here with nested lists

-    */

-    function listitem_open($level) {

-        echo str_repeat('  ', $level).$this->listMarker;

-    }

-    

-    function listitem_close() {

-        echo "\n";

-    }

-    

-    function unformatted($text) {

-        echo '%%'.$text.'%%';

-    }

-    

-    function php($text) {

-        echo "\n<php>\n$text\n</php>\n";

-    }

-    

-    function html($text) {

-        echo "\n<html>\n$text\n</html>\n";

-    }

-    

-    /**

-    * Indent?

-    */

-    function preformatted($text) {

-        echo "\n<code>\n$text\n</code>\n";

-    }

-    

-    function file($text) {

-        echo "\n<file>\n$text\n</file>\n";

-    }

-    

-    /**

-    * Problem here with nested quotes

-    */

-    function quote_open() {

-        echo '>';

-    }

-    

-    function quote_close() {

-        echo "\n";

-    }

-    

-    function code($text, $lang = NULL) {

-        if ( !$lang ) {

-            echo "\n<code>\n$text\n</code>\n";

-        } else {

-            echo "\n<code $lang>\n$text\n</code>\n";

-        }

-        

-    }

-    

-    function acronym($acronym) {

-        echo $acronym;

-    }

-    

-    function smiley($smiley) {

-        echo $smiley;

-    }

-    

-    function wordblock($word) {

-        echo $word;

-    }

-    

-    function entity($entity) {

-        echo $entity;

-    }

-    

-    // 640x480 ($x=640, $y=480)

-    function multiplyentity($x, $y) {

-        echo "{$x}x{$y}";

-    }

-    

-    function singlequoteopening() {

-        echo "'";

-    }

-    

-    function singlequoteclosing() {

-        echo "'";

-    }

-    

-    function doublequoteopening() {

-        echo '"';

-    }

-    

-    function doublequoteclosing() {

-        echo '"';

-    }

-    

-    // $link like 'SomePage'

-    function camelcaselink($link) {

-        echo $link;

-    }

-    

-    // $link like 'wikie:syntax', $title could be an array (media)

-    function internallink($link, $title = NULL) {

-        if ( $title ) {

-            echo '[['.$link.'|'.$title.']]';

-        } else {

-            echo '[['.$link.']]';

-        }

-    }

-    

-    // $link is full URL with scheme, $title could be an array (media)

-    function externallink($link, $title = NULL) {

-        if ( $title ) {

-            echo '[['.$link.'|'.$title.']]';

-        } else {

-            echo '[['.$link.']]';

-        }

-    }

-    

-    // $link is the original link - probably not much use

-    // $wikiName is an indentifier for the wiki

-    // $wikiUri is the URL fragment to append to some known URL

-    function interwikilink($link, $title = NULL, $wikiName, $wikiUri) {

-        if ( $title ) {

-            echo '[['.$link.'|'.$title.']]';

-        } else {

-            echo '[['.$link.']]';

-        }

-    }

-    

-    // Link to file on users OS, $title could be an array (media)

-    function filelink($link, $title = NULL) {

-        if ( $title ) {

-            echo '[['.$link.'|'.$title.']]';

-        } else {

-            echo '[['.$link.']]';

-        }

-    }

-    

-    // Link to a Windows share, , $title could be an array (media)

-    function windowssharelink($link, $title = NULL) {

-        if ( $title ) {

-            echo '[['.$link.'|'.$title.']]';

-        } else {

-            echo '[['.$link.']]';

-        }

-    }

-    

-    function email($address, $title = NULL) {

-        if ( $title ) {

-            echo '[['.$address.'|'.$title.']]';

-        } else {

-            echo '[['.$address.']]';

-        }

-    }

-    

-    // @TODO

-    function internalmedialink (

-        $src,$title=NULL,$align=NULL,$width=NULL,$height=NULL,$cache=NULL

-        ) {

-        

-    }

-    

-    // @TODO

-    function externalmedialink(

-        $src,$title=NULL,$align=NULL,$width=NULL,$height=NULL,$cache=NULL

-        ) {

-        if ( $title ) {

-            echo '{{'.$src.'|'.$title.'}}';

-        } else {

-            echo '{{'.$src.'}}';

-        }

-    }

-        

-    function table_open($maxcols = NULL, $numrows = NULL){}

-    

-    function table_close(){}

-    

-    function tablerow_open(){}

-    

-    function tablerow_close(){}

-    

-    function tableheader_open($colspan = 1, $align = NULL){}

-    

-    function tableheader_close(){}

-    

-    function tablecell_open($colspan = 1, $align = NULL){}

-    

-    function tablecell_close(){}

-    

-}

-

+        echo "\n";
+    }
+    
+    /**
+    * @TODO Problem here with nested lists
+    */
+    function listitem_open($level) {
+        echo str_repeat('  ', $level).$this->listMarker;
+    }
+    
+    function listitem_close() {
+        echo "\n";
+    }
+    
+    function unformatted($text) {
+        echo '%%'.$text.'%%';
+    }
+    
+    function php($text) {
+        echo "\n<php>\n$text\n</php>\n";
+    }
+    
+    function html($text) {
+        echo "\n<html>\n$text\n</html>\n";
+    }
+    
+    /**
+    * Indent?
+    */
+    function preformatted($text) {
+        echo "\n<code>\n$text\n</code>\n";
+    }
+    
+    function file($text) {
+        echo "\n<file>\n$text\n</file>\n";
+    }
+    
+    /**
+    * Problem here with nested quotes
+    */
+    function quote_open() {
+        echo '>';
+    }
+    
+    function quote_close() {
+        echo "\n";
+    }
+    
+    function code($text, $lang = NULL) {
+        if ( !$lang ) {
+            echo "\n<code>\n$text\n</code>\n";
+        } else {
+            echo "\n<code $lang>\n$text\n</code>\n";
+        }
+        
+    }
+    
+    function acronym($acronym) {
+        echo $acronym;
+    }
+    
+    function smiley($smiley) {
+        echo $smiley;
+    }
+    
+    function wordblock($word) {
+        echo $word;
+    }
+    
+    function entity($entity) {
+        echo $entity;
+    }
+    
+    // 640x480 ($x=640, $y=480)
+    function multiplyentity($x, $y) {
+        echo "{$x}x{$y}";
+    }
+    
+    function singlequoteopening() {
+        echo "'";
+    }
+    
+    function singlequoteclosing() {
+        echo "'";
+    }
+    
+    function doublequoteopening() {
+        echo '"';
+    }
+    
+    function doublequoteclosing() {
+        echo '"';
+    }
+    
+    // $link like 'SomePage'
+    function camelcaselink($link) {
+        echo $link;
+    }
+    
+    // $link like 'wikie:syntax', $title could be an array (media)
+    function internallink($link, $title = NULL) {
+        if ( $title ) {
+            echo '[['.$link.'|'.$title.']]';
+        } else {
+            echo '[['.$link.']]';
+        }
+    }
+    
+    // $link is full URL with scheme, $title could be an array (media)
+    function externallink($link, $title = NULL) {
+        if ( $title ) {
+            echo '[['.$link.'|'.$title.']]';
+        } else {
+            echo '[['.$link.']]';
+        }
+    }
+    
+    // $link is the original link - probably not much use
+    // $wikiName is an indentifier for the wiki
+    // $wikiUri is the URL fragment to append to some known URL
+    function interwikilink($link, $title = NULL, $wikiName, $wikiUri) {
+        if ( $title ) {
+            echo '[['.$link.'|'.$title.']]';
+        } else {
+            echo '[['.$link.']]';
+        }
+    }
+    
+    // Link to file on users OS, $title could be an array (media)
+    function filelink($link, $title = NULL) {
+        if ( $title ) {
+            echo '[['.$link.'|'.$title.']]';
+        } else {
+            echo '[['.$link.']]';
+        }
+    }
+    
+    // Link to a Windows share, , $title could be an array (media)
+    function windowssharelink($link, $title = NULL) {
+        if ( $title ) {
+            echo '[['.$link.'|'.$title.']]';
+        } else {
+            echo '[['.$link.']]';
+        }
+    }
+    
+    function email($address, $title = NULL) {
+        if ( $title ) {
+            echo '[['.$address.'|'.$title.']]';
+        } else {
+            echo '[['.$address.']]';
+        }
+    }
+    
+    // @TODO
+    function internalmedialink (
+        $src,$title=NULL,$align=NULL,$width=NULL,$height=NULL,$cache=NULL
+        ) {
+        
+    }
+    
+    // @TODO
+    function externalmedialink(
+        $src,$title=NULL,$align=NULL,$width=NULL,$height=NULL,$cache=NULL
+        ) {
+        if ( $title ) {
+            echo '{{'.$src.'|'.$title.'}}';
+        } else {
+            echo '{{'.$src.'}}';
+        }
+    }
+        
+    function table_open($maxcols = NULL, $numrows = NULL){}
+    
+    function table_close(){}
+    
+    function tablerow_open(){}
+    
+    function tablerow_close(){}
+    
+    function tableheader_open($colspan = 1, $align = NULL){}
+    
+    function tableheader_close(){}
+    
+    function tablecell_open($colspan = 1, $align = NULL){}
+    
+    function tablecell_close(){}
+    
+}
+
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index b66a92ec4..b5c2b5d8d 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -875,3 +875,5 @@ msg("deprecated wikiPageExists called",-1);
     return $pages[$name];
 }
 
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :