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

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

Revision: 10162
          http://foray.svn.sourceforge.net/foray/?rev=10162&view=rev
Author:   victormote
Date:     2007-08-09 13:47:42 -0700 (Thu, 09 Aug 2007)

Log Message:
-----------
Minor doc or debugging changes.

Modified Paths:
--------------
    trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java

Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java	2007-08-09 20:47:20 UTC (rev 10161)
+++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java	2007-08-09 20:47:42 UTC (rev 10162)
@@ -213,8 +213,8 @@
                 return fd;
             }
         }
-        /* According to the spec, weight will never cause the failure of a
-         * font-family to select a font.
+        /* According to the CSS2 Recommendation, Section 15.5, weight will never
+         * cause the failure of a font-family to select a font.
          * In other words, getting the desired font-family is perceived to be
          * more important than getting the right weight.
          * So, since we failed to find a perfect match above, look for fonts

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-08-09 20:47:20 UTC (rev 10161)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-08-09 20:47:42 UTC (rev 10162)
@@ -4049,15 +4049,16 @@
                 firstChar = ' ';
             }
             final FontConsumer fontConsumer = this.getFontConsumer();
-            resolvedFont = fontConsumer.selectFontXsl(
-                    this.traitFontSelectionStrategy(context),
-                    this.traitFontFamily(context),
-                    this.traitFontStyle(context),
-                    this.traitFontWeight(context),
-                    this.traitFontVariant(context),
-                    this.traitFontStretch(context),
-                    this.traitFontSize(context),
-                    firstChar);
+            final Font.SelectionStrategy strategy =
+                    this.traitFontSelectionStrategy(context);
+            final String[] fontFamily = this.traitFontFamily(context);
+            final Font.Style style = this.traitFontStyle(context);
+            final Font.Weight weight = this.traitFontWeight(context);
+            final Font.Variant variant = this.traitFontVariant(context);
+            final Font.Stretch stretch = this.traitFontStretch(context);
+            final int size = this.traitFontSize(context);
+            resolvedFont = fontConsumer.selectFontXsl(strategy, fontFamily,
+                    style, weight, variant, stretch, size, firstChar);
         } catch (final FontException e) {
             this.getLogger().error("Error creating Font.\n"
                     + this.getContextMessage());


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