Skip to content

[Backport stable-17.4.x] XRENDERING-798: Line breaks followed by empty format at the end of block elements should be escaped #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2025
Merged

[Backport stable-17.4.x] XRENDERING-798: Line breaks followed by empty format at the end of block elements should be escaped #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions xwiki-rendering-integration-tests/src/test/resources/simple/misc/misc7.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ paragraph1\\
paragraph2

[[Caption\\>>image:img.png]]

(% border="1" %)
|var|(%%)(% style="color: #0000ff;" %)asdf\\
|bar|function
.#-----------------------------------------------------
.expect|event/1.0
.#-----------------------------------------------------
Expand Down Expand Up @@ -105,5 +109,26 @@ onNewLine
endParagraph
endFigureCaption
endFigure [[class]=[image]]
beginTable [[border]=[1]]
beginTableRow
beginTableCell
onWord [var]
endTableCell
beginTableCell
beginFormat [NONE] [[style]=[color: #0000ff;]]
onWord [asdf]
onNewLine
endFormat [NONE] [[style]=[color: #0000ff;]]
endTableCell
endTableRow
beginTableRow
beginTableCell
onWord [bar]
endTableCell
beginTableCell
onWord [function]
endTableCell
endTableRow
endTable [[border]=[1]]
endSection
endDocument
19 changes: 14 additions & 5 deletions .../main/java/org/xwiki/rendering/internal/renderer/xwiki20/XWikiSyntaxChainingRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,12 +355,21 @@ public void onNewLine()
if (getBlockState().isInLine()) {
if (getXWikiSyntaxListenerChain().getConsecutiveNewLineStateChainingListener().getNewLineCount() > 1) {
print("\\\\");
} else if (getXWikiSyntaxListenerChain().getLookaheadChainingListener().getNextEvent().eventType
.isInlineEnd())
{
print("\\\\");
} else {
print("\n");
LookaheadChainingListener lookaheadListener =
getXWikiSyntaxListenerChain().getLookaheadChainingListener();
QueueListener.Event nextEvent = lookaheadListener.getNextEvent();
if (nextEvent.eventType.isInlineEnd()
// Format end events don't print anything for the none format at the end of inline elements as
// the format is automatically reset. So consider that we're already at the end of an inline
// element in that case.
|| (nextEvent.eventType == EventType.END_FORMAT && nextEvent.eventParameters[0] == Format.NONE
&& lookaheadListener.getNextEvent(2).eventType.isInlineEnd()))
{
print("\\\\");
} else {
print("\n");
}
}
} else {
print("\n");
Expand Down