[FOray-commit] SF.net SVN: foray: [7686] trunk/foray/foray-font/src/java/org/foray/font
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [7686] trunk/foray/foray-font/src/java/org/foray/font
|
From: <vic...@us...> - 2006-06-17 21:19:28
|
Revision: 7686 Author: victormote Date: 2006-06-17 14:18:47 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7686&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java trunk/foray/foray-font/src/java/org/foray/font/FontConfig.java trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java trunk/foray/foray-font/src/java/org/foray/font/charset/CharSet.java trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetExtendedRoman.java trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetParser.java trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java trunk/foray/foray-font/src/java/org/foray/font/format/FontFileReader.java trunk/foray/foray-font/src/java/org/foray/font/format/Kerning.java trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileReader.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFFile.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFFileSingle.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFMtxEntry.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFReader.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTable.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCFF.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirEntry.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirectory.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableGLYF.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHEAD.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHHEA.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHMTX.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableLOCA.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableMAXP.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableNAME.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableOS2.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTablePCLT.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTablePOST.java trunk/foray/foray-font/src/java/org/foray/font/format/Type1File.java trunk/foray/foray-font/src/java/org/foray/font/format/Type1PFAFile.java trunk/foray/foray-font/src/java/org/foray/font/format/Type1PFBFile.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -44,7 +44,7 @@ * a FontConsumer.</li> * <li>To handle subsetting.</li> * </ul> - * + * */ public class FOrayConsumerFont { Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2005 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 Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,23 +1,23 @@ /* * Copyright 2005 The aXSL Project. * http://www.axsl.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. - * + * */ /* $Id$ */ - + package org.foray.font; import org.axsl.fontR.Font; @@ -35,7 +35,7 @@ * An implementation of the aXSL {@link FontConsumer} interface. * Instances are obtained by using the FOrayFontConsumer constructor(s). * FOrayFontConsumer instances can then be used to obtain implementations of - * FontUse and Font which provide direct services to the client application. + * FontUse and Font which provide direct services to the client application. */ public class FOrayFontConsumer implements FontConsumer { @@ -452,7 +452,7 @@ } /** - * + * * @param font The Font instance for which we wish to find the * related FontUse instance. * @return The related FontUse instance. Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.foray.common.Environment; @@ -482,7 +482,7 @@ } if (fontFamilyAliases.containsKey(alias)) { RegisteredFontFamily family = - ((RegisteredFontFamily)fontFamilyAliases.get(alias)); + ((RegisteredFontFamily)fontFamilyAliases.get(alias)); throw new FontException("Alias " + alias + " already registered to family " + family.getName()); } Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.axsl.fontR.FontConsumer; Modified: trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.foray.common.IOUtil; Modified: trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.foray.font.format.FontFileReader; @@ -114,7 +114,7 @@ * http://www.adobe.com/support/salesdocs/10702.htm, which states: * "Although all Type 1 fonts can be embedded in PDF files, some * TrueType font manufacturers place embedding restrictions on their - * fonts...." + * fonts...." */ fontAllowsEmbedding = true; Modified: trunk/foray/foray-font/src/java/org/foray/font/FontConfig.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontConfig.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FontConfig.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 Modified: trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.foray.common.ClasspathHandler; Modified: trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 Modified: trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 Modified: trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 Modified: trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -37,7 +37,7 @@ /** * Base class for all fonts that are registered independently of the operating * system's font registration. - * + * * Fonts that are not FreeStandingFonts are SystemFonts. Access to SystemFont * capabilities is handled entirely through the parent Font class. However, * FreeStandingFonts can be embedded, and this capability requires that more of @@ -212,7 +212,7 @@ } /* If the fontFile exists, embed it. */ if (getRegisteredFont().getFontFileReader() != null) { - return true; + return true; } return false; } @@ -311,7 +311,7 @@ if (compare != 0) { return compare; } - // If those are equal, test the configured font name + // If those are equal, test the configured font name compare = getRegisteredFont().getConfiguredFontName().compareTo( anotherFSF.getRegisteredFont().getConfiguredFontName()); if (compare != 0) { Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.foray.font.format.FontFileReader; @@ -44,14 +44,14 @@ * turn points to RegisteredFont instance. * It then, as requested, converts that information into actual Font instances * that can be used by the client application.</p> - * + * * It is tempting to question why this separate class is needed. Because fonts * can be registered from several sources (hard-coded, font configuration, * operating system registration, and directly by the client application), a * separate registry concept ensures that all of the registered fonts can be * managed, even though they may not have been parsed yet. It is good to not * parse the font until it is known to be necessary. - * + * * Note that the data stored in RegisteredFont corresponds to the data passed * in the <font> element of the font configuration file. * Data from the actual font file itself tends to be stored in FreeStandingFont @@ -92,7 +92,7 @@ * the TTC that should be used. */ private String ttcName = null; - + /** {@link FOrayFont#FORMAT_UNKNOWN}, {@link FOrayFont#FORMAT_TYPE1}, or * {@link FOrayFont#FORMAT_TRUETYPE}. */ private int fontFormat = FOrayFont.FORMAT_UNKNOWN; @@ -194,7 +194,7 @@ } /** - * + * */ private void createSystemFont() { if (this.systemFontCreationCompleted) { Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2005 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 Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.axsl.fontR.FontException; Modified: trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.foray.font.charset.CharSet; Modified: trunk/foray/foray-font/src/java/org/foray/font/charset/CharSet.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/charset/CharSet.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/charset/CharSet.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2005 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 @@ -31,7 +31,7 @@ * <p>Instances of CharSet are collections of related characters. * Fonts are frequently designed to cover a specific collection of characters. * For example, 12 of the Base-14 fonts cover the ExtendedRoman collection.</p> - * + * * <p>The main purpose of the class is to efficiently map a Unicode code point * to an array index that can be used in other classes to store information * about that code point. Modified: trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetExtendedRoman.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetExtendedRoman.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetExtendedRoman.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 Modified: trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetParser.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetParser.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetParser.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2005 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.charset; import org.foray.common.Logging; @@ -206,7 +206,7 @@ /** * Main method useful for parsing a glyph list file from the command-line - * and generating the java code that encapsulates that glyph list. + * and generating the java code that encapsulates that glyph list. * @param args Element 0 is the URL of the glyph list to be parsed. * Element 1 is the URL of the file to which the java source code should be * written. Modified: trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 Modified: trunk/foray/foray-font/src/java/org/foray/font/format/FontFileReader.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/FontFileReader.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/FontFileReader.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.common.RandomReader; @@ -158,7 +158,7 @@ /** * Per the TTF Spec, Chapter 2 (Data Types), the "FIXED" data type is a * 16-bit signed twos-complement mantissa, followed by a 16-bit unsigned - * fraction. + * fraction. */ public float readTTFFixed() throws IOException { float ttfFixed = readShort(); 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-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/Kerning.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; /** Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.font.charset.CharSet; @@ -52,7 +52,7 @@ protected int dfMaxWidth; protected int dfMinWidth; protected int[] fontBBox = new int[4]; - + // Extension stuff // --- Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.font.charset.CharSet; @@ -1019,7 +1019,7 @@ /* * Per Section 3, para 4, this is a user-defined non-standard * entry, and we should just ignore it. - */ + */ return; } if (firstChar < 0x20) { Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.font.charset.CharSet; Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileReader.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileReader.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileReader.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.common.RandomReader; Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFFile.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFFile.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFFile.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.apache.commons.logging.Log; @@ -44,7 +44,7 @@ * TTFTable</pre></p> * * Each child keeps a reference to its parent. - * + * * Each TTFTable instance is essentially a parsed TTFDirTabEntry instance, and * therefore there is a logical one-to-one relationship between the instances. * However, it is possible that not all TTFDirTabEntrie instances will be parsed @@ -58,7 +58,7 @@ * Because TTFDirTabEntry/TTFTable instances can be shared between fonts, they * are directly children of a TTFFile instance, not to a * TTFTableDirectory/TTFFont pair. - * + * * The TrueType spec can be found at the Microsoft * Typography site: http://www.microsoft.com/truetype/ */ Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFFileSingle.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFFileSingle.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFFileSingle.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import java.io.IOException; 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-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.ps.encode.CMap; @@ -82,7 +82,7 @@ /** * This method should never need to be used by anything except * {@link TTFTableDirectory#getTTFFont()}, which ensures that there is a - * one-to-one relationship between TTFFont and TTFTableDirectory. + * one-to-one relationship between TTFFont and TTFTableDirectory. */ static TTFFont makeTTFFont(TTFTableDirectory ttfTableDir) { if (ttfTableDir == null) { Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFMtxEntry.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFMtxEntry.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFMtxEntry.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; class TTFMtxEntry { Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFReader.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFReader.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFReader.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.common.Logging; 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-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.font.Subset; @@ -289,7 +289,7 @@ return null; } ttfFont.seek_tab("maxp"); - byte[] byteArray = copyTableToByteArray(entry.getLength()); + byte[] byteArray = copyTableToByteArray(entry.getLength()); /* Set numGlyphs to its proper value. */ writeUShort(byteArray, 4, this.subset.numGlyphsUsed()); return byteArray; @@ -304,7 +304,7 @@ return null; } ttfFont.seek_tab("prep"); - return copyTableToByteArray(entry.getLength()); + return copyTableToByteArray(entry.getLength()); } @@ -422,7 +422,7 @@ byte[] byteArray = createTableByteArray(arraySize); for (int i = 0; i < subset.numGlyphsUsed(); i ++) { int originalIndex = this.subset.decodeSubsetIndex(i); - writeUShort(byteArray, i * 4, + writeUShort(byteArray, i * 4, ttfFont.getTTFTableHMTX().metrics[originalIndex].wx); writeUShort(byteArray, (i * 4) + 2, ttfFont.getTTFTableHMTX().metrics[originalIndex].lsb); Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTable.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTable.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTable.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCFF.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCFF.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCFF.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import java.io.IOException; 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-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.ps.encode.CMap; @@ -136,30 +136,30 @@ getReader().skipBytes(2); // Skip searchRange getReader().skipBytes(2); // Skip entrySelector getReader().skipBytes(2); // Skip rangeShift - + char[] endCount = new char[segCountX2 / 2]; char[] startCount = new char[segCountX2 / 2]; int deltas[] = new int[segCountX2 / 2]; int rangeOffset[] = new int[segCountX2 / 2]; - + for (int i = 0; i < (segCountX2 / 2); i++) { endCount[i] = (char) getReader().readUnsignedShort(); } - + getReader().skipBytes(2); // Skip reservedPad - + for (int i = 0; i < (segCountX2 / 2); i++) { startCount[i] = (char) getReader().readUnsignedShort(); } - + for (int i = 0; i < (segCountX2 / 2); i++) { deltas[i] = getReader().readShort(); } - + for (int i = 0; i < (segCountX2 / 2); i++) { rangeOffset[i] = getReader().readUnsignedShort(); } - + int glyphIdArrayOffset = (int)getReader().getFilePointer(); // Parse the table entries and build a CMap4 from them. @@ -209,7 +209,7 @@ 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(); Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirEntry.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirEntry.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirEntry.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * 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 *... [truncated message content] |
