Merge branch 'release-6.16.0'

ningzhang422 · Nov 17, 2020 · 6d759f8 · 6d759f8
2 parents fd32e77 + 7338836
commit 6d759f8
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 2 deletions.
diff --git a/...eports/TIB_js-jrlib-ce_6.15.0_license.pdf → ...eports/TIB_js-jrlib-ce_6.16.0_license.pdf b/...eports/TIB_js-jrlib-ce_6.15.0_license.pdf → ...eports/TIB_js-jrlib-ce_6.16.0_license.pdf
diff --git a/...eports/TIB_js-jrlib-ce_6.15.0_license.txt → ...eports/TIB_js-jrlib-ce_6.16.0_license.txt b/...eports/TIB_js-jrlib-ce_6.15.0_license.txt → ...eports/TIB_js-jrlib-ce_6.16.0_license.txt
diff --git a/jasperreports/changes.txt b/jasperreports/changes.txt
@@ -2,6 +2,20 @@
 JasperReports Library Change Log
 =============================================
 
+JasperReports 6.16.0 (2020-11-06)
+---------------------------------------------
+
+- allow generic element HTML export handlers to export generic elements as images 
+or any other built-in element type;
+
+- new custom property to control the HTML exporting of custom visualization components as images;
+
+- minor bug fixes and improvements;
+
+
+
+
+
 JasperReports 6.15.0 (2020-10-06)
 ---------------------------------------------
 

diff --git a/jasperreports/clirr-ignore.xml b/jasperreports/clirr-ignore.xml
@@ -1,2 +1,29 @@
 <differences>
+	<difference>
+		<className>net/sf/jasperreports/chrome/ResourceManager*</className>
+		<differenceType>7005</differenceType>
+		<method>*</method>
+		<to>*</to>
+	</difference>
+	<difference>
+		<className>net/sf/jasperreports/engine/util/ConcurrentMapping*</className>
+		<differenceType>7005</differenceType>
+		<method>*</method>
+		<to>*</to>
+	</difference>
+	<difference>
+		<className>net/sf/jasperreports/engine/fill/JRFillSubreport</className>
+		<differenceType>7004</differenceType>
+		<method>*loadReportSource(java.lang.Object, java.lang.String)</method>
+	</difference>
+	<difference>
+		<className>net/sf/jasperreports/engine/JasperReportsContext</className>
+		<differenceType>7012</differenceType>
+		<method>*getOwnProperty(java.lang.String)</method>
+	</difference>
+	<difference>
+		<className>net/sf/jasperreports/engine/export/GenericElementHtmlHandler</className>
+		<differenceType>7012</differenceType>
+		<method>*exportElement(*)</method>
+	</difference>
 </differences>
diff --git a/jasperreports/pom.xml b/jasperreports/pom.xml
@@ -661,7 +661,7 @@
 				<artifactId>clirr-maven-plugin</artifactId>
 				<version>2.8</version>
 				<configuration>
-					<comparisonVersion>6.14.0</comparisonVersion>
+					<comparisonVersion>6.15.0</comparisonVersion>
 					<ignoredDifferencesFile>${basedir}/clirr-ignore.xml</ignoredDifferencesFile>
 				</configuration>
 			</plugin>

diff --git a/jasperreports/src/net/sf/jasperreports/engine/export/AbstractHtmlExporter.java b/jasperreports/src/net/sf/jasperreports/engine/export/AbstractHtmlExporter.java
@@ -269,7 +269,7 @@ else if (fontInfo != null)
 			String handlerFamily = handleFont(fontInfo, locale);
 			if (handlerFamily != null)
 			{
-				fontFamily = handlerFamily;
+				fontFamily = handlerFamily + ", '" + fontFamily + "'"; // fallback to font family just in case it already exists in the system
 			}
 		}
 		return fontFamily;