Skip to content

Commit 3046f17

Browse files
Merge pull request #158 from metanorma/layout_table
Layout table
2 parents e53429a + 0146611 commit 3046f17

File tree

5 files changed

+20
-8
lines changed

5 files changed

+20
-8
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SHELL ?= /bin/bash
66
endif
77

88
#JAR_VERSION := $(shell mvn -q -Dexec.executable="echo" -Dexec.args='$${project.version}' --non-recursive exec:exec -DforceStdout)
9-
JAR_VERSION := 1.50
9+
JAR_VERSION := 1.51
1010
JAR_FILE := mn2pdf-$(JAR_VERSION).jar
1111

1212
all: target/$(JAR_FILE)

README.adoc

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ You will need the Java Development Kit (JDK) version 8, Update 241 (8u241) or hi
1717

1818
[source,sh]
1919
----
20-
java -Xss5m -Xmx2048m -jar target/mn2pdf-1.50.jar --xml-file <XML-FileName> --xsl-file <XSLT-FileName> --pdf-file <Output-PDF-FileName> [--syntax-highlight]
20+
java -Xss5m -Xmx2048m -jar target/mn2pdf-1.51.jar --xml-file <XML-FileName> --xsl-file <XSLT-FileName> --pdf-file <Output-PDF-FileName> [--syntax-highlight]
2121
----
2222

2323
e.g.
2424

2525
[source,sh]
2626
----
27-
java -Xss5m -Xmx2048m -jar target/mn2pdf-1.50.jar --xml-file tests/G.191.xml --xsl-file tests/itu.recommendation.xsl --pdf-file tests/G.191.pdf
27+
java -Xss5m -Xmx2048m -jar target/mn2pdf-1.51.jar --xml-file tests/G.191.xml --xsl-file tests/itu.recommendation.xsl --pdf-file tests/G.191.pdf
2828
----
2929

3030
=== PDF encryption features
@@ -100,7 +100,7 @@ Update version in `pom.xml`, e.g.:
100100
----
101101
<groupId>org.metanorma.fop</groupId>
102102
<artifactId>mn2pdf</artifactId>
103-
<version>1.50</version>
103+
<version>1.51</version>
104104
<name>Metanorma XML to PDF converter</name>
105105
----
106106

@@ -111,8 +111,8 @@ Tag the same version in Git:
111111

112112
[source,xml]
113113
----
114-
git tag v1.50
115-
git push origin v1.50
114+
git tag v1.51
115+
git push origin v1.51
116116
----
117117

118118
Then the corresponding GitHub release will be automatically created at:

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.metanorma.fop</groupId>
77
<artifactId>mn2pdf</artifactId>
8-
<version>1.50</version>
8+
<version>1.51</version>
99
<name>Metanorma XML to PDF converter</name>
1010
<packaging>jar</packaging>
1111
<url>https://www.metanorma.org</url>

src/main/java/org/apache/fop/events/EventFormatter.java

+10-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.apache.commons.logging.LogFactory;
3131

3232
import org.apache.fop.events.model.EventSeverity;
33-
import org.apache.fop.fo.FObj;
3433
import org.apache.fop.layoutmgr.LayoutManager;
3534
import org.apache.fop.util.XMLResourceBundle;
3635
import org.apache.fop.util.text.AdvancedMessageFormat;
@@ -90,6 +89,16 @@ private static String format(Event event, ResourceBundle bundle) {
9089
String template;
9190
if (bundle != null) {
9291
String elementName = (String)event.getParams().get("elementName");
92+
if (elementName != null) {
93+
String className = event.getSource().getClass().toString();
94+
try {
95+
String elementId = ((LayoutManager) (event.getSource())).getFObj().getId();
96+
if (elementId != null && elementId.startsWith("__internal_layout__")) { //
97+
// special case when element (for instance, table) is using for block position on the page, no need warning
98+
return "";
99+
}
100+
} catch (Exception ex) { }
101+
}
93102
if (key.equals("overconstrainedAdjustEndIndent") && elementName != null && elementName.equals("fo:table")) {
94103
key = "overconstrainedAdjustEndIndentTable";
95104
event.setSeverity(EventSeverity.WARN);

src/main/java/org/metanorma/fop/eventlistener/LoggingEventListener.java

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ public class LoggingEventListener implements EventListener {
2222
/** {@inheritDoc} */
2323
public void processEvent(Event event) {
2424
String msg = EventFormatter.format(event);
25+
if (msg.isEmpty()) {
26+
return;
27+
}
2528
EventSeverity severity = event.getSeverity();
2629
if (severity == EventSeverity.INFO) {
2730
logger.info(msg);

0 commit comments

Comments
 (0)