|
From: <vic...@us...> - 2006-05-25 16:18:27
|
Revision: 7253 Author: victormote Date: 2006-05-25 09:18:20 -0700 (Thu, 25 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7253&view=rev Log Message: ----------- Add switch structure to handle other algorithms. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-05-25 16:05:42 UTC (rev 7252) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-05-25 16:18:20 UTC (rev 7253) @@ -284,7 +284,12 @@ * {@inheritDoc} */ public float normalLineHeightFactor(int algorithm) { - return 1.2F; + switch (algorithm) { + case LH_ALGORITHM_DEFAULT: + default: { + return 1.2F; + } + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-26 14:21:50
|
Revision: 7259 Author: victormote Date: 2006-05-26 07:21:41 -0700 (Fri, 26 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7259&view=rev Log Message: ----------- Conform to axsl changes regarding location of constants. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-05-26 13:24:41 UTC (rev 7258) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-05-26 14:21:41 UTC (rev 7259) @@ -27,6 +27,8 @@ import org.foray.font.charset.CharSet; import org.foray.font.format.Kerning; +import org.axsl.common.Constants; + import org.apache.commons.logging.Log; /** @@ -326,34 +328,35 @@ public int estimateBaseline(int writingMode, int baselineType, int fontSize) { switch (baselineType) { - case BASELINE_ALPHABETIC: { + case Constants.BASELINE_ALPHABETIC: { return fontSize + this.getDescender(fontSize); } - case BASELINE_IDEOGRAPHIC: { + case Constants.BASELINE_IDEOGRAPHIC: { return fontSize; } - case BASELINE_HANGING: { + case Constants.BASELINE_HANGING: { return (int) Math.round(fontSize * .3); } - case BASELINE_MATHEMATICAL: { + case Constants.BASELINE_MATHEMATICAL: { /* For now, this is the same as Alphabetic. */ return fontSize + this.getDescender(fontSize); } - case BASELINE_CENTRAL: { + case Constants.BASELINE_CENTRAL: { return fontSize / 2; } - case BASELINE_MIDDLE: { + case Constants.BASELINE_MIDDLE: { /* First get the Alphabetic baseline. */ - int baseline = baseline(writingMode, BASELINE_ALPHABETIC, fontSize); + int baseline = baseline(writingMode, Constants.BASELINE_ALPHABETIC, + fontSize); baseline -= this.getXHeight(fontSize) / 2; return baseline; } - case BASELINE_TEXT_BEFORE_EDGE: { + case Constants.BASELINE_TEXT_BEFORE_EDGE: { /* TODO: This needs to comply with the Note under "text-before-edge" * at Section 7.13 of XSL-FO 1.0. */ return 0; } - case BASELINE_TEXT_AFTER_EDGE: { + case Constants.BASELINE_TEXT_AFTER_EDGE: { /* TODO: This needs to comply with the Note under "text-after-edge" * at Section 7.13 of XSL-FO 1.0. */ return fontSize; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-26 14:37:47
|
Revision: 7260 Author: victormote Date: 2006-05-26 07:37:43 -0700 (Fri, 26 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7260&view=rev Log Message: ----------- Stub implementation of new axsl method. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-05-26 14:21:41 UTC (rev 7259) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-05-26 14:37:43 UTC (rev 7260) @@ -367,4 +367,9 @@ } } + public int baseline(String script) { + /* TODO: Fix this. */ + return Constants.BASELINE_ALPHABETIC; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 02:10:49
|
Revision: 7665 Author: victormote Date: 2006-06-16 19:10:44 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7665&view=rev Log Message: ----------- Conform to axsl changes: Add new methods to Font interface to provide metrics for underline, overline, and strikout positions and weights. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-06-17 01:03:08 UTC (rev 7664) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-06-17 02:10:44 UTC (rev 7665) @@ -372,4 +372,63 @@ return Constants.BASELINE_ALPHABETIC; } + /** + * {@inheritDoc} + */ + public int underlineSize(int fontSize) { + /* TODO: Where possible, replace this heuristic with data from the + * font itself. */ + /* Until we learn better, make this the same size as the strikeout. */ + return strikeoutSize(fontSize); + } + + /** + * {@inheritDoc} + */ + public int underlinePosition(int fontSize) { + /* TODO: Where possible, replace this heuristic with data from the + * font itself. */ + return (fontSize / 10) * -1; + } + + /** + * {@inheritDoc} + */ + public int overlineSize(int fontSize) { + /* TODO: Where possible, replace this heuristic with data from the + * font itself. */ + /* Until we learn better, make this the same size as the strikeout. */ + return strikeoutSize(fontSize); + } + + /** + * {@inheritDoc} + */ + public int overlinePosition(int fontSize) { + /* TODO: Where possible, replace this heuristic with data from the + * font itself. */ + return getAscender(fontSize) + (fontSize / 10); + } + + /** + * {@inheritDoc} + */ + public int strikeoutSize(int fontSize) { + /* TODO: Where possible, replace this heuristic with data from the + * font itself. */ + /* This computation comes from the OpenType manual, Section OS/2 + * table, for the definition of "yStrikeoutSize", where this ratio is + * suggested. */ + return fontSize * 102 / 2048; + } + + /** + * {@inheritDoc} + */ + public int strikeoutPosition(int fontSize) { + /* TODO: Where possible, replace this heuristic with data from the + * font itself. */ + return getAscender(fontSize) * 3 / 8; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
