@@ -40,10 +40,10 @@ discard block |
||
| 40 | 40 | return array('substition', 'protected', 'disabled', 'formatting'); |
| 41 | 41 | } |
| 42 | 42 | function connectTo($mode) { |
| 43 | - $this->Lexer->addEntryPattern('\n {2,}(?:--?|\*\*?|\?|::?)', $mode, 'plugin_yalist'); |
|
| 44 | - $this->Lexer->addEntryPattern('\n\t{1,}(?:--?|\*\*?|\?|::?)', $mode, 'plugin_yalist'); |
|
| 45 | - $this->Lexer->addPattern('\n {2,}(?:--?|\*\*?|\?|::?|\.\.)', 'plugin_yalist'); |
|
| 46 | - $this->Lexer->addPattern('\n\t{1,}(?:--?|\*\*?|\?|::?|\.\.)', 'plugin_yalist'); |
|
| 43 | + $this->Lexer->addEntryPattern('\n {2,}(?:--?|\*\*?|\?|::?)', $mode, 'plugin_yalist'); |
|
| 44 | + $this->Lexer->addEntryPattern('\n\t{1,}(?:--?|\*\*?|\?|::?)', $mode, 'plugin_yalist'); |
|
| 45 | + $this->Lexer->addPattern('\n {2,}(?:--?|\*\*?|\?|::?|\.\.)', 'plugin_yalist'); |
|
| 46 | + $this->Lexer->addPattern('\n\t{1,}(?:--?|\*\*?|\?|::?|\.\.)', 'plugin_yalist'); |
|
| 47 | 47 | } |
| 48 | 48 | function postConnect() { |
| 49 | 49 | $this->Lexer->addExitPattern('\n', 'plugin_yalist'); |
@@ -56,9 +56,9 @@ discard block |
||
| 56 | 56 | $frame = $this->_interpret_match($match); |
| 57 | 57 | $level = $frame['level'] = 1; |
| 58 | 58 | array_push($output, |
| 59 | - "${frame['list']}_open", |
|
| 60 | - "${frame['item']}_open", |
|
| 61 | - "${frame['item']}_content_open"); |
|
| 59 | + "${frame['list']}_open", |
|
| 60 | + "${frame['item']}_open", |
|
| 61 | + "${frame['item']}_content_open"); |
|
| 62 | 62 | if ($frame['paras']) |
| 63 | 63 | array_push($output, 'p_open'); |
| 64 | 64 | array_push($this->stack, $frame); |
@@ -76,8 +76,8 @@ discard block |
||
| 76 | 76 | $close_content = false; |
| 77 | 77 | } |
| 78 | 78 | array_push($output, |
| 79 | - "${frame['item']}_close", |
|
| 80 | - "${frame['list']}_close"); |
|
| 79 | + "${frame['item']}_close", |
|
| 80 | + "${frame['list']}_close"); |
|
| 81 | 81 | } |
| 82 | 82 | break; |
| 83 | 83 | case DOKU_LEXER_MATCHED: |
@@ -95,8 +95,8 @@ discard block |
||
| 95 | 95 | $close_content = false; |
| 96 | 96 | } |
| 97 | 97 | array_push($output, |
| 98 | - "${last_frame['item']}_close", |
|
| 99 | - "${last_frame['list']}_close"); |
|
| 98 | + "${last_frame['item']}_close", |
|
| 99 | + "${last_frame['list']}_close"); |
|
| 100 | 100 | array_pop($this->stack); |
| 101 | 101 | $last_frame = end($this->stack); |
| 102 | 102 | } |
@@ -106,8 +106,8 @@ discard block |
||
| 106 | 106 | array_push($output, 'p_close', 'p_open'); |
| 107 | 107 | else |
| 108 | 108 | array_push($output, |
| 109 | - "${last_frame['item']}_content_open", |
|
| 110 | - 'p_open'); |
|
| 109 | + "${last_frame['item']}_content_open", |
|
| 110 | + 'p_open'); |
|
| 111 | 111 | } else { |
| 112 | 112 | // let's just pretend we didn't match... |
| 113 | 113 | $state = DOKU_LEXER_UNMATCHED; |
@@ -122,8 +122,8 @@ discard block |
||
| 122 | 122 | if ($last_frame['paras']) |
| 123 | 123 | array_push($output, 'p_close'); |
| 124 | 124 | array_push($output, |
| 125 | - "${last_frame['item']}_content_close", |
|
| 126 | - "${curr_frame['list']}_open"); |
|
| 125 | + "${last_frame['item']}_content_close", |
|
| 126 | + "${curr_frame['list']}_open"); |
|
| 127 | 127 | } else { |
| 128 | 128 | // same depth, or getting shallower |
| 129 | 129 | $close_content = true; |
@@ -142,8 +142,8 @@ discard block |
||
| 142 | 142 | $close_content = false; |
| 143 | 143 | } |
| 144 | 144 | array_push($output, |
| 145 | - "${last_frame['item']}_close", |
|
| 146 | - "${last_frame['list']}_close"); |
|
| 145 | + "${last_frame['item']}_close", |
|
| 146 | + "${last_frame['list']}_close"); |
|
| 147 | 147 | array_pop($this->stack); |
| 148 | 148 | $last_frame = end($this->stack); |
| 149 | 149 | } |
@@ -161,14 +161,14 @@ discard block |
||
| 161 | 161 | if ($curr_frame['list'] != $last_frame['list']) { |
| 162 | 162 | // change list types |
| 163 | 163 | array_push($output, |
| 164 | - "${last_frame['list']}_close", |
|
| 165 | - "${curr_frame['list']}_open"); |
|
| 164 | + "${last_frame['list']}_close", |
|
| 165 | + "${curr_frame['list']}_open"); |
|
| 166 | 166 | } |
| 167 | 167 | } |
| 168 | 168 | // and finally, open tags for the new list item |
| 169 | 169 | array_push($output, |
| 170 | - "${curr_frame['item']}_open", |
|
| 171 | - "${curr_frame['item']}_content_open"); |
|
| 170 | + "${curr_frame['item']}_open", |
|
| 171 | + "${curr_frame['item']}_content_open"); |
|
| 172 | 172 | if ($curr_frame['paras']) |
| 173 | 173 | array_push($output, 'p_open'); |
| 174 | 174 | $curr_frame['level'] = $level; |