[FOray-commit] SF.net SVN: foray:[12848] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray:[12848] trunk/foray
|
From: <vic...@us...> - 2022-12-13 12:43:14
|
Revision: 12848
http://sourceforge.net/p/foray/code/12848
Author: victormote
Date: 2022-12-13 12:43:11 +0000 (Tue, 13 Dec 2022)
Log Message:
-----------
Conform to aXSL change: Remove secondary font methods from FoTree and AreaTree.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.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-content/src/main/java/org/foray/content/TextContent4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java 2022-12-13 12:20:16 UTC (rev 12847)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java 2022-12-13 12:43:11 UTC (rev 12848)
@@ -542,9 +542,4 @@
return traitGeneratedBy().getPrimaryFont(this);
}
- @Override
- public FontUse getSecondaryFont(final int codePoint) {
- return traitGeneratedBy().getSecondaryFont(this, codePoint);
- }
-
}
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 2022-12-13 12:20:16 UTC (rev 12847)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java 2022-12-13 12:43:11 UTC (rev 12848)
@@ -285,9 +285,4 @@
return traitGeneratedBy().getPrimaryFont(this);
}
- @Override
- public FontUse getSecondaryFont(final int codePoint) {
- return traitGeneratedBy().getSecondaryFont(this, codePoint);
- }
-
}
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 2022-12-13 12:20:16 UTC (rev 12847)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java 2022-12-13 12:43:11 UTC (rev 12848)
@@ -306,9 +306,4 @@
return traitGeneratedBy().getPrimaryFont(this);
}
- @Override
- public FontUse getSecondaryFont(final int codePoint) {
- return traitGeneratedBy().getSecondaryFont(this, codePoint);
- }
-
}
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 2022-12-13 12:20:16 UTC (rev 12847)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java 2022-12-13 12:43:11 UTC (rev 12848)
@@ -306,9 +306,4 @@
return traitGeneratedBy().getPrimaryFont(this);
}
- @Override
- public FontUse getSecondaryFont(final int codePoint) {
- return traitGeneratedBy().getSecondaryFont(this, codePoint);
- }
-
}
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 2022-12-13 12:20:16 UTC (rev 12847)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java 2022-12-13 12:43:11 UTC (rev 12848)
@@ -293,11 +293,6 @@
}
@Override
- public FontUse getSecondaryFont(final int codePoint) {
- return traitGeneratedBy().getSecondaryFont(this, codePoint);
- }
-
- @Override
public FontContext fontContext() {
/* TODO: Get this from the FOTree. */
return FontContext4a.DEFAULT;
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 2022-12-13 12:20:16 UTC (rev 12847)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java 2022-12-13 12:43:11 UTC (rev 12848)
@@ -462,11 +462,6 @@
return traitGeneratedBy().getPrimaryFont(this);
}
- @Override
- public FontUse getSecondaryFont(final int codePoint) {
- return traitGeneratedBy().getSecondaryFont(this, codePoint);
- }
-
/**
* Returns the hyphenation-character trait for this area.
* @return The hyphenation-character trait for this area.
Modified: trunk/foray/foray-content/src/main/java/org/foray/content/TextContent4a.java
===================================================================
--- trunk/foray/foray-content/src/main/java/org/foray/content/TextContent4a.java 2022-12-13 12:20:16 UTC (rev 12847)
+++ trunk/foray/foray-content/src/main/java/org/foray/content/TextContent4a.java 2022-12-13 12:43:11 UTC (rev 12848)
@@ -70,11 +70,6 @@
}
@Override
- public FontUse inlineSecondaryFont(final int codePoint) {
- return effectiveParent().getSecondaryFont(getContext(), codePoint);
- }
-
- @Override
public FontContext inlineFontContext() {
// TODO Auto-generated method stub
return null;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2022-12-13 12:20:16 UTC (rev 12847)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2022-12-13 12:43:11 UTC (rev 12848)
@@ -2961,23 +2961,6 @@
return resolvedFont;
}
- @Override
- public FontUse getSecondaryFont(final FoContext context, final int codePoint) {
- final FontUse secondaryFont = this.getFontConsumer().selectFontXsl(
- this.traitFontSelectionStrategy(context),
- this.traitFontFamily(context),
- this.traitFontStyle(context),
- this.traitFontWeight(context),
- this.traitFontVariant(context),
- this.traitFontStretch(context),
- this.traitFontSize(context),
- codePoint);
- if (secondaryFont == null) {
- getFoTree().logError("Error creating Font.\n" + this.getContextMessage());
- }
- return secondaryFont;
- }
-
/**
* Returns the font-size for the lowercase characters when faux small caps are used by this FO.
* @param context An object that knows how to resolve FO Tree context issues.
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 2022-12-13 12:20:16 UTC (rev 12847)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java 2022-12-13 12:43:11 UTC (rev 12848)
@@ -484,11 +484,11 @@
return primaryFont;
}
- /* Look for a secondary font that can do the job. */
- final FontUse secondaryFont = area.getSecondaryFont(c);
- if (secondaryFont != null) {
- return secondaryFont;
- }
+// /* Look for a secondary font that can do the job. */
+// final FontUse secondaryFont = area.getSecondaryFont(c);
+// if (secondaryFont != null) {
+// return secondaryFont;
+// }
/* Otherwise, punt. */
return primaryFont;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
