[FOray-commit] SF.net SVN: foray:[12275] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray:[12275] trunk/foray
|
From: <vic...@us...> - 2021-12-25 17:59:42
|
Revision: 12275
http://sourceforge.net/p/foray/code/12275
Author: victormote
Date: 2021-12-25 17:59:39 +0000 (Sat, 25 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Rename some types to conform to new Galley naming convention.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractAncestralInlineArea.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -47,7 +47,7 @@
import org.axsl.fotree.fo.PageNumberCitation;
import org.axsl.fotree.fo.PageNumberCitationLast;
import org.axsl.fotree.fo.ScalingValueCitation;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import java.util.ArrayList;
import java.util.List;
@@ -96,7 +96,7 @@
}
@Override
- public GlyphAreaSequence makeGlyphAreaSequence(final FoTextWords paragraph, final int startLeaf,
+ public GlyphAreaSequenceG5 makeGlyphAreaSequence(final FoTextWords paragraph, final int startLeaf,
final int sizeInLeaves, final boolean hasFauxSmallCaps, final GraftingPoint graftingPoint) {
throw new UnsupportedOperationException();
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -34,7 +34,7 @@
import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.prop.BaselineShiftPa;
-import org.axsl.galley.GeneralInlineArea;
+import org.axsl.galley.GeneralInlineAreaG5;
/**
* Common superclass for all areas generated by inline formatting objects.
@@ -41,8 +41,7 @@
* This should not be confused with the more specific class {@link InlineArea}
* which specifically handles areas generated by the fo:inline object.
*/
-public abstract class AbstractInlineArea extends AreaFlexible
- implements GeneralInlineArea {
+public abstract class AbstractInlineArea extends AreaFlexible implements GeneralInlineAreaG5 {
/** See {@link #getProgressionDimension()} for a description of
* "progression dimension". */
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -36,6 +36,7 @@
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GeneralInlineAreaG5;
import java.awt.Color;
@@ -42,8 +43,7 @@
/**
* A normal inline-area generated by the fo:basic-link.
*/
-public final class BasicLinkArea extends AbstractAncestralInlineArea
- implements org.axsl.galley.GeneralInlineArea,
+public final class BasicLinkArea extends AbstractAncestralInlineArea implements GeneralInlineAreaG5,
org.axsl.area.AncestralNormalInlineArea {
/** The parent of this node. The parent can be either a {@link LineArea4a}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BidiOverrideArea.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -35,6 +35,7 @@
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GeneralInlineAreaG5;
import java.awt.Color;
@@ -41,8 +42,7 @@
/**
* A normal inline-area generated by the fo:bidi-override object.
*/
-public final class BidiOverrideArea extends AbstractAncestralInlineArea
- implements org.axsl.galley.GeneralInlineArea,
+public final class BidiOverrideArea extends AbstractAncestralInlineArea implements GeneralInlineAreaG5,
org.axsl.area.AncestralNormalInlineArea {
/** The parent of this node. The parent can be either a {@link LineArea4a}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -43,7 +43,7 @@
import org.axsl.fotree.fo.ListBlock;
import org.axsl.fotree.fo.Table;
import org.axsl.fotree.fo.prop.CommonPositionPa;
-import org.axsl.galley.BlockContainerArea;
+import org.axsl.galley.BlockContainerAreaG5;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.graphic.Graphic;
@@ -56,7 +56,7 @@
* The container area for the contents of a block-container FO.
*/
public final class BlockContainerRa extends ContainerRa
- implements BlockContainerArea, org.axsl.area.BlockContainerRefArea {
+ implements BlockContainerAreaG5, org.axsl.area.BlockContainerRefArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
private Linkage generatedBy;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/IndexPageCitationListArea.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -35,6 +35,7 @@
import org.axsl.fotree.fo.IndexPageCitationList;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.GeneralInlineAreaG5;
import java.awt.Color;
@@ -41,8 +42,7 @@
/**
* A normal inline-area generated by the fo:index-page-citation-list object.
*/
-public final class IndexPageCitationListArea extends AbstractAncestralInlineArea
- implements org.axsl.galley.GeneralInlineArea,
+public final class IndexPageCitationListArea extends AbstractAncestralInlineArea implements GeneralInlineAreaG5,
org.axsl.area.AncestralNormalInlineArea {
/** The parent of this node. The parent can be either a {@link LineArea4a}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -61,7 +61,7 @@
import org.axsl.fotree.fo.ScalingValueCitation;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import java.util.ArrayList;
import java.util.Iterator;
@@ -1014,7 +1014,7 @@
}
@Override
- public GlyphAreaSequence makeGlyphAreaSequence(final FoTextWords paragraph, final int startLeaf,
+ public GlyphAreaSequenceG5 makeGlyphAreaSequence(final FoTextWords paragraph, final int startLeaf,
final int sizeInLeaves, final boolean hasFauxSmallCaps, final GraftingPoint graftingPoint) {
throw new UnsupportedOperationException();
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -37,7 +37,7 @@
import org.axsl.fotree.fo.PageNumber;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import java.awt.Color;
@@ -44,8 +44,7 @@
/**
* The normal inline-area created by an fo:page-number object.
*/
-public final class PageNumberArea extends AbstractAncestralInlineArea
- implements GlyphAreaSequence,
+public final class PageNumberArea extends AbstractAncestralInlineArea implements GlyphAreaSequenceG5,
org.axsl.area.AncestralNormalInlineArea {
/** The parent of this node. The parent can be either a {@link LineArea4a}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -37,7 +37,7 @@
import org.axsl.fotree.fo.PageNumberCitation;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import java.awt.Color;
@@ -44,8 +44,7 @@
/**
* Area containing all or part of a page-number-citation.
*/
-public final class PageNumberCitationArea extends AbstractAncestralInlineArea
- implements GlyphAreaSequence,
+public final class PageNumberCitationArea extends AbstractAncestralInlineArea implements GlyphAreaSequenceG5,
org.axsl.area.AncestralNormalInlineArea {
/** The parent of this node. The parent can be either a {@link LineArea4a}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -37,7 +37,7 @@
import org.axsl.fotree.fo.PageNumberCitationLast;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import java.awt.Color;
@@ -44,9 +44,7 @@
/**
* Area containing all or part of a page-number-citation-last.
*/
-public final class PageNumberCitationLastArea
- extends AbstractAncestralInlineArea
- implements GlyphAreaSequence,
+public final class PageNumberCitationLastArea extends AbstractAncestralInlineArea implements GlyphAreaSequenceG5,
org.axsl.area.AncestralNormalInlineArea {
/** The parent of this node. The parent can be either a {@link LineArea4a}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -39,7 +39,7 @@
import org.axsl.fotree.fo.ScalingValueCitation;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import java.awt.Color;
import java.util.Collections;
@@ -48,8 +48,7 @@
/**
* The normal inline-area created by an fo:scaling-value-citation object.
*/
-public final class ScalingValueCitationArea extends AbstractInlineArea
- implements GlyphAreaSequence,
+public final class ScalingValueCitationArea extends AbstractInlineArea implements GlyphAreaSequenceG5,
org.axsl.area.NormalInlineArea {
/** The parent of this node. The parent can be either a {@link LineArea4a}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -40,7 +40,7 @@
import org.axsl.fotree.fo.FoTextCharacters;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import org.axsl.unicode.block.Basic_Latin_Block;
import java.awt.Color;
@@ -65,7 +65,7 @@
* different Fonts due to overriding).
* However, a TextSegment always springs from exactly one FOText node.
*/
-public abstract class TextArea extends AbstractInlineArea implements GlyphAreaSequence {
+public abstract class TextArea extends AbstractInlineArea implements GlyphAreaSequenceG5 {
/** The parent of this node. The parent can be either a {@link LineArea4a} or another {@link AbstractInlineArea}. */
private Area4a parent;
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -31,9 +31,9 @@
import org.axsl.common.value.LeaderPattern;
import org.axsl.common.value.RuleStyle;
import org.axsl.font.Font;
-import org.axsl.galley.BorderPaddingArea;
+import org.axsl.galley.BorderPaddingAreaG5;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import org.axsl.galley.LeaderArea;
import org.axsl.output.DocumentConfiguration;
@@ -51,7 +51,7 @@
private static final byte DOUBLE_LEADER_CONSTANT = 3;
@Override
- protected void markBorder(final BorderPaddingArea area) throws GalleyVisitorException {
+ protected void markBorder(final BorderPaddingAreaG5 area) throws GalleyVisitorException {
/* TODO: If the borders are all the same style, draw a rectangle
* instead of four lines. */
@@ -108,7 +108,7 @@
* @param area The area whose "space" features are to be rendered.
* @throws GalleyVisitorException For errors during rendering.
*/
- protected void renderGenericSpace(final GlyphAreaSequence area) throws GalleyVisitorException {
+ protected void renderGenericSpace(final GlyphAreaSequenceG5 area) throws GalleyVisitorException {
final int startX = area.crOriginX();
int startY;
final int endX = area.crOriginX() + area.crIpd();
@@ -138,7 +138,7 @@
* @param area The area whose metrics should be used for the computation.
* @return The Y position that should be used for the underline stroke.
*/
- protected int getUnderlineYPosition(final GlyphAreaSequence area) {
+ protected int getUnderlineYPosition(final GlyphAreaSequenceG5 area) {
final Font font = area.getPrimaryFont().getFont();
final int underlinePosition = font.underlinePosition(
area.traitFontSize());
@@ -150,7 +150,7 @@
* @param area The area whose metrics should be used for the computation.
* @return The Y position that should be used for the overline stroke.
*/
- protected int getOverlineYPosition(final GlyphAreaSequence area) {
+ protected int getOverlineYPosition(final GlyphAreaSequenceG5 area) {
final Font font = area.getPrimaryFont().getFont();
final int overlinePosition = font.overlinePosition(
area.traitFontSize());
@@ -162,7 +162,7 @@
* @param area The area whose metrics should be used for the computation.
* @return The Y position that should be used for the through stroke.
*/
- protected int getThroughYPosition(final GlyphAreaSequence area) {
+ protected int getThroughYPosition(final GlyphAreaSequenceG5 area) {
final Font font = area.getPrimaryFont().getFont();
final int strikeoutPosition = font.strikeoutPosition(
area.traitFontSize());
@@ -233,7 +233,7 @@
}
@Override
- public Void visit(final GlyphAreaSequence area) throws GalleyVisitorException {
+ public Void visit(final GlyphAreaSequenceG5 area) throws GalleyVisitorException {
final CharSequence text = area.getText();
renderGenericSpace(area);
renderTextSegment(area, text);
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -42,9 +42,9 @@
import org.axsl.galley.AreaNodeG5;
import org.axsl.galley.BackgroundAreaG5;
import org.axsl.galley.BeforeFloatAreaG5;
-import org.axsl.galley.BlockContainerArea;
+import org.axsl.galley.BlockContainerAreaG5;
import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.BorderPaddingArea;
+import org.axsl.galley.BorderPaddingAreaG5;
import org.axsl.galley.ExternalGraphicArea;
import org.axsl.galley.FootnoteAreaG5;
import org.axsl.galley.ForeignContentG5;
@@ -54,7 +54,7 @@
import org.axsl.galley.Galley;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import org.axsl.galley.GraphicArea;
import org.axsl.galley.InlineArea;
import org.axsl.galley.LineArea;
@@ -110,7 +110,7 @@
* @param area The area whose border is to be drawn.
* @throws GalleyVisitorException For errors during rendering.
*/
- protected abstract void markBorder(BorderPaddingArea area) throws GalleyVisitorException;
+ protected abstract void markBorder(BorderPaddingAreaG5 area) throws GalleyVisitorException;
/**
* Renders an area's background, both image and color.
@@ -348,7 +348,7 @@
}
@Override
- public Void visit(final BlockContainerArea area) throws GalleyVisitorException {
+ public Void visit(final BlockContainerAreaG5 area) throws GalleyVisitorException {
markBorder(area);
markBackground(area);
renderChildren(area);
@@ -471,7 +471,7 @@
* @param text The text content to be rendered.
* @throws GalleyVisitorException For errors during rendering.
*/
- public abstract void renderTextSegment(GlyphAreaSequence area, CharSequence text)
+ public abstract void renderTextSegment(GlyphAreaSequenceG5 area, CharSequence text)
throws GalleyVisitorException;
@Override
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -48,13 +48,13 @@
import org.axsl.font.Font;
import org.axsl.font.FontUse;
import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.BorderPaddingArea;
+import org.axsl.galley.BorderPaddingAreaG5;
import org.axsl.galley.ExternalGraphicArea;
import org.axsl.galley.ForeignContentMathG5;
import org.axsl.galley.ForeignContentSvgG5;
import org.axsl.galley.ForeignObjectAreaG5;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import org.axsl.galley.GraphicArea;
import org.axsl.galley.LeaderArea;
import org.axsl.galley.PageG5;
@@ -437,7 +437,7 @@
}
@Override
- protected void markBorder(final BorderPaddingArea area) {
+ protected void markBorder(final BorderPaddingAreaG5 area) {
final int rx = area.brOriginX();
final int ry = area.brOriginY();
final int w = area.brIpd();
@@ -549,7 +549,7 @@
@Override
- public void renderTextSegment(final GlyphAreaSequence area,
+ public void renderTextSegment(final GlyphAreaSequenceG5 area,
final CharSequence text) {
final FontUse font = area.getPrimaryFont();
final int size = area.traitFontSize();
@@ -699,7 +699,7 @@
}
@Override
- public Void visit(final GlyphAreaSequence area) {
+ public Void visit(final GlyphAreaSequenceG5 area) {
renderTextSegment(area, area.getText());
return null;
}
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -48,7 +48,7 @@
import org.axsl.galley.ForeignContentMathG5;
import org.axsl.galley.ForeignContentSvgG5;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import org.axsl.galley.GraphicArea;
import org.axsl.galley.PageG5;
import org.axsl.graphic.Graphic;
@@ -669,7 +669,7 @@
}
@Override
- public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) {
+ public void renderTextSegment(final GlyphAreaSequenceG5 area, final CharSequence text) {
/* TODO: Implement this. */
// Font font = area.getResolvedFont();
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -52,7 +52,7 @@
import org.axsl.galley.ForeignObjectAreaG5;
import org.axsl.galley.Galley;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import org.axsl.galley.GraphicArea;
import org.axsl.galley.PageCollectionG5;
import org.axsl.galley.PageG5;
@@ -366,7 +366,8 @@
}
@Override
- public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) throws GalleyVisitorException {
+ public void renderTextSegment(final GlyphAreaSequenceG5 area, final CharSequence text)
+ throws GalleyVisitorException {
if (text == null || text.length() < 1) {
return;
}
@@ -424,7 +425,7 @@
* @param c The next character to be written.
* @return The appropriate font to use.
*/
- private FontUse whichFont(final GlyphAreaSequence area, final FontUse primaryFont, final FontUse currentFont,
+ private FontUse whichFont(final GlyphAreaSequenceG5 area, final FontUse primaryFont, final FontUse currentFont,
final int c) {
/* Trying to avoid unnecessary font selection work on the one hand, and unnecessary switching between fonts in
* the output on the other.*/
@@ -471,7 +472,7 @@
* @param orthography The orthography that should be used when applying font features like subsitutions.
* @throws PdfException For errors painting the text.
*/
- private void paintText(final GlyphAreaSequence area, final FontUse fontUse,
+ private void paintText(final GlyphAreaSequenceG5 area, final FontUse fontUse,
final CharSequence text, final int startIndex, final int size,
final FontContext fontContext, final Orthography orthography) throws PdfException {
if (size < 1) {
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 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -51,12 +51,12 @@
import org.axsl.font.FontUse;
import org.axsl.galley.AreaG5;
import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.BorderPaddingArea;
+import org.axsl.galley.BorderPaddingAreaG5;
import org.axsl.galley.ForeignContentMathG5;
import org.axsl.galley.ForeignContentSvgG5;
import org.axsl.galley.ForeignObjectAreaG5;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import org.axsl.galley.GraphicArea;
import org.axsl.galley.LeaderArea;
import org.axsl.galley.PageG5;
@@ -872,7 +872,7 @@
}*/
@Override
- public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text)
+ public void renderTextSegment(final GlyphAreaSequenceG5 area, final CharSequence text)
throws GalleyVisitorException {
try {
writeTextSegment(area, text);
@@ -887,7 +887,7 @@
* @param text The text segment to be written.
* @throws IOException For errors writing to the output.
*/
- private void writeTextSegment(final GlyphAreaSequence area, final CharSequence text) throws IOException {
+ private void writeTextSegment(final GlyphAreaSequenceG5 area, final CharSequence text) throws IOException {
if (text == null || text.length() < 1) {
return;
}
@@ -1116,7 +1116,7 @@
}
@Override
- protected void markBorder(final BorderPaddingArea area) throws GalleyVisitorException {
+ protected void markBorder(final BorderPaddingAreaG5 area) throws GalleyVisitorException {
try {
writeBorder(area);
} catch (final IOException e) {
@@ -1129,7 +1129,7 @@
* @param area The area whose border is to be written.
* @throws IOException For errors writing to output.
*/
- private void writeBorder(final BorderPaddingArea area) throws IOException {
+ private void writeBorder(final BorderPaddingAreaG5 area) throws IOException {
final int rx = area.brOriginX();
final int ry = area.brOriginY();
final int w = area.crIpd();
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -37,13 +37,13 @@
import org.axsl.font.Font;
import org.axsl.galley.AreaG5;
import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.BorderPaddingArea;
+import org.axsl.galley.BorderPaddingAreaG5;
import org.axsl.galley.ExternalGraphicArea;
import org.axsl.galley.ForeignContentMathG5;
import org.axsl.galley.ForeignContentSvgG5;
import org.axsl.galley.ForeignObjectAreaG5;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import org.axsl.galley.GraphicArea;
import org.axsl.galley.LeaderArea;
import org.axsl.galley.PageG5;
@@ -333,7 +333,7 @@
}
@Override
- protected void markBorder(final BorderPaddingArea area) {
+ protected void markBorder(final BorderPaddingAreaG5 area) {
final int rx = area.brOriginX();
final int ry = area.brOriginY();
final int w = area.crIpd();
@@ -424,7 +424,7 @@
}
@Override
- public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) {
+ public void renderTextSegment(final GlyphAreaSequenceG5 area, final CharSequence text) {
/* TODO: Implement this. */
// char ch;
@@ -526,7 +526,7 @@
}
@Override
- public Void visit(final GlyphAreaSequence area) {
+ public Void visit(final GlyphAreaSequenceG5 area) {
// TODO: Implement this.
return null;
}
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -38,7 +38,7 @@
import org.axsl.galley.ForeignContentMathG5;
import org.axsl.galley.ForeignContentSvgG5;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GlyphAreaSequenceG5;
import org.axsl.galley.GraphicArea;
import org.axsl.galley.PageG5;
import org.axsl.graphic.Graphic;
@@ -503,7 +503,7 @@
}
@Override
- public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) {
+ public void renderTextSegment(final GlyphAreaSequenceG5 area, final CharSequence text) {
/* TODO: Implement this. */
// int rx = this.currentXPosition;
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java 2021-12-25 17:40:58 UTC (rev 12274)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
@@ -43,9 +43,9 @@
import org.axsl.galley.AreaNodeG5;
import org.axsl.galley.BackgroundAreaG5;
import org.axsl.galley.BeforeFloatAreaG5;
-import org.axsl.galley.BlockContainerArea;
+import org.axsl.galley.BlockContainerAreaG5;
import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.BorderPaddingArea;
+import org.axsl.galley.BorderPaddingAreaG5;
import org.axsl.galley.ExternalGraphicArea;
import org.axsl.galley.FootnoteAreaG5;
import org.axsl.galley.ForeignContentMathG5;
@@ -52,8 +52,8 @@
import org.axsl.galley.ForeignContentSvgG5;
import org.axsl.galley.ForeignObjectAreaG5;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.GeneralInlineArea;
-import org.axsl.galley.GlyphAreaSequence;
+import org.axsl.galley.GeneralInlineAreaG5;
+import org.axsl.galley.GlyphAreaSequenceG5;
import org.axsl.galley.GraphicArea;
import org.axsl.galley.InlineArea;
import org.axsl.galley.LeaderArea;
@@ -223,7 +223,7 @@
}
@Override
- public Void visit(final BlockContainerArea area) throws GalleyVisitorException {
+ public Void visit(final BlockContainerAreaG5 area) throws GalleyVisitorException {
final StringBuilder buffer = new StringBuilder();
outputCommonAttributes(area, buffer);
writeStartTag(area, buffer);
@@ -301,7 +301,7 @@
* @param area The Area to be rendered.
* @throws GalleyVisitorException For errors during rendering.
*/
- public void renderInlineArea(final GeneralInlineArea area) throws GalleyVisitorException {
+ public void renderInlineArea(final GeneralInlineAreaG5 area) throws GalleyVisitorException {
final StringBuilder buffer = new StringBuilder();
outputCommonAttributes(area, buffer);
writeStartTag(area, buffer);
@@ -343,7 +343,7 @@
}
@Override
- public void renderTextSegment(final GlyphAreaSequence area, final CharSequence text) {
+ public void renderTextSegment(final GlyphAreaSequenceG5 area, final CharSequence text) {
/* TODO: Implement this. */
}
@@ -389,7 +389,7 @@
}
@Override
- public Void visit(final GlyphAreaSequence area) {
+ public Void visit(final GlyphAreaSequenceG5 area) {
final StringBuilder buffer = new StringBuilder();
outputCommonAttributes(area, buffer);
writeStartTag(area, buffer);
@@ -528,7 +528,7 @@
}
@Override
- protected void markBorder(final BorderPaddingArea area) {
+ protected void markBorder(final BorderPaddingAreaG5 area) {
// No operation.
return;
}
@@ -617,7 +617,7 @@
* @param area The area whose color information should be written.
* @param buffer The buffer to which the attributes should be added.
*/
- public void outputColor(final GeneralInlineArea area,
+ public void outputColor(final GeneralInlineAreaG5 area,
final StringBuilder buffer) {
final String color = colorToFloat(area.traitColor().getRed())
+ ", "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
