Skip to content

Fix footnote sort by export #2282

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

Open
TruongQuangSB wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix footnote sort by export #2282

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
44 changes: 20 additions & 24 deletions ...ipse.set.feature.export/src/org/eclipse/set/feature/export/pdf/TableToTableDocument.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,38 +408,28 @@ class TableToTableDocument {
private dispatch def void addFootnoteContent(Element element,
SimpleFootnoteContainer fc, int columnNumber, boolean isRemarkColumn) {
val footNotesInfo = fc.footnotes.map[getFootnoteInfo(fc, it)].filterNull
val separator = remarkTextInlnie ? FOOTNOTE_INLINE_TEXT_SEPARATOR : FOOTNOTE_MARK_SEPRATOR
val footnotes = footNotesInfo.map [
remarkTextInlnie ? toText : toShorthand
].iterableToString(separator)
element.addFootnoteChild(footnotes, WARNING_MARK_BLACK, columnNumber,
isRemarkColumn)
element.addFootnoteChild(footNotesInfo.footnotesToString,
WARNING_MARK_BLACK, columnNumber, isRemarkColumn)
}

private dispatch def void addFootnoteContent(Element element,
CompareFootnoteContainer fc, int columnNumber, boolean isRemarkColumn) {
val separator = remarkTextInlnie ? FOOTNOTE_INLINE_TEXT_SEPARATOR : FOOTNOTE_MARK_SEPRATOR
val oldFootnotes = fc.oldFootnotes.footnotes.map [
getFootnoteInfo(fc, it)
].filterNull.map [
remarkTextInlnie ? toText : toShorthand
].iterableToString(separator)
]
val newFootnotes = fc.newFootnotes.footnotes.map [
getFootnoteInfo(fc, it)
].filterNull.map [
remarkTextInlnie ? toText : toShorthand
].iterableToString(separator)
]
val unchangedFootnotes = fc.unchangedFootnotes.footnotes.map [
getFootnoteInfo(fc, it)
].filterNull.map[remarkTextInlnie ? toText : toShorthand].
iterableToString(separator)
]

element.addFootnoteChild(oldFootnotes, WARNING_MARK_YELLOW,
columnNumber, isRemarkColumn)
element.addFootnoteChild(unchangedFootnotes, WARNING_MARK_BLACK,
columnNumber, isRemarkColumn)
element.addFootnoteChild(newFootnotes, WARNING_MARK_RED, columnNumber,
isRemarkColumn)
element.addFootnoteChild(oldFootnotes.footnotesToString,
WARNING_MARK_YELLOW, columnNumber, isRemarkColumn)
element.addFootnoteChild(unchangedFootnotes.footnotesToString,
WARNING_MARK_BLACK, columnNumber, isRemarkColumn)
element.addFootnoteChild(newFootnotes.footnotesToString,
WARNING_MARK_RED, columnNumber, isRemarkColumn)
}

private dispatch def void addFootnoteContent(Element element,
Expand All @@ -449,6 +439,13 @@ class TableToTableDocument {
isRemarkColumn)
}

private def String footnotesToString(Iterable<FootnoteInfo> fn) {
val separator = remarkTextInlnie ? FOOTNOTE_INLINE_TEXT_SEPARATOR : FOOTNOTE_MARK_SEPRATOR
return fn.filterNull.sortBy[index].map [
remarkTextInlnie ? toText : toShorthand
].toSet.iterableToString(separator)
}

private def Element createMultiColorElement(MultiColorContent content,
int columnNumber, boolean isRemarkColumn) {
if (content.multiColorValue === null || content.disableMultiColor) {
Expand Down Expand Up @@ -491,9 +488,8 @@ class TableToTableDocument {
private def Element addContentToElement(String content, Element element,
int columnNumber, boolean isRemarkColumn) {
val checkOutput = content.checkForTestOutput(columnNumber)
element.textContent = isRemarkColumn
? checkOutput
: checkOutput.intersperseWithZeroSpacesSC
element.textContent = isRemarkColumn ? checkOutput : checkOutput.
intersperseWithZeroSpacesSC
return element
}

Expand Down
Loading