Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
split handler.php into multiple files
For now I left Doku_Handler itself as it were. We will need to keep the class name around for backwards compatibility but should move the class itself. I introduced a new ReWriter Interface to formalize how the various call writer implementations are accessed. There are a whole bunch of doc blocks missing.
- Loading branch information
1 parent
e6686e8
commit 5c2aad1
Showing
13 changed files
with
1,169 additions
and
1,051 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,211 @@ | ||
| <?php | ||
|
|
||
| namespace dokuwiki\Handler; | ||
|
|
||
| /** | ||
| * Handler for paragraphs | ||
| * | ||
| * @author Harry Fuecks <hfuecks@gmail.com> | ||
| */ | ||
| class Block | ||
| { | ||
| protected $calls = array(); | ||
| protected $skipEol = false; | ||
| protected $inParagraph = false; | ||
|
|
||
| // Blocks these should not be inside paragraphs | ||
| protected $blockOpen = array( | ||
| 'header', | ||
| 'listu_open','listo_open','listitem_open','listcontent_open', | ||
| 'table_open','tablerow_open','tablecell_open','tableheader_open','tablethead_open', | ||
| 'quote_open', | ||
| 'code','file','hr','preformatted','rss', | ||
| 'htmlblock','phpblock', | ||
| 'footnote_open', | ||
| ); | ||
|
|
||
| protected $blockClose = array( | ||
| 'header', | ||
| 'listu_close','listo_close','listitem_close','listcontent_close', | ||
| 'table_close','tablerow_close','tablecell_close','tableheader_close','tablethead_close', | ||
| 'quote_close', | ||
| 'code','file','hr','preformatted','rss', | ||
| 'htmlblock','phpblock', | ||
| 'footnote_close', | ||
| ); | ||
|
|
||
| // Stacks can contain paragraphs | ||
| protected $stackOpen = array( | ||
| 'section_open', | ||
| ); | ||
|
|
||
| protected $stackClose = array( | ||
| 'section_close', | ||
| ); | ||
|
|
||
|
|
||
| /** | ||
| * Constructor. Adds loaded syntax plugins to the block and stack | ||
| * arrays | ||
| * | ||
| * @author Andreas Gohr <andi@splitbrain.org> | ||
| */ | ||
| public function __construct() | ||
| { | ||
| global $DOKU_PLUGINS; | ||
| //check if syntax plugins were loaded | ||
| if (empty($DOKU_PLUGINS['syntax'])) return; | ||
| foreach ($DOKU_PLUGINS['syntax'] as $n => $p) { | ||
| $ptype = $p->getPType(); | ||
| if ($ptype == 'block') { | ||
| $this->blockOpen[] = 'plugin_'.$n; | ||
| $this->blockClose[] = 'plugin_'.$n; | ||
| } elseif ($ptype == 'stack') { | ||
| $this->stackOpen[] = 'plugin_'.$n; | ||
| $this->stackClose[] = 'plugin_'.$n; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| protected function openParagraph($pos) | ||
| { | ||
| if ($this->inParagraph) return; | ||
| $this->calls[] = array('p_open',array(), $pos); | ||
| $this->inParagraph = true; | ||
| $this->skipEol = true; | ||
| } | ||
|
|
||
| /** | ||
| * Close a paragraph if needed | ||
| * | ||
| * This function makes sure there are no empty paragraphs on the stack | ||
| * | ||
| * @author Andreas Gohr <andi@splitbrain.org> | ||
| * | ||
| * @param string|integer $pos | ||
| */ | ||
| protected function closeParagraph($pos) | ||
| { | ||
| if (!$this->inParagraph) return; | ||
| // look back if there was any content - we don't want empty paragraphs | ||
| $content = ''; | ||
| $ccount = count($this->calls); | ||
| for ($i=$ccount-1; $i>=0; $i--) { | ||
| if ($this->calls[$i][0] == 'p_open') { | ||
| break; | ||
| } elseif ($this->calls[$i][0] == 'cdata') { | ||
| $content .= $this->calls[$i][1][0]; | ||
| } else { | ||
| $content = 'found markup'; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if (trim($content)=='') { | ||
| //remove the whole paragraph | ||
| //array_splice($this->calls,$i); // <- this is much slower than the loop below | ||
| for ($x=$ccount; $x>$i; | ||
| $x--) array_pop($this->calls); | ||
| } else { | ||
| // remove ending linebreaks in the paragraph | ||
| $i=count($this->calls)-1; | ||
| if ($this->calls[$i][0] == 'cdata') $this->calls[$i][1][0] = rtrim($this->calls[$i][1][0], DOKU_PARSER_EOL); | ||
| $this->calls[] = array('p_close',array(), $pos); | ||
| } | ||
|
|
||
| $this->inParagraph = false; | ||
| $this->skipEol = true; | ||
| } | ||
|
|
||
| protected function addCall($call) | ||
| { | ||
| $key = count($this->calls); | ||
| if ($key and ($call[0] == 'cdata') and ($this->calls[$key-1][0] == 'cdata')) { | ||
| $this->calls[$key-1][1][0] .= $call[1][0]; | ||
| } else { | ||
| $this->calls[] = $call; | ||
| } | ||
| } | ||
|
|
||
| // simple version of addCall, without checking cdata | ||
| protected function storeCall($call) | ||
| { | ||
| $this->calls[] = $call; | ||
| } | ||
|
|
||
| /** | ||
| * Processes the whole instruction stack to open and close paragraphs | ||
| * | ||
| * @author Harry Fuecks <hfuecks@gmail.com> | ||
| * @author Andreas Gohr <andi@splitbrain.org> | ||
| * | ||
| * @param array $calls | ||
| * | ||
| * @return array | ||
| */ | ||
| public function process($calls) | ||
| { | ||
| // open first paragraph | ||
| $this->openParagraph(0); | ||
| foreach ($calls as $key => $call) { | ||
| $cname = $call[0]; | ||
| if ($cname == 'plugin') { | ||
| $cname='plugin_'.$call[1][0]; | ||
| $plugin = true; | ||
| $plugin_open = (($call[1][2] == DOKU_LEXER_ENTER) || ($call[1][2] == DOKU_LEXER_SPECIAL)); | ||
| $plugin_close = (($call[1][2] == DOKU_LEXER_EXIT) || ($call[1][2] == DOKU_LEXER_SPECIAL)); | ||
| } else { | ||
| $plugin = false; | ||
| } | ||
| /* stack */ | ||
| if (in_array($cname, $this->stackClose) && (!$plugin || $plugin_close)) { | ||
| $this->closeParagraph($call[2]); | ||
| $this->storeCall($call); | ||
| $this->openParagraph($call[2]); | ||
| continue; | ||
| } | ||
| if (in_array($cname, $this->stackOpen) && (!$plugin || $plugin_open)) { | ||
| $this->closeParagraph($call[2]); | ||
| $this->storeCall($call); | ||
| $this->openParagraph($call[2]); | ||
| continue; | ||
| } | ||
| /* block */ | ||
| // If it's a substition it opens and closes at the same call. | ||
| // To make sure next paragraph is correctly started, let close go first. | ||
| if (in_array($cname, $this->blockClose) && (!$plugin || $plugin_close)) { | ||
| $this->closeParagraph($call[2]); | ||
| $this->storeCall($call); | ||
| $this->openParagraph($call[2]); | ||
| continue; | ||
| } | ||
| if (in_array($cname, $this->blockOpen) && (!$plugin || $plugin_open)) { | ||
| $this->closeParagraph($call[2]); | ||
| $this->storeCall($call); | ||
| continue; | ||
| } | ||
| /* eol */ | ||
| if ($cname == 'eol') { | ||
| // Check this isn't an eol instruction to skip... | ||
| if (!$this->skipEol) { | ||
| // Next is EOL => double eol => mark as paragraph | ||
| if (isset($calls[$key+1]) && $calls[$key+1][0] == 'eol') { | ||
| $this->closeParagraph($call[2]); | ||
| $this->openParagraph($call[2]); | ||
| } else { | ||
| //if this is just a single eol make a space from it | ||
| $this->addCall(array('cdata',array(DOKU_PARSER_EOL), $call[2])); | ||
| } | ||
| } | ||
| continue; | ||
| } | ||
| /* normal */ | ||
| $this->addCall($call); | ||
| $this->skipEol = false; | ||
| } | ||
| // close last paragraph | ||
| $call = end($this->calls); | ||
| $this->closeParagraph($call[2]); | ||
| return $this->calls; | ||
| } | ||
| } |
Oops, something went wrong.