Pdf export description inline (#1736)

* Make the markup in table, when it fit to column

* Re add maxCharInCell function

* more Footnote description inline

Author: TruongQuangSB

java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/pdf/TableToTableDocument.xtend

@@ -62,8 +62,7 @@ class TableToTableDocument {
 	var String tablename
 	var int groupNumber
 	var TableSpanUtils spanUtils
-
-	static val String FOOTNOTE_SEPARATOR = ", "
+	var remarkTextInlnie = true
 
 	private new() throws ParserConfigurationException {
 		val docFactory = DocumentBuilderFactory.newInstance
@@ -116,8 +115,11 @@ class TableToTableDocument {
 
 	private def Element create doc.createElement("Table") transform(Table table,
 		Titlebox titlebox, FreeFieldInfo freeFieldInfo) {
+		remarkTextInlnie = table.isInlineFootnote
 		appendChild(table.tablecontent.transform)
-		appendChild(transformToFootnotes(table))
+		if (!remarkTextInlnie) {
+			appendChild(transformToFootnotes(table))	
+		}
 		appendChild(titlebox.transform)
 		appendChild(freeFieldInfo.transform)
 		return
@@ -287,9 +289,7 @@ class TableToTableDocument {
 		val stringValue = content.plainStringValue
 		if (isRemarkColumn) {
 			val child = doc.createElement("UnchangedValue")
-			element.appendChild(
-				stringValue.addContentToElement(child, columnNumber,
-					isRemarkColumn))
+			stringValue.addContentToElement(child, columnNumber, isRemarkColumn)
 			element.addFootnoteContent(fc, columnNumber, isRemarkColumn)
 		} else {
 			element.textContent = stringValue.checkForTestOutput(columnNumber).
@@ -390,25 +390,26 @@ class TableToTableDocument {
 
 	private dispatch def void addFootnoteContent(Element element,
 		SimpleFootnoteContainer fc, int columnNumber, boolean isRemarkColumn) {
-
-		val footnotes = fc.footnotes.map[getFootnoteInfo(fc, it).toShorthand].
-			iterableToString(FOOTNOTE_SEPARATOR)
+		val footNotesInfo = fc.footnotes.map[getFootnoteInfo(fc, it)].filterNull
+		val footnotes = footNotesInfo.map [
+			remarkTextInlnie ? toText : toShorthand
+		].iterableToString(FOOTNOTE_SEPARATOR)
 		element.addFootnoteChild(footnotes, WARNING_MARK_BLACK, columnNumber,
 			isRemarkColumn)
 	}
 
 	private dispatch def void addFootnoteContent(Element element,
 		CompareFootnoteContainer fc, int columnNumber, boolean isRemarkColumn) {
-
-		val oldFootnotes = fc.oldFootnotes.map [
-			getFootnoteInfo(fc, it).toShorthand
+		val oldFootnotes = fc.oldFootnotes.map[getFootnoteInfo(fc, it)].map [
+			remarkTextInlnie ? toText : toShorthand
 		].iterableToString(FOOTNOTE_SEPARATOR)
-		val newFootnotes = fc.newFootnotes.map [
-			getFootnoteInfo(fc, it).toShorthand
+		val newFootnotes = fc.newFootnotes.map[getFootnoteInfo(fc, it)].map [
+			remarkTextInlnie ? toText : toShorthand
 		].iterableToString(FOOTNOTE_SEPARATOR)
 		val unchangedFootnotes = fc.unchangedFootnotes.map [
-			getFootnoteInfo(fc, it).toShorthand
-		].iterableToString(FOOTNOTE_SEPARATOR)
+			getFootnoteInfo(fc, it)
+		].map[remarkTextInlnie ? toText : toShorthand].iterableToString(
+			FOOTNOTE_SEPARATOR)
 
 		element.addFootnoteChild(oldFootnotes, WARNING_MARK_YELLOW,
 			columnNumber, isRemarkColumn)

java/bundles/org.eclipse.set.feature.table/src/org/eclipse/set/feature/table/ToolboxTableView.java

@@ -371,7 +371,6 @@ private void updateFootnotes() {
 		final List<String> lines = new ArrayList<>();
 		final List<StyleRange> styles = new ArrayList<>();
 		int startOffset = 0;
-
 		for (final FootnoteInfo footnote : TableExtensions
 				.getAllFootnotes(table)) {
 			final String text = footnote.toReferenceText();

java/bundles/org.eclipse.set.model.tablemodel.extensions/src/org/eclipse/set/model/tablemodel/extensions/TableExtensions.xtend

@@ -41,7 +41,7 @@ import org.eclipse.set.model.planpro.Basisobjekte.Bearbeitungsvermerk
  * Extensions for {@link Table}.
  */
 class TableExtensions {
-
+	public static val String FOOTNOTE_SEPARATOR = "; "
 	/**
 	 * @param columnLabels the column labels
 	 * 
@@ -454,8 +454,61 @@ class TableExtensions {
 		}
 		return getFootnoteInfo(object as Table, fn)
 	}
-	
+
 	static def boolean isTableEmpty(Table table) {
 		return table.tableRows.nullOrEmpty
 	}
+
+	static def boolean isInlineFootnote(Table table) {
+		val remarkColumn = table.columndescriptors.findFirst [
+			isFootnoteReferenceColumn
+		]
+		if (remarkColumn === null) {
+			return false
+		}
+		val remarkColumnWidth = remarkColumn.columnWidth
+		val maxCharInCell = remarkColumnWidth.maxCharInCell
+		return table.tableRows.forall [ row |
+			val fc = row.footnotes
+			if (fc === null) {
+				return true
+			}
+
+			if (fc instanceof SimpleFootnoteContainer) {
+				val remarks = fc.footnotes.map[getFootnoteInfo(table, it)].
+					filterNull
+					
+				return remarks.isEmpty ||
+					remarks.map[toText].join(", ").length < maxCharInCell
+			}
+
+			if (fc instanceof CompareFootnoteContainer) {
+				val oldFootnotes = fc.oldFootnotes.map [
+					getFootnoteInfo(table, it)
+				].filterNull
+				val newFootnotes = fc.newFootnotes.map [
+					getFootnoteInfo(table, it)
+				].filterNull
+				val unchangedFootnotes = fc.unchangedFootnotes.map [
+					getFootnoteInfo(table, it)
+				].filterNull
+				val notEmptyContainer = #[oldFootnotes, newFootnotes,
+					unchangedFootnotes].filter[!isEmpty]
+
+				return switch (notEmptyContainer.size) {
+					case 0:
+						true
+					case 1: {
+						val remarks = notEmptyContainer.firstOrNull.map[toText].
+							filterNull
+						return remarks.isEmpty || 
+							remarks.join(FOOTNOTE_SEPARATOR).length < maxCharInCell
+					}
+					default:
+						false
+				}
+			}
+			return true
+		]
+	}
 }

java/bundles/org.eclipse.set.utils/src/org/eclipse/set/utils/StringExtensions.xtend

@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2017 DB Netz AG and others.
- *
+ * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -16,14 +16,15 @@ import java.util.regex.Pattern
  * @author Schaefer
  */
 class StringExtensions {
-	
-	static val ENV_PATTERN = Pattern.compile("(?<start>[^$]*)\\$(?<var>[^$]+)\\$(?<end>.*)")
+
+	static val ENV_PATTERN = Pattern.compile(
+		"(?<start>[^$]*)\\$(?<var>[^$]+)\\$(?<end>.*)")
 	static val ENV_VAR = "var"
-	
-	
+
 	/**
 	 * This constant determine manual with OpenSans font 
 	 */
+	static val int CHARACTER_PRO_CM = 8
 	static final String ZERO_WIDTH_SPACE = "\u200b"
 
 	/**
@@ -45,7 +46,11 @@ class StringExtensions {
 	static def String intersperseWithZeroSpacesSC(String string) {
 		return string.replaceAll("([ /\\-_)}\\]])", "$1" + ZERO_WIDTH_SPACE)
 	}
-	
+
+	static def int maxCharInCell(float cellWidth) {
+		return Math.round(cellWidth * CHARACTER_PRO_CM)
+	}
+
 	/**
 	 * @param string this string
 	 * 
@@ -70,25 +75,27 @@ class StringExtensions {
 		}
 		return ""
 	}
-	
+
 	/**
 	 * Remove the given suffix from this string.
 	 * 
 	 * @param string this string
 	 * @param suffix the given suffix collection
 	 */
 	static def String removeSuffix(String string, String... suffix) {
-		val sortedSuffix = suffix.sortWith([a,b|Integer.compare(b.length, a.length)])
-		
+		val sortedSuffix = suffix.sortWith([ a, b |
+			Integer.compare(b.length, a.length)
+		])
+
 		for (p : sortedSuffix) {
 			if (string.endsWith(p)) {
 				return string.substring(0, string.length - p.length)
 			}
 		}
-		
+
 		return string
 	}
-	
+
 	/**
 	 * Compares the arguments. Any argument may be <code>null</code>.
 	 * 
@@ -101,7 +108,7 @@ class StringExtensions {
 		}
 		return string.equals(other)
 	}
-	
+
 	/**
 	 * Expand the given path with environment variables, marked with dollarsigns.
 	 * <p>
@@ -113,10 +120,8 @@ class StringExtensions {
 	 */
 	static def String expandFromEnvironment(String string) {
 		var String result = String.valueOf(string)
-		for (var matcher = ENV_PATTERN.matcher(result);
-			matcher.matches;
-			matcher = ENV_PATTERN.matcher(result)
-		) {
+		for (var matcher = ENV_PATTERN.matcher(result); matcher.
+			matches; matcher = ENV_PATTERN.matcher(result)) {
 			val name = matcher.group(ENV_VAR)
 			val expanded = System.getenv(name)
 			result = string.replace('''$«name»$''', expanded)