Skip to content

Commit

Permalink
Merge pull request #316 from metanorma/upgrade/pdfbox_3_0_3
Browse files Browse the repository at this point in the history
Upgrade to support PDFBox 3.0.3
  • Loading branch information
Intelligent2013 authored Dec 25, 2024
2 parents 17fe733 + eda3922 commit f21f325
Show file tree
Hide file tree
Showing 13 changed files with 2,692 additions and 718 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SHELL ?= /bin/bash
endif

#JAR_VERSION := $(shell mvn -q -Dexec.executable="echo" -Dexec.args='$${project.version}' --non-recursive exec:exec -DforceStdout)
JAR_VERSION := 2.11
JAR_VERSION := 2.12
JAR_FILE := mn2pdf-$(JAR_VERSION).jar

all: target/$(JAR_FILE)
Expand Down
10 changes: 5 additions & 5 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ You will need the Java Development Kit (JDK) version 8, Update 241 (8u241) or hi

[source,sh]
----
java -Xss5m -Xmx2048m -jar target/mn2pdf-2.11.jar --xml-file <XML-FileName> --xsl-file <XSLT-FileName> --pdf-file <Output-PDF-FileName> [--syntax-highlight]
java -Xss5m -Xmx2048m -jar target/mn2pdf-2.12.jar --xml-file <XML-FileName> --xsl-file <XSLT-FileName> --pdf-file <Output-PDF-FileName> [--syntax-highlight]
----

e.g.

[source,sh]
----
java -Xss5m -Xmx2048m -jar target/mn2pdf-2.11.jar --xml-file tests/G.191.xml --xsl-file tests/itu.recommendation.xsl --pdf-file tests/G.191.pdf
java -Xss5m -Xmx2048m -jar target/mn2pdf-2.12.jar --xml-file tests/G.191.xml --xsl-file tests/itu.recommendation.xsl --pdf-file tests/G.191.pdf
----

=== PDF encryption features
Expand Down Expand Up @@ -100,7 +100,7 @@ Update version in `pom.xml`, e.g.:
----
<groupId>org.metanorma.fop</groupId>
<artifactId>mn2pdf</artifactId>
<version>2.11</version>
<version>2.12</version>
<name>Metanorma XML to PDF converter</name>
----

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

[source,xml]
----
git tag v2.11
git push origin v2.11
git tag v2.12
git push origin v2.12
----

Then the corresponding GitHub release will be automatically created at:
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.metanorma.fop</groupId>
<artifactId>mn2pdf</artifactId>
<version>2.11</version>
<version>2.12</version>
<name>Metanorma XML to PDF converter</name>
<packaging>jar</packaging>
<url>https://www.metanorma.org</url>
Expand Down Expand Up @@ -160,7 +160,7 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>fontbox</artifactId>
<version>2.0.27</version>
<version>3.0.3</version> <!-- 2.0.27 -->
</dependency>
<!-- https://mvnrepository.com/artifact/de.rototor.jeuclid/jeuclid-fop -->
<dependency>
Expand Down Expand Up @@ -249,7 +249,7 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.27</version> <!-- 2.0.24 -->
<version>3.0.3</version> <!-- 2.0.24, 2.0.27, 3.0.3 -->
<!-- <scope>test</scope> -->
</dependency>
<dependency>
Expand Down
101 changes: 101 additions & 0 deletions src/main/java/org/apache/fop/fonts/CFFToType1Font.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* $Id$ */
package org.apache.fop.fonts;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.apache.commons.io.IOUtils;
import org.apache.fontbox.cff.CFFFont;
import org.apache.fontbox.cff.CFFParser;
import org.apache.pdfbox.io.RandomAccessReadBuffer;

import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.fonts.type1.PFBData;
import org.apache.fop.fonts.type1.PFBParser;
import org.apache.fop.fonts.type1.Type1SubsetFile;
import org.apache.fop.render.ps.Type1FontFormatter;

public class CFFToType1Font extends MultiByteFont {

public CFFToType1Font(InternalResourceResolver resourceResolver, EmbeddingMode embeddingMode) {
super(resourceResolver, embeddingMode);
setEmbeddingMode(EmbeddingMode.FULL);
setFontType(FontType.TYPE1);
}

public InputStream getInputStream() throws IOException {
return null;
}

public List<InputStream> getInputStreams() throws IOException {
InputStream cff = super.getInputStream();
return convertOTFToType1(cff);
}

private List<InputStream> convertOTFToType1(InputStream in) throws IOException {
CFFFont f = new CFFParser().parse(new RandomAccessReadBuffer(IOUtils.toByteArray(in))).get(0);
List<InputStream> fonts = new ArrayList<InputStream>();
Map<Integer, Integer> glyphs = cidSet.getGlyphs();
int i = 0;
for (Map<Integer, Integer> x : splitGlyphs(glyphs)) {
String iStr = "." + i;
fonts.add(convertOTFToType1(x, f, iStr));
i++;
}
return fonts;
}

private List<Map<Integer, Integer>> splitGlyphs(Map<Integer, Integer> glyphs) {
List<Map<Integer, Integer>> allGlyphs = new ArrayList<Map<Integer, Integer>>();
for (Map.Entry<Integer, Integer> x : glyphs.entrySet()) {
int k = x.getKey();
int v = x.getValue();
int pot = v / 256;
v = v % 256;
while (allGlyphs.size() < pot + 1) {
Map<Integer, Integer> glyphsPerFont = new HashMap<Integer, Integer>();
glyphsPerFont.put(0, 0);
allGlyphs.add(glyphsPerFont);
}
allGlyphs.get(pot).put(k, v);
}
return allGlyphs;
}

private InputStream convertOTFToType1(Map<Integer, Integer> glyphs, CFFFont cffFont, String splitGlyphsId)
throws IOException {
byte[] type1Bytes = new Type1FontFormatter(glyphs).format(cffFont, splitGlyphsId);
PFBData pfb = new PFBParser().parsePFB(new ByteArrayInputStream(type1Bytes));
ByteArrayOutputStream s1 = new ByteArrayOutputStream();
s1.write(pfb.getHeaderSegment());
ByteArrayOutputStream s2 = new ByteArrayOutputStream();
s2.write(pfb.getEncryptedSegment());
ByteArrayOutputStream s3 = new ByteArrayOutputStream();
s3.write(pfb.getTrailerSegment());
byte[] out = new Type1SubsetFile().stitchFont(s1, s2, s3);
return new ByteArrayInputStream(out);
}
}
Loading

0 comments on commit f21f325

Please sign in to comment.