Thread: [FOray-commit] SF.net SVN: foray: [10240] trunk/foray (Page 22)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 10240
          http://foray.svn.sourceforge.net/foray/?rev=10240&view=rev
Author:   victormote
Date:     2007-10-04 12:42:55 -0700 (Thu, 04 Oct 2007)

Log Message:
-----------
Include word-spacing in the computation of line lengths for line-breaking purposes.

Modified Paths:
--------------
    trunk/foray/doc/web/app/features/graphics.html
    trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBlock.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/CharacterSequence4a.java
    trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java
    trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java

Modified: trunk/foray/doc/web/app/features/graphics.html
===================================================================

--- trunk/foray/doc/web/app/features/graphics.html	2007-10-03 23:30:47 UTC (rev 10239)
+++ trunk/foray/doc/web/app/features/graphics.html	2007-10-04 19:42:55 UTC (rev 10240)
@@ -83,6 +83,11 @@
           <a href="#svg">SVG</a> (Scalable Vector Graphics)</td>
         <td colspan="1" rowspan="1">vector (with embedded bitmaps)</td>
       </tr>
+      <tr>
+        <td colspan="1" rowspan="1">
+          <a href="#mathml">MathML</a> (Mathematical Markup Language)</td>
+        <td colspan="1" rowspan="1">descriptive</td>
+      </tr>
     </table>
 
     <h2><a name="bmp">BMP</a></h2>
@@ -115,8 +120,8 @@
     <p>FOray provides support for two output targets:</p>
     <ul>
       <li>PostScript (full support).</li>
-      <li>PDF (partial support). Starting with releases after 0.2, and including
-      current repository code, FOray now includes a partially-implemented
+      <li>PDF (partial support).
+      Starting with release 0.3, FOray includes a partially-implemented
       built-in PostScript interpreter and support for converting supported
       PostScript input to PDF output. The current implementation covers enough
       of the PostScript operators to support many simple graphics. FOray logs
@@ -221,6 +226,10 @@
         is opaque. </li>
     </ul>
 
+    <h2><a name="mathml">MathML (Mathematical Markup Language)</a></h2>
+    <p>FOray supports MathML documents in fo:external-graphic, using
+    <a rel="external" href="http://jeuclid.sourceforge.net/">JEuclid</a>. We
+    hope to add support for fo:instream-foreign-object in a future release.</p>
     <hr/>
 
     <h2><a name="resolution">Resolution</a></h2>

Modified: trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBlock.java
===================================================================
--- trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBlock.java	2007-10-03 23:30:47 UTC (rev 10239)
+++ trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBlock.java	2007-10-04 19:42:55 UTC (rev 10240)
@@ -332,22 +332,21 @@
          * + space(278)
          * + W(944) + o(556) + r(333) + d(556)
          * + space(278)
-         * + S(556) + p(556) + a(556) + c(500) + i(222) + n(556) + g(556)
-         * = 12,616.
+         * + S(667) + p(556) + a(556) + c(500) + i(222) + n(556) + g(556)
+         * = 12,727.
          * If these are scaled to 12 points, the millipoints used are 12,616
-         * * 12 = 151,392.
+         * * 12 = 152,724.
          * The extra word spacing is .3em = .3 * 12000 * 3 occurrences = 10,800.
-         * Total ipd of text-area = 151,392 + 10,800 =  */
+         * Total ipd of text-area = 152,724 + 10,800 = 163,524. */
+        assertEquals(163524, textArea.crIpd());
 
-        /* TODO: Turn these tests back on after the code has been fixed. */
-//        assertEquals(162192, textArea.crIpd());
-
         /* The x value of the text area content rectangle should be at the x
          * location of the parent line area + 1/2 of the unused area in the
          * line. Total line area ipd = 468,000. Unused line area ipd =
-         * 468,000 - 92,040 = 375,960. One half of the unused line area ipd =
-         * 187,980. x = 72,000 + 187,980 = 259,980. */
-//        assertEquals(259980, textArea.crOriginX());
+         * 468,000 - 163,524 = 304,476. One half of the unused line area ipd =
+         * 152,238.
+         * x = 72,000 + 152,238 = 224,238. */
+        assertEquals(224238, textArea.crOriginX());
 
         /* The y value of the text area content rectangle should be the same as
          * the parent line area. */

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java	2007-10-03 23:30:47 UTC (rev 10239)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java	2007-10-04 19:42:55 UTC (rev 10240)
@@ -131,6 +131,20 @@
     /**
      * {@inheritDoc}
      */
+    public int inlineWordSpacingOptimum() {
+        return this.realLineText.inlineWordSpacingOptimum(this.context);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int inlineWordSpacingOptimum(final FoContext context) {
+        return this.realLineText.inlineWordSpacingOptimum(context);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
     public boolean inlineWrapOption() {
         return this.realLineText.inlineWrapOption(this.context);
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java	2007-10-03 23:30:47 UTC (rev 10239)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java	2007-10-04 19:42:55 UTC (rev 10240)
@@ -272,6 +272,21 @@
     /**
      * {@inheritDoc}
      */
+    public int inlineWordSpacingOptimum() {
+        return this.inlineWordSpacingOptimum(null);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int inlineWordSpacingOptimum(final FoContext context) {
+        final FObj effectiveParent = effectiveParent(context);
+        return effectiveParent.traitWordSpacingOpt(context);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
     public boolean inlineWrapOption() {
         return this.inlineWrapOption(null);
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/CharacterSequence4a.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/CharacterSequence4a.java	2007-10-03 23:30:47 UTC (rev 10239)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/CharacterSequence4a.java	2007-10-04 19:42:55 UTC (rev 10240)
@@ -613,6 +613,21 @@
     /**
      * {@inheritDoc}
      */
+    public int inlineWordSpacingOptimum() {
+        return this.inlineWordSpacingOptimum(null);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int inlineWordSpacingOptimum(final FoContext context) {
+        final FObj effectiveParent = effectiveParent(context);
+        return effectiveParent.traitWordSpacingOpt(context);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
     public boolean inlineWrapOption() {
         return this.inlineWrapOption(null);
     }

Modified: trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java	2007-10-03 23:30:47 UTC (rev 10239)
+++ trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java	2007-10-04 19:42:55 UTC (rev 10240)
@@ -246,15 +246,18 @@
         if (isZeroWidthSpace(codePoint)) {
             return getCharWidth(lineText, codePoint);
         }
+        int charWidth = 0;
         if (isWhitespace(codePoint)) {
             if ((codePoint == '\n')
                     || (codePoint == '\r')
                     || (codePoint == '\t')) {
-                return whitespaceWidth;
+                charWidth = whitespaceWidth;
+            } else {
+                charWidth = getCharWidth(lineText, codePoint);
             }
-            return getCharWidth(lineText, codePoint);
+            return charWidth;
         }
-        int charWidth = getCharWidth(lineText, codePoint);
+        charWidth = getCharWidth(lineText, codePoint);
         if (charWidth <= 0) {
             charWidth = whitespaceWidth;
         }

Modified: trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java	2007-10-03 23:30:47 UTC (rev 10239)
+++ trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java	2007-10-04 19:42:55 UTC (rev 10240)
@@ -128,7 +128,8 @@
         } else {
             this.canEatLeadingSpaces = true;
         }
-        final int whitespaceWidth = getCharWidth(lineText, ' ');
+        int whitespaceWidth = getCharWidth(lineText, ' ');
+        whitespaceWidth += lineText.inlineWordSpacingOptimum();
 
         // Bound start and end by the limits of the array.
         int startIndex = start;
@@ -342,6 +343,7 @@
         }
         if (! this.canEatLeadingSpaces) {
             this.spaceWidth += getCharWidth(lineText, codePoint);
+            this.spaceWidth += lineText.inlineWordSpacingOptimum();
         }
         this.previousCharacter = SolitaryLineBreaker.CONNECTOR;
     }


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




Thread: [FOray-commit] SF.net SVN: foray: [10240] trunk/foray (Page 22)

Modular XSL-FO Implementation for Java.

foray-commit