Changes in Preformatted.php

945681fc9df0c43e5065e67d03a08d832e81e66c - fix(parser): keep an indented list from being swallowed by a table

Sun, 05 Jul 2026 17:42:26 +0000

fix(parser): keep an indented list from being swallowed by a tableThe parser rework dropped the list-awareness lookahead from preformatted'sentry patterns ('\n (?![\*\-])' became '\n '). In base mode this is maskedby sort order - listblock sorts before preformatted and wins the tie - buttable mode connects preformatted as a protected sub-mode without connectingany list mode. Inside a table an indented list line therefore enteredpreformatted instead of ending the table, and the table rewriter discarded theresulting call: the list vanished from the output and the table's section-editrange grew to cover it, so saving via the inline table editor overwrote thelist text.Restore the lookahead. For DokuWiki syntax it is the original '(?![\*\-])'(Listblock treats a bare * or - as a marker). For Markdown-preferred syntax theguard follows GfmListblock, rejecting -, *, + and ordered markers only whenfollowed by whitespace or end of line, so mixed dw+md / md+dw wikis are fixedtoo while an indented code block that merely starts with such a character (e.g.a *** line) still parses as code. List of files: /dokuwiki/inc/Parsing/ParserMode/Preformatted.php

47a02a102092be9e1e6f1ddaf158bdfffdb13d4f - Parsing: make parse syntax a per-parse value, drop ModeInterface

Thu, 04 Jun 2026 12:27:59 +0000

Parsing: make parse syntax a per-parse value, drop ModeInterfaceThe active parse's syntax flavour is a per-parse question, not process-global state: within a single request a plugin can render bundledDokuWiki-syntax text inside an otherwise-Markdown page. Yet ModeRegistrywas a singleton that read $conf['syntax'] and the $PARSER_MODES global,and every mode reached it through ModeRegistry::getInstance() — so theflavour lived in shared mutable state that two parses in one requestwould fight over.Make the registry a short-lived value instead:- ModeRegistry is constructed once per parse with an explicit $syntax and injected into Parser, Handler and every mode. getSyntax() / isDwPreferred() / isMdPreferred() consult $this->syntax; the DOKU_UNITTEST-gated mode-list cache hack is gone (each registry is fresh, nothing to invalidate).- p_get_instructions() is now the single place in the pipeline where $conf['syntax'] is read; from there the flavour travels as a parameter. No code under inc/Parsing/ reads $conf['syntax'] directly anymore — the five syntax-reading modes (Preformatted, GfmHr, GfmEscape, Externallink, GfmQuote) route through $this->registry.Keep the two concepts apart, as documented in the ModeRegistry andAbstractMode docblocks: the user's configured *preference* stays in$conf['syntax'] for UI code (toolbar, settings), while the activeparse's syntax is a parameter carried by the registry.$PARSER_MODES is demoted to a deprecated, read-only mirror, publishedduring loadPluginModes() — third-party syntax plugins (columnlist,alphalist2, phpwikify, skipentity) and the bundled info plugin read theglobal directly, often from their constructors, so the taxonomy muststay visible there. No core code reads the mirror.Fold ModeInterface into AbstractMode while here: getSort()/handle() areabstract, the connect callbacks carry defaults, and the public $Lexer"FIXME should be done by setter" becomes setLexer()/getLexer() injectedby Parser::addMode() alongside the registry. Nested-content resolutionmoves to the allowedCategories()/filterAllowedModes() hooks, resolvedonce when the registry is attached.Tests build their own parser/registry through ParserTestBase::setSyntax()instead of mutating $conf and calling the removed ModeRegistry::reset(). List of files: /dokuwiki/inc/Parsing/ParserMode/Preformatted.php

f57da51cde0cd30236737579a7b446c40f66189e - Preformatted: leave boundary \n in stream when next line has content

Tue, 05 May 2026 08:32:28 +0000

Preformatted: leave boundary \n in stream when next line has contentAdds a zero-width lookahead exit (?=\n[^ \t\n]) ahead of the existingconsuming \n exit. When an indented code block is followed by a non-blank line, the boundary newline now stays available for downstreamblock-level matchers (GfmHr, GfmHeader, etc.) instead of being eatenon the way out of preformatted mode.Concretely fixes a thematic-break-after-indented-code case (GFM speccase 85's trailing ----): without this change, GfmHr's \n anchor failedbecause preformatted had already consumed the newline, and the bare---- fell through to Entity which converted --- to an em-dash.The consuming branch is kept as a fall-through for the blank-line andend-of-input cases, where a pure lookahead would trip the lexer'sno-advance safety check.Six PreformattedTest expectations updated: trailing cdata after apreformatted block now carries the leading \n (rendered output isunchanged — paragraph whitespace is trimmed). List of files: /dokuwiki/inc/Parsing/ParserMode/Preformatted.php

13a62f810fbd091d15ab734b467eaec0a6bf829a - rename syntax flavors 'dokuwiki' / 'markdown' to 'dw' / 'md'

Mon, 04 May 2026 10:18:11 +0000

rename syntax flavors 'dokuwiki' / 'markdown' to 'dw' / 'md'Symmetry with the existing 'dw+md' / 'md+dw' setting values. List of files: /dokuwiki/inc/Parsing/ParserMode/Preformatted.php

96d096f148d7def1456456590bd2910ff9115c0f - remove getLineStartMarkers registry — sort order already wins

Mon, 27 Apr 2026 14:36:55 +0000

remove getLineStartMarkers registry — sort order already winsPreformatted's entry pattern carried a `(?![\*\-])` negativelookahead to defer to list modes on indented bullet lines.0cecf9d50 (2005, "new parser added") introduced it hardcoded;7958e6980 (2026, "decouple hardcoded mode names in Eol andPreformatted") refactored that hardcoded knowledge intoregister/getLineStartMarkers on ModeRegistry so each list modeowned its marker chars. Both preserved the behavior verbatim;neither documented why it was needed.Tracing the lexer, it isn't. ParallelRegex merges all entrypatterns into one PCRE expression; PCRE returns the leftmostmatch and breaks ties on expression order. Modes are added insort order via ModeRegistry::getModes(), so Listblock (sort 10)always precedes Preformatted (sort 20) and wins the tie on" - foo" without any lookahead. The only test that caught adifference was testPreformattedList, which happened to registermodes in non-canonical order - that was a test bug.This patch drops the lookahead in Preformatted::connectTo, theregisterLineStartMarkers call in Listblock::preConnect, theregister/getLineStartMarkers methods on ModeRegistry, and thethree registry-API unit tests. testPreformattedList nowregisters Listblock before Preformatted. List of files: /dokuwiki/inc/Parsing/ParserMode/Preformatted.php

b1c59bed2e3645a1f5f11438cdbe7d1596f4a3a4 - add GfmCode / GfmFile for fenced code blocks

Thu, 23 Apr 2026 14:01:03 +0000

add GfmCode / GfmFile for fenced code blocksGfmCode (backticks) emits the `code` handler instruction; GfmFile(tildes) emits `file`. Column-0 fences only, no length pairingbetween opener and closer, and unclosed fences stay literal —matching DokuWiki's `

` tag convention. The info string acceptsDW's full attribute vocabulary (language, filename, [options])through a new shared `Helpers::parseCodeAttributes` that `Code`also uses, with `html` aliased to `html4strict` and `-` meaning "nolanguage".Preformatted's indent threshold is now preference-gated: 2 spacesin DW-preferred settings, 4 spaces in MD-preferred, matching GFM'sindented code block rule. A single tab is a trigger in both.

            List of files:
            /dokuwiki/inc/Parsing/ParserMode/Preformatted.php



259e91d9cbe9e692d758265730a1b3b4f8e3f356 - clean up Acronym and Preformatted
Sat, 18 Apr 2026 15:48:54 +0000
clean up Acronym and Preformatted- remove stale comment, use closure for array_map, simplify compare  with spaceship operator in Acronym- clarify misleading comment in Preformatted

            List of files:
            /dokuwiki/inc/Parsing/ParserMode/Preformatted.php


71096e46fcbfaeaa808667aba794e77fe2780169 - move handler methods into ParserMode classes and rename Handler
Sat, 18 Apr 2026 15:35:30 +0000
move handler methods into ParserMode classes and rename HandlerEach ParserMode class now implements handle() from ModeInterface,containing the token handling logic that previously lived as individualmethods on Doku_Handler.The Handler class (formerly Doku_Handler) is the single dispatch point:Lexer passes tokens to Handler::handleToken() which routes to modeobjects, plugins, or returns false. The Lexer only tokenizes andresolves mapHandler aliases.Key changes:- Add handle() to ModeInterface, implemented by all mode classes- Move Doku_Handler to dokuwiki\Parsing\Handler namespace- File extends Code (shared parsing via $type property)- Quotes uses mapHandler() + Handler::getModeName() for sub-modes- Media::parseMedia() replaces Doku_Handler_Parse_Media()- Code::parseHighlightOptions() replaces parse_highlight_options()- Per-parse state (footnote, doublequote) stays on Handler- Deprecated wrappers kept for base/header/internallink/media- Class alias and rector rules added for backward compatibility

            List of files:
            /dokuwiki/inc/Parsing/ParserMode/Preformatted.php


7958e69808290099292c0703b95d88708f6ebb96 - decouple hardcoded mode names in Eol and Preformatted
Thu, 16 Apr 2026 16:35:56 +0000
decouple hardcoded mode names in Eol and PreformattedEol.php hardcoded ['listblock', 'table'] as modes to skip, andPreformatted.php hardcoded [\*\-] as a negative lookahead for listmarkers. Both embed knowledge that belongs to the respective blockmodes, not to Eol/Preformatted. Adding a new block mode that handlesits own EOL or uses different line start markers would require editingthese unrelated files — a hidden coupling.Listblock and Table now register themselves on ModeRegistry duringpreConnect(). Eol queries getBlockEolModes() and Preformatted queriesgetLineStartMarkers() to build its lookahead dynamically. Each modeowns its own data, and new block modes can participate without touchingunrelated files.

            List of files:
            /dokuwiki/inc/Parsing/ParserMode/Preformatted.php


d4f83172d9533c4d84f450fe22ef630816b21d75 - code style: line breaks
Thu, 31 Aug 2023 20:44:40 +0000
code style: line breaks

            List of files:
            /dokuwiki/inc/Parsing/ParserMode/Preformatted.php


be906b566b9bdfd92c032ee07c4fd077d820a8d1 - moved all parsing related namespaces to their own
Fri, 04 May 2018 12:22:09 +0000
moved all parsing related namespaces to their own

            List of files:
            /dokuwiki/inc/Parsing/ParserMode/Preformatted.php