r24403 by jghali - #16413: Enable embedding OpenType fonts in PDF/X-4

[scribus-commit]

Author: jghali
Date: Wed Jan 13 02:34:37 2021
New Revision: 24403

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24403
Log:
#16413: Enable embedding OpenType fonts in PDF/X-4

Modified:
    trunk/Scribus/scribus/pdfversion.cpp
    trunk/Scribus/scribus/pdfwriter.cpp

Modified: trunk/Scribus/scribus/pdfversion.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24403&path=/trunk/Scribus/scribus/pdfversion.cpp
==============================================================================
--- trunk/Scribus/scribus/pdfversion.cpp	(original)
+++ trunk/Scribus/scribus/pdfversion.cpp	Wed Jan 13 02:34:37 2021
@@ -31,7 +31,11 @@
 
 bool PDFVersion::supportsEmbeddedOpenTypeFonts() const
 {
-	return (m_version == PDF_16);
+	if (m_version == PDF_16)
+		return true;
+	if (m_version == PDF_X4)
+		return true;
+	return false;
 }
 
 bool PDFVersion::supportsOCGs() const

Modified: trunk/Scribus/scribus/pdfwriter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24403&path=/trunk/Scribus/scribus/pdfwriter.cpp
==============================================================================
--- trunk/Scribus/scribus/pdfwriter.cpp	(original)
+++ trunk/Scribus/scribus/pdfwriter.cpp	Wed Jan 13 02:34:37 2021
@@ -739,11 +739,11 @@
 			case PDFVersion::PDF_14:
 				write("%PDF-1.4\n");
 				break;
-			case PDFVersion::PDF_X4:
 			case PDFVersion::PDF_15:
 				write("%PDF-1.5\n");
 				break;
 			case PDFVersion::PDF_16:
+			case PDFVersion::PDF_X4:
 				write("%PDF-1.6\n");
 				break;
 		}