foray-commit Mailing List for FOray (Page 280)
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
foray-commit — FOray repository commit log messages
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(139) |
Apr
(98) |
May
(250) |
Jun
(394) |
Jul
(84) |
Aug
(13) |
Sep
(420) |
Oct
(186) |
Nov
(1) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(108) |
Feb
(202) |
Mar
(291) |
Apr
(247) |
May
(374) |
Jun
(227) |
Jul
(231) |
Aug
(60) |
Sep
(31) |
Oct
(45) |
Nov
(18) |
Dec
|
| 2008 |
Jan
(38) |
Feb
(71) |
Mar
(142) |
Apr
|
May
(59) |
Jun
(6) |
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(12) |
Feb
(4) |
Mar
(88) |
Apr
(121) |
May
(17) |
Jun
(30) |
Jul
|
Aug
(5) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
(11) |
Feb
(76) |
Mar
(11) |
Apr
|
May
(11) |
Jun
|
Jul
|
Aug
(44) |
Sep
(14) |
Oct
(7) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(168) |
| 2017 |
Jan
(77) |
Feb
(11) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
(6) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
(88) |
Mar
(118) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(141) |
| 2021 |
Jan
(170) |
Feb
(20) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(62) |
Nov
(189) |
Dec
(162) |
| 2022 |
Jan
(201) |
Feb
(118) |
Mar
(8) |
Apr
|
May
(2) |
Jun
(47) |
Jul
(19) |
Aug
(14) |
Sep
(3) |
Oct
|
Nov
(28) |
Dec
(235) |
| 2023 |
Jan
(112) |
Feb
(23) |
Mar
(2) |
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(70) |
Sep
(92) |
Oct
(20) |
Nov
(1) |
Dec
(1) |
| 2024 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(14) |
Jun
(11) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(10) |
Feb
(29) |
Mar
|
Apr
(162) |
May
(245) |
Jun
(83) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <vic...@us...> - 2006-03-04 21:05:46
|
Revision: 6885 Author: victormote Date: 2006-03-04 13:05:41 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6885&view=rev Log Message: ----------- Fix encoding problem. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2006-03-04 21:00:12 UTC (rev 6884) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2006-03-04 21:05:41 UTC (rev 6885) @@ -97,7 +97,7 @@ if (! this.consumerFont.subSetting()) { return fontEncodedChar; } - return (char) this.getSubset().encodeSubsetIndex(fontEncodedChar); + return this.getSubset().encodeSubsetIndex(fontEncodedChar); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-04 21:05:21
|
Revision: 6884 Author: victormote Date: 2006-03-04 13:00:12 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6884&view=rev Log Message: ----------- Fix encoding bug. Modified Paths: -------------- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java 2006-03-04 19:46:37 UTC (rev 6883) +++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java 2006-03-04 21:00:12 UTC (rev 6884) @@ -57,7 +57,7 @@ } public int encodeCharacter(int codePoint) { - CMap12Entry entry = entryForChar((char) codePoint); + CMap12Entry entry = entryForChar(codePoint); if (entry == null) { return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-04 19:46:50
|
Revision: 6883 Author: victormote Date: 2006-03-04 11:46:37 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6883&view=rev Log Message: ----------- Fix some javadoc warnings. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/format/Kerning.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java Modified: trunk/foray/foray-font/src/java/org/foray/font/format/Kerning.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/Kerning.java 2006-03-04 19:34:08 UTC (rev 6882) +++ trunk/foray/foray-font/src/java/org/foray/font/format/Kerning.java 2006-03-04 19:46:37 UTC (rev 6883) @@ -26,7 +26,7 @@ /** * Manages the storage and retrieval of kerning information for a font. - * Use {@link #addKerningEntry(char, char, short)} to add kerning pairs. + * Use {@link #addKerningEntry(int, int, short)} to add kerning pairs. * When all pairs have been added, use {@link #lock()} to lock the instance. * Kerning information cannot be retrieved until the instance is locked. Once * it is locked, no more kerning entries can be added to it. @@ -130,7 +130,7 @@ /** * Run this method when all kerning entries have been added (using - * {@link #addKerningEntry(char, char, short)}). The Kerning instance is + * {@link #addKerningEntry(int, int, short)}). The Kerning instance is * not usable until it has been locked. */ public void lock() { Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java 2006-03-04 19:34:08 UTC (rev 6882) +++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java 2006-03-04 19:46:37 UTC (rev 6883) @@ -190,7 +190,7 @@ * @param codePoint The Unicode code point for which a glyph name is sought. * @return The glyph name which corresponds to codePoint, or null if there * is none. - * @see GlyphList#mapCodePointToGlyphName(char) + * @see GlyphList#mapCodePointToGlyphName(int) */ public static String mapCodePointToGlyphName(GlyphList[] glyphLists, int codePoint) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-04 19:34:24
|
Revision: 6882 Author: victormote Date: 2006-03-04 11:34:08 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6882&view=rev Log Message: ----------- Add dependency on icu4j for Java 5.0-like methods. Modified Paths: -------------- trunk/foray/foray-common/.classpath trunk/foray/foray-common/scripts/build.xml trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/HyphenationServer.java trunk/foray/scripts/build.xml trunk/foray/scripts/foray-build.properties Modified: trunk/foray/foray-common/.classpath =================================================================== --- trunk/foray/foray-common/.classpath 2006-03-04 18:08:28 UTC (rev 6881) +++ trunk/foray/foray-common/.classpath 2006-03-04 19:34:08 UTC (rev 6882) @@ -7,5 +7,6 @@ <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/avalon-framework-cvs-20020806.jar"/> + <classpathentry kind="var" path="ICU4J_HOME/icu4j_3_4_3.jar"/> <classpathentry kind="output" path="build/eclipse"/> </classpath> Modified: trunk/foray/foray-common/scripts/build.xml =================================================================== --- trunk/foray/foray-common/scripts/build.xml 2006-03-04 18:08:28 UTC (rev 6881) +++ trunk/foray/foray-common/scripts/build.xml 2006-03-04 19:34:08 UTC (rev 6882) @@ -28,11 +28,16 @@ <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> + <property name="icu4j.libs" location="${lib.dir}"/> + <echo>icu4j.libs: ${icu4j.libs}</echo> <path id="libs-build-classpath"> <fileset dir="${axsl.build}"> <include name="**/axsl*.jar"/> </fileset> + <fileset dir="${icu4j.libs}"> + <include name="icu*.jar"/> + </fileset> <fileset dir="${lib.dir}"> <include name="batik*.jar"/> <include name="xml-apis.jar"/> Modified: trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java 2006-03-04 18:08:28 UTC (rev 6881) +++ trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java 2006-03-04 19:34:08 UTC (rev 6882) @@ -31,6 +31,11 @@ public class StringUtil { /** + * Private constructor (should never be instantiated). + */ + private StringUtil() {} + + /** * Reports whether an input character is a valid hexadecimal character. * Valid hex characters are 0-9, A-F, and a-f. * @param input The character to be tested. Modified: trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java 2006-03-04 18:08:28 UTC (rev 6881) +++ trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java 2006-03-04 19:34:08 UTC (rev 6882) @@ -24,6 +24,8 @@ package org.foray.common; +import com.ibm.icu.text.UTF16; + /** * Utility class containing methods that are useful for mimicking certain * Java 5.0 behavior on pre-Java 5.0 platforms. If you are coding against @@ -32,6 +34,11 @@ public class StringUtilPre5 { /** + * Private constructor (should never be instantiated). + */ + private StringUtilPre5() {} + + /** * Mimics Java 5.0: Character.isLetter(int). * @param codePoint The Unicode code point to be tested. * @return True iff the character is a letter. @@ -50,10 +57,8 @@ /** * Mimics Java 5.0: String(int[], int, int). */ - public static String makeString(int[] codePoints, int offset, int count) { - /* TODO: This needs to be fixed to convert code points to chars. */ - char[] chars = new char[codePoints.length]; - return new String(chars, offset, count); + public static String newString(int[] codePoints, int offset, int count) { + return UTF16.newString(codePoints, offset, count); } } Modified: trunk/foray/foray-text/src/java/org/foray/text/hyphen/HyphenationServer.java =================================================================== --- trunk/foray/foray-text/src/java/org/foray/text/hyphen/HyphenationServer.java 2006-03-04 18:08:28 UTC (rev 6881) +++ trunk/foray/foray-text/src/java/org/foray/text/hyphen/HyphenationServer.java 2006-03-04 19:34:08 UTC (rev 6882) @@ -316,7 +316,7 @@ wordendFound = true; } } - return StringUtilPre5.makeString(newWord, 0, counter); + return StringUtilPre5.newString(newWord, 0, counter); } /** Modified: trunk/foray/scripts/build.xml =================================================================== --- trunk/foray/scripts/build.xml 2006-03-04 18:08:28 UTC (rev 6881) +++ trunk/foray/scripts/build.xml 2006-03-04 19:34:08 UTC (rev 6882) @@ -333,6 +333,9 @@ <fileset dir="${jai.libs}"> <include name="jai*.jar"/> </fileset> + <fileset dir="${icu4j.libs}"> + <include name="icu*.jar"/> + </fileset> </path> <javadoc Modified: trunk/foray/scripts/foray-build.properties =================================================================== --- trunk/foray/scripts/foray-build.properties 2006-03-04 18:08:28 UTC (rev 6881) +++ trunk/foray/scripts/foray-build.properties 2006-03-04 19:34:08 UTC (rev 6882) @@ -46,4 +46,9 @@ # Sample typical value: # jai.libs = D:/rsrc/java/jai/jai-1_1_1_01/lib +# icu4j.libs +# Directory containing the IBM ICU4J jar file. +# Sample typical value: +# icu4j.libs = D:/rsrc/icu4j/3_4_3 + # Last line of file. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-04 18:08:45
|
Revision: 6881 Author: victormote Date: 2006-03-04 10:08:28 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6881&view=rev Log Message: ----------- Add and use some static methods that can be used to mimic Java 5.0 on pre-Java 5.0 systems. Modified Paths: -------------- trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/HyphenationServer.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 Added Paths: ----------- trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java Modified: trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java 2006-03-04 17:04:13 UTC (rev 6880) +++ trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java 2006-03-04 18:08:28 UTC (rev 6881) @@ -223,4 +223,36 @@ } } + /** + * Converts a CharSequence to an array of Unicode code points. + * @param input The CharSequence to be converted. + * @return An array of Unicode code points. + */ + public static int[] toCodePoints(CharSequence input) { + if (input == null + || input.length() < 1) { + return new int[0]; + } + /* TODO: Add the char to int conversion. */ + int[] returnArray = new int[input.length()]; + for (int i = 0; i < input.length(); i++) { + returnArray[i] = input.charAt(i); + } + return returnArray; + } + + /** + * Converts a char[] to an array of Unicode code points. + * @param input The char[] to be converted. + * @return An array of Unicode code points. + */ + public static int[] toCodePoints(char[] input) { + /* TODO: Add the char to int conversion. */ + int[] returnArray = new int[input.length]; + for (int i = 0; i < input.length; i++) { + returnArray[i] = input[i]; + } + return returnArray; + } + } Added: trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java (rev 0) +++ trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java 2006-03-04 18:08:28 UTC (rev 6881) @@ -0,0 +1,59 @@ +/* + * Copyright 2004 The FOray Project. + * http://www.foray.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* $Id: StringUtil.java 6807 2006-02-24 22:48:53Z victormote $ */ + +package org.foray.common; + +/** + * Utility class containing methods that are useful for mimicking certain + * Java 5.0 behavior on pre-Java 5.0 platforms. If you are coding against + * Java 5.0 or greater, the equivalent functions should be used instead. + */ +public class StringUtilPre5 { + + /** + * Mimics Java 5.0: Character.isLetter(int). + * @param codePoint The Unicode code point to be tested. + * @return True iff the character is a letter. + */ + public static boolean isLetter(int codePoint) { + if (codePoint < Character.MIN_VALUE) { + return false; + } + if (codePoint <= Character.MAX_VALUE) { + return Character.isLetter((char) codePoint); + } + /* TODO: This needs to be expanded to handle code points > U+FFFF. */ + return false; + } + + /** + * Mimics Java 5.0: String(int[], int, int). + */ + public static String makeString(int[] codePoints, int offset, int count) { + /* TODO: This needs to be fixed to convert code points to chars. */ + char[] chars = new char[codePoints.length]; + return new String(chars, offset, count); + } + +} Modified: trunk/foray/foray-text/src/java/org/foray/text/hyphen/HyphenationServer.java =================================================================== --- trunk/foray/foray-text/src/java/org/foray/text/hyphen/HyphenationServer.java 2006-03-04 17:04:13 UTC (rev 6880) +++ trunk/foray/foray-text/src/java/org/foray/text/hyphen/HyphenationServer.java 2006-03-04 18:08:28 UTC (rev 6881) @@ -29,6 +29,7 @@ package org.foray.text.hyphen; +import org.foray.common.StringUtilPre5; import org.foray.text.TextServer; import org.axsl.text.TextException; @@ -301,21 +302,21 @@ /** * extracts a complete word from the character data */ - public String getHyphenationWord(char[] characters, int wordStart) { + public String getHyphenationWord(int[] characters, int wordStart) { boolean wordendFound = false; int counter = 0; - char[] newWord = new char[characters.length]; // create a buffer + int[] newWord = new int[characters.length]; // create a buffer while ((!wordendFound) && ((wordStart + counter) < characters.length)) { - char tk = characters[wordStart + counter]; - if (java.lang.Character.isLetter(tk)) { + int tk = characters[wordStart + counter]; + if (StringUtilPre5.isLetter(tk)) { newWord[counter] = tk; counter++; } else { wordendFound = true; } } - return new String(newWord, 0, counter); + return StringUtilPre5.makeString(newWord, 0, counter); } /** @@ -328,7 +329,7 @@ * @return The number of characters at the start that should be ignored for * purposes of forming a word to be evaluated for hyphenation. */ - public int nonWordChars(char[] characters, int startIndex) { + public int nonWordChars(int[] characters, int startIndex) { int count = 0; // Look for ' or " at the beginning of the word. if (characters[startIndex] == '"' || characters[startIndex] == '\'') { 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 2006-03-04 17:04:13 UTC (rev 6880) +++ trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java 2006-03-04 18:08:28 UTC (rev 6881) @@ -263,20 +263,20 @@ * space with normal behaviour. Normal behaviour means that * it's not non-breaking */ - public static boolean isSpace(char c) { - if (c == ' ' - || c == '\u2000' // en quad - || c == '\u2001' // em quad - || c == '\u2002' // en space - || c == '\u2003' // em space - || c == '\u2004' // three-per-em space - || c == '\u2005' // four--per-em space - || c == '\u2006' // six-per-em space - || c == '\u2007' // figure space - || c == '\u2008' // punctuation space - || c == '\u2009' // thin space - || c == '\u200A' // hair space - || c == '\u200B') { // zero width space + public static boolean isSpace(int codePoint) { + if (codePoint == ' ' + || codePoint == '\u2000' // en quad + || codePoint == '\u2001' // em quad + || codePoint == '\u2002' // en space + || codePoint == '\u2003' // em space + || codePoint == '\u2004' // three-per-em space + || codePoint == '\u2005' // four--per-em space + || codePoint == '\u2006' // six-per-em space + || codePoint == '\u2007' // figure space + || codePoint == '\u2008' // punctuation space + || codePoint == '\u2009' // thin space + || codePoint == '\u200A' // hair space + || codePoint == '\u200B') { // zero width space return true; } return false; @@ -286,11 +286,11 @@ * Method to determine if the character is a nonbreaking * space. */ - public static boolean isNonBreakingSpace(char c) { - if (c == '\u00A0' - || c == '\u202F' // narrow no-break space - || c == '\u3000' // ideographic space - || c == '\uFEFF') { // zero width no-break space + public static boolean isNonBreakingSpace(int codePoint) { + if (codePoint == '\u00A0' + || codePoint == '\u202F' // narrow no-break space + || codePoint == '\u3000' // ideographic space + || codePoint == '\uFEFF') { // zero width no-break space return true; } return false; @@ -298,12 +298,12 @@ /** * Determines whether a character forces a line break. - * @param c The character to be tested. + * @param codePoint The character to be tested. * @return True iff this character forces a line break. */ - public static boolean forcesLineBreak(char c) { - if (c == '\u2028' // Unicode line separator - || c == '\n') { // linefeed + public static boolean forcesLineBreak(int codePoint) { + if (codePoint == '\u2028' // Unicode line separator + || codePoint == '\n') { // linefeed return true; } return false; @@ -311,50 +311,53 @@ /** * Determines whether a character allows (but does not force) a line break. - * @param c The character to be tested. + * @param codePoint The character to be tested. * @return True iff this character allows (but does not force) a line break. */ - public static boolean allowsLineBreak(char c) { - if (isWhitespace(c)) { + public static boolean allowsLineBreak(int codePoint) { + if (isWhitespace(codePoint)) { return true; } - if (c == '-' // Regular hyphen - || c == '\u00ad') { // Unicode soft hyphen + if (codePoint == '-' // Regular hyphen + || codePoint == '\u00ad') { // Unicode soft hyphen return true; } return false; } - public static boolean isWhitespace(char c) { - if (isSpace(c) - || (c == '\n') - || (c == '\r') - || (c == '\t') - || (c == '\u2028')) { + public static boolean isWhitespace(int codePoint) { + if (isSpace(codePoint) + || (codePoint == '\n') + || (codePoint == '\r') + || (codePoint == '\t') + || (codePoint == '\u2028')) { return true; } return false; } - public static boolean isZeroWidthSpace(char c) { - if ((c == '\u200B') - || c == '\uFEFF') { + public static boolean isZeroWidthSpace(int codePoint) { + if ((codePoint == '\u200B') + || codePoint == '\uFEFF') { return true; } return false; } - protected int charWidth(LineText lineText, char c, int whitespaceWidth) { - if (isZeroWidthSpace(c)) { - return getCharWidth(lineText, c); + protected int charWidth(LineText lineText, int codePoint, + int whitespaceWidth) { + if (isZeroWidthSpace(codePoint)) { + return getCharWidth(lineText, codePoint); } - if (isWhitespace(c)) { - if ((c == '\n') || (c == '\r') || (c == '\t')) { + if (isWhitespace(codePoint)) { + if ((codePoint == '\n') + || (codePoint == '\r') + || (codePoint == '\t')) { return whitespaceWidth; } - return getCharWidth(lineText, c); + return getCharWidth(lineText, codePoint); } - int charWidth = getCharWidth(lineText, c); + int 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 2006-03-04 17:04:13 UTC (rev 6880) +++ trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java 2006-03-04 18:08:28 UTC (rev 6881) @@ -24,6 +24,7 @@ package org.foray.text.line.solitary; +import org.foray.common.StringUtil; import org.foray.text.hyphen.Hyphenation; import org.foray.text.hyphen.HyphenationServer; import org.foray.text.line.EagerLineBreaker; @@ -88,7 +89,7 @@ private int wordStart = 0; private LineText currentLineText = null; - private char[] currentChars = null; + private int[] currentChars = null; private boolean canEatLeadingSpaces = true; @@ -104,7 +105,7 @@ protected int processLineText(LineText lineText, int start, int end) throws TextException { this.currentLineText = lineText; - this.currentChars = currentLineText.inlineText(); + this.currentChars = StringUtil.toCodePoints(currentLineText.inlineText()); String language = lineText.inlineLanguage(); finalWidth = 0; @@ -131,7 +132,7 @@ /* iterate over each character */ for (int i = startIndex; i <= endIndex; i++) { /* get the character */ - char c = this.currentChars[i]; + int c = this.currentChars[i]; if (forcesLineBreak(c)) { createLineContent(start, i, finalWidth, false); return i + 1; @@ -284,9 +285,9 @@ * word-related variables to that everything up to this point is included * on the current line. * @param lineText - * @param c + * @param codePoint */ - private void processLineBreakPossibility(LineText lineText, char c) { + private void processLineBreakPossibility(LineText lineText, int codePoint) { if (previousCharacter == TEXT) { // Current is WHITESPACE and previous TEXT. /* @@ -302,7 +303,7 @@ wordWidth = 0; } if (! canEatLeadingSpaces) { - spaceWidth += getCharWidth(lineText, c); + spaceWidth += getCharWidth(lineText, codePoint); } previousCharacter = CONNECTOR; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-04 17:04:25
|
Revision: 6880 Author: victormote Date: 2006-03-04 09:04:13 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6880&view=rev Log Message: ----------- Conform to aXSL changes. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.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-03-04 16:11:35 UTC (rev 6879) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-03-04 17:04:13 UTC (rev 6880) @@ -125,7 +125,7 @@ /** * {@inheritDoc} */ - public int width(String word, int fontSize, int letterSpacing, + public int width(CharSequence word, int fontSize, int letterSpacing, int wordSpacing) { if (word == null) { return 0; 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 2006-03-04 16:11:35 UTC (rev 6879) +++ trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java 2006-03-04 17:04:13 UTC (rev 6880) @@ -218,21 +218,31 @@ */ protected abstract int findLineBreaks() throws TextException; - public int getCharWidth(LineText lineText, char c) { + /** + * {@inheritDoc} + */ + public int getCharWidth(LineText lineText, int codePoint) { FontUse fontUse = lineText.inlinePrimaryFont(); Font font = fontUse.getFont(); int fontSize = lineText.inlineFontSize(); if (lineText.inlineIsFauxSmallCaps() - && isLowerCase(c)) { + && isLowerCase(codePoint)) { fontSize = lineText.inlineFauxSmallCapsFontSize(); - c = java.lang.Character.toUpperCase(c); + codePoint = java.lang.Character.toUpperCase((char) codePoint); } - fontUse.registerCharUsed(c); - return font.width(c, fontSize) + fontUse.registerCharUsed(codePoint); + return font.width(codePoint, fontSize) + lineText.inlineLetterSpacingOptimum(); } - public boolean isLowerCase(char c) { + /** + * {@inheritDoc} + */ + public boolean isLowerCase(int codePoint) { + if (codePoint > Character.MAX_VALUE) { + return false; + } + char c = (char) codePoint; if (java.lang.Character.isLetter(c) && java.lang.Character.isLowerCase(c)) { return true; @@ -240,6 +250,9 @@ return false; } + /** + * {@inheritDoc} + */ public int getHyphenWidth(LineText lineText) { char hyphenChar = lineText.inlineHyphenationCharacter(); return getCharWidth(lineText, hyphenChar); @@ -435,7 +448,7 @@ return this.server.textServer.getHyphenationServer(); } - public int getWordWidth(LineText lineText, String word) { + public int getWordWidth(LineText lineText, CharSequence word) { FontUse fontUse = lineText.inlinePrimaryFont(); Font font = fontUse.getFont(); fontUse.registerCharsUsed(word); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-04 16:11:40
|
Revision: 6879 Author: victormote Date: 2006-03-04 08:11:35 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6879&view=rev Log Message: ----------- Make retrieval of the "cvt" table optional, since it is an optional table. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java 2006-03-04 15:34:27 UTC (rev 6878) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java 2006-03-04 16:11:35 UTC (rev 6879) @@ -109,7 +109,11 @@ addTable("hhea", createHhea()); addTable("hmtx", createHmtx()); addTable("maxp", createMaxp()); - addTable("cvt ", createCvt()); + byte[] cvtTable = createCvt(); + if (cvtTable != null + && cvtTable.length != 0) { + addTable("cvt ", cvtTable); + } addTable("fpgm", createFpgm()); addTable("prep", createPrep()); addTable("loca", createLoca()); @@ -232,7 +236,7 @@ * Copy the (optional) cvt table as-is from original font to subset font. */ private byte[] createCvt() throws IOException { - TTFTableDirEntry entry = getEntry("cvt ", true); + TTFTableDirEntry entry = getEntry("cvt ", false); if (entry == null) { return null; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-04 15:34:35
|
Revision: 6878 Author: victormote Date: 2006-03-04 07:34:27 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6878&view=rev Log Message: ----------- Remove char[] variants of "unavailable" methods in accordance with aXSL changes. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2006-03-04 15:06:54 UTC (rev 6877) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2006-03-04 15:34:27 UTC (rev 6878) @@ -173,19 +173,6 @@ /** * {@inheritDoc} */ - public int unavailableChar(char[] chars, int beginIndex) { - for (int i = 0; i < chars.length; i++) { - char c = chars[i]; - if (! glyphAvailable(c)) { - return i; - } - } - return -1; - } - - /** - * {@inheritDoc} - */ public int[] unavailableChars(CharSequence charSequence, int beginIndex) { int count = 0; /* Count them first. */ @@ -215,35 +202,6 @@ /** * {@inheritDoc} */ - public int[] unavailableChars(char[] chars, int beginIndex) { - int count = 0; - /* Count them first. */ - for (int i = 0; i < chars.length; i++) { - char c = chars[i]; - if (! glyphAvailable(c)) { - count++; - } - } - if (count < 1) { - return null; - } - /* Create empty array. */ - int[] returnArray = new int[count]; - /* Read through them again, completing the array. */ - count = 0; - for (int i = 0; i < chars.length; i++) { - char c = chars[i]; - if (! glyphAvailable(c)) { - returnArray[count] = i; - count++; - } - } - return returnArray; - } - - /** - * {@inheritDoc} - */ public boolean glyphAvailable(int codePoint) { /* Does the font have the glyph? */ if (! this.getFOrayFont().glyphAvailable(codePoint)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-04 15:07:11
|
Revision: 6877 Author: victormote Date: 2006-03-04 07:06:54 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6877&view=rev Log Message: ----------- Add method to parse format 12 cmap table. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-03-04 14:00:21 UTC (rev 6876) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-03-04 15:06:54 UTC (rev 6877) @@ -26,6 +26,7 @@ import org.foray.ps.encode.CMap; import org.foray.ps.encode.CMap04; +import org.foray.ps.encode.CMap12; import java.io.IOException; @@ -33,6 +34,11 @@ * Class representing a TTF "cmap" (character-to-glyph index mapping) table. */ class TTFTableCMAP extends TTFTable { + + public static final byte CMAP_FORMAT_UNKNOWN = -1; + public static final byte CMAP_FORMAT_4 = 4; + public static final byte CMAP_FORMAT_12 = 12; + private CMap unicodeCMap; TTFTableCMAP (TTFFont ttfFile) throws IOException { @@ -51,8 +57,8 @@ getLogger().debug(numSubtables + " cmap tables"); } - /* The offset to the subtable that we wish to parse. */ - long offsetToParse = -1; + long offsetToCMap04 = -1; + long offsetToCMap12 = -1; /* Parse the header entry for each encoding table and find the best * Unicode entry to parse and store. */ @@ -66,9 +72,28 @@ } if (platformID == 3 && encodingID == 1) { - offsetToParse = subtableOffset; + /* Platform is Microsoft, encoding is Unicode. */ + offsetToCMap04 = subtableOffset; } + if (platformID == 3 + && encodingID == 10) { + /* Platform is Microsoft, encoding is UCS-4 (32-bit Unicode). */ + offsetToCMap12 = subtableOffset; + } } + + /* The offset to the subtable that we wish to parse. Use the format 12 + * subtable if there is one. Otherwise use the format 4 subtable. + * According to the Microsoft cmap spec at + * http://www.microsoft.com/typography/otspec/cmap.htm, + * "The contents of the Format 12 subtable need to be a superset of the + * contents of the Format 4 subtable." + * Therefore we only need to parse one of them. */ + long offsetToParse = offsetToCMap04; + if (offsetToCMap12 > -1) { + offsetToParse = offsetToCMap12; + } + if (offsetToParse < 0) { getLogger().error("No Unicode cmap table."); return; @@ -77,23 +102,35 @@ } private CMap parseCMap(long offsetToParse) throws IOException { - getReader().seek(ttfFont.getTTFDirTabEntry(getTableTag()).getOffset() - + offsetToParse); - int format = getReader().readUnsignedShort(); - int length = getReader().readUnsignedShort(); + int tableOffset = ttfFont.getTTFDirTabEntry(getTableTag()).getOffset(); + tableOffset += offsetToParse; + getReader().seek(tableOffset); + int formatHigh = getReader().readUnsignedShort(); + int formatLow = 0; + long length = 0; + if (formatHigh > 6) { + formatLow = getReader().readUnsignedShort(); + length = getReader().readUnsignedInt(); + } else { + length = getReader().readUnsignedShort(); + } if (getLogger().isDebugEnabled()) { - getLogger().debug("CMAP format: " + format); + getLogger().debug("CMAP format: " + formatHigh + "." + formatLow); getLogger().debug("CMAP length: " + length); } - switch (format) { + switch (formatHigh) { case 4: { return parseCMap04(); } + case 12: { + return parseCMap12(); } + } return null; } private CMap04 parseCMap04() throws IOException { + /* Format and Length have already been read. */ getReader().skipBytes(2); // Skip version int segCountX2 = getReader().readUnsignedShort(); getReader().skipBytes(2); // Skip searchRange @@ -157,6 +194,30 @@ return cmap04; } + /** + * Creates a CMap12 instance by parsing the subtable contents. + * @return A CMap12 instance. + * @throws IOException If error reading file. + * @see <a href="http://developer.apple.com/fonts/TTRefMan/RM06/Chap6cmap.html"> + * The Apple doc for the cmap table</a> + */ + private CMap12 parseCMap12() throws IOException { + /* Format and Length have already been read. */ + getReader().skipBytes(4); // Skip language. + int nGroups = (int) getReader().readUnsignedInt(); + + String encodingName = "internal-" + this.ttfFont.getPostscriptName(); + CMap12 cmap12 = new CMap12(encodingName, nGroups); + + for (int i = 0; i < nGroups; i++) { + int startCharCode = (int) getReader().readUnsignedInt(); + int endCharCode = (int) getReader().readUnsignedInt(); + int startGlyphCode = (int) getReader().readUnsignedInt(); + cmap12.addEntry(startCharCode, endCharCode, startGlyphCode); + } + return cmap12; + } + public String getTableTag() { return "cmap"; } Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java 2006-03-04 14:00:21 UTC (rev 6876) +++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java 2006-03-04 15:06:54 UTC (rev 6877) @@ -49,8 +49,8 @@ this.entries[lastEntryAdded] = entry; } - public void addEntry(char unicodeStart, char unicodeEnd, - char glyphStartIndex) { + public void addEntry(int unicodeStart, int unicodeEnd, + int glyphStartIndex) { CMap12Entry newEntry = new CMap12Entry(unicodeStart, unicodeEnd, glyphStartIndex); addEntry(newEntry); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-04 14:00:27
|
Revision: 6876 Author: victormote Date: 2006-03-04 06:00:21 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6876&view=rev Log Message: ----------- Change parsing to read the format first, then transfer control to a format-specific method. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-03-04 13:48:08 UTC (rev 6875) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-03-04 14:00:21 UTC (rev 6876) @@ -73,18 +73,27 @@ getLogger().error("No Unicode cmap table."); return; } - parseCMap04(offsetToParse); + this.unicodeCMap = parseCMap(offsetToParse); } - private void parseCMap04(long offset) throws IOException { + private CMap parseCMap(long offsetToParse) throws IOException { getReader().seek(ttfFont.getTTFDirTabEntry(getTableTag()).getOffset() - + offset); + + offsetToParse); int format = getReader().readUnsignedShort(); int length = getReader().readUnsignedShort(); - getLogger().debug("CMAP format, length: " + format + ", " + length); - if (format != 4) { - return; + if (getLogger().isDebugEnabled()) { + getLogger().debug("CMAP format: " + format); + getLogger().debug("CMAP length: " + length); } + switch (format) { + case 4: { + return parseCMap04(); + } + } + return null; + } + + private CMap04 parseCMap04() throws IOException { getReader().skipBytes(2); // Skip version int segCountX2 = getReader().readUnsignedShort(); getReader().skipBytes(2); // Skip searchRange @@ -119,7 +128,6 @@ // Parse the table entries and build a CMap4 from them. String encodingName = "internal-" + this.ttfFont.getPostscriptName(); CMap04 cmap04 = new CMap04(encodingName, segCountX2 / 2); - this.unicodeCMap = cmap04; for (int i = 0; i < startCount.length; i++) { if (rangeOffset[i] == 0) { cmap04.addEntry(startCount[i], @@ -146,6 +154,7 @@ getLogger().debug(i + ": " + startCount[i] + " - " + endCount[i]); } + return cmap04; } public String getTableTag() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-04 13:48:13
|
Revision: 6875 Author: victormote Date: 2006-03-04 05:48:08 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6875&view=rev Log Message: ----------- Local refactorings for clarity. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-03-04 13:24:10 UTC (rev 6874) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-03-04 13:48:08 UTC (rev 6875) @@ -45,38 +45,40 @@ * Currently only unicode cmaps are supported. */ protected void parseTable() throws IOException { - getReader().skipBytes(2); - // Number of cmap subtables - int num_cmap = getReader().readUnsignedShort(); - long cmap_unioffset = 0; + getReader().skipBytes(2); // Skip table version. + int numSubtables = getReader().readUnsignedShort(); + if (getLogger().isDebugEnabled()) { + getLogger().debug(numSubtables + " cmap tables"); + } - getLogger().debug(num_cmap + " cmap tables"); + /* The offset to the subtable that we wish to parse. */ + long offsetToParse = -1; - /* - * Read offset for all tables - * We are only interested in the unicode table - */ - for (int i = 0; i < num_cmap; i++) { - int cmap_pid = getReader().readUnsignedShort(); - int cmap_eid = getReader().readUnsignedShort(); - long cmap_offset = getReader().readUnsignedInt(); - getLogger().debug("Platform ID: " + cmap_pid + " Encoding: " - + cmap_eid); - if (cmap_pid == 3 && cmap_eid == 1) { - cmap_unioffset = cmap_offset; + /* Parse the header entry for each encoding table and find the best + * Unicode entry to parse and store. */ + for (int i = 0; i < numSubtables; i++) { + int platformID = getReader().readUnsignedShort(); + int encodingID = getReader().readUnsignedShort(); + long subtableOffset = getReader().readUnsignedInt(); + if (getLogger().isDebugEnabled()) { + getLogger().debug("Platform ID: " + platformID + " Encoding: " + + encodingID); } + if (platformID == 3 + && encodingID == 1) { + offsetToParse = subtableOffset; + } } - parseUnicodeCmap(cmap_unioffset); + if (offsetToParse < 0) { + getLogger().error("No Unicode cmap table."); + return; + } + parseCMap04(offsetToParse); } - private void parseUnicodeCmap(long cmap_unioffset) - throws IOException { - if (cmap_unioffset <= 0) { - getLogger().error("Unicode cmap table not present"); - return; - } + private void parseCMap04(long offset) throws IOException { getReader().seek(ttfFont.getTTFDirTabEntry(getTableTag()).getOffset() - + cmap_unioffset); + + offset); int format = getReader().readUnsignedShort(); int length = getReader().readUnsignedShort(); getLogger().debug("CMAP format, length: " + format + ", " + length); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-04 13:24:18
|
Revision: 6874 Author: victormote Date: 2006-03-04 05:24:10 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6874&view=rev Log Message: ----------- Allow any CMap format. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java 2006-03-04 12:54:11 UTC (rev 6873) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java 2006-03-04 13:24:10 UTC (rev 6874) @@ -24,7 +24,7 @@ package org.foray.font.format; -import org.foray.ps.encode.CMap04; +import org.foray.ps.encode.CMap; import org.apache.commons.logging.Log; @@ -327,8 +327,8 @@ /** * Return a ArrayList with TTFCmapEntry */ - public CMap04 getCMaps() { - return cmapTable.getUnicodeCMap(); // Create cmaps for bfentries + public CMap getCMaps() { + return cmapTable.getUnicodeCMap(); } protected TTFTableDirEntry getTTFDirTabEntry(String name) { Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-03-04 12:54:11 UTC (rev 6873) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-03-04 13:24:10 UTC (rev 6874) @@ -24,6 +24,7 @@ package org.foray.font.format; +import org.foray.ps.encode.CMap; import org.foray.ps.encode.CMap04; import java.io.IOException; @@ -32,7 +33,7 @@ * Class representing a TTF "cmap" (character-to-glyph index mapping) table. */ class TTFTableCMAP extends TTFTable { - private CMap04 unicodeCMap; + private CMap unicodeCMap; TTFTableCMAP (TTFFont ttfFile) throws IOException { super(ttfFile); @@ -40,16 +41,10 @@ } /** - * Read the cmap table, + * Parse the cmap table. * Currently only unicode cmaps are supported. - * Set the unicodeIndex in the TTFMtxEntries and fills in the - * cmaps ArrayList. */ protected void parseTable() throws IOException { - /** - * Read CMAP table and correct mtx_tab.index - */ - getReader().skipBytes(2); // Number of cmap subtables int num_cmap = getReader().readUnsignedShort(); @@ -121,10 +116,11 @@ // Parse the table entries and build a CMap4 from them. String encodingName = "internal-" + this.ttfFont.getPostscriptName(); - this.unicodeCMap = new CMap04(encodingName, segCountX2 / 2); + CMap04 cmap04 = new CMap04(encodingName, segCountX2 / 2); + this.unicodeCMap = cmap04; for (int i = 0; i < startCount.length; i++) { if (rangeOffset[i] == 0) { - this.unicodeCMap.addEntry(startCount[i], + cmap04.addEntry(startCount[i], endCount[i], (char) (startCount[i] + deltas[i])); } else { @@ -142,7 +138,7 @@ + deltas[i]) & 0xffff); computedIndexes[j - startCount[i]] = glyphIndex; } - this.unicodeCMap.addEntry(startCount[i], + cmap04.addEntry(startCount[i], endCount[i], computedIndexes); } getLogger().debug(i + ": " + startCount[i] + " - " @@ -154,7 +150,7 @@ return "cmap"; } - public CMap04 getUnicodeCMap() { + public CMap getUnicodeCMap() { return this.unicodeCMap; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-04 12:54:23
|
Revision: 6873 Author: victormote Date: 2006-03-04 04:54:11 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6873&view=rev Log Message: ----------- Add and use methods to let the cmap table handle the encoding and decoding. This way the choice about which cmap subtable(s) to use is centralized. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java 2006-03-04 12:37:53 UTC (rev 6872) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java 2006-03-04 12:54:11 UTC (rev 6873) @@ -209,8 +209,7 @@ int capHeightToUse = 0; if (pcltTable == null) { // Approximate capHeight from height of "H". - int metricIndex = this.cmapTable.getUnicodeCMap() - .encodeCharacter('H'); + int metricIndex = this.cmapTable.encodeCharacter('H'); if (metricIndex != Character.MAX_VALUE) { capHeightToUse = hmtxTable.metrics[metricIndex].getHeight(); } Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-03-04 12:37:53 UTC (rev 6872) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-03-04 12:54:11 UTC (rev 6873) @@ -158,4 +158,12 @@ return this.unicodeCMap; } + public int encodeCharacter(int codePoint) { + return this.unicodeCMap.encodeCharacter(codePoint); + } + + public int decodeCharacter(int glyphIndex) { + return this.unicodeCMap.decodeCharacter(glyphIndex); + } + } Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java 2006-03-04 12:37:53 UTC (rev 6872) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java 2006-03-04 12:54:11 UTC (rev 6873) @@ -24,8 +24,6 @@ package org.foray.font.format; -import org.foray.ps.encode.CMap04; - import java.io.IOException; /** @@ -80,19 +78,16 @@ getReader().skipBytes(2); // Search range getReader().skipBytes(2); // Entry selector getReader().skipBytes(2); // Range shift - CMap04 cmap = null; - if (this.ttfFont.cmapTable != null) { - cmap = this.ttfFont.cmapTable.getUnicodeCMap(); - } - if (cmap == null) { + TTFTableCMAP cmapTable = null; + if (cmapTable == null) { return; } for (int i = 0; i < numPairs; i++) { char glyph1 = (char) getReader().readUnsignedShort(); char glyph2 = (char) getReader().readUnsignedShort(); short kernAmount = getReader().readShort(); - kerningTab.addKerningEntry(cmap.decodeCharacter(glyph1), - cmap.decodeCharacter(glyph2), kernAmount); + kerningTab.addKerningEntry(cmapTable.decodeCharacter(glyph1), + cmapTable.decodeCharacter(glyph2), kernAmount); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-04 12:38:13
|
Revision: 6872 Author: victormote Date: 2006-03-04 04:37:53 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6872&view=rev Log Message: ----------- 1. Create new classes to handle TrueType CMap Format 12 tables (32-bit entries). 2. Create abstract superclass for all CMap classes. Modified Paths: -------------- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java Added Paths: ----------- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12Entry.java Added: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap.java =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap.java (rev 0) +++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap.java 2006-03-04 12:37:53 UTC (rev 6872) @@ -0,0 +1,36 @@ +/* + * Copyright 2006 The FOray Project. + * http://www.foray.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* $Id$ */ + +package org.foray.ps.encode; + +/** + * Abstract superclass for all CMap Tables. + */ +public abstract class CMap extends Encoding { + + public CMap(String name) { + super(name); + } + +} Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04.java =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04.java 2006-03-04 12:06:03 UTC (rev 6871) +++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04.java 2006-03-04 12:37:53 UTC (rev 6872) @@ -25,11 +25,11 @@ package org.foray.ps.encode; /** - * Class containing a set of Unicode ranges that sequentially map to the + * Class containing a set of 16-bit Unicode ranges that sequentially map to the * same-sized range of glyph indexes. The contents are analogous to a Format 4 * TrueType Font cmap table (from which this class derives its name). */ -public class CMap04 extends Encoding { +public class CMap04 extends CMap { private CMap04Entry[] entries; Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java 2006-03-04 12:06:03 UTC (rev 6871) +++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java 2006-03-04 12:37:53 UTC (rev 6872) @@ -25,7 +25,8 @@ package org.foray.ps.encode; /** - * Contains one entry from a CMap table. + * Contains one entry from a TrueType CMap subtable, format 4, which handles + * 16-bit Unicode codepoint ranges. */ public class CMap04Entry { public char unicodeStart; Added: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java (rev 0) +++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12.java 2006-03-04 12:37:53 UTC (rev 6872) @@ -0,0 +1,110 @@ +/* + * Copyright 2006 The FOray Project. + * http://www.foray.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* $Id$ */ + +package org.foray.ps.encode; + +/** + * Class containing a set of 32-bit Unicode ranges that sequentially map to the + * same-sized range of glyph indexes. The contents are analogous to a Format 12 + * TrueType Font cmap table (from which this class derives its name). + */ +public class CMap12 extends CMap { + + private CMap12Entry[] entries; + + private int lastEntryAdded = -1; + + public CMap12 (String name, int expectedEntries) { + super(name); + this.entries = new CMap12Entry[expectedEntries]; + } + + public void addEntry(CMap12Entry entry) { + lastEntryAdded++; + if (lastEntryAdded >= entries.length) { + // Fails silently. + return; + } + this.entries[lastEntryAdded] = entry; + } + + public void addEntry(char unicodeStart, char unicodeEnd, + char glyphStartIndex) { + CMap12Entry newEntry = new CMap12Entry(unicodeStart, unicodeEnd, + glyphStartIndex); + addEntry(newEntry); + } + + public int encodeCharacter(int codePoint) { + CMap12Entry entry = entryForChar((char) codePoint); + if (entry == null) { + return 0; + } + return entry.encodeCharacter(codePoint); + } + + private CMap12Entry entryForChar(int codePoint) { + for (int i = 0; i < entries.length; i++) { + if (entries[i].containsChar(codePoint)) { + return entries[i]; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + public int decodeCharacter(int glyphIndexInput) { + for (int i = 0; i < entries.length; i++) { + int codePoint = entries[i].decodeCharacter(glyphIndexInput); + if (codePoint != Character.MAX_VALUE) { + return codePoint; + } + } + return Character.MAX_VALUE; + } + + /** + * {@inheritDoc} + */ + public String asPostScript(org.axsl.ps.Encoding baseEncoding) { + return null; + } + + /** + * {@inheritDoc} + */ + public int getFirstIndex() { + return INVALID_UNICODE_CHAR; + } + + /** + * {@inheritDoc} + */ + public int getLastIndex() { + return INVALID_UNICODE_CHAR; + } + +} Added: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12Entry.java =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12Entry.java (rev 0) +++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12Entry.java 2006-03-04 12:37:53 UTC (rev 6872) @@ -0,0 +1,77 @@ +/* + * Copyright 2006 The FOray Project. + * http://www.foray.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* $Id: CMap04Entry.java 6871 2006-03-04 12:06:03Z victormote $ */ + +package org.foray.ps.encode; + +/** + * Contains one entry from a TrueType CMap subtable, Format 12, which handles + * 32-bit Unicode codepoint ranges. + */ +public class CMap12Entry { + public int unicodeStart; + public int unicodeEnd; + public int glyphStartIndex; + + public CMap12Entry(int unicodeStart, int unicodeEnd, int glyphStartIndex) { + this.unicodeStart = unicodeStart; + this.unicodeEnd = unicodeEnd; + this.glyphStartIndex = glyphStartIndex; + } + + /** + * Compute the glyphEndIndex that is implied from the raw data. + * @return The last glyphIndex that is addressed by this entry, i.e. the + * glyph index that corresponds to unicodeEnd. + */ + public int getGlyphEndIndex() { + return glyphStartIndex + unicodeEnd - unicodeStart; + } + + public boolean containsChar(int codePoint) { + if (codePoint < this.unicodeStart) { + return false; + } + if (codePoint > this.unicodeEnd) { + return false; + } + return true; + } + + public int encodeCharacter(int codePoint) { + if (! containsChar(codePoint)) { + return 0; + } + return codePoint - this.unicodeStart + this.glyphStartIndex; + } + + public int decodeCharacter(int glyphIndex) { + int codePoint = glyphIndex - this.glyphStartIndex + this.unicodeStart; + if (glyphIndex >= this.glyphStartIndex + && codePoint <= this.unicodeStart) { + return codePoint; + } + return Character.MAX_VALUE; + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-04 12:06:22
|
Revision: 6871 Author: victormote Date: 2006-03-04 04:06:03 -0800 (Sat, 04 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6871&view=rev Log Message: ----------- Rename two classes to make room for other varieties. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java Added Paths: ----------- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java Removed Paths: ------------- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap4.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMapEntry.java Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java 2006-03-03 21:14:31 UTC (rev 6870) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java 2006-03-04 12:06:03 UTC (rev 6871) @@ -24,7 +24,7 @@ package org.foray.font.format; -import org.foray.ps.encode.CMap4; +import org.foray.ps.encode.CMap04; import org.apache.commons.logging.Log; @@ -328,7 +328,7 @@ /** * Return a ArrayList with TTFCmapEntry */ - public CMap4 getCMaps() { + public CMap04 getCMaps() { return cmapTable.getUnicodeCMap(); // Create cmaps for bfentries } Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-03-03 21:14:31 UTC (rev 6870) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-03-04 12:06:03 UTC (rev 6871) @@ -24,7 +24,7 @@ package org.foray.font.format; -import org.foray.ps.encode.CMap4; +import org.foray.ps.encode.CMap04; import java.io.IOException; @@ -32,7 +32,7 @@ * Class representing a TTF "cmap" (character-to-glyph index mapping) table. */ class TTFTableCMAP extends TTFTable { - private CMap4 unicodeCMap; + private CMap04 unicodeCMap; TTFTableCMAP (TTFFont ttfFile) throws IOException { super(ttfFile); @@ -121,7 +121,7 @@ // Parse the table entries and build a CMap4 from them. String encodingName = "internal-" + this.ttfFont.getPostscriptName(); - this.unicodeCMap = new CMap4(encodingName, segCountX2 / 2); + this.unicodeCMap = new CMap04(encodingName, segCountX2 / 2); for (int i = 0; i < startCount.length; i++) { if (rangeOffset[i] == 0) { this.unicodeCMap.addEntry(startCount[i], @@ -154,7 +154,7 @@ return "cmap"; } - public CMap4 getUnicodeCMap() { + public CMap04 getUnicodeCMap() { return this.unicodeCMap; } Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java 2006-03-03 21:14:31 UTC (rev 6870) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java 2006-03-04 12:06:03 UTC (rev 6871) @@ -24,7 +24,7 @@ package org.foray.font.format; -import org.foray.ps.encode.CMap4; +import org.foray.ps.encode.CMap04; import java.io.IOException; @@ -80,7 +80,7 @@ getReader().skipBytes(2); // Search range getReader().skipBytes(2); // Entry selector getReader().skipBytes(2); // Range shift - CMap4 cmap = null; + CMap04 cmap = null; if (this.ttfFont.cmapTable != null) { cmap = this.ttfFont.cmapTable.getUnicodeCMap(); } Copied: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04.java (from rev 6864, trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap4.java) =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04.java (rev 0) +++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04.java 2006-03-04 12:06:03 UTC (rev 6871) @@ -0,0 +1,117 @@ +/* + * Copyright 2004 The FOray Project. + * http://www.foray.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* $Id$ */ + +package org.foray.ps.encode; + +/** + * Class containing a set of Unicode ranges that sequentially map to the + * same-sized range of glyph indexes. The contents are analogous to a Format 4 + * TrueType Font cmap table (from which this class derives its name). + */ +public class CMap04 extends Encoding { + + private CMap04Entry[] entries; + + private int lastEntryAdded = -1; + + public CMap04 (String name, int expectedEntries) { + super(name); + this.entries = new CMap04Entry[expectedEntries]; + } + + public void addEntry(CMap04Entry entry) { + lastEntryAdded++; + if (lastEntryAdded >= entries.length) { + // Fails silently. + return; + } + this.entries[lastEntryAdded] = entry; + } + + public void addEntry(char unicodeStart, char unicodeEnd, + char glyphStartIndex) { + CMap04Entry newEntry = new CMap04Entry(unicodeStart, unicodeEnd, + glyphStartIndex); + addEntry(newEntry); + } + + public void addEntry(char unicodeStart, char unicodeEnd, + char[] glyphIndexes) { + CMap04Entry newEntry = new CMap04Entry(unicodeStart, unicodeEnd, + glyphIndexes); + addEntry(newEntry); + } + + public int encodeCharacter(int c) { + CMap04Entry entry = entryForChar((char) c); + if (entry == null) { + return 0; + } + return entry.encodeCharacter((char) c); + } + + private CMap04Entry entryForChar(char c) { + for (int i = 0; i < entries.length; i++) { + if (entries[i].containsChar(c)) { + return entries[i]; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + public int decodeCharacter(int glyphIndexInput) { + for (int i = 0; i < entries.length; i++) { + char codePoint = entries[i].decodeCharacter(glyphIndexInput); + if (codePoint != Character.MAX_VALUE) { + return codePoint; + } + } + return Character.MAX_VALUE; + } + + /** + * {@inheritDoc} + */ + public String asPostScript(org.axsl.ps.Encoding baseEncoding) { + return null; + } + + /** + * {@inheritDoc} + */ + public int getFirstIndex() { + return INVALID_UNICODE_CHAR; + } + + /** + * {@inheritDoc} + */ + public int getLastIndex() { + return INVALID_UNICODE_CHAR; + } + +} Copied: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java (from rev 6864, trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMapEntry.java) =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java (rev 0) +++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java 2006-03-04 12:06:03 UTC (rev 6871) @@ -0,0 +1,93 @@ +/* + * Copyright 2004 The FOray Project. + * http://www.foray.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* $Id$ */ + +package org.foray.ps.encode; + +/** + * Contains one entry from a CMap table. + */ +public class CMap04Entry { + public char unicodeStart; + public char unicodeEnd; + public char glyphStartIndex; + + /* For contiguous entries, this will be null. For non-contiguous entries, + * this array contains the glyph Indexes for the range of Unicode + * characters. */ + public char[] glyphIndexes; + + public CMap04Entry(char unicodeStart, char unicodeEnd, char glyphStartIndex) { + this.unicodeStart = unicodeStart; + this.unicodeEnd = unicodeEnd; + this.glyphStartIndex = glyphStartIndex; + } + + public CMap04Entry(char unicodeStart, char unicodeEnd, char[] glyphIndexes) { + this.unicodeStart = unicodeStart; + this.unicodeEnd = unicodeEnd; + this.glyphIndexes = glyphIndexes; + } + + /** + * Compute the glyphEndIndex that is implied from the raw data. + * @return The last glyphIndex that is addressed by this entry, i.e. the + * glyph index that corresponds to unicodeEnd. + */ + public char getGlyphEndIndex() { + return (char) (glyphStartIndex + unicodeEnd - unicodeStart); + } + + public boolean containsChar(char c) { + return (c >= this.unicodeStart && c <= this.unicodeEnd); + } + + public char encodeCharacter(char c) { + if (! containsChar(c)) { + return 0; + } + if (this.glyphIndexes == null) { + return (char) (c - this.unicodeStart + this.glyphStartIndex); + } + return this.glyphIndexes[c - this.unicodeStart]; + } + + public char decodeCharacter(int glyphIndex) { + if (this.glyphIndexes == null) { + char codePoint = (char) (glyphIndex - this.glyphStartIndex + + this.unicodeStart); + if (glyphIndex >= this.glyphStartIndex + && codePoint <= this.unicodeStart) { + return codePoint; + } + return Character.MAX_VALUE; + } + for (int i = 0; i < this.glyphIndexes.length; i++) { + if (this.glyphIndexes[i] == glyphIndex) { + return (char) (this.unicodeStart + i); + } + } + return Character.MAX_VALUE; + } + +} Deleted: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap4.java =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap4.java 2006-03-03 21:14:31 UTC (rev 6870) +++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap4.java 2006-03-04 12:06:03 UTC (rev 6871) @@ -1,117 +0,0 @@ -/* - * Copyright 2004 The FOray Project. - * http://www.foray.org - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * This work is in part derived from the following work(s), used with the - * permission of the licensor: - * Apache FOP, licensed by the Apache Software Foundation - * - */ - -/* $Id$ */ - -package org.foray.ps.encode; - -/** - * Class containing a set of Unicode ranges that sequentially map to the - * same-sized range of glyph indexes. The contents are analogous to a Format 4 - * TrueType Font cmap table (from which this class derives its name). - */ -public class CMap4 extends Encoding { - - private CMapEntry[] entries; - - private int lastEntryAdded = -1; - - public CMap4 (String name, int expectedEntries) { - super(name); - this.entries = new CMapEntry[expectedEntries]; - } - - public void addEntry(CMapEntry entry) { - lastEntryAdded++; - if (lastEntryAdded >= entries.length) { - // Fails silently. - return; - } - this.entries[lastEntryAdded] = entry; - } - - public void addEntry(char unicodeStart, char unicodeEnd, - char glyphStartIndex) { - CMapEntry newEntry = new CMapEntry(unicodeStart, unicodeEnd, - glyphStartIndex); - addEntry(newEntry); - } - - public void addEntry(char unicodeStart, char unicodeEnd, - char[] glyphIndexes) { - CMapEntry newEntry = new CMapEntry(unicodeStart, unicodeEnd, - glyphIndexes); - addEntry(newEntry); - } - - public int encodeCharacter(int c) { - CMapEntry entry = entryForChar((char) c); - if (entry == null) { - return 0; - } - return entry.encodeCharacter((char) c); - } - - private CMapEntry entryForChar(char c) { - for (int i = 0; i < entries.length; i++) { - if (entries[i].containsChar(c)) { - return entries[i]; - } - } - return null; - } - - /** - * {@inheritDoc} - */ - public int decodeCharacter(int glyphIndexInput) { - for (int i = 0; i < entries.length; i++) { - char codePoint = entries[i].decodeCharacter(glyphIndexInput); - if (codePoint != Character.MAX_VALUE) { - return codePoint; - } - } - return Character.MAX_VALUE; - } - - /** - * {@inheritDoc} - */ - public String asPostScript(org.axsl.ps.Encoding baseEncoding) { - return null; - } - - /** - * {@inheritDoc} - */ - public int getFirstIndex() { - return INVALID_UNICODE_CHAR; - } - - /** - * {@inheritDoc} - */ - public int getLastIndex() { - return INVALID_UNICODE_CHAR; - } - -} Deleted: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMapEntry.java =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMapEntry.java 2006-03-03 21:14:31 UTC (rev 6870) +++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMapEntry.java 2006-03-04 12:06:03 UTC (rev 6871) @@ -1,93 +0,0 @@ -/* - * Copyright 2004 The FOray Project. - * http://www.foray.org - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * This work is in part derived from the following work(s), used with the - * permission of the licensor: - * Apache FOP, licensed by the Apache Software Foundation - * - */ - -/* $Id$ */ - -package org.foray.ps.encode; - -/** - * Contains one entry from a CMap table. - */ -public class CMapEntry { - public char unicodeStart; - public char unicodeEnd; - public char glyphStartIndex; - - /* For contiguous entries, this will be null. For non-contiguous entries, - * this array contains the glyph Indexes for the range of Unicode - * characters. */ - public char[] glyphIndexes; - - public CMapEntry(char unicodeStart, char unicodeEnd, char glyphStartIndex) { - this.unicodeStart = unicodeStart; - this.unicodeEnd = unicodeEnd; - this.glyphStartIndex = glyphStartIndex; - } - - public CMapEntry(char unicodeStart, char unicodeEnd, char[] glyphIndexes) { - this.unicodeStart = unicodeStart; - this.unicodeEnd = unicodeEnd; - this.glyphIndexes = glyphIndexes; - } - - /** - * Compute the glyphEndIndex that is implied from the raw data. - * @return The last glyphIndex that is addressed by this entry, i.e. the - * glyph index that corresponds to unicodeEnd. - */ - public char getGlyphEndIndex() { - return (char) (glyphStartIndex + unicodeEnd - unicodeStart); - } - - public boolean containsChar(char c) { - return (c >= this.unicodeStart && c <= this.unicodeEnd); - } - - public char encodeCharacter(char c) { - if (! containsChar(c)) { - return 0; - } - if (this.glyphIndexes == null) { - return (char) (c - this.unicodeStart + this.glyphStartIndex); - } - return this.glyphIndexes[c - this.unicodeStart]; - } - - public char decodeCharacter(int glyphIndex) { - if (this.glyphIndexes == null) { - char codePoint = (char) (glyphIndex - this.glyphStartIndex - + this.unicodeStart); - if (glyphIndex >= this.glyphStartIndex - && codePoint <= this.unicodeStart) { - return codePoint; - } - return Character.MAX_VALUE; - } - for (int i = 0; i < this.glyphIndexes.length; i++) { - if (this.glyphIndexes[i] == glyphIndex) { - return (char) (this.unicodeStart + i); - } - } - return Character.MAX_VALUE; - } - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-03 21:14:38
|
Revision: 6870 Author: victormote Date: 2006-03-03 13:14:31 -0800 (Fri, 03 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6870&view=rev Log Message: ----------- Add test document for the Unicode Secondary Multilingual Plane. Added Paths: ----------- trunk/foray/resource/fo-examples/basic/fonts-smp.fo Added: trunk/foray/resource/fo-examples/basic/fonts-smp.fo =================================================================== --- trunk/foray/resource/fo-examples/basic/fonts-smp.fo (rev 0) +++ trunk/foray/resource/fo-examples/basic/fonts-smp.fo 2006-03-03 21:14:31 UTC (rev 6870) @@ -0,0 +1,82 @@ +<?xml version="1.0" ?> + +<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> + + <!-- defines the layout master --> + <fo:layout-master-set> + <fo:simple-page-master master-name="first" + page-height="29.7cm" + page-width="21cm" + margin-top="1cm" + margin-bottom="2cm" + margin-left="2.5cm" + margin-right="2.5cm"> + <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/> + <fo:region-before extent="3cm"/> + <fo:region-after extent="1.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> + + <!-- starts actual layout --> + <fo:page-sequence master-reference="first"> + + +<fo:flow flow-name="xsl-region-body"> + + <fo:block font-family="Helvetica" font-size="12pt">This document tests and +demonstrates the use of characters in the Unicode Secondary Multilingual Plane +(SMP), also called Plane One.</fo:block> + + <fo:block font-family="Helvetica" font-size="12pt">Assuming that the +font-family "ugaritic-test" has been configured, that it is a CID-encoded +TrueType font, and that it has properly-encoded glyphs for Ugaritic (U+10380 +thru U+1039F), the following paragraph should be set in that font, and the +Ugaritic alphabet should appear in it. +According to Alan Wood's Unicode Resources Ugaritic page at +http://www.alanwood.net/unicode/ugaritic.html, "Ugaritic was one of the +languages used in the ancient city state of Ugarit, in present-day Syria. The +script is cuneiform and alphabetic, and normally (but not always) written left +to right. It is one of the Semitic languages, and is closely related to +Phaenician." +The Code2001 font, available at http://home.att.net/~jameskass/code2001.htm, +contains glyphs for these characters. +The Unicode Code Chart for Ugaritic can be found at +http://www.unicode.org/charts/PDF/U10380.pdf</fo:block> + + <fo:block font-family="ugaritic-test" font-size="12pt"> +<!-- UGARITIC LETTER ALPA -->𐎀 +<!-- UGARITIC LETTER BETA -->𐎁 +<!-- UGARITIC LETTER GAMLA -->𐎂 +<!-- UGARITIC LETTER KHA -->𐎃 +<!-- UGARITIC LETTER DELTA -->𐎄 +<!-- UGARITIC LETTER HO -->𐎅 +<!-- UGARITIC LETTER WO -->𐎆 +<!-- UGARITIC LETTER ZETA -->𐎇 +<!-- UGARITIC LETTER HOTA -->𐎈 +<!-- UGARITIC LETTER TET -->𐎉 +<!-- UGARITIC LETTER YOD -->𐎊 +<!-- UGARITIC LETTER KAF -->𐎋 +<!-- UGARITIC LETTER SHIN -->𐎌 +<!-- UGARITIC LETTER LAMDA -->𐎍 +<!-- UGARITIC LETTER MEM -->𐎎 +<!-- UGARITIC LETTER DHAL -->𐎏 +<!-- UGARITIC LETTER NUN -->𐎐 +<!-- UGARITIC LETTER ZU -->𐎑 +<!-- UGARITIC LETTER SAMKA -->𐎒 +<!-- UGARITIC LETTER AIN -->𐎓 +<!-- UGARITIC LETTER PU -->𐎔 +<!-- UGARITIC LETTER SADE -->𐎕 +<!-- UGARITIC LETTER QOPA -->𐎖 +<!-- UGARITIC LETTER RASHA -->𐎗 +<!-- UGARITIC LETTER THANNA -->𐎘 +<!-- UGARITIC LETTER GHAIN -->𐎙 +<!-- UGARITIC LETTER TO -->𐎚 +<!-- UGARITIC LETTER I -->𐎛 +<!-- UGARITIC LETTER U -->𐎜 +<!-- UGARITIC LETTER SSU -->𐎝 +<!-- UGARITIC WORD DIVIDER -->𐎟 +</fo:block> + +</fo:flow> +</fo:page-sequence> +</fo:root> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-03 15:51:16
|
Revision: 6868 Author: victormote Date: 2006-03-03 07:20:02 -0800 (Fri, 03 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6868&view=rev Log Message: ----------- Remove some more cvs references. Modified Paths: -------------- trunk/foray/resource/fo-examples/basic/pdfoutline.fo trunk/foray/resource/fo-examples/basic/readme.fo Modified: trunk/foray/resource/fo-examples/basic/pdfoutline.fo =================================================================== --- trunk/foray/resource/fo-examples/basic/pdfoutline.fo 2006-03-03 14:03:13 UTC (rev 6867) +++ trunk/foray/resource/fo-examples/basic/pdfoutline.fo 2006-03-03 15:20:02 UTC (rev 6868) @@ -1,29 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -THIS IS NOT THE LATEST VERSION OF THE FOP DOCUMENTATION BUT ONLY AN EXAMPLE FILE +THIS IS NOT THE LATEST VERSION OF THE FOP DOCUMENTATION BUT ONLY AN EXAMPLE FILE This files shows next to the trivial usage of fo:block and fo:inline examples of - fo:basic-link external-destination - fo:basic-link internal-destination - fo:table - fo:list-block (including a bullet from the font Symbol as list-item-label) -- fo:page-number-citation (computes dynamically the page number in section 'content') +- fo:page-number-citation (computes dynamically the page number in section 'content') --> <!-- note the extensions namespace (foray) --> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:foray="http://org.foray/fo-extensions/2004"> + xmlns:foray="http://org.foray/fo-extensions/2004"> <fo:layout-master-set> <!-- layout for the first page --> <fo:simple-page-master master-name="first" - page-height="29.7cm" + page-height="29.7cm" page-width="21cm" - margin-top="1cm" - margin-bottom="2cm" - margin-left="2.5cm" + margin-top="1cm" + margin-bottom="2cm" + margin-left="2.5cm" margin-right="2.5cm"> <fo:region-body margin-top="3cm" margin-bottom="1.5cm"/> <fo:region-before extent="3cm"/> @@ -32,11 +32,11 @@ <!-- layout for the other pages --> <fo:simple-page-master master-name="rest" - page-height="29.7cm" + page-height="29.7cm" page-width="21cm" - margin-top="1cm" - margin-bottom="2cm" - margin-left="2.5cm" + margin-top="1cm" + margin-bottom="2cm" + margin-left="2.5cm" margin-right="2.5cm"> <fo:region-body margin-top="2.5cm" margin-bottom="1.5cm"/> <fo:region-before extent="2.5cm"/> @@ -147,7 +147,7 @@ <fo:table-body font-size="10pt" font-family="sans-serif"> <fo:table-row line-height="12pt"> <fo:table-cell> -<fo:block text-align="end">A) +<fo:block text-align="end">A) </fo:block> </fo:table-cell> <fo:table-cell> @@ -159,7 +159,7 @@ </fo:table-row> <fo:table-row line-height="12pt"> <fo:table-cell> -<fo:block text-align="end">B) +<fo:block text-align="end">B) </fo:block> </fo:table-cell> <fo:table-cell> @@ -171,7 +171,7 @@ </fo:table-row> <fo:table-row line-height="12pt"> <fo:table-cell> -<fo:block text-align="end">C) +<fo:block text-align="end">C) </fo:block> </fo:table-cell> <fo:table-cell> @@ -183,7 +183,7 @@ </fo:table-row> <fo:table-row line-height="12pt"> <fo:table-cell> -<fo:block text-align="end">D) +<fo:block text-align="end">D) </fo:block> </fo:table-cell> <fo:table-cell> @@ -195,7 +195,7 @@ </fo:table-row> <fo:table-row line-height="12pt"> <fo:table-cell> -<fo:block text-align="end">E) +<fo:block text-align="end">E) </fo:block> </fo:table-cell> <fo:table-cell> @@ -207,7 +207,7 @@ </fo:table-row> <fo:table-row line-height="12pt"> <fo:table-cell> -<fo:block text-align="end">F) +<fo:block text-align="end">F) </fo:block> </fo:table-cell> <fo:table-cell> @@ -219,7 +219,7 @@ </fo:table-row> <fo:table-row line-height="12pt"> <fo:table-cell> -<fo:block text-align="end">G) +<fo:block text-align="end">G) </fo:block> </fo:table-cell> <fo:table-cell> @@ -231,7 +231,7 @@ </fo:table-row> <fo:table-row line-height="12pt"> <fo:table-cell> -<fo:block text-align="end">H) +<fo:block text-align="end">H) </fo:block> </fo:table-cell> <fo:table-cell> @@ -243,7 +243,7 @@ </fo:table-row> <fo:table-row line-height="12pt"> <fo:table-cell> -<fo:block text-align="end">I) +<fo:block text-align="end">I) </fo:block> </fo:table-cell> <fo:table-cell> @@ -255,7 +255,7 @@ </fo:table-row> <fo:table-row line-height="12pt"> <fo:table-cell> -<fo:block text-align="end">J) +<fo:block text-align="end">J) </fo:block> </fo:table-cell> <fo:table-cell> @@ -267,7 +267,7 @@ </fo:table-row> <fo:table-row line-height="12pt"> <fo:table-cell> -<fo:block text-align="end">K) +<fo:block text-align="end">K) </fo:block> </fo:table-cell> <fo:table-cell> @@ -292,14 +292,14 @@ the case of XT) SAX events. </fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">FOP is part of Apache's XML project. The homepage of FOP is + <fo:block space-after.optimum="3pt" font-family="serif">FOP is part of Apache's XML project. The homepage of FOP is <fo:inline font-style="italic" font-family="serif"><fo:basic-link color="blue" external-destination="url(http://xml.apache.org/fop)">http://xml.apache.org/fop</fo:basic-link></fo:inline> </fo:block> - <fo:block id="sec2" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >B) + <fo:block id="sec2" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >B) Downloading FOP</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">The latest release version is <fo:inline font-style="italic" font-family="serif">FOP 0.14</fo:inline> <fo:inline font-family="serif"> @@ -309,12 +309,12 @@ <fo:block space-after.optimum="3pt" font-family="serif">Documentation can be downloaded here as <fo:inline font-style="italic" font-family="serif">HMTL file</fo:inline> <fo:inline font-family="serif"> () - </fo:inline> or + </fo:inline> or as <fo:inline font-style="italic" font-family="serif">PDF file</fo:inline> <fo:inline font-family="serif"> () </fo:inline>.</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">To run FOP from the command line, see Running FOP. If you are interested in + <fo:block space-after.optimum="3pt" font-family="serif">To run FOP from the command line, see Running FOP. If you are interested in embedding FOP in a Java application of your own, see Embedding FOP. </fo:block> <fo:block space-after.optimum="3pt" font-family="serif">You can also download the <fo:inline font-style="italic" font-family="serif">source code v. 0.14</fo:inline> @@ -324,40 +324,40 @@ - <fo:block id="sec3" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >C) + <fo:block id="sec3" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >C) Running FOP</fo:block> - + <fo:block id="sec3-1" font-size="16pt" font-family="serif" line-height="18pt" space-before.optimum="8pt" space-after.optimum="8pt" >1) Prerequisites</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">Following software must be installed:</fo:block> <fo:block id="sec3-1-1" space-after.optimum="3pt" font-family="serif">a) Java 1.1.x or later</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">For the fo-file viewer mode of FOP (see below) you must have the swing classes installed. - From Java 1.2 on (aka Java 2) they are part of the standard java distribution. + <fo:block space-after.optimum="3pt" font-family="serif">For the fo-file viewer mode of FOP (see below) you must have the swing classes installed. + From Java 1.2 on (aka Java 2) they are part of the standard java distribution. If you use Java 1.1.x you must seperately include the swing classes, which can be found at the <fo:inline font-style="italic" font-family="serif"> Sun website</fo:inline> <fo:inline font-family="serif"> (http://java.sun.com/products/jfc/#download-swing) - </fo:inline>. + </fo:inline>. </fo:block> - <fo:block id="sec3-1-2" space-after.optimum="3pt" font-family="serif">b) An XML parser which supports SAX and DOM like + <fo:block id="sec3-1-2" space-after.optimum="3pt" font-family="serif">b) An XML parser which supports SAX and DOM like <fo:inline font-style="italic" font-family="serif">Xerces-J</fo:inline> <fo:inline font-family="serif"> (http://xml.apache.org/xerces-j/index.html) </fo:inline>.</fo:block> - <fo:block id="sec3-1-3" space-after.optimum="3pt" font-family="serif">c) If you have to produce the flow objects files, which are the input for FOP, - you need a transformation utility to create this files from your xml files. - Normally this is an XSLT stylesheet processor like + <fo:block id="sec3-1-3" space-after.optimum="3pt" font-family="serif">c) If you have to produce the flow objects files, which are the input for FOP, + you need a transformation utility to create this files from your xml files. + Normally this is an XSLT stylesheet processor like <fo:inline font-style="italic" font-family="serif">XT</fo:inline> <fo:inline font-family="serif"> (http://www.jclark.com/xml/xt.html) - </fo:inline> + </fo:inline> or <fo:inline font-style="italic" font-family="serif">XALAN</fo:inline> <fo:inline font-family="serif"> (http://xml.apache.org/xalan/index.html) - </fo:inline>. + </fo:inline>. </fo:block> - - + + <fo:block id="sec3-2" font-size="16pt" font-family="serif" line-height="18pt" space-before.optimum="8pt" space-after.optimum="8pt" >2) Starting FOP as an standalone application</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">There are three ways to run FOP from the command line.</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">a) Batch processing formatting objects (fo) files: </fo:block> @@ -366,34 +366,34 @@ <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">java org.apache.fop.apps.CommandLine xml-file xsl-file pdf-file</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">c) Previewing the fo-file:</fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">java org.apache.fop.apps.AWTCommandLine fo-file</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">Each method uses next to the fop classes other packages. The following describes + <fo:block space-after.optimum="3pt" font-family="serif">Each method uses next to the fop classes other packages. The following describes each method in detail.</fo:block> - + <fo:block font-size="14pt" font-family="serif" line-height="16pt" space-before.optimum="8pt" space-after.optimum="4pt" >a) Method One</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">One is to first use an XSLT engine to produce the formatting object tree as an + <fo:block space-after.optimum="3pt" font-family="serif">One is to first use an XSLT engine to produce the formatting object tree as an XML document and then running the class org.apache.fop.apps.CommandLine with the - formatting object file name and PDF filename as arguments. You will need to include - FOP and your XML Parser in your classpath and so you might invoke + formatting object file name and PDF filename as arguments. You will need to include + FOP and your XML Parser in your classpath and so you might invoke </fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">java -cp fop_x_xx_x.jar;xerces.jar</fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">org.apache.fop.apps.CommandLine fo-file pdf-file</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">If your SAX Parser is other than Xerces, you will need to set the property - org.xml.sax.parser to the SAX Parser class to use. The following example shows - the command line, if you use XP, the XML parser from James Clark: + <fo:block space-after.optimum="3pt" font-family="serif">If your SAX Parser is other than Xerces, you will need to set the property + org.xml.sax.parser to the SAX Parser class to use. The following example shows + the command line, if you use XP, the XML parser from James Clark: </fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">java -Dorg.xml.sax.parser=com.jclark.xml.sax.Driver</fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">-cp fop_x_xx_x.jar;sax.jar;xt.jar;xp.jar;xerces.jar</fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">org.apache.fop.apps.AWTCommandLine formatting-tree-file pdf-file</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">(You have to include xerces.jar or another xml parser which supports DOM in your classpath.) </fo:block> - - + + <fo:block font-size="14pt" font-family="serif" line-height="16pt" space-before.optimum="8pt" space-after.optimum="4pt" >b) Method Two</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">Rather than performing transformation with an XSLT before invoking FOP, it is - possible, if you use XT as your XSLT engine, to just call FOP and have it call - XT for you. To do this, run the class org.apache.fop.apps.CommandLine with the - source XML file name, XSL file name and PDF file name as arguments. You will - need to include FOP, SAX, your SAX Parser and XT in your classpath and so you might - invoke + <fo:block space-after.optimum="3pt" font-family="serif">Rather than performing transformation with an XSLT before invoking FOP, it is + possible, if you use XT as your XSLT engine, to just call FOP and have it call + XT for you. To do this, run the class org.apache.fop.apps.CommandLine with the + source XML file name, XSL file name and PDF file name as arguments. You will + need to include FOP, SAX, your SAX Parser and XT in your classpath and so you might + invoke </fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">java -Dorg.xml.sax.parser=com.jclark.xml.sax.Driver</fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">-cp fop_x_xx_x.jar;xt.jar;xerces.jar</fo:block> @@ -401,26 +401,26 @@ <fo:block space-after.optimum="3pt" font-family="serif">Again, if your SAX Parser is other than Xerces, you will need to set the property org.xml.sax.parser to the SAX Parser class to use. </fo:block> - - + + <fo:block font-size="14pt" font-family="serif" line-height="16pt" space-before.optimum="8pt" space-after.optimum="4pt" >c) Method Three</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">If you already produced the FO file, you can preview the results of your - transformation without using any pdf viewer by invoking FOP with the viewer - application. You will need to include FOP and your XML Parser in your classpath + <fo:block space-after.optimum="3pt" font-family="serif">If you already produced the FO file, you can preview the results of your + transformation without using any pdf viewer by invoking FOP with the viewer + application. You will need to include FOP and your XML Parser in your classpath </fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">java -cp fop_x_xx_x.jar;xerces.jar</fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">org.apache.fop.apps.AWTCommandLine fo-file </fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">The viewer uses the swing classes.</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">Note: If you are using java 2 or later (i.e. jdk 1.2. or later) you can put all - needed jar files into the subdirectory jdk1.2.x\jre\lib\ext (windows example). Then - FOP can be started without classpath: + <fo:block space-after.optimum="3pt" font-family="serif">The viewer uses the swing classes.</fo:block> + <fo:block space-after.optimum="3pt" font-family="serif">Note: If you are using java 2 or later (i.e. jdk 1.2. or later) you can put all + needed jar files into the subdirectory jdk1.2.x\jre\lib\ext (windows example). Then + FOP can be started without classpath: </fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt">java org.apache.fop.apps.CommandLine fo-file pdf-file</fo:block> - - - - <fo:block font-size="16pt" font-family="serif" line-height="18pt" space-before.optimum="8pt" space-after.optimum="8pt" >3) Running FOP on MacOS</fo:block> - + + + + <fo:block font-size="16pt" font-family="serif" line-height="18pt" space-before.optimum="8pt" space-after.optimum="8pt" >3) Running FOP on MacOS</fo:block> + <fo:block space-after.optimum="3pt" font-family="serif">Ensure that you have a recent MRJ, and that you have downloaded and unpacked the XP and SAX distributions. The xp.jar and sax.jar files work as is on MacOS. @@ -436,25 +436,25 @@ </fo:block> <fo:block space-after.optimum="3pt" font-family="serif">Once both are added (the FOP jarfile will already be in the list), click Run. A "stdout" window will appear and display FOP runtime messages. - </fo:block> - - + </fo:block> + + <fo:block font-size="16pt" font-family="serif" line-height="18pt" space-before.optimum="8pt" space-after.optimum="8pt" >4) Problems</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">If you have problems running FOP, please have a look at the + <fo:block space-after.optimum="3pt" font-family="serif">If you have problems running FOP, please have a look at the <fo:inline font-style="italic" font-family="serif">FOP FAQ</fo:inline> <fo:inline font-family="serif"> (faq.html) </fo:inline>. If you don't find a solution there, - you can ask for help on the list fo...@xm.... Maybe it's bug and - maybe somebody is already working on it. + you can ask for help on the list fo...@xm.... Maybe it's bug and + maybe somebody is already working on it. </fo:block> - - <fo:block id="sec4" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >D) + + <fo:block id="sec4" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >D) Embedding FOP </fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">Instantiate org.apache.fop.apps.Driver. Once this class is + <fo:block space-after.optimum="3pt" font-family="serif">Instantiate org.apache.fop.apps.Driver. Once this class is instantiated, methods are called to set the Renderer to use, the (possibly multiple) ElementMapping(s) to use and the PrintWriter to use to output the results of the @@ -490,10 +490,10 @@ - <fo:block id="sec5" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >E) + <fo:block id="sec5" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >E) What's Implemented?</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">Also see STATUS for what is being worked on.</fo:block> - + <fo:block font-size="16pt" font-family="serif" line-height="18pt" space-before.optimum="8pt" space-after.optimum="8pt" >1) Formatting Objects</fo:block> <fo:list-block start-indent="1cm" provisional-distance-between-starts="12pt" font-family="serif"> <fo:list-item> @@ -721,9 +721,9 @@ </fo:list-item-body> </fo:list-item> </fo:list-block> - - + + <fo:block font-size="16pt" font-family="serif" line-height="18pt" space-before.optimum="8pt" space-after.optimum="8pt" >2) Properties</fo:block> <fo:list-block start-indent="1cm" provisional-distance-between-starts="12pt" font-family="serif"> <fo:list-item> @@ -1055,20 +1055,20 @@ </fo:list-item-body> </fo:list-item> </fo:list-block> - - - <fo:block id="sec6" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >F) + + + <fo:block id="sec6" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >F) Limitations</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">Although FOP implements the above listed fo objects and properties, sometimes it does so - only in a limited way. + <fo:block space-after.optimum="3pt" font-family="serif">Although FOP implements the above listed fo objects and properties, sometimes it does so + only in a limited way. </fo:block> - + <fo:block font-size="16pt" font-family="serif" line-height="18pt" space-before.optimum="8pt" space-after.optimum="8pt" >list-block</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">The fo working draft allows describes two ways to markup lists.The list-block must have as + <fo:block space-after.optimum="3pt" font-family="serif">The fo working draft allows describes two ways to markup lists.The list-block must have as children either: 1) pairs of fo:list-item-label and fo:list-item-body formatting objects, or 2) fo:list-item formatting objects.</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">At the moment FOP only implements the second way. Therefore a list has a basic structure like this:</fo:block> @@ -1078,21 +1078,21 @@ <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"><fo:list-item-body><fo:block></fo:block></fo:list-item-body></fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"></fo:list-item></fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"></fo:list-block></fo:block> - - + + <fo:block font-size="16pt" font-family="serif" line-height="18pt" space-before.optimum="8pt" space-after.optimum="8pt" >Padding</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">Padding works in conjunction with indents and spaces. It is only implemented + <fo:block space-after.optimum="3pt" font-family="serif">Padding works in conjunction with indents and spaces. It is only implemented for blocks. At the moment padding can't be used to make extra space (indents+spaces must be used), but only to control how much the background-color extends beyond the content rectangle. - </fo:block> - - + </fo:block> + + <fo:block font-size="16pt" font-family="serif" line-height="18pt" space-before.optimum="8pt" space-after.optimum="8pt" >Tables</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">There two limitations for tables: 1) FOP needs you to explicitly specify column widths + <fo:block space-after.optimum="3pt" font-family="serif">There two limitations for tables: 1) FOP needs you to explicitly specify column widths 2) Cells have to contain block-level FOs. They can't contain straight character data. </fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">A working basic example of a table looks like this: </fo:block> + <fo:block space-after.optimum="3pt" font-family="serif">A working basic example of a table looks like this: </fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"><fo:table></fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-column column-width="150pt"/></fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> <fo:table-column column-width="150pt"/></fo:block> @@ -1123,10 +1123,7 @@ <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-row></fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"> </fo:table-body></fo:block> <fo:block font-size="10pt" font-family="monospace" line-height="12pt" space-before.optimum="0pt" space-after.optimum="0pt"></fo:table></fo:block> - - - @@ -1134,7 +1131,10 @@ - <fo:block id="sec7" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >G) + + + + <fo:block id="sec7" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >G) Bugs</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">see STATUS file</fo:block> @@ -1143,30 +1143,30 @@ - <fo:block id="sec8" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >H) + <fo:block id="sec8" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >H) Compiling FOP</fo:block> - + <fo:block font-size="16pt" font-family="serif" line-height="18pt" space-before.optimum="8pt" space-after.optimum="8pt" >1. Prerequisites</fo:block> - + <fo:block font-size="14pt" font-family="serif" line-height="16pt" space-before.optimum="8pt" space-after.optimum="4pt" >a) Java 1.1.x or later</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">If you use Java 1.1.x you must also seperately include the swing classes, which can be found at the <fo:inline font-style="italic" font-family="serif"> Sun website</fo:inline> <fo:inline font-family="serif"> (http://java.sun.com/products/jfc/#download-swing) - </fo:inline>. From Java 1.2 on (aka Java 2) they are part of the standard - distribution. + </fo:inline>. From Java 1.2 on (aka Java 2) they are part of the standard + distribution. </fo:block> - - + + <fo:block font-size="14pt" font-family="serif" line-height="16pt" space-before.optimum="8pt" space-after.optimum="4pt" >b) An XML parser</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">An XML parser which supports DOM like + <fo:block space-after.optimum="3pt" font-family="serif">An XML parser which supports DOM like <fo:inline font-style="italic" font-family="serif">Xerces-J</fo:inline> <fo:inline font-family="serif"> (http://xml.apache.org/xerces-j/index.html) </fo:inline>.</fo:block> - - + + <fo:block font-size="14pt" font-family="serif" line-height="16pt" space-before.optimum="8pt" space-after.optimum="4pt" >c) XT from James Clark</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">Some of the Java source code in FOP is generated from XML using XSLT. XT must be used to generate this code.</fo:block> @@ -1182,27 +1182,27 @@ generic jar file, otherwise make won't work) </fo:block> <fo:block space-after.optimum="3pt" font-family="serif">XT relies on an sax parser like XP (also J. Clark), which can be - downloaded at <fo:inline font-style="italic" font-family="serif">James + downloaded at <fo:inline font-style="italic" font-family="serif">James Clark's Website</fo:inline> <fo:inline font-family="serif"> (http://www.jclark.com/xml/xp/index.html) </fo:inline> </fo:block> - - + + <fo:block font-size="14pt" font-family="serif" line-height="16pt" space-before.optimum="8pt" space-after.optimum="4pt" >d) make</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">Under windows it has been reported that the use of the cygnus solutions port - of the GNU utilities works. You can find it at + <fo:block space-after.optimum="3pt" font-family="serif">Under windows it has been reported that the use of the cygnus solutions port + of the GNU utilities works. You can find it at <fo:inline font-style="italic" font-family="serif">Cygnus Solutions</fo:inline> <fo:inline font-family="serif"> (http://sourceware.cygnus.com/cygwin/) </fo:inline> </fo:block> - - - + + + <fo:block font-size="16pt" font-family="serif" line-height="18pt" space-before.optimum="8pt" space-after.optimum="8pt" >Compiling FOP on MacOS</fo:block> - + <fo:block space-after.optimum="3pt" font-family="serif">We strongly recommend the use of Codewarrior Java. This Readme will contain a link to more information in the near future. </fo:block> @@ -1213,19 +1213,20 @@ - <fo:block id="sec9" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >I) + <fo:block id="sec9" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >I) Getting involved</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">1. Subscribe to fo...@xm... by sending an email + <fo:block space-after.optimum="3pt" font-family="serif">1. Subscribe to fo...@xm... by sending an email to fop...@xm...</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">2. Read the archives to fop-dev to get an idea of the issues being + <fo:block space-after.optimum="3pt" font-family="serif">2. Read the archives to fop-dev to get an idea of the issues being discussed. </fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">3. Subscribe to fo...@xm... by sending an email to - fop...@xm... (it is important - that you follow changes being made). </fo:block> + <fo:block space-after.optimum="3pt" font-family="serif">3. Subscribe to the +FOray commit mailing list, so that you know what changes are being +made.</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">4. Try :-) to wrap your head around the XSL working draft. </fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">5. Get CVS working on your system. </fo:block> + <fo:block space-after.optimum="3pt" font-family="serif">5. Get Subversion +working on your system. </fo:block> <fo:block space-after.optimum="3pt" font-family="serif">6. Ask, on fop-dev, any questions you have at all about the code, design, etc. </fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">7. When you feel comfortable modifying the code, send diffs to + <fo:block space-after.optimum="3pt" font-family="serif">7. When you feel comfortable modifying the code, send diffs to fop-dev with your contributions. </fo:block> <fo:block space-after.optimum="3pt" font-family="serif">8. Have fun!</fo:block> @@ -1234,7 +1235,7 @@ - <fo:block id="sec10" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >J) + <fo:block id="sec10" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >J) FOP Relevant Specifications</fo:block> <fo:list-block start-indent="1cm" provisional-distance-between-starts="12pt" font-family="serif"> <fo:list-item> @@ -1246,7 +1247,7 @@ <fo:inline font-style="italic" font-family="serif">XML Recommendation</fo:inline> <fo:inline font-family="serif" > (<fo:basic-link color="blue" external-destination="url(http://www.w3.org/TR/REC-xml)">http://www.w3.org/TR/REC-xml</fo:basic-link>) - </fo:inline> + </fo:inline> </fo:block> </fo:list-item-body> </fo:list-item> @@ -1348,13 +1349,13 @@ - <fo:block id="sec11" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >K) + <fo:block id="sec11" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >K) Licence</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">==================================================================</fo:block> <fo:block space-after.optimum="3pt" font-family="serif" text-align="center">The Apache Software License, Version 1.1</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">==================================================================</fo:block> <fo:block space-after.optimum="3pt" font-family="serif"> Copyright (C) 1999 The Apache Software Foundation. All rights reserved.</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif"> Redistribution and use in source and binary forms, with or without modification, + <fo:block space-after.optimum="3pt" font-family="serif"> Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. @@ -1381,23 +1382,23 @@ <fo:block space-after.optimum="3pt" font-family="serif">5. Products derived from this software may not be called "Apache", nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation. - </fo:block> + </fo:block> <fo:block space-after.optimum="3pt" font-family="serif">THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </fo:block> - + <fo:block space-after.optimum="3pt" font-family="serif"> This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation and was originally created by - James Tauber <jt...@jt...>. For more information on the Apache + James Tauber <jt...@jt...>. For more information on the Apache Software Foundation, please see <fo:inline font-style="italic" font-family="serif">http://www.apache.org/</fo:inline> <fo:inline font-family="serif"> (http://www.apache.org/) Modified: trunk/foray/resource/fo-examples/basic/readme.fo =================================================================== --- trunk/foray/resource/fo-examples/basic/readme.fo 2006-03-03 14:03:13 UTC (rev 6867) +++ trunk/foray/resource/fo-examples/basic/readme.fo 2006-03-03 15:20:02 UTC (rev 6868) @@ -1007,10 +1007,8 @@ the FOray dev mailing list.</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">2. Read the archives to fop-dev to get an idea of the issues being discussed.</fo:block> - <fo:block space-after.optimum="3pt" font-family="serif">3. Subscribe to -fo...@xm... by sending an email to - fop...@xm... (it is important - that you follow changes being made). </fo:block> + <fo:block space-after.optimum="3pt" font-family="serif">3. Subscribe to the +FOray commit mailing list, so that you can track changes being made.</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">4. Try :-) to wrap your head around the XSL working draft.</fo:block> <fo:block space-after.optimum="3pt" font-family="serif">5. Get a Subversion This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-03 15:51:12
|
Revision: 6869 Author: victormote Date: 2006-03-03 07:50:38 -0800 (Fri, 03 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6869&view=rev Log Message: ----------- Make all batch and script files executable. Property Changed: ---------------- trunk/foray/foray-app/scripts/build.sh trunk/foray/foray-areatree/scripts/build.sh trunk/foray/foray-common/scripts/build.sh trunk/foray/foray-font/scripts/build.sh trunk/foray/foray-fotree/scripts/build.sh trunk/foray/foray-graphic/scripts/build.sh trunk/foray/foray-mif/scripts/build.sh trunk/foray/foray-output/scripts/build.sh trunk/foray/foray-pdf/scripts/build.sh trunk/foray/foray-pioneer/scripts/build.sh trunk/foray/foray-ps/scripts/build.sh trunk/foray/foray-ps/scripts/glyphListToJava.sh trunk/foray/foray-render/scripts/build.sh trunk/foray/foray-text/scripts/build.sh trunk/foray/scripts/build.sh trunk/foray/scripts/foray.sh trunk/foray/scripts/xalan.sh Property changes on: trunk/foray/foray-app/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/foray-areatree/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/foray-common/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/foray-font/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/foray-fotree/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/foray-graphic/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/foray-mif/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/foray-output/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/foray-pdf/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/foray-pioneer/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/foray-ps/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/foray-ps/scripts/glyphListToJava.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/foray-render/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/foray-text/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/scripts/build.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/scripts/foray.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/foray/scripts/xalan.sh ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-03-03 14:03:20
|
Revision: 6867 Author: victormote Date: 2006-03-03 06:03:13 -0800 (Fri, 03 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6867&view=rev Log Message: ----------- Fix error in URL. Modified Paths: -------------- trunk/foray/doc/web/dev/index.html Modified: trunk/foray/doc/web/dev/index.html =================================================================== --- trunk/foray/doc/web/dev/index.html 2006-03-02 23:56:04 UTC (rev 6866) +++ trunk/foray/doc/web/dev/index.html 2006-03-03 14:03:13 UTC (rev 6867) @@ -53,7 +53,7 @@ rel="external">FOray-commit mailing list</a>, which emails the log of each repository commit. Read-only access to this list is available through its -<a href="http://sourceforge.net/mailarchive/forum.php?forum=foray-developer" +<a href="http://sourceforge.net/mailarchive/forum.php?forum=foray-commit" rel="external">public archive</a>.</p> <h2><a name="wiki">Wiki</a></h2> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
10 messages has been excluded from this view by a project administrator.
