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

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

Revision: 12860
          http://sourceforge.net/p/foray/code/12860
Author:   victormote
Date:     2022-12-14 14:16:48 +0000 (Wed, 14 Dec 2022)
Log Message:
-----------
Remove some dependencies on getPrimaryFont().

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextAltitude.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextDepth.java
    trunk/foray/foray-fotree/src/test/java/org/foray/fotree/AbstractPropertyTests.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/OverrideGraftingContext.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java	2022-12-14 13:39:45 UTC (rev 12859)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java	2022-12-14 14:16:48 UTC (rev 12860)
@@ -865,4 +865,26 @@
         return BaselineIdentifier.ALPHABETIC;
     }
 
+    @Override
+    public int fontMetricsTextAltitude(final int fontSize) {
+        FontUse fontUse = null;
+        if (this instanceof Area4a) {
+            final Area4a area = (Area4a) this;
+            fontUse = area.traitNominalFont();
+            return fontUse.getFont().getAscender(fontSize);
+        }
+        return -1;
+    }
+
+    @Override
+    public int fontMetricsTextDepth(final int fontSize) {
+        FontUse fontUse = null;
+        if (this instanceof Area4a) {
+            final Area4a area = (Area4a) this;
+            fontUse = area.traitNominalFont();
+            return fontUse.getFont().getDescender(fontSize);
+        }
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextAltitude.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextAltitude.java	2022-12-14 13:39:45 UTC (rev 12859)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextAltitude.java	2022-12-14 14:16:48 UTC (rev 12860)
@@ -132,7 +132,8 @@
      * @return The initial value for this property.
      */
     public static int getValueNoInstance(final FoObj fobj, final FoContext context) {
-        return fobj.getPrimaryFont(context).getFont().getAscender(fobj.traitFontSize(context));
+        final int fontSize = fobj.traitFontSize(context);
+        return context.fontMetricsTextAltitude(fontSize);
     }
 
     @Override

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextDepth.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextDepth.java	2022-12-14 13:39:45 UTC (rev 12859)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextDepth.java	2022-12-14 14:16:48 UTC (rev 12860)
@@ -132,7 +132,8 @@
      * @return The initial value for this property.
      */
     public static int getValueNoInstance(final FoObj fobj, final FoContext context) {
-        return fobj.getPrimaryFont(context).getFont().getDescender(fobj.traitFontSize(context));
+        final int fontSize = fobj.traitFontSize(context);
+        return context.fontMetricsTextDepth(fontSize);
     }
 
     @Override

Modified: trunk/foray/foray-fotree/src/test/java/org/foray/fotree/AbstractPropertyTests.java
===================================================================
--- trunk/foray/foray-fotree/src/test/java/org/foray/fotree/AbstractPropertyTests.java	2022-12-14 13:39:45 UTC (rev 12859)
+++ trunk/foray/foray-fotree/src/test/java/org/foray/fotree/AbstractPropertyTests.java	2022-12-14 14:16:48 UTC (rev 12860)
@@ -119,6 +119,16 @@
         public BaselineIdentifier baselineForScript(final Script script) {
             return BaselineIdentifier.ALPHABETIC;
         }
+        @Override
+        public int fontMetricsTextAltitude(final int fontSize) {
+            /* We don't care about this for now. */
+            return -1;
+        }
+        @Override
+        public int fontMetricsTextDepth(final int fontSize) {
+            /* We don't care about this for now. */
+            return -1;
+        }
     };
 
     /** Constant providing a standard, but completely bogus context to be

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/OverrideGraftingContext.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/OverrideGraftingContext.java	2022-12-14 13:39:45 UTC (rev 12859)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/OverrideGraftingContext.java	2022-12-14 14:16:48 UTC (rev 12860)
@@ -162,4 +162,14 @@
         return this.wrappedContext.baselineForScript(script);
     }
 
+    @Override
+    public int fontMetricsTextAltitude(final int fontSize) {
+        return this.wrappedContext.fontMetricsTextAltitude(fontSize);
+    }
+
+    @Override
+    public int fontMetricsTextDepth(final int fontSize) {
+        return this.wrappedContext.fontMetricsTextDepth(fontSize);
+    }
+
 }

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