@@ -12,64 +12,62 @@ require_once(DOKU_PLUGIN.'action.php'); class action_plugin_creole extends DokuWiki_Action_Plugin { - /** - * return some info - */ - function getInfo(){ - return array( - 'author' => 'Gina Häußge, Michael Klier, Esther Brunner', - 'email' => 'dokuwiki@chimeric.de', - 'date' => '2008-02-12', - 'name' => 'Creole Plugin', - 'desc' => 'Changes the editor toolbar if markup precedence is set to Creole', - 'url' => 'http://wiki.splitbrain.org/plugin:creole', - ); - } + /** + * return some info + */ + function getInfo() { + return array( + 'author' => 'Gina Häußge, Michael Klier, Esther Brunner', + 'email' => 'dokuwiki@chimeric.de', + 'date' => '2008-02-12', + 'name' => 'Creole Plugin', + 'desc' => 'Changes the editor toolbar if markup precedence is set to Creole', + 'url' => 'http://wiki.splitbrain.org/plugin:creole', + ); + } + + /** + * register the eventhandlers + */ + function register(&$contr) { + $contr->register_hook('TOOLBAR_DEFINE', + 'AFTER', + $this, + 'define_toolbar', + array()); + } + + /** + * modifiy the toolbar JS defines + * + * @author Esther Brunner <wikidesign@gmail.com> + */ + function define_toolbar(&$event, $param) { + // return false; + if ($this->getConf('precedence') != 'creole') return false; // leave untouched - /** - * register the eventhandlers - */ - function register(&$contr){ - $contr->register_hook('TOOLBAR_DEFINE', - 'AFTER', - $this, - 'define_toolbar', - array()); - } + $c = count($event->data); + for ($i = 0; $i <= $c; $i++) { + if ($event->data[$i]['type'] == 'format') { - /** - * modifiy the toolbar JS defines - * - * @author Esther Brunner <wikidesign@gmail.com> - */ - function define_toolbar(&$event, $param){ - // return false; - if ($this->getConf('precedence') != 'creole') return false; // leave untouched - - $c = count($event->data); - for ($i = 0; $i <= $c; $i++){ - if ($event->data[$i]['type'] == 'format'){ - - // headers - if (preg_match("/h(\d)\.png/", $event->data[$i]['icon'], $match)){ - $markup = substr('======', 0, $match[1]); - $event->data[$i]['open'] = $markup." "; - $event->data[$i]['close'] = " ".$markup."\\n"; - - // ordered lists - } elseif ($event->data[$i]['icon'] == 'ol.png'){ - $event->data[$i]['open'] = "# "; - - // unordered lists - } elseif ($event->data[$i]['icon'] == 'ul.png'){ - $event->data[$i]['open'] = "* "; + // headers + if (preg_match("/h(\d)\.png/", $event->data[$i]['icon'], $match)) { + $markup = substr('======', 0, $match[1]); + $event->data[$i]['open'] = $markup." "; + $event->data[$i]['close'] = " ".$markup."\\n"; + + // ordered lists + } elseif ($event->data[$i]['icon'] == 'ol.png') { + $event->data[$i]['open'] = "# "; + + // unordered lists + } elseif ($event->data[$i]['icon'] == 'ul.png') { + $event->data[$i]['open'] = "* "; + } + } } - } + + return true; } - - return true; - } - } - -//Setup VIM: ex: et ts=4 enc=utf-8 : +//vim:ts=4:sw=4:et:enc=utf-8: action.php @@ -5,86 +5,85 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Esther Brunner <wikidesign@gmail.com> */ - + // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); require_once(DOKU_PLUGIN.'syntax.php'); - + /** * All DokuWiki plugins to extend the parser/rendering mechanism * need to inherit from this class */ class syntax_plugin_creole_header extends DokuWiki_Syntax_Plugin { - - function getInfo(){ - return array( - 'author' => 'Gina Häußge, Michael Klier, Esther Brunner', - 'email' => 'dokuwiki@chimeric.de', - 'date' => '2008-02-12', - 'name' => 'Creole Plugin, header component', - 'desc' => 'Creole style headers', - 'url' => 'http://wiki.splitbrain.org/plugin:creole', - ); - } - function getType(){ return 'container'; } - function getPType(){ return 'block'; } - function getSort(){ return 49; } - - function getAllowedTypes(){ - return array('formatting', 'substition', 'disabled', 'protected'); - } - - function preConnect(){ - $this->Lexer->addSpecialPattern( - '(?m)^[ \t]*=+[^\n]+=*[ \t]*$', - 'base', - 'plugin_creole_header' - ); - } - - function handle($match, $state, $pos, &$handler){ - global $conf; - - // get level and title - $title = trim($match); - if (($this->getConf('precedence') == 'dokuwiki') - && ($title{strlen($title) - 1} == '=')){ // DokuWiki - $level = 7 - strspn($title, '='); - } else { // Creole - $level = strspn($title, '='); + function getInfo() { + return array( + 'author' => 'Gina Häußge, Michael Klier, Esther Brunner', + 'email' => 'dokuwiki@chimeric.de', + 'date' => '2008-02-12', + 'name' => 'Creole Plugin, header component', + 'desc' => 'Creole style headers', + 'url' => 'http://wiki.splitbrain.org/plugin:creole', + ); } - if ($level < 1) $level = 1; - elseif ($level > 5) $level = 5; - $title = trim($title, '='); - $title = trim($title); - if ($handler->status['section']) $handler->_addCall('section_close', array(), $pos); + function getType() { return 'container'; } + function getPType() { return 'block'; } + function getSort() { return 49; } + + function getAllowedTypes() { + return array('formatting', 'substition', 'disabled', 'protected'); + } - if ($level <= $conf['maxseclevel']){ - $handler->_addCall('section_edit', array( - $handler->status['section_edit_start'], - $pos-1, - $handler->status['section_edit_level'], - $handler->status['section_edit_title'] - ), $pos); - $handler->status['section_edit_start'] = $pos; - $handler->status['section_edit_level'] = $level; - $handler->status['section_edit_title'] = $title; + function preConnect() { + $this->Lexer->addSpecialPattern( + '(?m)^[ \t]*=+[^\n]+=*[ \t]*$', + 'base', + 'plugin_creole_header' + ); } - $handler->_addCall('header', array($title, $level, $pos), $pos); + function handle($match, $state, $pos, &$handler) { + global $conf; + + // get level and title + $title = trim($match); + if (($this->getConf('precedence') == 'dokuwiki') + && ($title{strlen($title) - 1} == '=')) { // DokuWiki + $level = 7 - strspn($title, '='); + } else { // Creole + $level = strspn($title, '='); + } + if ($level < 1) $level = 1; + elseif ($level > 5) $level = 5; + $title = trim($title, '='); + $title = trim($title); + + if ($handler->status['section']) $handler->_addCall('section_close', array(), $pos); - $handler->_addCall('section_open', array($level), $pos); - $handler->status['section'] = true; - return true; - } - - function render($mode, &$renderer, $data){ - return true; - } + if ($level <= $conf['maxseclevel']) { + $handler->_addCall('section_edit', array( + $handler->status['section_edit_start'], + $pos-1, + $handler->status['section_edit_level'], + $handler->status['section_edit_title'] + ), $pos); + $handler->status['section_edit_start'] = $pos; + $handler->status['section_edit_level'] = $level; + $handler->status['section_edit_title'] = $title; + } + + $handler->_addCall('header', array($title, $level, $pos), $pos); + + $handler->_addCall('section_open', array($level), $pos); + $handler->status['section'] = true; + return true; + } + + function render($mode, &$renderer, $data) { + return true; + } } - -//Setup VIM: ex: et ts=4 enc=utf-8 : +//vim:ts=4:sw=4:et:enc=utf-8: syntax/header.php @@ -7,53 +7,54 @@ * @author Christopher Smith <chris@jalakai.co.uk> * @author Esther Brunner <wikidesign@gmail.com> */ - + // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); - + if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); require_once(DOKU_PLUGIN.'syntax.php'); - + /** * All DokuWiki plugins to extend the parser/rendering mechanism * need to inherit from this class */ class syntax_plugin_creole_linebreak extends DokuWiki_Syntax_Plugin { - - function getInfo(){ - return array( - 'author' => 'Gina Häußge, Michael Klier, Christopher Smith', - 'email' => 'dokuwiki@chimeric.de', - 'date' => '2008-02-12', - 'name' => 'Creole Plugin (linebreak component)', - 'desc' => 'Provide a line break for a new line in the raw wiki data', - 'url' => 'http://wiki.splitbrain.org/plugin:creole', - ); - } - - function getType() { return 'substition'; } - function getSort() { return 100; } - - function connectTo($mode) { - $this->Lexer->addSpecialPattern( - '(?<!^|\n)\n(?!\n|>)', - $mode, - 'plugin_creole_linebreak' - ); - } - - function handle($match, $state, $pos, &$handler){ - - if ($match == "\n") return true; - return false; - } - - function render($mode, &$renderer, $data){ - - if($mode == 'xhtml'){ - if ($data) $renderer->doc .= "<br />"; - return true; - } - return false; - } + + function getInfo() { + return array( + 'author' => 'Gina Häußge, Michael Klier, Christopher Smith', + 'email' => 'dokuwiki@chimeric.de', + 'date' => '2008-02-12', + 'name' => 'Creole Plugin (linebreak component)', + 'desc' => 'Provide a line break for a new line in the raw wiki data', + 'url' => 'http://wiki.splitbrain.org/plugin:creole', + ); + } + + function getType() { return 'substition'; } + function getSort() { return 100; } + + function connectTo($mode) { + $this->Lexer->addSpecialPattern( + '(?<!^|\n)\n(?!\n|>)', + $mode, + 'plugin_creole_linebreak' + ); + } + + function handle($match, $state, $pos, &$handler) { + + if ($match == "\n") return true; + return false; + } + + function render($mode, &$renderer, $data) { + + if($mode == 'xhtml') { + if ($data) $renderer->doc .= "<br />"; + return true; + } + return false; + } } +//vim:ts=4:sw=4:et:enc=utf-8: syntax/linebreak.php @@ -5,100 +5,99 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Esther Brunner <wikidesign@gmail.com> */ - + // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); require_once(DOKU_PLUGIN.'syntax.php'); - + /** * All DokuWiki plugins to extend the parser/rendering mechanism * need to inherit from this class */ class syntax_plugin_creole_listblock extends DokuWiki_Syntax_Plugin { - - function getInfo(){ - return array( - 'author' => 'Gina Häußge, Michael Klier, Esther Brunner', - 'email' => 'dokuwiki@chimeric.de', - 'date' => '2008-02-12', - 'name' => 'Creole Plugin, listblock component', - 'desc' => 'Creole style ordered and unorderered lists', - 'url' => 'http://wiki.splitbrain.org/plugin:creole', - ); - } - function getType(){ return 'container'; } - function getPType(){ return 'block'; } - function getSort(){ return 9; } - - function getAllowedTypes(){ - return array('formatting', 'substition', 'disabled', 'protected'); - } - - function connectTo($mode){ - $this->Lexer->addEntryPattern( - '\n[ \t]*[\#\*](?!\*)', - $mode, - 'plugin_creole_listblock' - ); - $this->Lexer->addPattern( - '\n[ \t]*[\#\*\-]+', - 'plugin_creole_listblock' - ); - } - - function postConnect(){ - $this->Lexer->addExitPattern( - '\n', - 'plugin_creole_listblock' - ); - } - - function handle($match, $state, $pos, &$handler){ - switch ($state){ - case DOKU_LEXER_ENTER: - $ReWriter = & new Doku_Handler_List($handler->CallWriter); - $ReWriter = & new Doku_Handler_Creole_List($handler->CallWriter); - $handler->CallWriter = & $ReWriter; - $handler->_addCall('list_open', array($match), $pos); - break; - case DOKU_LEXER_EXIT: - $handler->_addCall('list_close', array(), $pos); - $handler->CallWriter->process(); - $ReWriter = & $handler->CallWriter; - $handler->CallWriter = & $ReWriter->CallWriter; - break; - case DOKU_LEXER_MATCHED: - $handler->_addCall('list_item', array($match), $pos); - break; - case DOKU_LEXER_UNMATCHED: - $handler->_addCall('cdata', array($match), $pos); - break; + function getInfo() { + return array( + 'author' => 'Gina Häußge, Michael Klier, Esther Brunner', + 'email' => 'dokuwiki@chimeric.de', + 'date' => '2008-02-12', + 'name' => 'Creole Plugin, listblock component', + 'desc' => 'Creole style ordered and unorderered lists', + 'url' => 'http://wiki.splitbrain.org/plugin:creole', + ); + } + + function getType() { return 'container'; } + function getPType() { return 'block'; } + function getSort() { return 9; } + + function getAllowedTypes() { + return array('formatting', 'substition', 'disabled', 'protected'); + } + + function connectTo($mode) { + $this->Lexer->addEntryPattern( + '\n[ \t]*[\#\*](?!\*)', + $mode, + 'plugin_creole_listblock' + ); + $this->Lexer->addPattern( + '\n[ \t]*[\#\*\-]+', + 'plugin_creole_listblock' + ); + } + + function postConnect() { + $this->Lexer->addExitPattern( + '\n', + 'plugin_creole_listblock' + ); + } + + function handle($match, $state, $pos, &$handler) { + switch ($state) { + case DOKU_LEXER_ENTER: + $ReWriter = & new Doku_Handler_List($handler->CallWriter); + $ReWriter = & new Doku_Handler_Creole_List($handler->CallWriter); + $handler->CallWriter = & $ReWriter; + $handler->_addCall('list_open', array($match), $pos); + break; + case DOKU_LEXER_EXIT: + $handler->_addCall('list_close', array(), $pos); + $handler->CallWriter->process(); + $ReWriter = & $handler->CallWriter; + $handler->CallWriter = & $ReWriter->CallWriter; + break; + case DOKU_LEXER_MATCHED: + $handler->_addCall('list_item', array($match), $pos); + break; + case DOKU_LEXER_UNMATCHED: + $handler->_addCall('cdata', array($match), $pos); + break; + } + return true; + } + + function render($mode, &$renderer, $data) { + return true; } - return true; - } - - function render($mode, &$renderer, $data){ - return true; - } } /* ----- Creole List Call Writer ----- */ class Doku_Handler_Creole_List extends Doku_Handler_List { - function interpretSyntax($match, &$type){ - if (substr($match,-1) == '*') $type = 'u'; - else $type = 'o'; - $level = strlen(trim($match)); // Creole - if ($level <= 1){ - $c = count(explode(' ',str_replace("\t",' ',$match))); - if ($c > $level) $level = $c; // DokuWiki + function interpretSyntax($match, &$type) { + if (substr($match,-1) == '*') $type = 'u'; + else $type = 'o'; + $level = strlen(trim($match)); // Creole + if ($level <= 1) { + $c = count(explode(' ',str_replace("\t",' ',$match))); + if ($c > $level) $level = $c; // DokuWiki + } + return $level; } - return $level; - } } - -//Setup VIM: ex: et ts=4 enc=utf-8 : +//vim:ts=4:sw=4:et:enc=utf-8: syntax/listblock.php @@ -5,59 +5,58 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Esther Brunner <wikidesign@gmail.com> */ - + // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); require_once(DOKU_PLUGIN.'syntax.php'); - + /** * All DokuWiki plugins to extend the parser/rendering mechanism * need to inherit from this class */ class syntax_plugin_creole_preblock extends DokuWiki_Syntax_Plugin { - - function getInfo(){ - return array( - 'author' => 'Gina Häußge, Michael Klier, Esther Brunner', - 'email' => 'dokuwiki@chimeric.de', - 'date' => '2008-02-12', - 'name' => 'Creole Plugin, preformatted block component', - 'desc' => 'Creole style preformatted text', - 'url' => 'http://wiki.splitbrain.org/plugin:creole', - ); - } - - function getType(){ return 'protected'; } - function getPType(){ return 'block'; } - function getSort(){ return 101; } - - function connectTo($mode){ - $this->Lexer->addEntryPattern( - '\n\{\{\{\n(?=.*?\n\}\}\}\n)', - $mode, - 'plugin_creole_preblock' - ); - } - - function postConnect(){ - $this->Lexer->addExitPattern( - '\n\}\}\}\n', - 'plugin_creole_preblock' - ); - } - - function handle($match, $state, $pos, &$handler){ - if ($state == DOKU_LEXER_UNMATCHED){ - $handler->_addCall('preformatted', array($match), $pos); + + function getInfo() { + return array( + 'author' => 'Gina Häußge, Michael Klier, Esther Brunner', + 'email' => 'dokuwiki@chimeric.de', + 'date' => '2008-02-12', + 'name' => 'Creole Plugin, preformatted block component', + 'desc' => 'Creole style preformatted text', + 'url' => 'http://wiki.splitbrain.org/plugin:creole', + ); + } + + function getType() { return 'protected'; } + function getPType() { return 'block'; } + function getSort() { return 101; } + + function connectTo($mode) { + $this->Lexer->addEntryPattern( + '\n\{\{\{\n(?=.*?\n\}\}\}\n)', + $mode, + 'plugin_creole_preblock' + ); + } + + function postConnect() { + $this->Lexer->addExitPattern( + '\n\}\}\}\n', + 'plugin_creole_preblock' + ); + } + + function handle($match, $state, $pos, &$handler) { + if ($state == DOKU_LEXER_UNMATCHED) { + $handler->_addCall('preformatted', array($match), $pos); + } + return true; + } + + function render($mode, &$renderer, $data) { + return true; } - return true; - } - - function render($mode, &$renderer, $data){ - return true; - } } - -//Setup VIM: ex: et ts=4 enc=utf-8 : +//vim:ts=4:sw=4:et:enc=utf-8: syntax/preblock.php @@ -5,66 +5,65 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Esther Brunner <wikidesign@gmail.com> */ - + // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); require_once(DOKU_PLUGIN.'syntax.php'); - + /** * All DokuWiki plugins to extend the parser/rendering mechanism * need to inherit from this class */ class syntax_plugin_creole_preinline extends DokuWiki_Syntax_Plugin { - - function getInfo(){ - return array( - 'author' => 'Gina Häußge, Michael Klier, Esther Brunner', - 'email' => 'dokuwiki@chimeric.de', - 'date' => '2008-02-12', - 'name' => 'Creole Plugin, inline preformatted component', - 'desc' => 'Creole style preformatted text', - 'url' => 'http://wiki.splitbrain.org/plugin:creole', - ); - } - function getType(){ return 'protected'; } - function getSort(){ return 102; } - - function connectTo($mode){ - $this->Lexer->addEntryPattern( - '\{\{\{(?=.*?\}\}\})', - $mode, - 'plugin_creole_preinline' - ); - } - - function postConnect(){ - $this->Lexer->addExitPattern( - '\}\}\}', - 'plugin_creole_preinline' - ); - } - - function handle($match, $state, $pos, &$handler){ - switch ($state){ - case DOKU_LEXER_ENTER: - $handler->_addCall('monospace_open', array(), $pos); - break; - case DOKU_LEXER_UNMATCHED: - $handler->_addCall('unformatted', array($match), $pos); - break; - case DOKU_LEXER_EXIT: - $handler->_addCall('monospace_close', array(), $pos); - break; + function getInfo() { + return array( + 'author' => 'Gina Häußge, Michael Klier, Esther Brunner', + 'email' => 'dokuwiki@chimeric.de', + 'date' => '2008-02-12', + 'name' => 'Creole Plugin, inline preformatted component', + 'desc' => 'Creole style preformatted text', + 'url' => 'http://wiki.splitbrain.org/plugin:creole', + ); + } + + function getType() { return 'protected'; } + function getSort() { return 102; } + + function connectTo($mode) { + $this->Lexer->addEntryPattern( + '\{\{\{(?=.*?\}\}\})', + $mode, + 'plugin_creole_preinline' + ); + } + + function postConnect() { + $this->Lexer->addExitPattern( + '\}\}\}', + 'plugin_creole_preinline' + ); + } + + function handle($match, $state, $pos, &$handler) { + switch ($state) { + case DOKU_LEXER_ENTER: + $handler->_addCall('monospace_open', array(), $pos); + break; + case DOKU_LEXER_UNMATCHED: + $handler->_addCall('unformatted', array($match), $pos); + break; + case DOKU_LEXER_EXIT: + $handler->_addCall('monospace_close', array(), $pos); + break; + } + return true; + } + + function render($mode, &$renderer, $data) { + return true; } - return true; - } - - function render($mode, &$renderer, $data){ - return true; - } } - -//Setup VIM: ex: et ts=4 enc=utf-8 : +//vim:ts=4:sw=4:et:enc=utf-8: syntax/preinline.php 116e7ece75ea33c9208e9e5cccc0788931d5c0a6 Michael Klier chi@chimeric.de http://github.com/dokufreaks/plugin-creole/commit/3afc7a5504acd212cd76cef7a9dd4ea139ad60cd 3afc7a5504acd212cd76cef7a9dd4ea139ad60cd 2008-06-07T13:43:00-07:00 2008-06-07T13:43:00-07:00 fixed code style darcs-hash:20080607204300-23886-de335f85eca78fde25a5782e9aaa7e9e6fba6683.gz cc66854a1caff171aee5e32c6f968b68c9a66798 Michael Klier chi@chimeric.de