[FOray-commit] SF.net SVN: foray:[13023] trunk/foray

[<vic...@us...>]

Revision: 13023
          http://sourceforge.net/p/foray/code/13023
Author:   victormote
Date:     2023-01-06 22:01:05 +0000 (Fri, 06 Jan 2023)
Log Message:
-----------
Conform to aXSL change: Remove FontUse method width() that was a pass-thru to Font.

Modified Paths:
--------------
    trunk/foray/foray-app/src/test/java/org/foray/app/area/BlockTests.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-font/src/main/java/org/foray/font/FontUse4a.java
    trunk/foray/foray-font/src/test/java/org/foray/font/Font4aTests.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PdfTextPainter.java
    trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/KpContext4a.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/LineBreaker.java

Modified: trunk/foray/foray-app/src/test/java/org/foray/app/area/BlockTests.java
===================================================================
--- trunk/foray/foray-app/src/test/java/org/foray/app/area/BlockTests.java	2023-01-06 21:33:12 UTC (rev 13022)
+++ trunk/foray/foray-app/src/test/java/org/foray/app/area/BlockTests.java	2023-01-06 22:01:05 UTC (rev 13023)
@@ -272,7 +272,7 @@
         final FontUse fontUse = getHelveticaFont();
         /* The following computation is tested in {@link TestFont4a#testWidth()}. */
         final String testString = "Test of Centering";
-        final int textWidth = fontUse.width(
+        final int textWidth = fontUse.getFont().width(
                 testString, 0, testString.length(), 12000, 0, 0, this.fontOptionsWithKerning, null);
         assertEquals(textWidth, textArea.crIpd());
 
@@ -335,7 +335,7 @@
         /* The following computation is tested in {@link TestFont4a#testWidth()}.
          * The extra word spacing is .3em = .3 * 12000 = 3600. */
         final String testString = "Centered with Word Spacing";
-        final int textWidth = fontUse.width(testString, 0, testString.length(), 12000, 0, 3600,
+        final int textWidth = fontUse.getFont().width(testString, 0, testString.length(), 12000, 0, 3600,
                 this.fontOptionsWithKerning, null);
         assertEquals(textWidth, textArea.crIpd());
 

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	2023-01-06 21:33:12 UTC (rev 13022)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberArea.java	2023-01-06 22:01:05 UTC (rev 13023)
@@ -228,8 +228,9 @@
     public int getWordWidth(final CharSequence word) {
         final FontUse fontUse = traitNominalFont();
         fontUse.registerCharsUsed(word);
-        return fontUse.width(word, 0, word.length(), traitFontSize(), traitGeneratedBy().traitLetterSpacingOpt(this),
-                traitGeneratedBy().traitWordSpacingOpt(this), fontContext(), getOrthography());
+        return fontUse.getFont().width(word, 0, word.length(), traitFontSize(),
+                traitGeneratedBy().traitLetterSpacingOpt(this), traitGeneratedBy().traitWordSpacingOpt(this),
+                fontContext(), getOrthography());
     }
 
     @Override

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	2023-01-06 21:33:12 UTC (rev 13022)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationArea.java	2023-01-06 22:01:05 UTC (rev 13023)
@@ -249,8 +249,9 @@
     public int getWordWidth(final CharSequence word) {
         final FontUse fontUse = traitNominalFont();
         fontUse.registerCharsUsed(word);
-        return fontUse.width(word, 0, word.length(), traitFontSize(), traitGeneratedBy().traitLetterSpacingOpt(this),
-                traitGeneratedBy().traitWordSpacingOpt(this), fontContext(), getOrthography());
+        return fontUse.getFont().width(word, 0, word.length(), traitFontSize(),
+                traitGeneratedBy().traitLetterSpacingOpt(this), traitGeneratedBy().traitWordSpacingOpt(this),
+                fontContext(), getOrthography());
     }
 
     @Override

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	2023-01-06 21:33:12 UTC (rev 13022)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageNumberCitationLastArea.java	2023-01-06 22:01:05 UTC (rev 13023)
@@ -249,8 +249,9 @@
     public int getWordWidth(final CharSequence word) {
         final FontUse fontUse = traitNominalFont();
         fontUse.registerCharsUsed(word);
-        return fontUse.width(word, 0, word.length(), traitFontSize(), traitGeneratedBy().traitLetterSpacingOpt(this),
-                traitGeneratedBy().traitWordSpacingOpt(this), fontContext(), getOrthography());
+        return fontUse.getFont().width(word, 0, word.length(), traitFontSize(),
+                traitGeneratedBy().traitLetterSpacingOpt(this), traitGeneratedBy().traitWordSpacingOpt(this),
+                fontContext(), getOrthography());
     }
 
     @Override

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	2023-01-06 21:33:12 UTC (rev 13022)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ScalingValueCitationArea.java	2023-01-06 22:01:05 UTC (rev 13023)
@@ -234,8 +234,9 @@
     public int getWordWidth(final CharSequence word) {
         final FontUse fontUse = traitNominalFont();
         fontUse.registerCharsUsed(word);
-        return fontUse.width(word, 0, word.length(), traitFontSize(), traitGeneratedBy().traitLetterSpacingOpt(this),
-                traitGeneratedBy().traitWordSpacingOpt(this), fontContext(), getOrthography());
+        return fontUse.getFont().width(word, 0, word.length(), traitFontSize(),
+                traitGeneratedBy().traitLetterSpacingOpt(this), traitGeneratedBy().traitWordSpacingOpt(this),
+                fontContext(), getOrthography());
     }
 
     @Override

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	2023-01-06 21:33:12 UTC (rev 13022)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java	2023-01-06 22:01:05 UTC (rev 13023)
@@ -384,8 +384,8 @@
      */
     int recomputeProgressionDimension() {
         final CharSequence text = getText();
-        final int pd = traitNominalFont().width(text, 0, text.length(), traitFontSize(), traitLetterSpacingOpt(),
-                traitWordSpacingOpt(), fontContext(), getOrthography());
+        final int pd = traitNominalFont().getFont().width(text, 0, text.length(), traitFontSize(),
+                traitLetterSpacingOpt(), traitWordSpacingOpt(), fontContext(), getOrthography());
         return pd;
     }
 

Modified: trunk/foray/foray-font/src/main/java/org/foray/font/FontUse4a.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/FontUse4a.java	2023-01-06 21:33:12 UTC (rev 13022)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/FontUse4a.java	2023-01-06 22:01:05 UTC (rev 13023)
@@ -202,7 +202,7 @@
     @Override
     public int width(final CharSequence chars, final int fontSize, final FontContext fontContext,
             final Orthography orthography) {
-        return width(chars, 0, chars.length(), fontSize, 0, 0, fontContext, orthography);
+        return getFont().width(chars, 0, chars.length(), fontSize, 0, 0, fontContext, orthography);
     }
 
     @Override

Modified: trunk/foray/foray-font/src/test/java/org/foray/font/Font4aTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/Font4aTests.java	2023-01-06 21:33:12 UTC (rev 13022)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/Font4aTests.java	2023-01-06 22:01:05 UTC (rev 13023)
@@ -90,11 +90,7 @@
         assertNotNull(rf);
         final FreeStandingFont fsf = rf.getFreeStandingFont();
         assertNotNull(fsf);
-
-        final FontConsumer4a fontConsumer = server.createFontConsumer(null);
         final Font4a font = rf.getBestFont();
-        final ConsumerFont4a consumerFont = new ConsumerFont4a(font, fontConsumer);
-        final FontUse4a fontUse = new FontUse4a(consumerFont, null, font.getInternalEncoding());
 
         final String testString = "Test of Centering";
 
@@ -110,7 +106,7 @@
          * = 7,565.
          * If these are scaled to 12 points, the millipoints used are 7565 * 12
          * = 90,780. */
-        assertEquals(90780, fontUse.width(
+        assertEquals(90780, font.width(
                 testString, 0, testString.length(), 12000, 0, 0, fontOptionsWithKerning, null));
 
         /* Test without kerning.
@@ -117,7 +113,7 @@
          * Total kerning = -105.
          * Adjusted text space units = 7,565 + 105 = 7,670.
          * When scaled to 12 points, the millipoints used are 7670 * 12 = 92,040. */
-        assertEquals(92040, fontUse.width(
+        assertEquals(92040, font.width(
                 testString, 0, testString.length(), 12000, 0, 0, fontOptionsWithoutKerning, null));
 
         /* Test with word spacing.
@@ -125,7 +121,7 @@
          * Number of word spaces = 2.
          * Total word spacing = 600.
          * Total space (kerning on) = 90,780 + 600 = 91,380. */
-        assertEquals(91380, fontUse.width(
+        assertEquals(91380, font.width(
                 testString, 0, testString.length(), 12000, 0, 300, fontOptionsWithKerning, null));
 
         /* Test with letter spacing.
@@ -133,12 +129,12 @@
          * Number of word spaces = 16.
          * Total word spacing = 80.
          * Total space (kerning on) = 90,780 + 80 = 90,860. */
-        assertEquals(90860, fontUse.width(
+        assertEquals(90860, font.width(
                 testString, 0, testString.length(), 12000, 5, 0, fontOptionsWithKerning, null));
 
         /* Test with both word spacing and letter spacing, using same parameters as above.
          * Total space (kerning on) = 90,780 + 600 + 80 = 91,460. */
-        assertEquals(91460, fontUse.width(
+        assertEquals(91460, font.width(
                 testString, 0, testString.length(), 12000, 5, 300, fontOptionsWithKerning, null));
     }
 

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PdfTextPainter.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PdfTextPainter.java	2023-01-06 21:33:12 UTC (rev 13022)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/batik/PdfTextPainter.java	2023-01-06 22:01:05 UTC (rev 13023)
@@ -278,7 +278,7 @@
         /* TODO: If letter-spacing is used, it needs to come from the SVG. */
         final int letterSpacing = 0;
         /* TODO: Pass the font options below instead of hard-coding them. */
-        final int width = fontToUse.width(txt, 0, txt.length(),
+        final int width = fontToUse.getFont().width(txt, 0, txt.length(),
                 awtFontSize * TypographicConstants.MILLIPOINTS_PER_POINT, letterSpacing, 0, FontContext.DEFAULT,
                 this.orthography);
         final float advance = width / (float) TypographicConstants.MILLIPOINTS_PER_POINT;

Modified: trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/KpContext4a.java
===================================================================
--- trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/KpContext4a.java	2023-01-06 21:33:12 UTC (rev 13022)
+++ trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/KpContext4a.java	2023-01-06 22:01:05 UTC (rev 13023)
@@ -81,7 +81,7 @@
     public int getIdealWidth(final KpLeaf leaf) {
         if (leaf instanceof CharSequence) {
             final CharSequence chars = (CharSequence) leaf;
-            return this.fontUse.width(chars, 0, chars.length(), fontSize, 0, 0, fontContext, orthography);
+            return this.fontUse.getFont().width(chars, 0, chars.length(), fontSize, 0, 0, fontContext, orthography);
         }
         return 0;
     }

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/LineBreaker.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/LineBreaker.java	2023-01-06 21:33:12 UTC (rev 13022)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/LineBreaker.java	2023-01-06 22:01:05 UTC (rev 13023)
@@ -323,8 +323,8 @@
     public int getWordWidth(final CharContent lineText, final CharSequence word, final int offset, final int length) {
         final FontUse fontUse = lineText.inlinePrimaryFont();
         fontUse.registerCharsUsed(word);
-        return fontUse.width(word, offset, length, lineText.inlineFontSize(), lineText.inlineLetterSpacingOptimum(), 0,
-                lineText.inlineFontContext(), lineText.inlineOrthography());
+        return fontUse.getFont().width(word, offset, length, lineText.inlineFontSize(),
+                lineText.inlineLetterSpacingOptimum(), 0, lineText.inlineFontContext(), lineText.inlineOrthography());
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.