[FOray-commit] SF.net SVN: foray:[12408] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
|
From: <vic...@us...> - 2022-01-16 13:45:36
|
Revision: 12408
http://sourceforge.net/p/foray/code/12408
Author: victormote
Date: 2022-01-16 13:45:33 +0000 (Sun, 16 Jan 2022)
Log Message:
-----------
Conform to aXSL change: Move BoundingBox interface from axsl-common to axsl-ps.
Modified Paths:
--------------
trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxFloat.java
trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxShort.java
trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxUtils.java
trunk/foray/foray-font/src/main/java/org/foray/font/FreeStandingFont.java
trunk/foray/foray-font/src/main/java/org/foray/font/FsTrueTypeFont.java
trunk/foray/foray-font/src/main/java/org/foray/font/FsType1Font.java
trunk/foray/foray-font/src/main/java/org/foray/font/SystemFont.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollectionLister.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeFont.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfMtxEntry.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGlyf.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1Metrics.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java
trunk/foray/foray-font/src/main/java/org/foray/font/util/MockFont.java
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier-Bold.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier-BoldOblique.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier-Oblique.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica-Bold.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica-BoldOblique.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica-Oblique.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Symbol.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-Bold.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-BoldItalic.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-Italic.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-Roman.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/ZapfDingbats.jbso
trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeFontParserTests.java
trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfaTests.java
trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfbTests.java
trunk/foray/foray-graphic/build.gradle
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfFormXobject.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfRectangle.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformEps.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformMath.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformSvg.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXreference.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/type1/PsFontDictionary4a.java
trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxFloat.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxFloat.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxFloat.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -28,7 +28,7 @@
package org.foray.common.data;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
import java.io.Serializable;
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxShort.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxShort.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxShort.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -28,7 +28,7 @@
package org.foray.common.data;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
import java.io.Serializable;
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxUtils.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxUtils.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxUtils.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -30,7 +30,7 @@
import org.foray.common.primitive.FloatUtils;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
/**
* Utilities related to bounding boxes.
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/FreeStandingFont.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/FreeStandingFont.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/FreeStandingFont.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -34,9 +34,9 @@
import org.foray.font.format.Kerning;
import org.foray.font.format.Panose4a;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.Font;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.CharSet;
import org.axsl.ps.Encoding;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/FsTrueTypeFont.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/FsTrueTypeFont.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/FsTrueTypeFont.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -37,9 +37,9 @@
import org.foray.font.format.ttf.TrueTypeFont;
import org.foray.font.format.ttf.TtfSubSetFile;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.Font;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import java.io.IOException;
import java.io.InputStream;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/FsType1Font.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/FsType1Font.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/FsType1Font.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -39,9 +39,9 @@
import org.foray.font.format.type1.Type1Metrics;
import org.foray.font.format.type1.Type1MetricsParser;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.Font;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.PsEncoding;
import org.axsl.ps.PsServer;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/SystemFont.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/SystemFont.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/SystemFont.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -36,8 +36,8 @@
import org.foray.font.format.Kerning;
import org.foray.font.format.Panose4a;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.CharSet;
import java.awt.Font;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollectionLister.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollectionLister.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollectionLister.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -35,8 +35,8 @@
import org.foray.font.format.FontParserClient;
import org.foray.font.format.type1.Type1MetricsSerializer;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeFont.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeFont.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeFont.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -36,8 +36,8 @@
import org.foray.font.format.Panose4a;
import org.foray.font.output.FontPdfUtilities;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.Font;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.Cmap;
import org.slf4j.Logger;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfMtxEntry.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfMtxEntry.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfMtxEntry.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -30,7 +30,7 @@
import org.foray.common.data.BoundingBoxUtils;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
/**
* A TTF Font Mtx entry.
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGlyf.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGlyf.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGlyf.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -32,7 +32,7 @@
import org.foray.common.io.RandomAccessInput;
import org.foray.common.primitive.BitUtils;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -32,7 +32,7 @@
import org.foray.common.data.BoundingBoxUtils;
import org.foray.common.io.RandomAccessInput;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1Metrics.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1Metrics.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1Metrics.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -33,7 +33,7 @@
import org.foray.font.format.Kerning;
import org.foray.font.output.FontPdfUtilities;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.CharSet;
import org.axsl.ps.PsEncoding;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -34,9 +34,9 @@
import org.foray.font.FontServer4a;
import org.foray.font.format.Kerning;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.Font;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.CharSet;
import org.axsl.ps.GlyphList;
import org.axsl.ps.PsEncoding;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/util/MockFont.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/util/MockFont.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/util/MockFont.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -32,9 +32,9 @@
import org.foray.font.Font4a;
import org.foray.font.format.Kerning;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.Font;
import org.axsl.font.Panose;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.CharSet;
import org.axsl.ps.Encoding;
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier-Bold.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier-BoldOblique.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier-Oblique.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica-Bold.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica-BoldOblique.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica-Oblique.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Symbol.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-Bold.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-BoldItalic.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-Italic.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-Roman.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/ZapfDingbats.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeFontParserTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeFontParserTests.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeFontParserTests.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -34,8 +34,8 @@
import org.foray.font.format.FontContent;
import org.foray.font.format.FontParser;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.junit.Assert;
import org.junit.Test;
Modified: trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfaTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfaTests.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfaTests.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -32,8 +32,8 @@
import org.foray.font.FontServer4a;
import org.foray.font.format.FontParser;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.PsCharStringsDictionary;
import org.axsl.ps.PsFontDictionary;
import org.axsl.ps.PsFontInfoDictionary;
Modified: trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfbTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfbTests.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfbTests.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -32,8 +32,8 @@
import org.foray.font.FontServer4a;
import org.foray.font.format.FontParser;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.PsCharStringsDictionary;
import org.axsl.ps.PsFontDictionary;
import org.axsl.ps.PsFontInfoDictionary;
Modified: trunk/foray/foray-graphic/build.gradle
===================================================================
--- trunk/foray/foray-graphic/build.gradle 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-graphic/build.gradle 2022-01-16 13:45:33 UTC (rev 12408)
@@ -20,6 +20,7 @@
api (group: 'org.axsl', name: 'axsl-graphic', version: axslVersion) { transitive = false }
api (group: 'org.axsl', name: 'axsl-orthography', version: axslVersion) { transitive = false }
api (group: 'org.axsl', name: 'axsl-pdf', version: axslVersion) { transitive = false }
+ api (group: 'org.axsl', name: 'axsl-ps', version: axslVersion) { transitive = false }
api (project(':foray-common')) { transitive = false }
api (project(':foray-xml')) { transitive = false }
Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -33,10 +33,10 @@
import org.foray.common.data.BoundingBoxUtils;
import org.foray.common.sequence.ByteArray;
-import org.axsl.common.data.BoundingBox;
import org.axsl.common.sequence.ByteSequence;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicException;
+import org.axsl.ps.BoundingBox;
import java.awt.Color;
import java.awt.color.ColorSpace;
Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfFormXobject.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfFormXobject.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfFormXobject.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -28,10 +28,10 @@
package org.foray.pdf.object;
-import org.axsl.common.data.BoundingBox;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicException;
import org.axsl.pdf.PdfException;
+import org.axsl.ps.BoundingBox;
import java.awt.geom.AffineTransform;
Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfRectangle.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfRectangle.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfRectangle.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -28,7 +28,7 @@
package org.foray.pdf.object;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
import java.io.UnsupportedEncodingException;
Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformEps.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformEps.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformEps.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -31,9 +31,9 @@
import org.foray.common.data.BoundingBoxUtils;
import org.foray.common.sequence.ByteArray;
-import org.axsl.common.data.BoundingBox;
import org.axsl.graphic.EpsGraphic;
import org.axsl.graphic.GraphicException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.PsException;
import org.axsl.ps.PsInput;
import org.axsl.ps.PsInterpreter;
Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformMath.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformMath.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformMath.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -32,7 +32,6 @@
import org.foray.common.data.BoundingBoxUtils;
import org.foray.pdf.util.PdfGraphics2D;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.FontConsumer;
import org.axsl.graphic.GraphicException;
import org.axsl.graphic.MathGraphic;
@@ -39,6 +38,7 @@
import org.axsl.graphic.output.GraphicOutput;
import org.axsl.graphic.output.GraphicPdf;
import org.axsl.orthography.Orthography;
+import org.axsl.ps.BoundingBox;
import java.awt.Graphics2D;
import java.awt.geom.AffineTransform;
Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformSvg.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformSvg.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformSvg.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -32,7 +32,6 @@
import org.foray.common.data.BoundingBoxUtils;
import org.foray.pdf.util.PdfGraphics2D;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.FontConsumer;
import org.axsl.graphic.GraphicException;
import org.axsl.graphic.SvgGraphic;
@@ -39,6 +38,7 @@
import org.axsl.graphic.output.GraphicOutput;
import org.axsl.graphic.output.GraphicPdf;
import org.axsl.orthography.Orthography;
+import org.axsl.ps.BoundingBox;
import java.awt.Graphics2D;
import java.awt.geom.AffineTransform;
Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXreference.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXreference.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXreference.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -30,11 +30,11 @@
import org.foray.common.data.BoundingBoxUtils;
-import org.axsl.common.data.BoundingBox;
import org.axsl.common.sequence.ByteSequence;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicException;
import org.axsl.pdf.PdfException;
+import org.axsl.ps.BoundingBox;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
Modified: trunk/foray/foray-ps/src/main/java/org/foray/ps/type1/PsFontDictionary4a.java
===================================================================
--- trunk/foray/foray-ps/src/main/java/org/foray/ps/type1/PsFontDictionary4a.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-ps/src/main/java/org/foray/ps/type1/PsFontDictionary4a.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -35,7 +35,7 @@
import org.foray.ps.PsInteger;
import org.foray.ps.PsObject;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.PsFontDictionary;
/**
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -43,7 +43,6 @@
import org.foray.render.PrintRenderer;
import org.axsl.common.Gradient;
-import org.axsl.common.data.BoundingBox;
import org.axsl.common.sequence.ByteSequence;
import org.axsl.common.sequence.IntSequence;
import org.axsl.font.Font;
@@ -67,6 +66,7 @@
import org.axsl.graphic.output.GraphicPs;
import org.axsl.output.DocumentConfiguration;
import org.axsl.output.OutputException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.Encoding;
import org.axsl.ps.PsEncoding;
import org.axsl.ps.PsFilterType;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|