axsl-commit Mailing List for aXSL (Page 9)
An API for XSL-FO.
Status: Alpha
Brought to you by:
victormote
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
(36) |
Apr
(36) |
May
(127) |
Jun
(193) |
Jul
(12) |
Aug
(46) |
Sep
(66) |
Oct
(28) |
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(39) |
Feb
(68) |
Mar
(58) |
Apr
(88) |
May
(40) |
Jun
(82) |
Jul
(213) |
Aug
(19) |
Sep
(2) |
Oct
(26) |
Nov
(2) |
Dec
|
2008 |
Jan
(5) |
Feb
(30) |
Mar
(26) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
|
Mar
(4) |
Apr
(44) |
May
(1) |
Jun
(9) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2010 |
Jan
(4) |
Feb
(4) |
Mar
|
Apr
(7) |
May
(35) |
Jun
|
Jul
|
Aug
(48) |
Sep
(10) |
Oct
(1) |
Nov
|
Dec
|
2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(40) |
2017 |
Jan
(82) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(15) |
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
(37) |
Mar
(28) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(7) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(27) |
2021 |
Jan
(52) |
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(8) |
Nov
(72) |
Dec
(100) |
2022 |
Jan
(119) |
Feb
(94) |
Mar
(4) |
Apr
|
May
|
Jun
(5) |
Jul
(3) |
Aug
(2) |
Sep
|
Oct
|
Nov
(10) |
Dec
(97) |
2023 |
Jan
(52) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(17) |
Sep
(21) |
Oct
(8) |
Nov
|
Dec
|
2024 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2025 |
Jan
(11) |
Feb
(1) |
Mar
|
Apr
(27) |
May
(62) |
Jun
(27) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <vic...@us...> - 2023-01-10 01:14:57
|
Revision: 2683 http://sourceforge.net/p/axsl/code/2683 Author: victormote Date: 2023-01-10 01:14:55 +0000 (Tue, 10 Jan 2023) Log Message: ----------- Move MIME constants class to aXSL. Added Paths: ----------- trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/MimeConstants.java Added: trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/MimeConstants.java =================================================================== --- trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/MimeConstants.java (rev 0) +++ trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/MimeConstants.java 2023-01-10 01:14:55 UTC (rev 2683) @@ -0,0 +1,51 @@ +/* + * Copyright 2023 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. + */ + +/* + * $LastChangedRevision$ + * $LastChangedDate$ + * $LastChangedBy$ + */ + +package org.axsl.constants; + +/** + * Some MIME types needed in publishing applications. + */ +public final class MimeConstants { + + /** The MIME type for PDF. */ + public static final String MIME_PDF = "application/pdf"; + + /** The MIME type for PostScript. */ + public static final String MIME_POSTSCRIPT = "application/postscript"; + + /** The (pseudo) MIME type for Java 2D output. */ + public static final String MIME_JAVA2D = "java/java2d"; + + /** The MIME type for SVG. */ + public static final String MIME_SVG = "image/svg+xml"; + + /** The (assumed) MIME type for MathML documents. */ + public static final String MIME_MATHML = "text/mathml"; + + /** + * Private contructor. This is a utility class that should never be instantiated. + */ + private MimeConstants() { } + +} Property changes on: trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/MimeConstants.java ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-07 22:51:22
|
Revision: 2682 http://sourceforge.net/p/axsl/code/2682 Author: victormote Date: 2023-01-07 22:51:19 +0000 (Sat, 07 Jan 2023) Log Message: ----------- Bix bug related to word-spacing computation. Modified Paths: -------------- trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java =================================================================== --- trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java 2023-01-07 22:36:53 UTC (rev 2681) +++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java 2023-01-07 22:51:19 UTC (rev 2682) @@ -27,6 +27,7 @@ import org.axsl.orthography.Orthography; import org.axsl.ps.BoundingBox; import org.axsl.ps.Encoding; +import org.axsl.unicode.block.U0000_Basic_Latin; import java.awt.font.TextAttribute; import java.util.Arrays; @@ -743,7 +744,6 @@ default int width(final CharSequence chars, int offset, int length, int fontSize, int letterSpacing, int wordSpacing, FontContext requestedFontContext, Orthography orthography) { final FontContext fontContext = requestedFontContext == null ? FontContext.DEFAULT : requestedFontContext; - final int spaceMetricIndex = this.metricIndex(' '); int width = 0; for (int i = 0; i < chars.length(); i++) { final int codePoint = chars.charAt(i); @@ -764,7 +764,7 @@ width += Math.round(kerning * fontSize / TypographicConstants.MILLIPOINTS_PER_POINT); } // Add any word-spacing - if (codePoint == spaceMetricIndex) { + if (codePoint == U0000_Basic_Latin.SPACE) { width += wordSpacing; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-07 22:36:55
|
Revision: 2681 http://sourceforge.net/p/axsl/code/2681 Author: victormote Date: 2023-01-07 22:36:53 +0000 (Sat, 07 Jan 2023) Log Message: ----------- Change semantic of parameters to kern(int, int) method from glyph indexes to code points. Modified Paths: -------------- trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java =================================================================== --- trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java 2023-01-07 18:03:26 UTC (rev 2680) +++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java 2023-01-07 22:36:53 UTC (rev 2681) @@ -893,14 +893,14 @@ Font.Source getFontSource(); /** - * Computes the kerning needed between two glyphs in this font. - * @param glyphIndex1 The glyph index of the first (left in a left-to-right system) glyph. - * @param glyphIndex2 The glyph index of the second (right in left-to-right system) glyph. + * Computes the kerning needed between the glyphs of two code points in this font. + * @param codePoint1 The code point of the first (left in a left-to-right system) glyph. + * @param codePoint2 The code point of the second (right in left-to-right system) glyph. * @return The length to be kerned, in raw font units (millipoints in a Type 1 font). * A positive amount means that the characters should be moved farther apart, and a negative amount means that they * should be moved closer together. */ - int kern(int glyphIndex1, int glyphIndex2); + int kern(int codePoint1, int codePoint2); /** * Returns the ItalicAngle value for this font. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-07 18:03:29
|
Revision: 2680 http://sourceforge.net/p/axsl/code/2680 Author: victormote Date: 2023-01-07 18:03:26 +0000 (Sat, 07 Jan 2023) Log Message: ----------- Remove no-longer-needed method FontUse.width(int, int). Modified Paths: -------------- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java =================================================================== --- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java 2023-01-07 17:51:27 UTC (rev 2679) +++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java 2023-01-07 18:03:26 UTC (rev 2680) @@ -165,15 +165,6 @@ boolean glyphAvailable(int codePoint); /** - * Returns the width of a Unicode character for this font, at a specified point size. - * @param codePoint The Unicode character for which the width should be returned. - * @param fontSize The size, in millipoints, of the font. - * @return The width, in millipoints, of the glyph in this font for {@code codePoint}, or {@link Integer#MIN_VALUE} - * if such a glyph is not found. - */ - int width(int codePoint, int fontSize); - - /** * Returns the weight of the next bolder font in this font's font-family, if one exists. * If no bolder font exists, returns the next bolder numerical weight value. * If the weight of this Font is already the boldest, Modified: trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java =================================================================== --- trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java 2023-01-07 17:51:27 UTC (rev 2679) +++ trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java 2023-01-07 18:03:26 UTC (rev 2680) @@ -102,12 +102,6 @@ } @Override - public int width(final int codePoint, final int fontSize) { - // TODO Auto-generated method stub - return 0; - } - - @Override public Weight nextBolderWeight() { // TODO Auto-generated method stub return null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-07 17:51:29
|
Revision: 2679 http://sourceforge.net/p/axsl/code/2679 Author: victormote Date: 2023-01-07 17:51:27 +0000 (Sat, 07 Jan 2023) Log Message: ----------- Change the semantic of the first parameter of Font.width(int, int) from "metric index" to "code point." Modified Paths: -------------- trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFont.java Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java =================================================================== --- trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java 2023-01-07 15:32:34 UTC (rev 2678) +++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java 2023-01-07 17:51:27 UTC (rev 2679) @@ -712,31 +712,29 @@ /** * Returns the width of a glyph for this font, at a specified point size. - * @param metricIndex The metric index for which the width should be returned. - * For TrueType fonts the metric index is the same as the glyph index. - * For Type1 fonts, a CharSet is used to map between the glyph index and the metric index. + * @param codePoint The code point for which the width should be returned. * @param fontSize The size, in millipoints, of the font. * @return The width, in millipoints, of the glyph in this font for {@code codePoint}, or {@link Integer#MIN_VALUE} * if such a glyph is not found. */ - int width(int metricIndex, int fontSize); + int width(int codePoint, int fontSize); /** * Calculates the width of a given glyph sequence, considering letter spacing, word spacing, and font options * such as kerning and ligatures. * @param chars The character sequence whose width should be computed. - * @param offset The zero-based index into {@code metricIndexes} that is the start of what should be computed. - * @param length The number of glyph indexes in {@code metricIndexes} that should be computed. + * @param offset The zero-based index into {@code chars} that is the start of what should be computed. + * @param length The number of glyph indexes in {@code chars} that should be computed. * @param fontSize The size, in millipoints, of the font. * @param letterSpacing The size, in millipoints, of any additional letter-spacing. * @param wordSpacing The size, in millipoints, of any additional word-spacing. * @param requestedFontContext Options indicating how the font should use its features. * @param orthography The orthography that should be used when applying locale-sensitive font features. - * @return The width, in millipoints, of {@code metricIndexes}. - * Letter-spacing and kerning are added <em>between </em> characters in {@code metricIndexes}, but are not added - * either before or after. + * @return The width, in millipoints, of {@code chars}. + * Letter-spacing and kerning are added <em>between </em> characters in {@code chars}, but are not added either + * before or after. * (Adding letter-spacing or kerning before or after would require making assumptions about the context of - * {metricIndexes chars}, including whether it is at the beginning or end of the line, what fonts surround it, etc.) + * {@code chars}, including whether it is at the beginning or end of the line, what fonts surround it, etc.) * Word-spacing is added only to space characters (0x20). * Any other whitespace characters that the client applications wishes to have considered as word-spacing must * first be normalized to 0x20. @@ -744,22 +742,13 @@ */ default int width(final CharSequence chars, int offset, int length, int fontSize, int letterSpacing, int wordSpacing, FontContext requestedFontContext, Orthography orthography) { - final int[] metricIndexes = new int[chars.length()]; - for (int i = 0; i < chars.length(); i ++) { - final char c = chars.charAt(i); - final int metricIndex = metricIndex(c); - if (metricIndex < 0) { - metricIndexes[i] = 0; - } else { - metricIndexes[i] = metricIndex; - } - } final FontContext fontContext = requestedFontContext == null ? FontContext.DEFAULT : requestedFontContext; final int spaceMetricIndex = this.metricIndex(' '); int width = 0; - for (int i = 0; i < metricIndexes.length; i++) { + for (int i = 0; i < chars.length(); i++) { + final int codePoint = chars.charAt(i); // Add the width of the character itself. - final int charWidth = width(metricIndexes[i], fontSize); + final int charWidth = width(codePoint, fontSize); if (charWidth == Integer.MIN_VALUE) { width += widthUndefinedGlyph(fontSize); } else { @@ -767,8 +756,8 @@ } // Add any kerning. if (fontContext.isKerning() - && i < metricIndexes.length - 1) { - final int kerning = kern(metricIndexes[i], metricIndexes[i + 1]); + && i < chars.length() - 1) { + final int kerning = kern(codePoint, chars.charAt(i + 1)); /* Kerning is computed in 1/1000 of a text-space unit, regardless of how the value * is stored internally in the font. Therefore, we just need to adjust for the * font-size. */ @@ -775,7 +764,7 @@ width += Math.round(kerning * fontSize / TypographicConstants.MILLIPOINTS_PER_POINT); } // Add any word-spacing - if (metricIndexes[i] == spaceMetricIndex) { + if (codePoint == spaceMetricIndex) { width += wordSpacing; } } @@ -789,7 +778,7 @@ * TODO: Characters like combining diacriticals should almost * certainly not be letter-spaced. */ - width += (metricIndexes.length - 1) * letterSpacing; + width += (chars.length() - 1) * letterSpacing; return width; } Modified: trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFont.java =================================================================== --- trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFont.java 2023-01-07 15:32:34 UTC (rev 2678) +++ trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFont.java 2023-01-07 17:51:27 UTC (rev 2679) @@ -66,12 +66,13 @@ } @Override - public int width(final int metricIndex, final int fontSize) { + public int width(final int codePoint, final int fontSize) { + final int metricIndex = metricIndex(codePoint); return this.widths[metricIndex] * fontSize / TypographicConstants.MILLIPOINTS_PER_POINT; } /** - * Sets the width of a given code point. + * Sets the width of the glyph for a given code point. * @param codePoint The code point for which the new width is to be set. * @param width The new width, in millipoints, for {@code codePoint}. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-07 15:32:38
|
Revision: 2678 http://sourceforge.net/p/axsl/code/2678 Author: victormote Date: 2023-01-07 15:32:34 +0000 (Sat, 07 Jan 2023) Log Message: ----------- Rename Unicode block classes to include their starting code point. Modified Paths: -------------- trunk/axsl/axsl-value/src/main/java/org/axsl/value/group/TextModifiers.java Added Paths: ----------- trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/U0000_Basic_Latin.java trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/U0080_Latin_1_Supplement.java trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/U2000_General_Punctuation.java trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/U3000_CJK_Symbols_and_Punctuation.java trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/Ufe70_Arabic_Presentation_Forms_B.java Removed Paths: ------------- trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/Arabic_Presentation_Forms_B_Block.java trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/Basic_Latin_Block.java trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/CJK_Symbols_and_Punctuation_Block.java trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/General_Punctuation_Block.java trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/Latin_1_Supplement_Block.java Deleted: trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/Arabic_Presentation_Forms_B_Block.java =================================================================== --- trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/Arabic_Presentation_Forms_B_Block.java 2023-01-07 02:24:17 UTC (rev 2677) +++ trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/Arabic_Presentation_Forms_B_Block.java 2023-01-07 15:32:34 UTC (rev 2678) @@ -1,184 +0,0 @@ -/* - * Copyright 2021 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. - */ - -/* - * $LastChangedRevision$ - * $LastChangedDate$ - * $LastChangedBy$ - */ - -package org.axsl.unicode.block; - -/** - * Unicode(r) code points for the "Arabic Presentation Forms-B" block (0xfe70 thru 0xfeff). - * See package documentation for links to the Unicode(r) license and terms of use. - */ -public final class Arabic_Presentation_Forms_B_Block { - - /* - * This class was generated by {@link org.foray.unicode.UnicodeParser}. - * If changes are needed, it will likely be better to regenerate than to change manually. - */ - - public static final char ARABIC_FATHATAN_ISOLATED_FORM = 0xfe70; - public static final char ARABIC_TATWEEL_WITH_FATHATAN_ABOVE = 0xfe71; - public static final char ARABIC_DAMMATAN_ISOLATED_FORM = 0xfe72; - public static final char ARABIC_TAIL_FRAGMENT = 0xfe73; - public static final char ARABIC_KASRATAN_ISOLATED_FORM = 0xfe74; - public static final char ARABIC_FATHA_ISOLATED_FORM = 0xfe76; - public static final char ARABIC_FATHA_MEDIAL_FORM = 0xfe77; - public static final char ARABIC_DAMMA_ISOLATED_FORM = 0xfe78; - public static final char ARABIC_DAMMA_MEDIAL_FORM = 0xfe79; - public static final char ARABIC_KASRA_ISOLATED_FORM = 0xfe7a; - public static final char ARABIC_KASRA_MEDIAL_FORM = 0xfe7b; - public static final char ARABIC_SHADDA_ISOLATED_FORM = 0xfe7c; - public static final char ARABIC_SHADDA_MEDIAL_FORM = 0xfe7d; - public static final char ARABIC_SUKUN_ISOLATED_FORM = 0xfe7e; - public static final char ARABIC_SUKUN_MEDIAL_FORM = 0xfe7f; - public static final char ARABIC_LETTER_HAMZA_ISOLATED_FORM = 0xfe80; - public static final char ARABIC_LETTER_ALEF_WITH_MADDA_ABOVE_ISOLATED_FORM = 0xfe81; - public static final char ARABIC_LETTER_ALEF_WITH_MADDA_ABOVE_FINAL_FORM = 0xfe82; - public static final char ARABIC_LETTER_ALEF_WITH_HAMZA_ABOVE_ISOLATED_FORM = 0xfe83; - public static final char ARABIC_LETTER_ALEF_WITH_HAMZA_ABOVE_FINAL_FORM = 0xfe84; - public static final char ARABIC_LETTER_WAW_WITH_HAMZA_ABOVE_ISOLATED_FORM = 0xfe85; - public static final char ARABIC_LETTER_WAW_WITH_HAMZA_ABOVE_FINAL_FORM = 0xfe86; - public static final char ARABIC_LETTER_ALEF_WITH_HAMZA_BELOW_ISOLATED_FORM = 0xfe87; - public static final char ARABIC_LETTER_ALEF_WITH_HAMZA_BELOW_FINAL_FORM = 0xfe88; - public static final char ARABIC_LETTER_YEH_WITH_HAMZA_ABOVE_ISOLATED_FORM = 0xfe89; - public static final char ARABIC_LETTER_YEH_WITH_HAMZA_ABOVE_FINAL_FORM = 0xfe8a; - public static final char ARABIC_LETTER_YEH_WITH_HAMZA_ABOVE_INITIAL_FORM = 0xfe8b; - public static final char ARABIC_LETTER_YEH_WITH_HAMZA_ABOVE_MEDIAL_FORM = 0xfe8c; - public static final char ARABIC_LETTER_ALEF_ISOLATED_FORM = 0xfe8d; - public static final char ARABIC_LETTER_ALEF_FINAL_FORM = 0xfe8e; - public static final char ARABIC_LETTER_BEH_ISOLATED_FORM = 0xfe8f; - public static final char ARABIC_LETTER_BEH_FINAL_FORM = 0xfe90; - public static final char ARABIC_LETTER_BEH_INITIAL_FORM = 0xfe91; - public static final char ARABIC_LETTER_BEH_MEDIAL_FORM = 0xfe92; - public static final char ARABIC_LETTER_TEH_MARBUTA_ISOLATED_FORM = 0xfe93; - public static final char ARABIC_LETTER_TEH_MARBUTA_FINAL_FORM = 0xfe94; - public static final char ARABIC_LETTER_TEH_ISOLATED_FORM = 0xfe95; - public static final char ARABIC_LETTER_TEH_FINAL_FORM = 0xfe96; - public static final char ARABIC_LETTER_TEH_INITIAL_FORM = 0xfe97; - public static final char ARABIC_LETTER_TEH_MEDIAL_FORM = 0xfe98; - public static final char ARABIC_LETTER_THEH_ISOLATED_FORM = 0xfe99; - public static final char ARABIC_LETTER_THEH_FINAL_FORM = 0xfe9a; - public static final char ARABIC_LETTER_THEH_INITIAL_FORM = 0xfe9b; - public static final char ARABIC_LETTER_THEH_MEDIAL_FORM = 0xfe9c; - public static final char ARABIC_LETTER_JEEM_ISOLATED_FORM = 0xfe9d; - public static final char ARABIC_LETTER_JEEM_FINAL_FORM = 0xfe9e; - public static final char ARABIC_LETTER_JEEM_INITIAL_FORM = 0xfe9f; - public static final char ARABIC_LETTER_JEEM_MEDIAL_FORM = 0xfea0; - public static final char ARABIC_LETTER_HAH_ISOLATED_FORM = 0xfea1; - public static final char ARABIC_LETTER_HAH_FINAL_FORM = 0xfea2; - public static final char ARABIC_LETTER_HAH_INITIAL_FORM = 0xfea3; - public static final char ARABIC_LETTER_HAH_MEDIAL_FORM = 0xfea4; - public static final char ARABIC_LETTER_KHAH_ISOLATED_FORM = 0xfea5; - public static final char ARABIC_LETTER_KHAH_FINAL_FORM = 0xfea6; - public static final char ARABIC_LETTER_KHAH_INITIAL_FORM = 0xfea7; - public static final char ARABIC_LETTER_KHAH_MEDIAL_FORM = 0xfea8; - public static final char ARABIC_LETTER_DAL_ISOLATED_FORM = 0xfea9; - public static final char ARABIC_LETTER_DAL_FINAL_FORM = 0xfeaa; - public static final char ARABIC_LETTER_THAL_ISOLATED_FORM = 0xfeab; - public static final char ARABIC_LETTER_THAL_FINAL_FORM = 0xfeac; - public static final char ARABIC_LETTER_REH_ISOLATED_FORM = 0xfead; - public static final char ARABIC_LETTER_REH_FINAL_FORM = 0xfeae; - public static final char ARABIC_LETTER_ZAIN_ISOLATED_FORM = 0xfeaf; - public static final char ARABIC_LETTER_ZAIN_FINAL_FORM = 0xfeb0; - public static final char ARABIC_LETTER_SEEN_ISOLATED_FORM = 0xfeb1; - public static final char ARABIC_LETTER_SEEN_FINAL_FORM = 0xfeb2; - public static final char ARABIC_LETTER_SEEN_INITIAL_FORM = 0xfeb3; - public static final char ARABIC_LETTER_SEEN_MEDIAL_FORM = 0xfeb4; - public static final char ARABIC_LETTER_SHEEN_ISOLATED_FORM = 0xfeb5; - public static final char ARABIC_LETTER_SHEEN_FINAL_FORM = 0xfeb6; - public static final char ARABIC_LETTER_SHEEN_INITIAL_FORM = 0xfeb7; - public static final char ARABIC_LETTER_SHEEN_MEDIAL_FORM = 0xfeb8; - public static final char ARABIC_LETTER_SAD_ISOLATED_FORM = 0xfeb9; - public static final char ARABIC_LETTER_SAD_FINAL_FORM = 0xfeba; - public static final char ARABIC_LETTER_SAD_INITIAL_FORM = 0xfebb; - public static final char ARABIC_LETTER_SAD_MEDIAL_FORM = 0xfebc; - public static final char ARABIC_LETTER_DAD_ISOLATED_FORM = 0xfebd; - public static final char ARABIC_LETTER_DAD_FINAL_FORM = 0xfebe; - public static final char ARABIC_LETTER_DAD_INITIAL_FORM = 0xfebf; - public static final char ARABIC_LETTER_DAD_MEDIAL_FORM = 0xfec0; - public static final char ARABIC_LETTER_TAH_ISOLATED_FORM = 0xfec1; - public static final char ARABIC_LETTER_TAH_FINAL_FORM = 0xfec2; - public static final char ARABIC_LETTER_TAH_INITIAL_FORM = 0xfec3; - public static final char ARABIC_LETTER_TAH_MEDIAL_FORM = 0xfec4; - public static final char ARABIC_LETTER_ZAH_ISOLATED_FORM = 0xfec5; - public static final char ARABIC_LETTER_ZAH_FINAL_FORM = 0xfec6; - public static final char ARABIC_LETTER_ZAH_INITIAL_FORM = 0xfec7; - public static final char ARABIC_LETTER_ZAH_MEDIAL_FORM = 0xfec8; - public static final char ARABIC_LETTER_AIN_ISOLATED_FORM = 0xfec9; - public static final char ARABIC_LETTER_AIN_FINAL_FORM = 0xfeca; - public static final char ARABIC_LETTER_AIN_INITIAL_FORM = 0xfecb; - public static final char ARABIC_LETTER_AIN_MEDIAL_FORM = 0xfecc; - public static final char ARABIC_LETTER_GHAIN_ISOLATED_FORM = 0xfecd; - public static final char ARABIC_LETTER_GHAIN_FINAL_FORM = 0xfece; - public static final char ARABIC_LETTER_GHAIN_INITIAL_FORM = 0xfecf; - public static final char ARABIC_LETTER_GHAIN_MEDIAL_FORM = 0xfed0; - public static final char ARABIC_LETTER_FEH_ISOLATED_FORM = 0xfed1; - public static final char ARABIC_LETTER_FEH_FINAL_FORM = 0xfed2; - public static final char ARABIC_LETTER_FEH_INITIAL_FORM = 0xfed3; - public static final char ARABIC_LETTER_FEH_MEDIAL_FORM = 0xfed4; - public static final char ARABIC_LETTER_QAF_ISOLATED_FORM = 0xfed5; - public static final char ARABIC_LETTER_QAF_FINAL_FORM = 0xfed6; - public static final char ARABIC_LETTER_QAF_INITIAL_FORM = 0xfed7; - public static final char ARABIC_LETTER_QAF_MEDIAL_FORM = 0xfed8; - public static final char ARABIC_LETTER_KAF_ISOLATED_FORM = 0xfed9; - public static final char ARABIC_LETTER_KAF_FINAL_FORM = 0xfeda; - public static final char ARABIC_LETTER_KAF_INITIAL_FORM = 0xfedb; - public static final char ARABIC_LETTER_KAF_MEDIAL_FORM = 0xfedc; - public static final char ARABIC_LETTER_LAM_ISOLATED_FORM = 0xfedd; - public static final char ARABIC_LETTER_LAM_FINAL_FORM = 0xfede; - public static final char ARABIC_LETTER_LAM_INITIAL_FORM = 0xfedf; - public static final char ARABIC_LETTER_LAM_MEDIAL_FORM = 0xfee0; - public static final char ARABIC_LETTER_MEEM_ISOLATED_FORM = 0xfee1; - public static final char ARABIC_LETTER_MEEM_FINAL_FORM = 0xfee2; - public static final char ARABIC_LETTER_MEEM_INITIAL_FORM = 0xfee3; - public static final char ARABIC_LETTER_MEEM_MEDIAL_FORM = 0xfee4; - public static final char ARABIC_LETTER_NOON_ISOLATED_FORM = 0xfee5; - public static final char ARABIC_LETTER_NOON_FINAL_FORM = 0xfee6; - public static final char ARABIC_LETTER_NOON_INITIAL_FORM = 0xfee7; - public static final char ARABIC_LETTER_NOON_MEDIAL_FORM = 0xfee8; - public static final char ARABIC_LETTER_HEH_ISOLATED_FORM = 0xfee9; - public static final char ARABIC_LETTER_HEH_FINAL_FORM = 0xfeea; - public static final char ARABIC_LETTER_HEH_INITIAL_FORM = 0xfeeb; - public static final char ARABIC_LETTER_HEH_MEDIAL_FORM = 0xfeec; - public static final char ARABIC_LETTER_WAW_ISOLATED_FORM = 0xfeed; - public static final char ARABIC_LETTER_WAW_FINAL_FORM = 0xfeee; - public static final char ARABIC_LETTER_ALEF_MAKSURA_ISOLATED_FORM = 0xfeef; - public static final char ARABIC_LETTER_ALEF_MAKSURA_FINAL_FORM = 0xfef0; - public static final char ARABIC_LETTER_YEH_ISOLATED_FORM = 0xfef1; - public static final char ARABIC_LETTER_YEH_FINAL_FORM = 0xfef2; - public static final char ARABIC_LETTER_YEH_INITIAL_FORM = 0xfef3; - public static final char ARABIC_LETTER_YEH_MEDIAL_FORM = 0xfef4; - public static final char ARABIC_LIGATURE_LAM_WITH_ALEF_WITH_MADDA_ABOVE_ISOLATED_FORM = 0xfef5; - public static final char ARABIC_LIGATURE_LAM_WITH_ALEF_WITH_MADDA_ABOVE_FINAL_FORM = 0xfef6; - public static final char ARABIC_LIGATURE_LAM_WITH_ALEF_WITH_HAMZA_ABOVE_ISOLATED_FORM = 0xfef7; - public static final char ARABIC_LIGATURE_LAM_WITH_ALEF_WITH_HAMZA_ABOVE_FINAL_FORM = 0xfef8; - public static final char ARABIC_LIGATURE_LAM_WITH_ALEF_WITH_HAMZA_BELOW_ISOLATED_FORM = 0xfef9; - public static final char ARABIC_LIGATURE_LAM_WITH_ALEF_WITH_HAMZA_BELOW_FINAL_FORM = 0xfefa; - public static final char ARABIC_LIGATURE_LAM_WITH_ALEF_ISOLATED_FORM = 0xfefb; - public static final char ARABIC_LIGATURE_LAM_WITH_ALEF_FINAL_FORM = 0xfefc; - public static final char ZERO_WIDTH_NO_BREAK_SPACE = 0xfeff; - - /** - * Private constructor. This is a utility class and should never be instantiated. - */ - private Arabic_Presentation_Forms_B_Block() { } - -} Deleted: trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/Basic_Latin_Block.java =================================================================== --- trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/Basic_Latin_Block.java 2023-01-07 02:24:17 UTC (rev 2677) +++ trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/Basic_Latin_Block.java 2023-01-07 15:32:34 UTC (rev 2678) @@ -1,178 +0,0 @@ -/* - * Copyright 2021 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. - */ - -/* - * $LastChangedRevision$ - * $LastChangedDate$ - * $LastChangedBy$ - */ - -package org.axsl.unicode.block; - -/** - * Unicode(r) code points for the "Basic Latin" block (0x0 thru 0x7f). - * See package documentation for links to the Unicode(r) license and terms of use. - */ -public final class Basic_Latin_Block { - - /* - * This class was generated by {@link org.foray.unicode.UnicodeParser}. - * If changes are needed, it will likely be better to regenerate than to change manually. - */ - - /* - * Since all code points in this block can be contained in one byte, it is tempting to use byte as the type for - * them. However, byte is a numeric type, which causes some String-building methods to treat it is a number, - * resulting in the numeric value being included in the string instead of the char value: for example "32" instead - * of " ". - */ - - public static final char CONTROL_NULL = 0x0000; - public static final char CONTROL_START_OF_HEADING = 0x0001; - public static final char CONTROL_START_OF_TEXT = 0x0002; - public static final char CONTROL_END_OF_TEXT = 0x0003; - public static final char CONTROL_END_OF_TRANSMISSION = 0x0004; - public static final char CONTROL_ENQUIRY = 0x0005; - public static final char CONTROL_ACKNOWLEDGE = 0x0006; - public static final char CONTROL_BELL = 0x0007; - public static final char CONTROL_BACKSPACE = 0x0008; - public static final char CONTROL_CHARACTER_TABULATION = 0x0009; - public static final char CONTROL_LINE_FEED = 0x000a; - public static final char CONTROL_LINE_TABULATION = 0x000b; - public static final char CONTROL_FORM_FEED = 0x000c; - public static final char CONTROL_CARRIAGE_RETURN = 0x000d; - public static final char CONTROL_SHIFT_OUT = 0x000e; - public static final char CONTROL_SHIFT_IN = 0x000f; - public static final char CONTROL_DATA_LINK_ESCAPE = 0x0010; - public static final char CONTROL_DEVICE_CONTROL_ONE = 0x0011; - public static final char CONTROL_DEVICE_CONTROL_TWO = 0x0012; - public static final char CONTROL_DEVICE_CONTROL_THREE = 0x0013; - public static final char CONTROL_DEVICE_CONTROL_FOUR = 0x0014; - public static final char CONTROL_NEGATIVE_ACKNOWLEDGE = 0x0015; - public static final char CONTROL_SYNCHRONOUS_IDLE = 0x0016; - public static final char CONTROL_END_OF_TRANSMISSION_BLOCK = 0x0017; - public static final char CONTROL_CANCEL = 0x0018; - public static final char CONTROL_END_OF_MEDIUM = 0x0019; - public static final char CONTROL_SUBSTITUTE = 0x001a; - public static final char CONTROL_ESCAPE = 0x001b; - public static final char CONTROL_INFORMATION_SEPARATOR_FOUR = 0x001c; - public static final char CONTROL_INFORMATION_SEPARATOR_THREE = 0x001d; - public static final char CONTROL_INFORMATION_SEPARATOR_TWO = 0x001e; - public static final char CONTROL_INFORMATION_SEPARATOR_ONE = 0x001f; - public static final char SPACE = 0x0020; - public static final char EXCLAMATION_MARK = 0x0021; - public static final char QUOTATION_MARK = 0x0022; - public static final char NUMBER_SIGN = 0x0023; - public static final char DOLLAR_SIGN = 0x0024; - public static final char PERCENT_SIGN = 0x0025; - public static final char AMPERSAND = 0x0026; - public static final char APOSTROPHE = 0x0027; - public static final char LEFT_PARENTHESIS = 0x0028; - public static final char RIGHT_PARENTHESIS = 0x0029; - public static final char ASTERISK = 0x002a; - public static final char PLUS_SIGN = 0x002b; - public static final char COMMA = 0x002c; - public static final char HYPHEN_MINUS = 0x002d; - public static final char FULL_STOP = 0x002e; - public static final char SOLIDUS = 0x002f; - public static final char DIGIT_ZERO = 0x0030; - public static final char DIGIT_ONE = 0x0031; - public static final char DIGIT_TWO = 0x0032; - public static final char DIGIT_THREE = 0x0033; - public static final char DIGIT_FOUR = 0x0034; - public static final char DIGIT_FIVE = 0x0035; - public static final char DIGIT_SIX = 0x0036; - public static final char DIGIT_SEVEN = 0x0037; - public static final char DIGIT_EIGHT = 0x0038; - public static final char DIGIT_NINE = 0x0039; - public static final char COLON = 0x003a; - public static final char SEMICOLON = 0x003b; - public static final char LESS_THAN_SIGN = 0x003c; - public static final char EQUALS_SIGN = 0x003d; - public static final char GREATER_THAN_SIGN = 0x003e; - public static final char QUESTION_MARK = 0x003f; - public static final char COMMERCIAL_AT = 0x0040; - public static final char LATIN_CAPITAL_LETTER_A = 0x0041; - public static final char LATIN_CAPITAL_LETTER_B = 0x0042; - public static final char LATIN_CAPITAL_LETTER_C = 0x0043; - public static final char LATIN_CAPITAL_LETTER_D = 0x0044; - public static final char LATIN_CAPITAL_LETTER_E = 0x0045; - public static final char LATIN_CAPITAL_LETTER_F = 0x0046; - public static final char LATIN_CAPITAL_LETTER_G = 0x0047; - public static final char LATIN_CAPITAL_LETTER_H = 0x0048; - public static final char LATIN_CAPITAL_LETTER_I = 0x0049; - public static final char LATIN_CAPITAL_LETTER_J = 0x004a; - public static final char LATIN_CAPITAL_LETTER_K = 0x004b; - public static final char LATIN_CAPITAL_LETTER_L = 0x004c; - public static final char LATIN_CAPITAL_LETTER_M = 0x004d; - public static final char LATIN_CAPITAL_LETTER_N = 0x004e; - public static final char LATIN_CAPITAL_LETTER_O = 0x004f; - public static final char LATIN_CAPITAL_LETTER_P = 0x0050; - public static final char LATIN_CAPITAL_LETTER_Q = 0x0051; - public static final char LATIN_CAPITAL_LETTER_R = 0x0052; - public static final char LATIN_CAPITAL_LETTER_S = 0x0053; - public static final char LATIN_CAPITAL_LETTER_T = 0x0054; - public static final char LATIN_CAPITAL_LETTER_U = 0x0055; - public static final char LATIN_CAPITAL_LETTER_V = 0x0056; - public static final char LATIN_CAPITAL_LETTER_W = 0x0057; - public static final char LATIN_CAPITAL_LETTER_X = 0x0058; - public static final char LATIN_CAPITAL_LETTER_Y = 0x0059; - public static final char LATIN_CAPITAL_LETTER_Z = 0x005a; - public static final char LEFT_SQUARE_BRACKET = 0x005b; - public static final char REVERSE_SOLIDUS = 0x005c; - public static final char RIGHT_SQUARE_BRACKET = 0x005d; - public static final char CIRCUMFLEX_ACCENT = 0x005e; - public static final char LOW_LINE = 0x005f; - public static final char GRAVE_ACCENT = 0x0060; - public static final char LATIN_SMALL_LETTER_A = 0x0061; - public static final char LATIN_SMALL_LETTER_B = 0x0062; - public static final char LATIN_SMALL_LETTER_C = 0x0063; - public static final char LATIN_SMALL_LETTER_D = 0x0064; - public static final char LATIN_SMALL_LETTER_E = 0x0065; - public static final char LATIN_SMALL_LETTER_F = 0x0066; - public static final char LATIN_SMALL_LETTER_G = 0x0067; - public static final char LATIN_SMALL_LETTER_H = 0x0068; - public static final char LATIN_SMALL_LETTER_I = 0x0069; - public static final char LATIN_SMALL_LETTER_J = 0x006a; - public static final char LATIN_SMALL_LETTER_K = 0x006b; - public static final char LATIN_SMALL_LETTER_L = 0x006c; - public static final char LATIN_SMALL_LETTER_M = 0x006d; - public static final char LATIN_SMALL_LETTER_N = 0x006e; - public static final char LATIN_SMALL_LETTER_O = 0x006f; - public static final char LATIN_SMALL_LETTER_P = 0x0070; - public static final char LATIN_SMALL_LETTER_Q = 0x0071; - public static final char LATIN_SMALL_LETTER_R = 0x0072; - public static final char LATIN_SMALL_LETTER_S = 0x0073; - public static final char LATIN_SMALL_LETTER_T = 0x0074; - public static final char LATIN_SMALL_LETTER_U = 0x0075; - public static final char LATIN_SMALL_LETTER_V = 0x0076; - public static final char LATIN_SMALL_LETTER_W = 0x0077; - public static final char LATIN_SMALL_LETTER_X = 0x0078; - public static final char LATIN_SMALL_LETTER_Y = 0x0079; - public static final char LATIN_SMALL_LETTER_Z = 0x007a; - public static final char LEFT_CURLY_BRACKET = 0x007b; - public static final char VERTICAL_LINE = 0x007c; - public static final char RIGHT_CURLY_BRACKET = 0x007d; - public static final char TILDE = 0x007e; - public static final char CONTROL_DELETE = 0x007f; - - /** - * Private constructor. This is a utility class and should never be instantiated. - */ - private Basic_Latin_Block() { } - -} Deleted: trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/CJK_Symbols_and_Punctuation_Block.java =================================================================== --- trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/CJK_Symbols_and_Punctuation_Block.java 2023-01-07 02:24:17 UTC (rev 2677) +++ trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/CJK_Symbols_and_Punctuation_Block.java 2023-01-07 15:32:34 UTC (rev 2678) @@ -1,107 +0,0 @@ -/* - * Copyright 2021 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. - */ - -/* - * $LastChangedRevision$ - * $LastChangedDate$ - * $LastChangedBy$ - */ - -package org.axsl.unicode.block; - -/** - * Unicode(r) code points for the "CJK Symbols and Punctuation" block (0x3000 thru 0x303f). - * See package documentation for links to the Unicode(r) license and terms of use. - */ -public final class CJK_Symbols_and_Punctuation_Block { - - /* - * This class was generated by {@link org.foray.unicode.UnicodeParser}. - * If changes are needed, it will likely be better to regenerate than to change manually. - */ - - public static final char IDEOGRAPHIC_SPACE = 0x3000; - public static final char IDEOGRAPHIC_COMMA = 0x3001; - public static final char IDEOGRAPHIC_FULL_STOP = 0x3002; - public static final char DITTO_MARK = 0x3003; - public static final char JAPANESE_INDUSTRIAL_STANDARD_SYMBOL = 0x3004; - public static final char IDEOGRAPHIC_ITERATION_MARK = 0x3005; - public static final char IDEOGRAPHIC_CLOSING_MARK = 0x3006; - public static final char IDEOGRAPHIC_NUMBER_ZERO = 0x3007; - public static final char LEFT_ANGLE_BRACKET = 0x3008; - public static final char RIGHT_ANGLE_BRACKET = 0x3009; - public static final char LEFT_DOUBLE_ANGLE_BRACKET = 0x300a; - public static final char RIGHT_DOUBLE_ANGLE_BRACKET = 0x300b; - public static final char LEFT_CORNER_BRACKET = 0x300c; - public static final char RIGHT_CORNER_BRACKET = 0x300d; - public static final char LEFT_WHITE_CORNER_BRACKET = 0x300e; - public static final char RIGHT_WHITE_CORNER_BRACKET = 0x300f; - public static final char LEFT_BLACK_LENTICULAR_BRACKET = 0x3010; - public static final char RIGHT_BLACK_LENTICULAR_BRACKET = 0x3011; - public static final char POSTAL_MARK = 0x3012; - public static final char GETA_MARK = 0x3013; - public static final char LEFT_TORTOISE_SHELL_BRACKET = 0x3014; - public static final char RIGHT_TORTOISE_SHELL_BRACKET = 0x3015; - public static final char LEFT_WHITE_LENTICULAR_BRACKET = 0x3016; - public static final char RIGHT_WHITE_LENTICULAR_BRACKET = 0x3017; - public static final char LEFT_WHITE_TORTOISE_SHELL_BRACKET = 0x3018; - public static final char RIGHT_WHITE_TORTOISE_SHELL_BRACKET = 0x3019; - public static final char LEFT_WHITE_SQUARE_BRACKET = 0x301a; - public static final char RIGHT_WHITE_SQUARE_BRACKET = 0x301b; - public static final char WAVE_DASH = 0x301c; - public static final char REVERSED_DOUBLE_PRIME_QUOTATION_MARK = 0x301d; - public static final char DOUBLE_PRIME_QUOTATION_MARK = 0x301e; - public static final char LOW_DOUBLE_PRIME_QUOTATION_MARK = 0x301f; - public static final char POSTAL_MARK_FACE = 0x3020; - public static final char HANGZHOU_NUMERAL_ONE = 0x3021; - public static final char HANGZHOU_NUMERAL_TWO = 0x3022; - public static final char HANGZHOU_NUMERAL_THREE = 0x3023; - public static final char HANGZHOU_NUMERAL_FOUR = 0x3024; - public static final char HANGZHOU_NUMERAL_FIVE = 0x3025; - public static final char HANGZHOU_NUMERAL_SIX = 0x3026; - public static final char HANGZHOU_NUMERAL_SEVEN = 0x3027; - public static final char HANGZHOU_NUMERAL_EIGHT = 0x3028; - public static final char HANGZHOU_NUMERAL_NINE = 0x3029; - public static final char IDEOGRAPHIC_LEVEL_TONE_MARK = 0x302a; - public static final char IDEOGRAPHIC_RISING_TONE_MARK = 0x302b; - public static final char IDEOGRAPHIC_DEPARTING_TONE_MARK = 0x302c; - public static final char IDEOGRAPHIC_ENTERING_TONE_MARK = 0x302d; - public static final char HANGUL_SINGLE_DOT_TONE_MARK = 0x302e; - public static final char HANGUL_DOUBLE_DOT_TONE_MARK = 0x302f; - public static final char WAVY_DASH = 0x3030; - public static final char VERTICAL_KANA_REPEAT_MARK = 0x3031; - public static final char VERTICAL_KANA_REPEAT_WITH_VOICED_SOUND_MARK = 0x3032; - public static final char VERTICAL_KANA_REPEAT_MARK_UPPER_HALF = 0x3033; - public static final char VERTICAL_KANA_REPEAT_WITH_VOICED_SOUND_MARK_UPPER_HALF = 0x3034; - public static final char VERTICAL_KANA_REPEAT_MARK_LOWER_HALF = 0x3035; - public static final char CIRCLED_POSTAL_MARK = 0x3036; - public static final char IDEOGRAPHIC_TELEGRAPH_LINE_FEED_SEPARATOR_SYMBOL = 0x3037; - public static final char HANGZHOU_NUMERAL_TEN = 0x3038; - public static final char HANGZHOU_NUMERAL_TWENTY = 0x3039; - public static final char HANGZHOU_NUMERAL_THIRTY = 0x303a; - public static final char VERTICAL_IDEOGRAPHIC_ITERATION_MARK = 0x303b; - public static final char MASU_MARK = 0x303c; - public static final char PART_ALTERNATION_MARK = 0x303d; - public static final char IDEOGRAPHIC_VARIATION_INDICATOR = 0x303e; - public static final char IDEOGRAPHIC_HALF_FILL_SPACE = 0x303f; - - /** - * Private constructor. This is a utility class and should never be instantiated. - */ - private CJK_Symbols_and_Punctuation_Block() { } - -} Deleted: trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/General_Punctuation_Block.java =================================================================== --- trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/General_Punctuation_Block.java 2023-01-07 02:24:17 UTC (rev 2677) +++ trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/General_Punctuation_Block.java 2023-01-07 15:32:34 UTC (rev 2678) @@ -1,154 +0,0 @@ -/* - * Copyright 2021 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. - */ - -/* - * $LastChangedRevision$ - * $LastChangedDate$ - * $LastChangedBy$ - */ - -package org.axsl.unicode.block; - -/** - * Unicode(r) code points for the "General Punctuation" block (0x2000 thru 0x206f). - * See package documentation for links to the Unicode(r) license and terms of use. - */ -public final class General_Punctuation_Block { - - /* - * This class was generated by {@link org.foray.unicode.UnicodeParser}. - * If changes are needed, it will likely be better to regenerate than to change manually. - */ - - public static final char EN_QUAD = 0x2000; - public static final char EM_QUAD = 0x2001; - public static final char EN_SPACE = 0x2002; - public static final char EM_SPACE = 0x2003; - public static final char THREE_PER_EM_SPACE = 0x2004; - public static final char FOUR_PER_EM_SPACE = 0x2005; - public static final char SIX_PER_EM_SPACE = 0x2006; - public static final char FIGURE_SPACE = 0x2007; - public static final char PUNCTUATION_SPACE = 0x2008; - public static final char THIN_SPACE = 0x2009; - public static final char HAIR_SPACE = 0x200a; - public static final char ZERO_WIDTH_SPACE = 0x200b; - public static final char ZERO_WIDTH_NON_JOINER = 0x200c; - public static final char ZERO_WIDTH_JOINER = 0x200d; - public static final char LEFT_TO_RIGHT_MARK = 0x200e; - public static final char RIGHT_TO_LEFT_MARK = 0x200f; - public static final char HYPHEN = 0x2010; - public static final char NON_BREAKING_HYPHEN = 0x2011; - public static final char FIGURE_DASH = 0x2012; - public static final char EN_DASH = 0x2013; - public static final char EM_DASH = 0x2014; - public static final char HORIZONTAL_BAR = 0x2015; - public static final char DOUBLE_VERTICAL_LINE = 0x2016; - public static final char DOUBLE_LOW_LINE = 0x2017; - public static final char LEFT_SINGLE_QUOTATION_MARK = 0x2018; - public static final char RIGHT_SINGLE_QUOTATION_MARK = 0x2019; - public static final char SINGLE_LOW_9_QUOTATION_MARK = 0x201a; - public static final char SINGLE_HIGH_REVERSED_9_QUOTATION_MARK = 0x201b; - public static final char LEFT_DOUBLE_QUOTATION_MARK = 0x201c; - public static final char RIGHT_DOUBLE_QUOTATION_MARK = 0x201d; - public static final char DOUBLE_LOW_9_QUOTATION_MARK = 0x201e; - public static final char DOUBLE_HIGH_REVERSED_9_QUOTATION_MARK = 0x201f; - public static final char DAGGER = 0x2020; - public static final char DOUBLE_DAGGER = 0x2021; - public static final char BULLET = 0x2022; - public static final char TRIANGULAR_BULLET = 0x2023; - public static final char ONE_DOT_LEADER = 0x2024; - public static final char TWO_DOT_LEADER = 0x2025; - public static final char HORIZONTAL_ELLIPSIS = 0x2026; - public static final char HYPHENATION_POINT = 0x2027; - public static final char LINE_SEPARATOR = 0x2028; - public static final char PARAGRAPH_SEPARATOR = 0x2029; - public static final char LEFT_TO_RIGHT_EMBEDDING = 0x202a; - public static final char RIGHT_TO_LEFT_EMBEDDING = 0x202b; - public static final char POP_DIRECTIONAL_FORMATTING = 0x202c; - public static final char LEFT_TO_RIGHT_OVERRIDE = 0x202d; - public static final char RIGHT_TO_LEFT_OVERRIDE = 0x202e; - public static final char NARROW_NO_BREAK_SPACE = 0x202f; - public static final char PER_MILLE_SIGN = 0x2030; - public static final char PER_TEN_THOUSAND_SIGN = 0x2031; - public static final char PRIME = 0x2032; - public static final char DOUBLE_PRIME = 0x2033; - public static final char TRIPLE_PRIME = 0x2034; - public static final char REVERSED_PRIME = 0x2035; - public static final char REVERSED_DOUBLE_PRIME = 0x2036; - public static final char REVERSED_TRIPLE_PRIME = 0x2037; - public static final char CARET = 0x2038; - public static final char SINGLE_LEFT_POINTING_ANGLE_QUOTATION_MARK = 0x2039; - public static final char SINGLE_RIGHT_POINTING_ANGLE_QUOTATION_MARK = 0x203a; - public static final char REFERENCE_MARK = 0x203b; - public static final char DOUBLE_EXCLAMATION_MARK = 0x203c; - public static final char INTERROBANG = 0x203d; - public static final char OVERLINE = 0x203e; - public static final char UNDERTIE = 0x203f; - public static final char CHARACTER_TIE = 0x2040; - public static final char CARET_INSERTION_POINT = 0x2041; - public static final char ASTERISM = 0x2042; - public static final char HYPHEN_BULLET = 0x2043; - public static final char FRACTION_SLASH = 0x2044; - public static final char LEFT_SQUARE_BRACKET_WITH_QUILL = 0x2045; - public static final char RIGHT_SQUARE_BRACKET_WITH_QUILL = 0x2046; - public static final char DOUBLE_QUESTION_MARK = 0x2047; - public static final char QUESTION_EXCLAMATION_MARK = 0x2048; - public static final char EXCLAMATION_QUESTION_MARK = 0x2049; - public static final char TIRONIAN_SIGN_ET = 0x204a; - public static final char REVERSED_PILCROW_SIGN = 0x204b; - public static final char BLACK_LEFTWARDS_BULLET = 0x204c; - public static final char BLACK_RIGHTWARDS_BULLET = 0x204d; - public static final char LOW_ASTERISK = 0x204e; - public static final char REVERSED_SEMICOLON = 0x204f; - public static final char CLOSE_UP = 0x2050; - public static final char TWO_ASTERISKS_ALIGNED_VERTICALLY = 0x2051; - public static final char COMMERCIAL_MINUS_SIGN = 0x2052; - public static final char SWUNG_DASH = 0x2053; - public static final char INVERTED_UNDERTIE = 0x2054; - public static final char FLOWER_PUNCTUATION_MARK = 0x2055; - public static final char THREE_DOT_PUNCTUATION = 0x2056; - public static final char QUADRUPLE_PRIME = 0x2057; - public static final char FOUR_DOT_PUNCTUATION = 0x2058; - public static final char FIVE_DOT_PUNCTUATION = 0x2059; - public static final char TWO_DOT_PUNCTUATION = 0x205a; - public static final char FOUR_DOT_MARK = 0x205b; - public static final char DOTTED_CROSS = 0x205c; - public static final char TRICOLON = 0x205d; - public static final char VERTICAL_FOUR_DOTS = 0x205e; - public static final char MEDIUM_MATHEMATICAL_SPACE = 0x205f; - public static final char WORD_JOINER = 0x2060; - public static final char FUNCTION_APPLICATION = 0x2061; - public static final char INVISIBLE_TIMES = 0x2062; - public static final char INVISIBLE_SEPARATOR = 0x2063; - public static final char INVISIBLE_PLUS = 0x2064; - public static final char LEFT_TO_RIGHT_ISOLATE = 0x2066; - public static final char RIGHT_TO_LEFT_ISOLATE = 0x2067; - public static final char FIRST_STRONG_ISOLATE = 0x2068; - public static final char POP_DIRECTIONAL_ISOLATE = 0x2069; - public static final char INHIBIT_SYMMETRIC_SWAPPING = 0x206a; - public static final char ACTIVATE_SYMMETRIC_SWAPPING = 0x206b; - public static final char INHIBIT_ARABIC_FORM_SHAPING = 0x206c; - public static final char ACTIVATE_ARABIC_FORM_SHAPING = 0x206d; - public static final char NATIONAL_DIGIT_SHAPES = 0x206e; - public static final char NOMINAL_DIGIT_SHAPES = 0x206f; - - /** - * Private constructor. This is a utility class and should never be instantiated. - */ - private General_Punctuation_Block() { } - -} Deleted: trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/Latin_1_Supplement_Block.java =================================================================== --- trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/Latin_1_Supplement_Block.java 2023-01-07 02:24:17 UTC (rev 2677) +++ trunk/axsl/axsl-constants/src/main/java/org/axsl/unicode/block/Latin_1_Supplement_Block.java 2023-01-07 15:32:34 UTC (rev 2678) @@ -1,171 +0,0 @@ -/* - * Copyright 2021 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. - */ - -/* - * $LastChangedRevision$ - * $LastChangedDate$ - * $LastChangedBy$ - */ - -package org.axsl.unicode.block; - -/** - * Unicode(r) code points for the "Latin-1 Supplement" block (0x80 thru 0xff). - * See package documentation for links to the Unicode(r) license and terms of use. - */ -public final class Latin_1_Supplement_Block { - - /* - * This class was generated by {@link org.foray.unicode.UnicodeParser}. - * If changes are needed, it will likely be better to regenerate than to change manually. - */ - - public static final char CONTROL_0X80 = 0x0080; - public static final char CONTROL_0X81 = 0x0081; - public static final char CONTROL_BREAK_PERMITTED_HERE = 0x0082; - public static final char CONTROL_NO_BREAK_HERE = 0x0083; - public static final char CONTROL_0X84 = 0x0084; - public static final char CONTROL_NEXT_LINE = 0x0085; - public static final char CONTROL_START_OF_SELECTED_AREA = 0x0086; - public static final char CONTROL_END_OF_SELECTED_AREA = 0x0087; - public static final char CONTROL_CHARACTER_TABULATION_SET = 0x0088; - public static final char CONTROL_CHARACTER_TABULATION_WITH_JUSTIFICATION = 0x0089; - public static final char CONTROL_LINE_TABULATION_SET = 0x008a; - public static final char CONTROL_PARTIAL_LINE_FORWARD = 0x008b; - public static final char CONTROL_PARTIAL_LINE_BACKWARD = 0x008c; - public static final char CONTROL_REVERSE_LINE_FEED = 0x008d; - public static final char CONTROL_SINGLE_SHIFT_TWO = 0x008e; - public static final char CONTROL_SINGLE_SHIFT_THREE = 0x008f; - public static final char CONTROL_DEVICE_CONTROL_STRING = 0x0090; - public static final char CONTROL_PRIVATE_USE_ONE = 0x0091; - public static final char CONTROL_PRIVATE_USE_TWO = 0x0092; - public static final char CONTROL_SET_TRANSMIT_STATE = 0x0093; - public static final char CONTROL_CANCEL_CHARACTER = 0x0094; - public static final char CONTROL_MESSAGE_WAITING = 0x0095; - public static final char CONTROL_START_OF_GUARDED_AREA = 0x0096; - public static final char CONTROL_END_OF_GUARDED_AREA = 0x0097; - public static final char CONTROL_START_OF_STRING = 0x0098; - public static final char CONTROL_0X99 = 0x0099; - public static final char CONTROL_SINGLE_CHARACTER_INTRODUCER = 0x009a; - public static final char CONTROL_CONTROL_SEQUENCE_INTRODUCER = 0x009b; - public static final char CONTROL_STRING_TERMINATOR = 0x009c; - public static final char CONTROL_OPERATING_SYSTEM_COMMAND = 0x009d; - public static final char CONTROL_PRIVACY_MESSAGE = 0x009e; - public static final char CONTROL_APPLICATION_PROGRAM_COMMAND = 0x009f; - public static final char NO_BREAK_SPACE = 0x00a0; - public static final char INVERTED_EXCLAMATION_MARK = 0x00a1; - public static final char CENT_SIGN = 0x00a2; - public static final char POUND_SIGN = 0x00a3; - public static final char CURRENCY_SIGN = 0x00a4; - public static final char YEN_SIGN = 0x00a5; - public static final char BROKEN_BAR = 0x00a6; - public static final char SECTION_SIGN = 0x00a7; - public static final char DIAERESIS = 0x00a8; - public static final char COPYRIGHT_SIGN = 0x00a9; - public static final char FEMININE_ORDINAL_INDICATOR = 0x00aa; - public static final char LEFT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK = 0x00ab; - public static final char NOT_SIGN = 0x00ac; - public static final char SOFT_HYPHEN = 0x00ad; - public static final char REGISTERED_SIGN = 0x00ae; - public static final char MACRON = 0x00af; - public static final char DEGREE_SIGN = 0x00b0; - public static final char PLUS_MINUS_SIGN = 0x00b1; - public static final char SUPERSCRIPT_TWO = 0x00b2; - public static final char SUPERSCRIPT_THREE = 0x00b3; - public static final char ACUTE_ACCENT = 0x00b4; - public static final char MICRO_SIGN = 0x00b5; - public static final char PILCROW_SIGN = 0x00b6; - public static final char MIDDLE_DOT = 0x00b7; - public static final char CEDILLA = 0x00b8; - public static final char SUPERSCRIPT_ONE = 0x00b9; - public static final char MASCULINE_ORDINAL_INDICATOR = 0x00ba; - public static final char RIGHT_POINTING_DOUBLE_ANGLE_QUOTATION_MARK = 0x00bb; - public static final char VULGAR_FRACTION_ONE_QUARTER = 0x00bc; - public static final char VULGAR_FRACTION_ONE_HALF = 0x00bd; - public static final char VULGAR_FRACTION_THREE_QUARTERS = 0x00be; - public static final char INVERTED_QUESTION_MARK = 0x00bf; - public static final char LATIN_CAPITAL_LETTER_A_WITH_GRAVE = 0x00c0; - public static final char LATIN_CAPITAL_LETTER_A_WITH_ACUTE = 0x00c1; - public static final char LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX = 0x00c2; - public static final char LATIN_CAPITAL_LETTER_A_WITH_TILDE = 0x00c3; - public static final char LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS = 0x00c4; - public static final char LATIN_CAPITAL_LETTER_A_WITH_RING_ABOVE = 0x00c5; - public static final char LATIN_CAPITAL_LETTER_AE = 0x00c6; - public static final char LATIN_CAPITAL_LETTER_C_WITH_CEDILLA = 0x00c7; - public static final char LATIN_CAPITAL_LETTER_E_WITH_GRAVE = 0x00c8; - public static final char LATIN_CAPITAL_LETTER_E_WITH_ACUTE = 0x00c9; - public static final char LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX = 0x00ca; - public static final char LATIN_CAPITAL_LETTER_E_WITH_DIAERESIS = 0x00cb; - public static final char LATIN_CAPITAL_LETTER_I_WITH_GRAVE = 0x00cc; - public static final char LATIN_CAPITAL_LETTER_I_WITH_ACUTE = 0x00cd; - public static final char LATIN_CAPITAL_LETTER_I_WITH_CIRCUMFLEX = 0x00ce; - public static final char LATIN_CAPITAL_LETTER_I_WITH_DIAERESIS = 0x00cf; - public static final char LATIN_CAPITAL_LETTER_ETH = 0x00d0; - public static final char LATIN_CAPITAL_LETTER_N_WITH_TILDE = 0x00d1; - public static final char LATIN_CAPITAL_LETTER_O_WITH_GRAVE = 0x00d2; - public static final char LATIN_CAPITAL_LETTER_O_WITH_ACUTE = 0x00d3; - public static final char LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX = 0x00d4; - public static final char LATIN_CAPITAL_LETTER_O_WITH_TILDE = 0x00d5; - public static final char LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS = 0x00d6; - public static final char MULTIPLICATION_SIGN = 0x00d7; - public static final char LATIN_CAPITAL_LETTER_O_WITH_STROKE = 0x00d8; - public static final char LATIN_CAPITAL_LETTER_U_WITH_GRAVE = 0x00d9; - public static final char LATIN_CAPITAL_LETTER_U_WITH_ACUTE = 0x00da; - public static final char LATIN_CAPITAL_LETTER_U_WITH_CIRCUMFLEX = 0x00db; - public static final char LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS = 0x00dc; - public static final char LATIN_CAPITAL_LETTER_Y_WITH_ACUTE = 0x00dd; - public static final char LATIN_CAPITAL_LETTER_THORN = 0x00de; - public static final char LATIN_SMALL_LETTER_SHARP_S = 0x00df; - public static final char LATIN_SMALL_LETTER_A_WITH_GRAVE = 0x00e0; - public static final char LATIN_SMALL_LETTER_A_WITH_ACUTE = 0x00e1; - public static final char LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX = 0x00e2; - public static final char LATIN_SMALL_LETTER_A_WITH_TILDE = 0x00e3; - public static final char LATIN_SMALL_LETTER_A_WITH_DIAERESIS = 0x00e4; - public static final char LATIN_SMALL_LETTER_A_WITH_RING_ABOVE = 0x00e5; - public static final char LATIN_SMALL_LETTER_AE = 0x00e6; - public static final char LATIN_SMALL_LETTER_C_WITH_CEDILLA = 0x00e7; - public static final char LATIN_SMALL_LETTER_E_WITH_GRAVE = 0x00e8; - public static final char LATIN_SMALL_LETTER_E_WITH_ACUTE = 0x00e9; - public static final char LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX = 0x00ea; - public static final char LATIN_SMALL_LETTER_E_WITH_DIAERESIS = 0x00eb; - public static final char LATIN_SMALL_LETTER_I_WITH_GRAVE = 0x00ec; - public static final char LATIN_SMALL_LETTER_I_WITH_ACUTE = 0x00ed; - public static final char LATIN_SMALL_LETTER_I_WITH_CIRCUMFLEX = 0x00ee; - public static final char LATIN_SMALL_LETTER_I_WITH_DIAERESIS = 0x00ef; - public static final char LATIN_SMALL_LETTER_ETH = 0x00f0; - public static final char LATIN_SMALL_LETTER_N_WITH_TILDE = 0x00f1; - public static final char LATIN_SMALL_LETTER_O_WITH_GRAVE = 0x00f2; - public static final char LATIN_SMALL_LETTER_O_WITH_ACUTE = 0x00f3; - public static final char LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX = 0x00f4; - public static final char LATIN_SMALL_LETTER_O_WITH_TILDE = 0x00f5; - public static final char LATIN_SMALL_LETTER_O_WITH_DIAERESIS = 0x00f6; - public static final char DIVISION_SIGN = 0x00f7; - public static final char LATIN_SMALL_LETTER_O_WITH_STROKE = 0x00f8; - public static final char LATIN_SMALL_LETTER_U_WITH_GRAVE = 0x00f9; - public static final char LATIN_SMALL_LETTER_U_WITH_ACUTE = 0x00fa; -... [truncated message content] |
From: <vic...@us...> - 2023-01-07 02:24:20
|
Revision: 2677 http://sourceforge.net/p/axsl/code/2677 Author: victormote Date: 2023-01-07 02:24:17 +0000 (Sat, 07 Jan 2023) Log Message: ----------- Standardize spelling of "code point" and "codePoint". Modified Paths: -------------- trunk/axsl/axsl-00-master/config/checkstyle/checkstyle-config.xml trunk/axsl/axsl-00-master/doc/javadoc/overview.html trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFont.java trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CharacterPa.java trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonHyphenationPa.java trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/text/FoTextToken.java trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/Cmap04Ttf.java trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/Encoding.java Modified: trunk/axsl/axsl-00-master/config/checkstyle/checkstyle-config.xml =================================================================== --- trunk/axsl/axsl-00-master/config/checkstyle/checkstyle-config.xml 2023-01-06 22:16:33 UTC (rev 2676) +++ trunk/axsl/axsl-00-master/config/checkstyle/checkstyle-config.xml 2023-01-07 02:24:17 UTC (rev 2677) @@ -280,7 +280,13 @@ <property name="format" value="\siff\s"/> <property name="message" value="Use "if and only if" instead of "iff"."/> </module> + <module name="RegexpSinglelineJava"> + <property name="ignoreComments" value="false"/> + <property name="format" value="[Cc]odepoint"/> + <property name="message" value="For consistency, use 'codePoint' or 'code point' instead of 'codepoint'."/> + </module> + <module name="MissingOverride"/> </module> Modified: trunk/axsl/axsl-00-master/doc/javadoc/overview.html =================================================================== --- trunk/axsl/axsl-00-master/doc/javadoc/overview.html 2023-01-06 22:16:33 UTC (rev 2676) +++ trunk/axsl/axsl-00-master/doc/javadoc/overview.html 2023-01-07 02:24:17 UTC (rev 2677) @@ -19,6 +19,27 @@ so in parallel, leaving the rest of the system unaffected, and allowing it to continue functioning while the new module is written.</p> +<h3>General Standards</h3> +<ul>Wherever possible, Lists of non-primitive types have been preferred over arrays in the API. +This is mostly to allow providers to ensure immutability.</ul> +<ul>Wherever possible, primitive sequences have been preferred over arrays in the API. +This is mostly to allow providers to ensure immutability.</ul> + + +<h3>Spelling Standards</h3> +<p>Spelling standards should be documented in axsl-00-master/config/checkstyle/checkstyle-config.xml.</p> +<table> + <thead> + <th>Correct</th> + <th>Incorrect</th> + <th>Reason</th> + </thead> + <tr> + <td>codePoint</td> + <td>codepoint</td> + <td>Unicode Standard 14.0 and ISO-10646 consistently treat "code point" as two words.</td> +</table> + </body> </html> Modified: trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFont.java =================================================================== --- trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFont.java 2023-01-06 22:16:33 UTC (rev 2676) +++ trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFont.java 2023-01-07 02:24:17 UTC (rev 2677) @@ -71,8 +71,8 @@ } /** - * Sets the width of a given codepoint. - * @param codePoint The codepoint for which the new width is to be set. + * Sets the width of a given code point. + * @param codePoint The code point for which the new width is to be set. * @param width The new width, in millipoints, for {@code codePoint}. */ public void setWidth(final int codePoint, final int width) { @@ -81,8 +81,8 @@ } /** - * Sets the width of a given codepoint, using the Monotype "unit" system. - * @param codePoint The codepoint for which the new width is to be set. + * Sets the width of a given code point, using the Monotype "unit" system. + * @param codePoint The code point for which the new width is to be set. * @param monotypeUnits The number of Monotype "units" for {@code codePoint}. * @see <a href="https://books.google.com/books/download/The_monotype_system.pdf?id=6kU5AAAAMAAJ&output=pdf">1912, * The Monotype System, Philadelphia, Lanston Monotype Machine Co.</a> @@ -246,14 +246,14 @@ } /** - * Returns the metric index for a given codepoint. - * @param codePoint The codepoint for which a metric index is needed. + * Returns the metric index for a given code point. + * @param codePoint The code point for which a metric index is needed. * @return The metric index for {@code codePoint}. */ public int metricIndex(final int codePoint) { final int metricIndex = this.charSet.getIndex(codePoint); if (metricIndex < 0) { - throw new IllegalArgumentException("Character contains no index for codepoint: " + codePoint); + throw new IllegalArgumentException("Character contains no index for code point: " + codePoint); } return metricIndex; } Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CharacterPa.java =================================================================== --- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CharacterPa.java 2023-01-06 22:16:33 UTC (rev 2676) +++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CharacterPa.java 2023-01-07 02:24:17 UTC (rev 2677) @@ -31,7 +31,7 @@ /** * Returns the "character" trait for this FO. * This trait is not inherited. - * @return The Unicode codepoint of the character. + * @return The Unicode code point of the character. * @see "XSL-FO Recommendation 1.1, Section 7.17.1" */ int traitCharacter(); Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonHyphenationPa.java =================================================================== --- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonHyphenationPa.java 2023-01-06 22:16:33 UTC (rev 2676) +++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonHyphenationPa.java 2023-01-07 02:24:17 UTC (rev 2677) @@ -62,10 +62,10 @@ * Returns the "hyphenation-character" trait for this FO. * This trait is inherited. * <p>The XSL-FO Recommendation describes this value as a single Unicode character, and consideration was given to - * returning an int representing a Unicode codepoint. + * returning an int representing a Unicode code point. * {@link CharSequence} was chosen instead as being flexible enough to handle the full range of Unicode values, as * well as allowing a multi-character value, if for some reason that is useful. - * Implementations that wish to restrict this value to a single Unicode codepoint should do so in some upstream + * Implementations that wish to restrict this value to a single Unicode code point should do so in some upstream * process.</p> * @param context An object that knows how to resolve FO Tree context issues. * @return The hyphenation-character trait. Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/text/FoTextToken.java =================================================================== --- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/text/FoTextToken.java 2023-01-06 22:16:33 UTC (rev 2676) +++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/text/FoTextToken.java 2023-01-07 02:24:17 UTC (rev 2677) @@ -35,28 +35,28 @@ /** * Returns the number of chars in this token, after applying text modifiers. * @param textModifiers The text modifiers needed to compute the refined text value. - * @param codepointBefore The Unicode codepoint, if any, immediately before this text in the paragraph. + * @param codePointBefore The Unicode code point, if any, immediately before this text in the paragraph. * This is needed to properly handle white-space-collapse. - * Setting this to -1 indicates that there is no such codepoint. - * @param codepointAfter The Unicode codepoint, if any, immediately after this text in the paragraph. + * Setting this to -1 indicates that there is no such code point. + * @param codePointAfter The Unicode code point, if any, immediately after this text in the paragraph. * This is needed to properly handle white-space-collapse. - * Setting this to -1 indicates that there is no such codepoint. + * Setting this to -1 indicates that there is no such code point. * @return The number of chars in this token, after applying text modifiers. */ - int qtyRefinedChars(TextModifiers textModifiers, int codepointBefore, int codepointAfter); + int qtyRefinedChars(TextModifiers textModifiers, int codePointBefore, int codePointAfter); /** * Returns the char at a given index in this token, after applying text modifiers. * @param index The index into the refined text value for this token. * @param textModifiers The text modifiers needed to compute the refined text value. - * @param codepointBefore The Unicode codepoint, if any, immediately before this text in the paragraph. + * @param codePointBefore The Unicode code point, if any, immediately before this text in the paragraph. * This is needed to properly handle white-space-collapse. - * Setting this to -1 indicates that there is no such codepoint. - * @param codepointAfter The Unicode codepoint, if any, immediately after this text in the paragraph. + * Setting this to -1 indicates that there is no such code point. + * @param codePointAfter The Unicode code point, if any, immediately after this text in the paragraph. * This is needed to properly handle white-space-collapse. - * Setting this to -1 indicates that there is no such codepoint. + * Setting this to -1 indicates that there is no such code point. * @return The char at index {@code index} of the refined text value for this token. */ - char refinedCharAt(int index, TextModifiers textModifiers, int codepointBefore, int codepointAfter); + char refinedCharAt(int index, TextModifiers textModifiers, int codePointBefore, int codePointAfter); } Modified: trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/Cmap04Ttf.java =================================================================== --- trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/Cmap04Ttf.java 2023-01-06 22:16:33 UTC (rev 2676) +++ trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/Cmap04Ttf.java 2023-01-07 02:24:17 UTC (rev 2677) @@ -24,7 +24,7 @@ package org.axsl.ps; /** - * CMap containing a set of Unicode codepoint ranges that sequentially map to the same-sized range of glyph indexes. + * CMap containing a set of Unicode code point 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 interface derives its name). */ public interface Cmap04Ttf extends Cmap { Modified: trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/Encoding.java =================================================================== --- trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/Encoding.java 2023-01-06 22:16:33 UTC (rev 2676) +++ trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/Encoding.java 2023-01-07 02:24:17 UTC (rev 2677) @@ -29,8 +29,8 @@ public interface Encoding { /** - * Finds the encoding index for a given Unicode codepoint. - * @param codePoint The Unicode codepoint which should be encoded. + * Finds the encoding index for a given Unicode code point. + * @param codePoint The Unicode code point which should be encoded. * @return The encoding index corresponding to codePoint, or -1 if there is none. */ int encode(int codePoint); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-06 22:16:35
|
Revision: 2676 http://sourceforge.net/p/axsl/code/2676 Author: victormote Date: 2023-01-06 22:16:33 +0000 (Fri, 06 Jan 2023) Log Message: ----------- Move width-related convenience method from FontUse to Font. Modified Paths: -------------- trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java =================================================================== --- trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java 2023-01-06 22:00:24 UTC (rev 2675) +++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java 2023-01-06 22:16:33 UTC (rev 2676) @@ -794,6 +794,21 @@ } /** + * Calculates the width of a given character sequence, considering font options such as kerning and ligatures. + * Calling this convenience method returns the same result as + * {@code width(chars, 0, chars.length(), fontSize, 0, 0, options, orthography)}. + * @param chars The character sequence whose width should be computed. + * @param fontSize The size, in millipoints, of the font. + * @param fontContext Options indicating how the font should use its features. + * @param orthography The orthography that should be used when applying locale-sensitive font features. + * @return The width, in millipoints, of {@code chars}. + * If there is no glyph for a character in {@code chars}, the width returned will be that of the "missing glyph". + */ + default int width(CharSequence chars, int fontSize, FontContext fontContext, Orthography orthography) { + return width(chars, 0, chars.length(), fontSize, 0, 0, fontContext, orthography); + } + + /** * Returns the estimated width of a Unicode character for this font, at a specified point size. * This method is implementation-dependent. * It may attempt to estimate the size of characters such as hair spaces and em quads, which may not be available in Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java =================================================================== --- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java 2023-01-06 22:00:24 UTC (rev 2675) +++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java 2023-01-06 22:16:33 UTC (rev 2676) @@ -174,19 +174,6 @@ int width(int codePoint, int fontSize); /** - * Calculates the width of a given character sequence, considering font options such as kerning and ligatures. - * Calling this method returns the same result as - * {@code width(chars, 0, chars.length(), fontSize, 0, 0, options, orthography)}. - * @param chars The character sequence whose width should be computed. - * @param fontSize The size, in millipoints, of the font. - * @param fontContext Options indicating how the font should use its features. - * @param orthography The orthography that should be used when applying locale-sensitive font features. - * @return The width, in millipoints, of {@code chars}. - * If there is no glyph for a character in {@code chars}, the width returned will be that of the "missing glyph". - */ - int width(CharSequence chars, int fontSize, FontContext fontContext, Orthography orthography); - - /** * Returns the weight of the next bolder font in this font's font-family, if one exists. * If no bolder font exists, returns the next bolder numerical weight value. * If the weight of this Font is already the boldest, Modified: trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java =================================================================== --- trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java 2023-01-06 22:00:24 UTC (rev 2675) +++ trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java 2023-01-06 22:16:33 UTC (rev 2676) @@ -108,13 +108,6 @@ } @Override - public int width(final CharSequence chars, final int fontSize, final FontContext fontContext, - final Orthography orthography) { - // TODO Auto-generated method stub - return 0; - } - - @Override public Weight nextBolderWeight() { // TODO Auto-generated method stub return null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-06 22:00:27
|
Revision: 2675 http://sourceforge.net/p/axsl/code/2675 Author: victormote Date: 2023-01-06 22:00:24 +0000 (Fri, 06 Jan 2023) Log Message: ----------- Remove FontUse method width() that was a pass-thru to Font. Modified Paths: -------------- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java =================================================================== --- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java 2023-01-05 20:26:43 UTC (rev 2674) +++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java 2023-01-06 22:00:24 UTC (rev 2675) @@ -174,33 +174,6 @@ int width(int codePoint, int fontSize); /** - * Calculates the width of a given character sequence, considering letter spacing, word spacing, and font options - * such as kerning and ligatures. - * @param chars The character sequence whose width should be computed. - * @param offset The zero-based index into {@code chars} that is the start of what should be computed. - * @param length The number of chars in {@code chars} that should be computed. - * @param fontSize The size, in millipoints, of the font. - * @param letterSpacing The size, in millipoints, of any letter-spacing. - * @param wordSpacing The size, in millipoints, of any word-spacing. - * @param fontContext Options indicating how the font should use its features. - * @param orthography The orthography that should be used when applying locale-sensitive font features. - * @return The width, in millipoints, of {@code chars}. - * Letter-spacing and kerning are added <em>between </em> characters in {@code chars}, but are not added either - * before or after. - * (Adding letter-spacing or kerning before or after would require making assumptions about the context of - * {@code chars}, including whether it is at the beginning or end of the line, what fonts surround it, etc.) - * Word-spacing is added only to space characters (0x20). - * Any other whitespace characters that the client applications wishes to have considered as word-spacing must - * first be normalized to 0x20. - * If there is no glyph for a character in {@code chars}, the width returned will be that of the "missing glyph". - */ - default int width(CharSequence chars, int offset, int length, int fontSize, int letterSpacing, int wordSpacing, - FontContext fontContext, Orthography orthography) { - return getFont().width(chars, offset, length, fontSize, letterSpacing, wordSpacing, fontContext, - orthography); - } - - /** * Calculates the width of a given character sequence, considering font options such as kerning and ligatures. * Calling this method returns the same result as * {@code width(chars, 0, chars.length(), fontSize, 0, 0, options, orthography)}. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-05 20:26:49
|
Revision: 2674 http://sourceforge.net/p/axsl/code/2674 Author: victormote Date: 2023-01-05 20:26:43 +0000 (Thu, 05 Jan 2023) Log Message: ----------- Eliminate dependency on PsServer to get standard PS encodings. Modified Paths: -------------- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontServer.java Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontServer.java =================================================================== --- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontServer.java 2023-01-05 00:03:20 UTC (rev 2673) +++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontServer.java 2023-01-05 20:26:43 UTC (rev 2674) @@ -83,13 +83,6 @@ List<java.awt.Font> getSystemFontList(); /** - * Returns an Encoding instance for the given name. - * @param name The name of the Encoding instance that is sought. - * @return The Encoding instance for name. - */ - Encoding getEncoding(String name); - - /** * Register a font-family for use by the system. * @param name The name of the font-family (e.g. "Courier"). * @throws FontException If the font-family is already registered. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-05 00:03:21
|
Revision: 2673 http://sourceforge.net/p/axsl/code/2673 Author: victormote Date: 2023-01-05 00:03:20 +0000 (Thu, 05 Jan 2023) Log Message: ----------- Move some default code from FontUse to Font. Modified Paths: -------------- trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java =================================================================== --- trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java 2023-01-04 04:01:21 UTC (rev 2672) +++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java 2023-01-05 00:03:20 UTC (rev 2673) @@ -724,7 +724,7 @@ /** * Calculates the width of a given glyph sequence, considering letter spacing, word spacing, and font options * such as kerning and ligatures. - * @param metricIndexes The metric indexes of the glyph sequence whose width should be computed. + * @param chars The character sequence whose width should be computed. * @param offset The zero-based index into {@code metricIndexes} that is the start of what should be computed. * @param length The number of glyph indexes in {@code metricIndexes} that should be computed. * @param fontSize The size, in millipoints, of the font. @@ -742,12 +742,19 @@ * first be normalized to 0x20. * If there is no glyph for a character in {@code chars}, the width returned will be that of the "missing glyph". */ - default int width(int[] metricIndexes, int offset, int length, int fontSize, int letterSpacing, + default int width(final CharSequence chars, int offset, int length, int fontSize, int letterSpacing, int wordSpacing, FontContext requestedFontContext, Orthography orthography) { + final int[] metricIndexes = new int[chars.length()]; + for (int i = 0; i < chars.length(); i ++) { + final char c = chars.charAt(i); + final int metricIndex = metricIndex(c); + if (metricIndex < 0) { + metricIndexes[i] = 0; + } else { + metricIndexes[i] = metricIndex; + } + } final FontContext fontContext = requestedFontContext == null ? FontContext.DEFAULT : requestedFontContext; - if (metricIndexes == null) { - return 0; - } final int spaceMetricIndex = this.metricIndex(' '); int width = 0; for (int i = 0; i < metricIndexes.length; i++) { Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java =================================================================== --- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java 2023-01-04 04:01:21 UTC (rev 2672) +++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java 2023-01-05 00:03:20 UTC (rev 2673) @@ -196,17 +196,7 @@ */ default int width(CharSequence chars, int offset, int length, int fontSize, int letterSpacing, int wordSpacing, FontContext fontContext, Orthography orthography) { - final int[] metricIndexes = new int[chars.length()]; - for (int i = 0; i < chars.length(); i ++) { - final char c = chars.charAt(i); - final int metricIndex = getFont().metricIndex(c); - if (metricIndex < 0) { - metricIndexes[i] = 0; - } else { - metricIndexes[i] = metricIndex; - } - } - return getFont().width(metricIndexes, offset, length, fontSize, letterSpacing, wordSpacing, fontContext, + return getFont().width(chars, offset, length, fontSize, letterSpacing, wordSpacing, fontContext, orthography); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-04 04:01:23
|
Revision: 2672 http://sourceforge.net/p/axsl/code/2672 Author: victormote Date: 2023-01-04 04:01:21 +0000 (Wed, 04 Jan 2023) Log Message: ----------- Convert use of short[] to ShortSequence. Modified Paths: -------------- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java =================================================================== --- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java 2023-01-04 00:29:05 UTC (rev 2671) +++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java 2023-01-04 04:01:21 UTC (rev 2672) @@ -26,6 +26,7 @@ import org.axsl.orthography.Orthography; import org.axsl.primitive.sequence.ByteSequence; import org.axsl.primitive.sequence.IntSequence; +import org.axsl.primitive.sequence.ShortSequence; import org.axsl.ps.Encoding; import java.math.BigDecimal; @@ -370,7 +371,7 @@ * + {@link Encoding#getFirstIndex()}. * For fonts that have been subsetted, only the characters that are included in the subset are returned. */ - short[] getWidths(); + ShortSequence getWidths(); /** * Return an array of all characters that should be embedded with the font when it is embedded. Modified: trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java =================================================================== --- trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java 2023-01-04 00:29:05 UTC (rev 2671) +++ trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java 2023-01-04 04:01:21 UTC (rev 2672) @@ -32,6 +32,7 @@ import org.axsl.orthography.Orthography; import org.axsl.primitive.sequence.ByteSequence; import org.axsl.primitive.sequence.IntSequence; +import org.axsl.primitive.sequence.ShortSequence; import org.axsl.ps.Encoding; import java.math.BigDecimal; @@ -187,7 +188,7 @@ } @Override - public short[] getWidths() { + public ShortSequence getWidths() { // TODO Auto-generated method stub return null; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-04 00:29:08
|
Revision: 2671 http://sourceforge.net/p/axsl/code/2671 Author: victormote Date: 2023-01-04 00:29:05 +0000 (Wed, 04 Jan 2023) Log Message: ----------- Clean up related to simulation of font features that aren't natively available in the font. Modified Paths: -------------- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontServer.java trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java Added Paths: ----------- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontFeatureSimulation.java Added: trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontFeatureSimulation.java =================================================================== --- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontFeatureSimulation.java (rev 0) +++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontFeatureSimulation.java 2023-01-04 00:29:05 UTC (rev 2671) @@ -0,0 +1,89 @@ +/* + * Copyright 2023 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. + */ + +/* + * $LastChangedRevision$ + * $LastChangedDate$ + * $LastChangedBy$ + */ + +package org.axsl.font; + +import java.math.BigDecimal; + +/** + * Stores information about whether and how to simulate font features that are not present in the font. + */ +public interface FontFeatureSimulation { + + /** A default instance that returns the default value for all methods. */ + FontFeatureSimulation DEFAULT = new FontFeatureSimulation() { }; + + /** + * Constant indicating that the font should be allowed to simulate small-caps using the font's native x-height as + * the basis for the small-caps percentage. + * @see #getSimulatedSmallCaps() + */ + BigDecimal SMALL_CAP_SIMULATION_NATIVE = BigDecimal.valueOf(Long.MIN_VALUE); + + /** + * Returns the percentage which should be applied to the font-size to simulate small caps. + * For example, if set to 80%, and the font-size is 12 points, the resulting small-caps will be presented at + * 9.6 points. + * @return The percentage which should be applied to the font-size to simulate small caps, or null if small caps + * should not be simulated, or {@link #SMALL_CAP_SIMULATION_NATIVE} if the font's x-height should be used as the + * basis for simulating small-caps. + */ + default BigDecimal getSimulatedSmallCaps() { + return null; + } + + /** + * Returns the number of degrees clockwise that the font should be skewed to simulate oblique. + * @return The number of degrees clockwise that the font should be skewed to simulate oblique, or null if it should + * not simulate oblique. + */ + default BigDecimal getSimulatedOblique() { + return null; + } + + /** + * Returns the number of degrees counterclockwise that the font should be skewed to simulate backslant. + * @return The number of degrees counterclockwise that the font should be skewed to simulate backslant, or null if + * it should not simulate backslant. + */ + default BigDecimal getSimulatedBackslant() { + return null; + } + + /** + * Returns the percentage by which the font should be stretched horizontally to simulate a given + * {@link Font.Stretch} value. + * Values greater than 100 will result in wider characters. + * Values less than 100 will result in narrower characters. + * @param fontStretch The font-stretch descriptor for which a simulated value is wanted. + * Return values for {@link Font.Stretch#NORMAL} are meaningless, since that does not need to be simulated. + * Return values for {@link Font.Stretch#ANY} are also meaningless, the purpose of that value having no + * corresponding meaning for purposes of font feature simulation. + * @return Returns the percentage by which the font should be stretched horizontally to simulat {@code fontStretch}, + * or null if it should not simulate font-stretch. + */ + default BigDecimal getSimulatedStretch(Font.Stretch fontStretch) { + return null; + } + +} Property changes on: trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontFeatureSimulation.java ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Rev \ No newline at end of property Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontServer.java =================================================================== --- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontServer.java 2023-01-03 21:10:30 UTC (rev 2670) +++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontServer.java 2023-01-04 00:29:05 UTC (rev 2671) @@ -49,43 +49,6 @@ public interface FontServer { /** - * Constant indicating that the font to be registered should not be allowed to simulate - * small-caps. - * @see #registerFontDescription(String, String, Encoding, org.axsl.font.Font.Style, - * org.axsl.font.Font.Weight, org.axsl.font.Font.Variant, org.axsl.font.Font.Stretch, float, - * float, float, float[]) - */ - float SMALL_CAP_SIMULATION_INVALID = 0; - - /** - * Constant indicating that the font to be registered should be allowed to simulate - * small-caps using the font's native x-height as the basis for the small-caps - * percentage. - * @see #registerFontDescription(String, String, Encoding, org.axsl.font.Font.Style, - * org.axsl.font.Font.Weight, org.axsl.font.Font.Variant, org.axsl.font.Font.Stretch, float, - * float, float, float[]) - */ - float SMALL_CAP_SIMULATION_NATIVE = -1; - - /** - * Constant indicating that the font to be registered should not be allowed to simulate - * oblique, italic, or backslant. - * @see #registerFontDescription(String, String, Encoding, org.axsl.font.Font.Style, - * org.axsl.font.Font.Weight, org.axsl.font.Font.Variant, org.axsl.font.Font.Stretch, float, - * float, float, float[]) - */ - float OBLIQUE_SIMULATION_INVALID = 0; - - /** - * Constant indicating that the font to be registered should not be allowed to simulate - * various font-stretch values. - * @see #registerFontDescription(String, String, Encoding, org.axsl.font.Font.Style, - * org.axsl.font.Font.Weight, org.axsl.font.Font.Variant, org.axsl.font.Font.Stretch, float, - * float, float, float[]) - */ - float STRETCH_SIMULATION_INVALID = 0; - - /** * Returns a list of all Font instances. * @param freeStandingFonts Set to true to include free-standing fonts in * the returned array. @@ -192,65 +155,16 @@ * @param encoding The encoding, if any, that should be used by this * font description. Set this value to null unless you wish to override * the encoding for this font. - * @param style One of {@link Font.Style#NORMAL}, - * {@link Font.Style#ITALIC}, - * {@link Font.Style#OBLIQUE}, or - * {@link Font.Style#BACKSLANT}. - * @param weight One of {@link Font.Weight#EXTREMELY_LIGHT}, - * {@link Font.Weight#VERY_LIGHT}, - * {@link Font.Weight#LIGHT}, - * {@link Font.Weight#NORMAL}, - * {@link Font.Weight#DARK}, - * {@link Font.Weight#SEMI_BOLD}, - * {@link Font.Weight#BOLD}, - * {@link Font.Weight#EXTRA_BOLD},or - * {@link Font.Weight#BLACK}. - * @param variant One of {@link Font.Variant#NORMAL}, or - * {@link Font.Variant#SMALL_CAPS}. - * @param stretch One of {@link Font.Stretch#ULTRA_CONDENSED}, - * {@link Font.Stretch#EXTRA_CONDENSED}, - * {@link Font.Stretch#CONDENSED}, - * {@link Font.Stretch#SEMI_CONDENSED}, - * {@link Font.Stretch#NORMAL}, - * {@link Font.Stretch#SEMI_EXPANDED}, - * {@link Font.Stretch#EXPANDED}, - * {@link Font.Stretch#EXTRA_EXPANDED}, or - * {@link Font.Stretch#ULTRA_EXPANDED}. - * @param simulatedSmallCaps To prevent this font-description from being - * used to simulate small-caps, set this value to - * {@link FontServer#SMALL_CAP_SIMULATION_INVALID}. - * To allow it to simulate small-caps using the font's native x-height computation, set this - * value to {@link FontServer#SMALL_CAP_SIMULATION_NATIVE}. - * Otherwise, set it to the percentage which should be applied to the - * font-size for the small caps. For example, if set to 80%, and the - * font-size is 12 points, the resulting small-caps will be presented at - * 9.6 points. - * @param simulatedOblique To prevent this font-description from being - * used to simulate oblique, set this value to {@link FontServer#OBLIQUE_SIMULATION_INVALID}. - * Otherwise, set it to the number of degrees clockwise that the font should - * be skewed to simulate oblique. - * @param simulatedBackslant To prevent this font-description from being - * used to simulate backslant, set this value to {@link FontServer#OBLIQUE_SIMULATION_INVALID}. - * Otherwise, set it to the number of degrees counterclockwise that the font - * should be skewed to simulate backslant. - * @param simulatedStretch Array containing percentages by which the font - * should be stretched horizontally for various font-stretch values. - * Values greater than 100 will result in wider characters. - * Values less than 100 will result in narrower characters. - * Invalid or unset amounts are indicated by the value - * {@link FontServer#STRETCH_SIMULATION_INVALID}. - * Element 0 corresponds to ultra-condensed (the narrowest value), and - * element 7 corresponds to ultra-expanded (the widest value). - * Note that there is no element for "normal", since that does not need to - * be simulated. - * @throws FontException If {@code fontFamily} or {@code fontID} - * are not already registered. + * @param style The font style (normal, italic, etc.). + * @param weight The font weight (normal, bold, etc.). + * @param variant The font variant (normal, small-caps, etc.). + * @param stretch The font stretch (normal, condensed, expanded, etc.). + * @param simulation Information about whether and how font features should be simulated if they are not native to + * the font. + * @throws FontException If {@code fontFamily} or {@code fontID} are not already registered. */ - void registerFontDescription(String fontFamily, String fontID, - Encoding encoding, Font.Style style, Font.Weight weight, - Font.Variant variant, Font.Stretch stretch, - float simulatedSmallCaps, float simulatedOblique, - float simulatedBackslant, float[] simulatedStretch) + void registerFontDescription(String fontFamily, String fontID, Encoding encoding, Font.Style style, + Font.Weight weight, Font.Variant variant, Font.Stretch stretch, FontFeatureSimulation simulation) throws FontException; /** Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java =================================================================== --- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java 2023-01-03 21:10:30 UTC (rev 2670) +++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontUse.java 2023-01-04 00:29:05 UTC (rev 2671) @@ -28,6 +28,8 @@ import org.axsl.primitive.sequence.IntSequence; import org.axsl.ps.Encoding; +import java.math.BigDecimal; + /** * The FontUse interface exposes a font resource to the client application. * It encapsulates a {@link Font} as it is used by a specific @@ -221,8 +223,7 @@ int width(CharSequence chars, int fontSize, FontContext fontContext, Orthography orthography); /** - * Returns the weight of the next bolder font in this font's font-family, - * if one exists. + * Returns the weight of the next bolder font in this font's font-family, if one exists. * If no bolder font exists, returns the next bolder numerical weight value. * If the weight of this Font is already the boldest, * {@link Font.Weight#BLACK}, then returns that value. @@ -236,8 +237,7 @@ Font.Weight nextBolderWeight(); /** - * Returns the weight of the next lighter font in this font's font-family, - * if one exists. + * Returns the weight of the next lighter font in this font's font-family, if one exists. * If no lighter font exists, returns the next lighter numerical weight * value. * If the weight of this Font is already the lightest, @@ -266,184 +266,70 @@ FontUse nextLighterFont(); /** - * If this font has been configured to simulate small-caps, - * returns the percentage of the font-size that will be used to compute - * the faux small-caps size. - * @return The percentage that will be applied to the font-size to get - * the faux small-caps font-size. - * If the font has not been configured to simulate small-caps, returns - * {@link FontServer#SMALL_CAP_SIMULATION_INVALID}. + * Returns the percentage of the font-size that will be used to compute the faux small-caps size. + * @return The percentage that will be applied to the font-size to get the faux small-caps font-size, or null if + * small-caps should not be simulated, or {@link FontFeatureSimulation#SMALL_CAP_SIMULATION_NATIVE} if the native + * font metrics should be used to compute the font size. */ - float simulateSmallCaps(); + BigDecimal simulateSmallCaps(); /** - * <p>Computes the size, in millipoints, which should be used for the - * intrinsically lowercase characters in this font. - * If the font has true small-caps glyphs or is unable to simulate - * small-caps, the value returned will be the same as the value passed. + * <p>Returns the size, in millipoints, which should be used for the intrinsically lowercase characters in this + * font. + * If the font has true small-caps glyphs or is unable to simulate small-caps, the value returned will be the same + * as the value passed. * In other words, no scaling is implied. - * Only if the font is capable of simulating small-caps will the value - * returned be different from the value passed.</p> + * Only if the font is capable of simulating small-caps will the value returned be different from the value + * passed.</p> * - * <p>Not all font-families have a small-caps variant, but small-caps can be - * simulated by the client application. - * To do so, 1) convert all text to uppercase characters, and 2) switch - * back and forth between a larger font size (for characters originally in - * uppercase) and a smaller font size (for characters originally in - * lowercase). If the requested font size is 12 points, and the lowercase - * characters should be scaled at 80%, then the font size to use for the - * lowercase characters is 9.6 points.</p> + * <p>Not all font-families have a small-caps variant, but small-caps can be simulated by the client application. + * To do so, 1) convert all text to uppercase characters, and 2) switch back and forth between a larger font size + * (for characters originally in uppercase) and a smaller font size (for characters originally in lowercase). + * If the requested font size is 12 points, and the lowercase characters should be scaled at 80%, then the font size + * to use for the lowercase characters is 9.6 points.</p> * - * <p>Note that the simulation of small-caps is done entirely outside of - * the font system. As far as the font system is concerned, the same font - * is being used regardless of whether it is being used at the size for - * uppercase characters or the size for lowercase characters. All that is - * being reported in this method is the computation of what has been - * configured for the font.</p> + * <p>Note that the simulation of small-caps is done entirely outside of the font system. + * As far as the font system is concerned, the same font is being used regardless of whether it is being used at the + * size for uppercase characters or the size for lowercase characters. + * All that is being reported in this method is the computation of what has been configured for the font.</p> * * @param fontSize The size, in millipoints, of the font at normal size. - * In other words, the size that will be used to create the uppercase - * glyphs. - * @return The size, in millipoints, that should be used for creating the - * instrinsically lowercase glyphs in this font. For a font that is - * capable of simulating small-caps, this value will be scaled to a - * percentage configured for the font. + * In other words, the size that will be used to create the uppercase glyphs. + * @return The size, in millipoints, that should be used for creating the instrinsically lowercase glyphs in this + * font. + * For a font that is capable of simulating small-caps, this value will be scaled to a percentage configured for the + * font. */ int smallCapsSize(int fontSize); /** - * If this font has been configured to simulate the "oblique" font-style, - * return the percentage of 90 degrees that should be used to compute - * the angle at which the characters should be skewed to obtain that - * effect. - * A positive value skews the character clockwise, and a negative value - * skews the character counter-clockwise. + * Returns the percentage of 90 degrees that this font should be rotated clockwise to simulate oblique. + * A positive value skews the glyphs clockwise, and a negative value skews the glyphs counter-clockwise. * Presumably values returned should be positive. - * @return The percentage that characters from this font should be skewed - * when the "oblique" font-style is requested, or zero if the font has not - * been configured to simulate oblique. + * @return The percentage of 90 degrees that glyphs from this font should be rotated clockwise to simulate oblique, + * or null if oblique should not be simulated. */ - float simulateOblique(); + BigDecimal simulateOblique(); /** - * If this font has been configured to simulate the "backslant" font-style, - * return the percentage of 90 degrees that should be used to compute - * the angle at which the characters should be skewed to obtain that - * effect. - * A positive value skews the character clockwise, and a negative value - * skews the character counter-clockwise. - * Presumably values returned should be negative. - * @return The percentage that characters from this font should be skewed - * when the "backslant" font-style is requested, or zero if the font has not - * been configured to simulate backslant. + * Returns the percentage of 90 degrees that this font should be rotated counter-clockwise to simulate backslant. + * A positive value skews the glyphs counter-clockwise, and a negative value skews the glyphs clockwise. + * Presumably values returned should be positive. + * @return The percentage of 90 degrees that glyphs from this font should be rotated counter-clockwise to simulate + * backslant, or null if backslant should not be simulated. */ - float simulateBackslant(); + BigDecimal simulateBackslant(); /** - * If this font has been configured to simulate the "ultra-condensed" - * font-stretch, return the percentage that should be applied to the width - * of characters in this font to achieve that effect. - * Values over 100% will result in wider characters, and a values less than - * 100% will result in narrower characters. - * Presumably values returned should be less than 100%. - * @return The percentage that should be applied to the width of characters - * from this font when the "ultra-condensed" font-stretch is requested, - * or 100% if the font has not been configured to simulate ultra-condensed. + * Returns the percentage by which the horizontal width of glyphs should be stretched to simulate font-stretch. + * Values over 100% will result in wider characters, and a values less than 100% will result in narrower characters. + * @param stretch The font-stretch value for which a simulation stretch percentage is being requested. + * @return The percentage that should be applied to the width of characters from this font for {@code stretch}, or + * null if the font has not been configured to simulate that stretch value. */ - float simulateUltraCondensed(); + BigDecimal simulateStretch(Font.Stretch stretch); /** - * If this font has been configured to simulate the "extra-condensed" - * font-stretch, return the percentage that should be applied to the width - * of characters in this font to achieve that effect. - * Values over 100% will result in wider characters, and a values less than - * 100% will result in narrower characters. - * Presumably values returned should be less than 100%. - * @return The percentage that should be applied to the width of characters - * from this font when the "extra-condensed" font-stretch is requested, - * or 100% if the font has not been configured to simulate extra-condensed. - */ - float simulateExtraCondensed(); - - /** - * If this font has been configured to simulate the "condensed" - * font-stretch, return the percentage that should be applied to the width - * of characters in this font to achieve that effect. - * Values over 100% will result in wider characters, and a values less than - * 100% will result in narrower characters. - * Presumably values returned should be less than 100%. - * @return The percentage that should be applied to the width of characters - * from this font when the "condensed" font-stretch is requested, - * or 100% if the font has not been configured to simulate condensed. - */ - float simulateCondensed(); - - /** - * If this font has been configured to simulate the "semi-condensed" - * font-stretch, return the percentage that should be applied to the width - * of characters in this font to achieve that effect. - * Values over 100% will result in wider characters, and a values less than - * 100% will result in narrower characters. - * Presumably values returned should be less than 100%. - * @return The percentage that should be applied to the width of characters - * from this font when the "semi-condensed" font-stretch is requested, - * or 100% if the font has not been configured to simulate semi-condensed. - */ - float simulateSemiCondensed(); - - /** - * If this font has been configured to simulate the "semi-expanded" - * font-stretch, return the percentage that should be applied to the width - * of characters in this font to achieve that effect. - * Values over 100% will result in wider characters, and a values less than - * 100% will result in narrower characters. - * Presumably values returned should be greater than 100%. - * @return The percentage that should be applied to the width of characters - * from this font when the "semi-expanded" font-stretch is requested, - * or 100% if the font has not been configured to simulate semi-expanded. - */ - float simulateSemiExpanded(); - - /** - * If this font has been configured to simulate the "expanded" - * font-stretch, return the percentage that should be applied to the width - * of characters in this font to achieve that effect. - * Values over 100% will result in wider characters, and a values less than - * 100% will result in narrower characters. - * Presumably values returned should be greater than 100%. - * @return The percentage that should be applied to the width of characters - * from this font when the "expanded" font-stretch is requested, - * or 100% if the font has not been configured to simulate expanded. - */ - float simulateExpanded(); - - /** - * If this font has been configured to simulate the "extra-expanded" - * font-stretch, return the percentage that should be applied to the width - * of characters in this font to achieve that effect. - * Values over 100% will result in wider characters, and a values less than - * 100% will result in narrower characters. - * Presumably values returned should be greater than 100%. - * @return The percentage that should be applied to the width of characters - * from this font when the "extra-expanded" font-stretch is requested, - * or 100% if the font has not been configured to simulate extra-expanded. - */ - float simulateExtraExpanded(); - - /** - * If this font has been configured to simulate the "ultra-expanded" - * font-stretch, return the percentage that should be applied to the width - * of characters in this font to achieve that effect. - * Values over 100% will result in wider characters, and a values less than - * 100% will result in narrower characters. - * Presumably values returned should be greater than 100%. - * @return The percentage that should be applied to the width of characters - * from this font when the "ultra-expanded" font-stretch is requested, - * or 100% if the font has not been configured to simulate ultra-expanded. - */ - float simulateUltraExpanded(); - - /** * Returns the PostScript name of the font. * If this FontUse uses the Font's internal encoding, this name should be * the same as the Font's PostScript name. Modified: trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java =================================================================== --- trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java 2023-01-03 21:10:30 UTC (rev 2670) +++ trunk/axsl/axsl-font/src/testFixtures/java/org/axsl/font/fixture/MockFontUse.java 2023-01-04 00:29:05 UTC (rev 2671) @@ -24,6 +24,7 @@ package org.axsl.font.fixture; import org.axsl.font.Font; +import org.axsl.font.Font.Stretch; import org.axsl.font.Font.Weight; import org.axsl.font.FontConsumer; import org.axsl.font.FontContext; @@ -33,6 +34,8 @@ import org.axsl.primitive.sequence.IntSequence; import org.axsl.ps.Encoding; +import java.math.BigDecimal; + /** * A mock implementation of {@link FontUse}, useful for tests. */ @@ -135,78 +138,31 @@ } @Override - public float simulateSmallCaps() { - // TODO Auto-generated method stub - return 0; + public BigDecimal simulateSmallCaps() { + return null; } @Override public int smallCapsSize(final int fontSize) { - // TODO Auto-generated method stub - return 0; + return fontSize; } @Override - public float simulateOblique() { - // TODO Auto-generated method stub - return 0; + public BigDecimal simulateOblique() { + return null; } @Override - public float simulateBackslant() { - // TODO Auto-generated method stub - return 0; + public BigDecimal simulateBackslant() { + return null; } @Override - public float simulateUltraCondensed() { - // TODO Auto-generated method stub - return 0; + public BigDecimal simulateStretch(final Stretch stretch) { + return null; } @Override - public float simulateExtraCondensed() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public float simulateCondensed() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public float simulateSemiCondensed() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public float simulateSemiExpanded() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public float simulateExpanded() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public float simulateExtraExpanded() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public float simulateUltraExpanded() { - // TODO Auto-generated method stub - return 0; - } - - @Override public String getPostscriptName() { // TODO Auto-generated method stub return null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-03 21:10:33
|
Revision: 2670 http://sourceforge.net/p/axsl/code/2670 Author: victormote Date: 2023-01-03 21:10:30 +0000 (Tue, 03 Jan 2023) Log Message: ----------- Convert array parameters and return types to List. Modified Paths: -------------- trunk/axsl/axsl-kp-model/src/main/java/org/axsl/kp/KpFitnessClass.java trunk/axsl/axsl-pdf/src/main/java/org/axsl/pdf/PdfContentStream.java Modified: trunk/axsl/axsl-kp-model/src/main/java/org/axsl/kp/KpFitnessClass.java =================================================================== --- trunk/axsl/axsl-kp-model/src/main/java/org/axsl/kp/KpFitnessClass.java 2023-01-03 18:56:36 UTC (rev 2669) +++ trunk/axsl/axsl-kp-model/src/main/java/org/axsl/kp/KpFitnessClass.java 2023-01-03 21:10:30 UTC (rev 2670) @@ -44,6 +44,13 @@ /** Signifies a line whose type is set very loosely (interword space is very large). */ VERY_LOOSE(3); + /** Cache a copy of the enum for performance reasons. */ + public static final List<KpFitnessClass> VALUES = Collections.unmodifiableList(Arrays.asList(values())); + + + + + /** Constant indicating the top threshold for a tight classification. */ private static final float TIGHT_TOP_THRESHOLD = (float) -.5; @@ -53,12 +60,6 @@ /** Constant indicating the top threshold for a loose classification. */ private static final float LOOSE_TOP_THRESHOLD = (float) 1; - - - - /** Cache a copy of the enum for performance reasons. */ - private static final List<KpFitnessClass> VALUES = Collections.unmodifiableList(Arrays.asList(values())); - /** The numeric value assigned to this fitness class. */ private int numericValue; Modified: trunk/axsl/axsl-pdf/src/main/java/org/axsl/pdf/PdfContentStream.java =================================================================== --- trunk/axsl/axsl-pdf/src/main/java/org/axsl/pdf/PdfContentStream.java 2023-01-03 18:56:36 UTC (rev 2669) +++ trunk/axsl/axsl-pdf/src/main/java/org/axsl/pdf/PdfContentStream.java 2023-01-03 21:10:30 UTC (rev 2670) @@ -30,6 +30,10 @@ import java.awt.geom.Line2D; import java.awt.geom.Rectangle2D; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; /** * A PDF Content Stream. @@ -39,6 +43,17 @@ */ public interface PdfContentStream { + /** Constant used to designate a solid dash pattern. */ + List<BigDecimal> DASHPATTERN_SOLID = Collections.emptyList(); + + /** Constant used to designate a "dotted" dash pattern. */ + List<BigDecimal> DASHPATTERN_DOTTED = + Collections.unmodifiableList(Arrays.asList(BigDecimal.ONE, BigDecimal.valueOf(3))); + + /** Constant used to designate a "dashed" dash pattern. */ + List<BigDecimal> DASHPATTERN_DASHED = + Collections.unmodifiableList(Arrays.asList(BigDecimal.valueOf(3), BigDecimal.valueOf(3))); + /** * Sets the stroke color (and color space) in the graphics state. * @param newColor The new color. @@ -74,8 +89,11 @@ * @param dashPhase The dash phase to be used for drawing this line. * See the PDF Documentation for information about this value. * @throws PdfException For errors while setting the value. + * @see #DASHPATTERN_SOLID + * @see #DASHPATTERN_DOTTED + * @see #DASHPATTERN_DASHED */ - void setDashPattern(float[] dashArray, float dashPhase) throws PdfException; + void setDashPattern(List<BigDecimal> dashArray, BigDecimal dashPhase) throws PdfException; /** * Sets the location of the cursor. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-03 18:56:39
|
Revision: 2669 http://sourceforge.net/p/axsl/code/2669 Author: victormote Date: 2023-01-03 18:56:36 +0000 (Tue, 03 Jan 2023) Log Message: ----------- Convert array parameters and return types to List. Modified Paths: -------------- trunk/axsl/axsl-kp-model/src/main/java/org/axsl/kp/KpFitnessClass.java trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpFitnessClassTests.java Modified: trunk/axsl/axsl-kp-model/src/main/java/org/axsl/kp/KpFitnessClass.java =================================================================== --- trunk/axsl/axsl-kp-model/src/main/java/org/axsl/kp/KpFitnessClass.java 2023-01-03 18:42:34 UTC (rev 2668) +++ trunk/axsl/axsl-kp-model/src/main/java/org/axsl/kp/KpFitnessClass.java 2023-01-03 18:56:36 UTC (rev 2669) @@ -23,6 +23,10 @@ package org.axsl.kp; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + /** * Enumeration of the Knuth-Plass fitness classes. */ @@ -49,18 +53,12 @@ /** Constant indicating the top threshold for a loose classification. */ private static final float LOOSE_TOP_THRESHOLD = (float) 1; - /** The number of values in this enumeration. Cached to avoid performance problems. */ - private static final int QTY_VALUES = KpFitnessClass.values().length; - /** Array of the fitness classes, indexed by their numeric values. */ - private static final KpFitnessClass[] KP_FITNESS_CLASSES = new KpFitnessClass[QTY_VALUES]; - static { - KP_FITNESS_CLASSES[TIGHT.numericValue] = TIGHT; - KP_FITNESS_CLASSES[NORMAL.numericValue] = NORMAL; - KP_FITNESS_CLASSES[LOOSE.numericValue] = LOOSE; - KP_FITNESS_CLASSES[VERY_LOOSE.numericValue] = VERY_LOOSE; - } + + /** Cache a copy of the enum for performance reasons. */ + private static final List<KpFitnessClass> VALUES = Collections.unmodifiableList(Arrays.asList(values())); + /** The numeric value assigned to this fitness class. */ private int numericValue; @@ -96,18 +94,10 @@ * @return The instanceof this enumeration matching {@code numericValue}. */ public static KpFitnessClass fromNumericValue(final int numericValue) { - return KP_FITNESS_CLASSES[numericValue]; + return VALUES.get(numericValue); } /** - * Returns the number of values in this enumeration. - * @return The number of values in this enumeration. - */ - public static int getQtyValues() { - return KpFitnessClass.QTY_VALUES; - } - - /** * Returns the numeric value associated with this fitness class. * @return The numeric value of this fitness class. */ Modified: trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpFitnessClassTests.java =================================================================== --- trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpFitnessClassTests.java 2023-01-03 18:42:34 UTC (rev 2668) +++ trunk/axsl/axsl-kp-model/src/test/java/org/axsl/kp/KpFitnessClassTests.java 2023-01-03 18:56:36 UTC (rev 2669) @@ -36,7 +36,7 @@ */ @Test public void testInitialState() { - assertEquals(4, KpFitnessClass.getQtyValues()); + assertEquals(4, KpFitnessClass.values().length); assertEquals(KpFitnessClass.TIGHT, KpFitnessClass.fromNumericValue(KpFitnessClass.TIGHT.getNumericValue())); assertEquals(KpFitnessClass.NORMAL, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-03 18:42:36
|
Revision: 2668 http://sourceforge.net/p/axsl/code/2668 Author: victormote Date: 2023-01-03 18:42:34 +0000 (Tue, 03 Jan 2023) Log Message: ----------- Convert array parameters and return types to List. Modified Paths: -------------- trunk/axsl/axsl-galley/src/main/java/org/axsl/galley/TableAreaG5.java trunk/axsl/axsl-graphic/src/main/java/org/axsl/graphic/Graphic.java Modified: trunk/axsl/axsl-galley/src/main/java/org/axsl/galley/TableAreaG5.java =================================================================== --- trunk/axsl/axsl-galley/src/main/java/org/axsl/galley/TableAreaG5.java 2023-01-03 18:19:52 UTC (rev 2667) +++ trunk/axsl/axsl-galley/src/main/java/org/axsl/galley/TableAreaG5.java 2023-01-03 18:42:34 UTC (rev 2668) @@ -23,6 +23,8 @@ package org.axsl.galley; +import java.util.List; + /** * An Area containing part or all of a table. */ @@ -30,8 +32,8 @@ /** * Return the background-only areas related to this table area. - * @return An ordered array of background-only areas that should be painted in the output, or null if this table - * area has no background areas. + * @return An ordered list of background-only areas that should be painted in the output, or an empty list if this + * table area has no background areas. * The order is the z-order in which they should be painted, that is, those that should be painted first should * appear first in the array. * The z-index order is defined in the XSL-FO Recommendation, which refers the reader to @@ -43,6 +45,6 @@ * @see "XSL-FO Recommendation 1.0, Section 6.7.3" * @see <a href="http://www.w3.org/TR/REC-CSS2/tables.html#table-layers">The CSS definition of z-indez</a> */ - BackgroundAreaG5[] getBackgroundAreas(); + List<BackgroundAreaG5> getBackgroundAreas(); } Modified: trunk/axsl/axsl-graphic/src/main/java/org/axsl/graphic/Graphic.java =================================================================== --- trunk/axsl/axsl-graphic/src/main/java/org/axsl/graphic/Graphic.java 2023-01-03 18:19:52 UTC (rev 2667) +++ trunk/axsl/axsl-graphic/src/main/java/org/axsl/graphic/Graphic.java 2023-01-03 18:42:34 UTC (rev 2668) @@ -32,6 +32,7 @@ import java.awt.Color; import java.awt.color.ColorSpace; import java.net.URL; +import java.util.List; /** * Interface for Graphics. Graphics, as used here, may include: @@ -276,10 +277,9 @@ /** * Returns any links embedded in the graphic. - * @return The links embedded in the graphic. If there are none, returns an - * empty array. + * @return The links embedded in the graphic, or an empty list of there are none. */ - GraphicLink[] getLinks(); + List<? extends GraphicLink> getLinks(); /** * Provide a {@link GraphicOutput} implementation for a given mime type. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-03 18:19:55
|
Revision: 2667 http://sourceforge.net/p/axsl/code/2667 Author: victormote Date: 2023-01-03 18:19:52 +0000 (Tue, 03 Jan 2023) Log Message: ----------- Convert array parameters and return types to List. Modified Paths: -------------- trunk/axsl/axsl-orthography/src/main/java/org/axsl/orthography/Word.java trunk/axsl/axsl-output/src/main/java/org/axsl/output/DocumentPdfConfiguration.java Modified: trunk/axsl/axsl-orthography/src/main/java/org/axsl/orthography/Word.java =================================================================== --- trunk/axsl/axsl-orthography/src/main/java/org/axsl/orthography/Word.java 2023-01-03 16:15:14 UTC (rev 2666) +++ trunk/axsl/axsl-orthography/src/main/java/org/axsl/orthography/Word.java 2023-01-03 18:19:52 UTC (rev 2667) @@ -188,74 +188,74 @@ /** For languages requiring a distinction between past tense and remote past tense, this indicates that the * tense is remote past. */ - REMOTE_PAST((byte) 0, new PartOfSpeech[] {PartOfSpeech.VERB}), + REMOTE_PAST((byte) 0, Collections.singletonList(PartOfSpeech.VERB)), /** For languages with more than two tenses, this indicates the past tense. For languages that have only tenses * "future" and "non-future," this indicates "non-future". */ - PAST((byte) 1, new PartOfSpeech[] {PartOfSpeech.VERB}), + PAST((byte) 1, Collections.singletonList(PartOfSpeech.VERB)), /** Indicates the present tense. */ - PRESENT((byte) 2, new PartOfSpeech[] {PartOfSpeech.VERB}), + PRESENT((byte) 2, Collections.singletonList(PartOfSpeech.VERB)), /** For languages with more than two tenses, this indicates the future tense. For languages that have only * tenses "past" and "non-past," this indicates "non-past". */ - FUTURE((byte) 3, new PartOfSpeech[] {PartOfSpeech.VERB}), + FUTURE((byte) 3, Collections.singletonList(PartOfSpeech.VERB)), /** For languages requiring a distinction between future tense and remote future tense, this indicates that the * tense is remote future. */ - REMOTE_FUTURE((byte) 4, new PartOfSpeech[] {PartOfSpeech.VERB}), + REMOTE_FUTURE((byte) 4, Collections.singletonList(PartOfSpeech.VERB)), /** Indicates the "perfect" aspect. */ - PERFECT((byte) 5, new PartOfSpeech[] {PartOfSpeech.VERB}), + PERFECT((byte) 5, Collections.singletonList(PartOfSpeech.VERB)), /** Inidicates the "imperfect" aspect. */ - IMPERFECT((byte) 6, new PartOfSpeech[] {PartOfSpeech.VERB}), + IMPERFECT((byte) 6, Collections.singletonList(PartOfSpeech.VERB)), /** The "indicative" mood. */ - INDICATIVE((byte) 7, new PartOfSpeech[] {PartOfSpeech.VERB}), + INDICATIVE((byte) 7, Collections.singletonList(PartOfSpeech.VERB)), /** The "subjunctive" mood. */ - SUBJUNCTIVE((byte) 8, new PartOfSpeech[] {PartOfSpeech.VERB}), + SUBJUNCTIVE((byte) 8, Collections.singletonList(PartOfSpeech.VERB)), /** The "conditional" mood. */ - CONDITIONAL((byte) 9, new PartOfSpeech[] {PartOfSpeech.VERB}), + CONDITIONAL((byte) 9, Collections.singletonList(PartOfSpeech.VERB)), /** Indicates whether this word can be used in the singular number. */ - SINGULAR((byte) 10, new PartOfSpeech[] {PartOfSpeech.NOUN, PartOfSpeech.PRONOUN}), + SINGULAR((byte) 10, Collections.unmodifiableList(Arrays.asList(PartOfSpeech.NOUN, PartOfSpeech.PRONOUN))), /** Indicates whether this word can be used in the plural number. */ - PLURAL((byte) 11, new PartOfSpeech[] {PartOfSpeech.NOUN, PartOfSpeech.PRONOUN}), + PLURAL((byte) 11, Collections.unmodifiableList(Arrays.asList(PartOfSpeech.NOUN, PartOfSpeech.PRONOUN))), /** Indicates whether this word can be used in the plural number. */ - PLURALIZABLE((byte) 12, new PartOfSpeech[] {PartOfSpeech.NOUN}), + PLURALIZABLE((byte) 12, Collections.singletonList(PartOfSpeech.NOUN)), /** Indicates that the word can be used in the masculine gender. */ - MASCULINE((byte) 13, new PartOfSpeech[] {PartOfSpeech.NOUN, PartOfSpeech.PRONOUN, PartOfSpeech.VERB, - PartOfSpeech.ADJECTIVE}), + MASCULINE((byte) 13, Collections.unmodifiableList(Arrays.asList(PartOfSpeech.NOUN, PartOfSpeech.PRONOUN, + PartOfSpeech.VERB, PartOfSpeech.ADJECTIVE))), /** Indicates that the word can be used in the feminine gender. */ - FEMININE((byte) 14, new PartOfSpeech[] {PartOfSpeech.NOUN, PartOfSpeech.PRONOUN, PartOfSpeech.VERB, - PartOfSpeech.ADJECTIVE}), + FEMININE((byte) 14, Collections.unmodifiableList(Arrays.asList(PartOfSpeech.NOUN, PartOfSpeech.PRONOUN, + PartOfSpeech.VERB, PartOfSpeech.ADJECTIVE))), /** Indicates that the word can be used in the neuter gender. */ - NEUTER((byte) 15, new PartOfSpeech[] {PartOfSpeech.NOUN, PartOfSpeech.PRONOUN, PartOfSpeech.VERB, - PartOfSpeech.ADJECTIVE}), + NEUTER((byte) 15, Collections.unmodifiableList(Arrays.asList(PartOfSpeech.NOUN, PartOfSpeech.PRONOUN, + PartOfSpeech.VERB, PartOfSpeech.ADJECTIVE))), /** Indicates whether this word, which must also be usable only in the singular number, can be converted to a * plural form using standard rules from the orthography. */ - CONVERTIBLE_TO_POSSESSIVE((byte) 16, new PartOfSpeech[] {PartOfSpeech.NOUN}), + CONVERTIBLE_TO_POSSESSIVE((byte) 16, Collections.singletonList(PartOfSpeech.NOUN)), /** Indicates that the word is a regular root, as defined for the applicable orthography. */ - REGULAR_ROOT((byte) 17, new PartOfSpeech[] {PartOfSpeech.VERB}), + REGULAR_ROOT((byte) 17, Collections.singletonList(PartOfSpeech.VERB)), /** Indicates whether the word can be converted into comparative and superlative forms in a standard way, as * defined for the applicable orthography. In English, The word "great" is extensible, as it can be converted to * "greater" and "greatest" in a standard way. Neither "greater" nor "greatest" is extensible, as none of the * following are valid English words: "greaterer", "greaterest", "greatester", nor "greatestest". */ - EXTENSIBLE((byte) 18, new PartOfSpeech[] {PartOfSpeech.ADJECTIVE}), + EXTENSIBLE((byte) 18, Collections.singletonList(PartOfSpeech.ADJECTIVE)), - /** Indicates whether thie word is the possessive form of a noun. */ - POSSESSIVE((byte) 19, new PartOfSpeech[] {PartOfSpeech.ADJECTIVE}); + /** Indicates whether the word is the possessive form of a noun. */ + POSSESSIVE((byte) 19, Collections.singletonList(PartOfSpeech.ADJECTIVE)); /** The items in this enumeration as an unmodifiable List, to avoid copying the underlying array each time its * content is needed. */ @@ -266,7 +266,7 @@ private byte index; /** The parts of speech for which this qualifier is valid. */ - private PartOfSpeech[] validPartsOfSpeech; + private List<PartOfSpeech> validPartsOfSpeech; /** * Constructor. @@ -273,7 +273,7 @@ * @param index The index for the new instance. * @param validPartsOfSpeech The parts of speech for which this qualifier is valid. */ - PosQualifier(final byte index, final PartOfSpeech[] validPartsOfSpeech) { + PosQualifier(final byte index, final List<PartOfSpeech> validPartsOfSpeech) { this.validPartsOfSpeech = validPartsOfSpeech; } @@ -286,8 +286,8 @@ if (this.validPartsOfSpeech == null) { return false; } - for (int index = 0; index < this.validPartsOfSpeech.length; index ++) { - if (this.validPartsOfSpeech[index] == pos) { + for (int index = 0; index < this.validPartsOfSpeech.size(); index ++) { + if (this.validPartsOfSpeech.get(index) == pos) { return true; } } Modified: trunk/axsl/axsl-output/src/main/java/org/axsl/output/DocumentPdfConfiguration.java =================================================================== --- trunk/axsl/axsl-output/src/main/java/org/axsl/output/DocumentPdfConfiguration.java 2023-01-03 16:15:14 UTC (rev 2666) +++ trunk/axsl/axsl-output/src/main/java/org/axsl/output/DocumentPdfConfiguration.java 2023-01-03 18:19:52 UTC (rev 2667) @@ -23,6 +23,8 @@ package org.axsl.output; +import java.util.List; + /** * Configuration options for creating PDF document output. */ @@ -38,7 +40,7 @@ * Returns the list of PDF filters that this document should use, in the order that they should be applied. * @return The list of PDF filters that this document should use. */ - String[] getPdfFilters(); + List<String> getPdfFilters(); /** * Return the owner password set by the user. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-03 16:15:18
|
Revision: 2666 http://sourceforge.net/p/axsl/code/2666 Author: victormote Date: 2023-01-03 16:15:14 +0000 (Tue, 03 Jan 2023) Log Message: ----------- Convert array parameters and return types to List. Modified Paths: -------------- trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/PsEncoding.java Modified: trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/PsEncoding.java =================================================================== --- trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/PsEncoding.java 2023-01-03 14:31:43 UTC (rev 2665) +++ trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/PsEncoding.java 2023-01-03 16:15:14 UTC (rev 2666) @@ -23,6 +23,8 @@ package org.axsl.ps; +import java.util.List; + /** * <p>{@link PsEncoding} implementations represent what PostScript and PDF call an Encoding, that is, a mapping from * character to glyph index that is based on the character's location in an array (vector).</p> @@ -191,6 +193,6 @@ * The index is the encoding index for the glyph name at that index. * @return The glyph name array for this encoding. */ - String[] getGlyphNames(); + List<String> getGlyphNames(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-03 14:31:45
|
Revision: 2665 http://sourceforge.net/p/axsl/code/2665 Author: victormote Date: 2023-01-03 14:31:43 +0000 (Tue, 03 Jan 2023) Log Message: ----------- Convert array parameters and return types to List. Modified Paths: -------------- trunk/axsl/axsl-speech/src/main/java/org/axsl/speech/SpeechServer.java trunk/axsl/axsl-speech/src/main/java/org/axsl/speech/SpeechUtility.java Modified: trunk/axsl/axsl-speech/src/main/java/org/axsl/speech/SpeechServer.java =================================================================== --- trunk/axsl/axsl-speech/src/main/java/org/axsl/speech/SpeechServer.java 2023-01-03 14:17:20 UTC (rev 2664) +++ trunk/axsl/axsl-speech/src/main/java/org/axsl/speech/SpeechServer.java 2023-01-03 14:31:43 UTC (rev 2665) @@ -23,6 +23,8 @@ package org.axsl.speech; +import java.util.List; + /** * <p>SpeechServer provides system-wide services for integrating document creation systems with speech systems.</p> */ @@ -38,7 +40,7 @@ * expected here. * @return The best-fitting {@link Voice} instance associated with the descriptive input, or null if none is found. */ - Voice selectVoiceXsl(String[] familyList); + Voice selectVoiceXsl(List<String> familyList); /** * Accepts the client's description of the desired voice, and returns the best-fitting voice found, using the @@ -50,6 +52,6 @@ * value expected here. * @return The best-fitting {@link Voice} instance associated with the descriptive input, or null if none is found. */ - Voice selectVoiceCss(String[] familyList); + Voice selectVoiceCss(List<String> familyList); } Modified: trunk/axsl/axsl-speech/src/main/java/org/axsl/speech/SpeechUtility.java =================================================================== --- trunk/axsl/axsl-speech/src/main/java/org/axsl/speech/SpeechUtility.java 2023-01-03 14:17:20 UTC (rev 2664) +++ trunk/axsl/axsl-speech/src/main/java/org/axsl/speech/SpeechUtility.java 2023-01-03 14:31:43 UTC (rev 2665) @@ -23,6 +23,9 @@ package org.axsl.speech; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; /** * <p>Class containing speech-related utility methods.</p> @@ -34,14 +37,11 @@ * <p>{@code http://www.w3.org/TR/2001/REC-xsl-20011015/}</p> */ public final class SpeechUtility { + /* TODO: This class probably doesn't belong in aXSL. Either remove it or document why it belongs here. */ /** String value for invalid input. */ public static final String INPUT_INVALID = "invalid"; - /** An array of Strings with zero elements, useful especially as a return - * value. */ - public static final String[] EMPTY_STRING_ARRAY = new String[0]; - /** One space. Used for text conversions. */ private static final String ONE_SPACE = " "; @@ -56,7 +56,7 @@ /** * Converts a CSS2-style String input for voice-family into a value expected - * by {@link SpeechServer#selectVoiceCss(String[])}. + * by {@link SpeechServer#selectVoiceCss(List)}. * @param input The CSS2-style voice-family String to be converted. * This is a comma-delimited String containing one or more potential * voice-family items to be selected. Consult the CSS2 standard for @@ -64,9 +64,9 @@ * @return A String array with the parsed voice-family items in it. * This method never returns "null", but may return an array with zero * elements for invalid input. - * @see SpeechServer#selectVoiceCss(String[]) + * @see SpeechServer#selectVoiceCss(List) */ - public static String[] cssVoiceFamily(final CharSequence input) { + public static List<String> cssVoiceFamily(final CharSequence input) { /* There may be a better way to do this ... * Our main delimiter is comma, but a comma would be allowed inside * a quoted string. So I see no way to use StringTokenizer. @@ -75,16 +75,16 @@ * This method may get used frequently, so performance is somewhat * important here. */ if (input == null) { - return SpeechUtility.EMPTY_STRING_ARRAY; + return Collections.emptyList(); } final String modifiedInput = normalizeWhitespace(input); final boolean validInput = validVoiceFamilyInput(modifiedInput); if (! validInput) { - return SpeechUtility.EMPTY_STRING_ARRAY; + return Collections.emptyList(); } final int elementCount = countVoiceFamilyElements(modifiedInput); if (elementCount < 1) { - return SpeechUtility.EMPTY_STRING_ARRAY; + return Collections.emptyList(); } return SpeechUtility.parseVoiceFamilyElements(modifiedInput, elementCount); } @@ -227,9 +227,8 @@ * output. * @return The parsed voice-family elements. */ - private static String[] parseVoiceFamilyElements(final CharSequence chars, - final int elementCount) { - final String[] returnArray = new String[elementCount]; + private static List<String> parseVoiceFamilyElements(final CharSequence chars, final int elementCount) { + final List<String> returnArray = new ArrayList<String>(elementCount); int index = 0; int charCount = 0; boolean insideQuotes = false; @@ -250,8 +249,7 @@ if (insideQuotes) { charCount++; } else if (charCount > 0) { - returnArray[index] = SpeechUtility.extractText(chars, - firstChar, charCount); + returnArray.set(index, SpeechUtility.extractText(chars, firstChar, charCount)); firstChar = -1; charCount = 0; index++; @@ -269,11 +267,9 @@ } } if (charCount > 0) { - returnArray[index] = SpeechUtility.extractText(chars, - firstChar, charCount); + returnArray.set(index, SpeechUtility.extractText(chars, firstChar, charCount)); } return returnArray; - } /** @@ -302,7 +298,7 @@ * elements for invalid input. * @see #cssVoiceFamily(CharSequence) */ - public static String[] foVoiceFamily(final String input) { + public static List<String> foVoiceFamily(final String input) { return SpeechUtility.cssVoiceFamily(input); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-03 14:17:23
|
Revision: 2664 http://sourceforge.net/p/axsl/code/2664 Author: victormote Date: 2023-01-03 14:17:20 +0000 (Tue, 03 Jan 2023) Log Message: ----------- Clean up search for numeric weights. Modified Paths: -------------- trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontWeight.java Modified: trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontWeight.java =================================================================== --- trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontWeight.java 2023-01-03 13:49:44 UTC (rev 2663) +++ trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontWeight.java 2023-01-03 14:17:20 UTC (rev 2664) @@ -23,6 +23,10 @@ package org.axsl.value; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + /** * Enumeration of specified font-weight values. * @see "XSL-FO Recommendation 1.1, Section 7.9.9" @@ -30,44 +34,44 @@ public enum FontWeight { /** Normal font-weight. */ - NORMAL((short) 400, "normal"), + NORMAL((short) 400, "normal", false), /** Bold font-weight. */ - BOLD((short) 700, "bold"), + BOLD((short) 700, "bold", false), /** Numeric font-weight mapping to "extremely light". */ - N100((short) 100, "100"), + N100((short) 100, "100", true), /** Numeric font-weight mapping to "very light". */ - N200((short) 200, "200"), + N200((short) 200, "200", true), /** Numeric font-weight mapping to "light". */ - N300((short) 300, "300"), + N300((short) 300, "300", true), /** Numeric font-weight mapping to "normal". */ - N400((short) 400, "400"), + N400((short) 400, "400", true), /** Numeric font-weight mapping to "dark". */ - N500((short) 500, "500"), + N500((short) 500, "500", true), /** Numeric font-weight mapping to "semi-bold". */ - N600((short) 600, "600"), + N600((short) 600, "600", true), /** Numeric font-weight mapping to "bold". */ - N700((short) 700, "700"), + N700((short) 700, "700", true), /** Numeric font-weight mapping to "extra bold". */ - N800((short) 800, "800"), + N800((short) 800, "800", true), /** Numeric font-weight mapping to "black". */ - N900((short) 900, "900"); + N900((short) 900, "900", true); - /** The interval between the numeric values. */ - private static final int NUMERIC_INTERVAL = 100; - /** Array of valid numeric values. */ - private static final FontWeight[] NUMERIC_VALUES = {null, N100, N200, N300, N400, N500, N600, N700, N800, N900}; + + /** Immutable local copy of the enumeration, for performance. */ + private static final List<FontWeight> VALUES = Collections.unmodifiableList(Arrays.asList(values())); + /** The numeric weight. */ private short numericWeight; @@ -74,14 +78,19 @@ /** The String describing this style in CSS and/or XSL-FO. */ private String name; + /** Indicates whether this instance is an explicitly numeric instance. */ + private boolean isNumeric; + /** * Private constructor. * @param numericWeight The numeric weight for this weight. * @param name The String describing this style in CSS and/or XSL-FO. + * @param isNumeric Indicates whether this instance is an explicitly numeric instance. */ - FontWeight(final short numericWeight, final String name) { + FontWeight(final short numericWeight, final String name, final boolean isNumeric) { this.numericWeight = numericWeight; this.name = name; + this.isNumeric = isNumeric; } /** @@ -108,15 +117,14 @@ * @return The Weight instance, or null if none corresponds to {@code numericWeight.} */ public static FontWeight fromNumeric(final int numericWeight) { - if (numericWeight % NUMERIC_INTERVAL != 0) { - return null; + for (int index = 0; index < VALUES.size(); index ++) { + final FontWeight instance = VALUES.get(index); + if (instance.isNumeric + && instance.numericWeight == numericWeight) { + return instance; + } } - final int index = numericWeight / NUMERIC_INTERVAL; - if (index < 0 - || index >= NUMERIC_VALUES.length) { - return null; - } - return NUMERIC_VALUES[index]; + return null; } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-03 13:49:46
|
Revision: 2663 http://sourceforge.net/p/axsl/code/2663 Author: victormote Date: 2023-01-03 13:49:44 +0000 (Tue, 03 Jan 2023) Log Message: ----------- Switch the numeric aural return types from int x 1000 back to Number. Modified Paths: -------------- trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/MeasurementConstants.java trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/NumericConstants.java trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralInheritedPa.java trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/package-info.java Modified: trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/MeasurementConstants.java =================================================================== --- trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/MeasurementConstants.java 2023-01-03 11:58:44 UTC (rev 2662) +++ trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/MeasurementConstants.java 2023-01-03 13:49:44 UTC (rev 2663) @@ -40,19 +40,16 @@ /** Well-known constant used to convert seconds to/from milliseconds, which is {@value}. */ public static final short MILLISECONDS_PER_SECOND = 1_000; - /** Well-known constant used to convert generic milli-units to/from units, which is {@value}. */ - public static final short MILLIUNITS_PER_UNIT = 1_000; - - /** The number of centimeters per inch. */ + /** The number of centimeters per inch, which is {@value}. */ public static final float CM_PER_INCH = (float) 2.54; - /** The number of millimeters per centimeter. */ + /** The number of millimeters per centimeter, which is {@value}. */ public static final float MM_PER_CM = 10; - /** The number of bytes per kilobyte, that is, 1024. */ + /** The number of bytes per kilobyte, which is {@value}. */ public static final short BYTES_PER_KILOBYTE = 1_024; - /** The number of kilobytes per megabytes, that is, 1024. */ + /** The number of kilobytes per megabytes, which is {@value}. */ public static final short KILOBYTES_PER_MEGABYTE = 1_024; /** Modified: trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/NumericConstants.java =================================================================== --- trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/NumericConstants.java 2023-01-03 11:58:44 UTC (rev 2662) +++ trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/NumericConstants.java 2023-01-03 13:49:44 UTC (rev 2663) @@ -28,35 +28,34 @@ */ public final class NumericConstants { - /** The conversion factor between a percentage value and its decimal - * equivalent, that is, 100. */ + /** The conversion factor between a percentage value and its decimal equivalent, which is {@value}. */ public static final byte PERCENT_CONVERSION = 100; - /** The radix for base-2 numbers, that is, 2. */ + /** The radix for base-2 numbers, which is {@value}. */ public static final byte RADIX_BASE_2 = 2; - /** The radix for base-8 numbers, that is, 8. */ + /** The radix for base-8 numbers, which is {@value}. */ public static final byte RADIX_BASE_8 = 8; - /** The radix for base-10 numbers, that is, 10. */ + /** The radix for base-10 numbers, which is {@value}. */ public static final byte RADIX_BASE_10 = 10; - /** The radix for base-16 numbers, that is, 16. */ + /** The radix for base-16 numbers, which is {@value}. */ public static final byte RADIX_BASE_16 = 16; - /** The number of degrees in a circle, that is, 360. */ + /** The number of degrees in a circle, which is {@value}. */ public static final short DEGREES_PER_CIRCLE = 360; /** Well-known constant used to convert millidegrees to/from degrees, which is {@value}. */ public static final short MILLIDEGREES_PER_DEGREE = 1_000; - /** The number of grads in a circle, that is, 400. */ + /** The number of grads in a circle, which is {@value}. */ public static final short GRADS_PER_CIRCLE = 400; - /** The exponent to use when squaring a value, that is, 2. */ + /** The exponent to use when squaring a value, which is {@value}. */ public static final int SQUARED_EXPONENT = 2; - /** The exponent to use when cubing a value, that is, 3. */ + /** The exponent to use when cubing a value, which is {@value}. */ public static final int CUBED_EXPONENT = 3; /** Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralInheritedPa.java =================================================================== --- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralInheritedPa.java 2023-01-03 11:58:44 UTC (rev 2662) +++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralInheritedPa.java 2023-01-03 13:49:44 UTC (rev 2663) @@ -92,32 +92,31 @@ PitchRelative traitPitchRelative(FoContext context); /** - * Returns the "pitch-range" trait for this FO, expressed as 1/1000 of a pitch-range unit. + * Returns the "pitch-range" trait for this FO. * Pitch-range unit values fall between 0 inclusive and 100 inclusive, where 0 is a flat, monotonic voice, 50 is * normal inflection, and values greater than 50 produce animated voices. * This trait is inherited. * @param context An object that knows how to resolve FO Tree context issues. - * @return The range of frequency to be used by the voice for reading, in 1/1000 of a pitch-range unit, falling in - * the range of 0 inclusive and 100,000 inclusive. + * @return The range of frequency to be used by the voice for reading, in the range from 0 inclusive to 100 + * inclusive. * @see "XSL-FO Recommendation 1.0, Section 7.6.8" * @see "XSL-FO Recommendation 1.1, Section 7.7.8" * @see <a href="https://www.w3.org/TR/CSS2/aural.html#propdef-pitch-range">CSS definition of "pitch-range"</a> */ - int traitPitchRange(FoContext context); + Number traitPitchRange(FoContext context); /** - * Returns the "richness" trait for this FO, expressed as 1/1000 of a richness unit. + * Returns the "richness" trait for this FO. * Richness unit values fall between 0 inclusive and 100 inclusive, where lower values produce softer voices, and * greater values produce richer or brighter voices. * This trait is inherited. * @param context An object that knows how to resolve FO Tree context issues. - * @return The "richness" trait, in 1/1000 of a richness unit, falling in the range of 0 inclusive to 100,000 - * inclusive. + * @return The "richness" trait, in the range from 0 inclusive to 100 inclusive. * @see "XSL-FO Recommendation 1.0, Section 7.6.10" * @see "XSL-FO Recommendation 1.1, Section 7.7.10" * @see <a href="https://www.w3.org/TR/CSS2/aural.html#propdef-richness">CSS definition of "richness"</a> */ - int traitRichness(FoContext context); + Number traitRichness(FoContext context); /** * Returns the "speak" trait for this FO. @@ -160,29 +159,28 @@ SpeakPunctuation traitSpeakPunctuation(FoContext context); /** - * Returns the desired speech-rate, in 1/1000 words-per-minute. + * Returns the desired speech-rate, in words-per-minute. * This trait is inherited. * @param context An object that knows how to resolve FO Tree context issues. - * @return The desired speech-rate, in 1/1000 words-per-minute. + * @return The desired speech-rate, words-per-minute. * @see "XSL-FO Recommendation 1.0, Section 7.6.15" * @see "XSL-FO Recommendation 1.1, Section 7.7.15" * @see <a href="https://www.w3.org/TR/CSS2/aural.html#propdef-speech-rate">CSS definition of "speech-rate"</a> */ - int traitSpeechRate(FoContext context); + Number traitSpeechRate(FoContext context); /** - * Returns the "stress" trait for this FO, expressed in 1/1000 of a stress unit. + * Returns the "stress" trait for this FO. * Stress unit values fall between 0 inclusive and 100 inclusive, controlling the amount of inflection that * results from language stress markers. * This trait is inherited. * @param context An object that knows how to resolve FO Tree context issues. - * @return The "stress" trait, in 1/1000 of a stress unit, falling in the range of 0 inclusive to 100,000 - * inclusive. + * @return The "stress" trait, in the range from 0 inclusive to 100 inclusive. * @see "XSL-FO Recommendation 1.0, Section 7.6.16" * @see "XSL-FO Recommendation 1.1, Section 7.7.16" * @see <a href="https://www.w3.org/TR/CSS2/aural.html#propdef-stress">CSS definition of "stress"</a> */ - int traitStress(FoContext context); + Number traitStress(FoContext context); /** * Returns the "voice-family" trait for this FO. @@ -195,16 +193,16 @@ List<String> traitVoiceFamily(FoContext context); /** - * Returns the computed value for the "volume" property, expressed in 1/1000 of a volume unit. + * Returns the computed value for the "volume" property. * Volume unit values fall between 0 inclusive and 100 inclusive, and adjust the dynamic range of the volume, * where 0 represents the minimum audible volume, and 100 corresponds to the maximum comfortable level. * This trait is inherited. * @param context An object that knows how to resolve FO Tree context issues. - * @return A value in the range from 0 inclusive to 100,000 inclusive, or a -1 for "silent". + * @return A value in the range from 0 inclusive to 100 inclusive, or a -1 for "silent". * @see "XSL-FO Recommendation 1.0, Section 7.6.18" * @see "XSL-FO Recommendation 1.1, Section 7.7.18" * @see <a href="https://www.w3.org/TR/CSS2/aural.html#propdef-volume">CSS definition of "volume"</a> */ - int traitVolume(FoContext context); + Number traitVolume(FoContext context); } Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/package-info.java =================================================================== --- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/package-info.java 2023-01-03 11:58:44 UTC (rev 2662) +++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/package-info.java 2023-01-03 13:49:44 UTC (rev 2663) @@ -40,6 +40,11 @@ * specified. * However, we think that the purpose of using "number" instead of "integer" was to allow fractional seconds to be * specified, but think it doubtful that fractional milliseconds were intended.</li> + * <li>Other methods returning number types return {@link java.lang.Number}. TODO: Consider further whether this + * should be changed to {@link java.math.BigInteger}. The classes that have methods that return such values are + * {@link org.axsl.fotree.fo.prop.ColumnWidthPa}, {@link org.axsl.fotree.fo.prop.CommonAuralInheritedPa} + * (5 occurrences), {@link org.axsl.fotree.fo.prop.CommonFontPa}, and + * {@link org.axsl.fotree.fo.prop.IntrinsicScaleValuePa}.</li> * </ul> */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-03 11:58:48
|
Revision: 2662 http://sourceforge.net/p/axsl/code/2662 Author: victormote Date: 2023-01-03 11:58:44 +0000 (Tue, 03 Jan 2023) Log Message: ----------- Rename method for clarity. Add TODO item for its removal. Modified Paths: -------------- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/ColumnWidthPa.java Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/ColumnWidthPa.java =================================================================== --- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/ColumnWidthPa.java 2023-01-02 14:34:26 UTC (rev 2661) +++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/ColumnWidthPa.java 2023-01-03 11:58:44 UTC (rev 2662) @@ -47,6 +47,8 @@ * @return The number of column-width table units specified for this column. * This value is used to proportionally divide available column width between columns. */ - Number traitColumnWidthTableUnits(); + Number traitProportionalColumnWidthUnits(); + /* TODO: This method should be removed. It is related to the computation of the width of the column, which should + * be done inside the FO Tree with the help of context information. */ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-02 14:34:33
|
Revision: 2661 http://sourceforge.net/p/axsl/code/2661 Author: victormote Date: 2023-01-02 14:34:26 +0000 (Mon, 02 Jan 2023) Log Message: ----------- Add methods to find next widest and next narrowest instances. Modified Paths: -------------- trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontStretch.java Modified: trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontStretch.java =================================================================== --- trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontStretch.java 2023-01-02 02:21:37 UTC (rev 2660) +++ trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontStretch.java 2023-01-02 14:34:26 UTC (rev 2661) @@ -77,4 +77,42 @@ return this.numericStretch; } + /** + * Returns the next narrowest stretch. + * @return The next narrowest stretch, or "this" if it is the narrowest stretch (ultra-condensed). + */ + public FontStretch nextNarrowest() { + switch (this) { + case ULTRA_CONDENSED: return this; + case EXTRA_CONDENSED: return ULTRA_CONDENSED; + case CONDENSED: return EXTRA_CONDENSED; + case SEMI_CONDENSED: return CONDENSED; + case NORMAL: return SEMI_CONDENSED; + case SEMI_EXPANDED: return NORMAL; + case EXPANDED: return SEMI_EXPANDED; + case EXTRA_EXPANDED: return EXPANDED; + case ULTRA_EXPANDED: return EXTRA_EXPANDED; + default: return null; + } + } + + /** + * Returns the next widest stretch. + * @return The next widest stretch, or "this" if it is the widest stretch (ultra-expanded). + */ + public FontStretch nextWidest() { + switch (this) { + case ULTRA_CONDENSED: return EXTRA_CONDENSED; + case EXTRA_CONDENSED: return CONDENSED; + case CONDENSED: return SEMI_CONDENSED; + case SEMI_CONDENSED: return NORMAL; + case NORMAL: return SEMI_EXPANDED; + case SEMI_EXPANDED: return EXPANDED; + case EXPANDED: return EXTRA_EXPANDED; + case EXTRA_EXPANDED: return ULTRA_EXPANDED; + case ULTRA_EXPANDED: return this; + default: return null; + } + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-02 02:21:40
|
Revision: 2660 http://sourceforge.net/p/axsl/code/2660 Author: victormote Date: 2023-01-02 02:21:37 +0000 (Mon, 02 Jan 2023) Log Message: ----------- Remove relative FontStretch enums .WIDER and .NARROWER. Modified Paths: -------------- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AreaTree.java trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontStretch.java Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AreaTree.java =================================================================== --- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AreaTree.java 2023-01-02 02:09:49 UTC (rev 2659) +++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AreaTree.java 2023-01-02 02:21:37 UTC (rev 2660) @@ -120,7 +120,6 @@ /** * Converts an FO Tree "font-stretch" value to its equivalent in the Font system. - * Input of {@link FontStretch#WIDER} and {@link FontStretch#NARROWER} are not supported, and will return null. * @param foFontStretch The FO Tree "font-stretch" value to be converted to a font value. * @return The Font equivalent of {code foFontStretch}, or null for unsupported input. */ @@ -130,8 +129,6 @@ } switch (foFontStretch) { case NORMAL: return Font.Stretch.NORMAL; -// case WIDER: return null; -// case NARROWER: return null; case ULTRA_CONDENSED: return Font.Stretch.ULTRA_CONDENSED; case EXTRA_CONDENSED: return Font.Stretch.EXTRA_CONDENSED; case CONDENSED: return Font.Stretch.CONDENSED; Modified: trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontStretch.java =================================================================== --- trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontStretch.java 2023-01-02 02:09:49 UTC (rev 2659) +++ trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontStretch.java 2023-01-02 02:21:37 UTC (rev 2660) @@ -28,14 +28,7 @@ * @see "XSL-FO Recommendation 1.1, Section 7.9.5" */ public enum FontStretch { - /* TODO: Handle "wider" and "narrower" differently. They do not belong here. */ - /** Select a wider stretch than the current stretch. */ - WIDER((byte) -1), - - /** Select a wider stretch than the current stretch. */ - NARROWER((byte) -1), - /** Font-stretch constant indicating ultra-condensed. */ ULTRA_CONDENSED((byte) 10), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vic...@us...> - 2023-01-02 02:09:52
|
Revision: 2659 http://sourceforge.net/p/axsl/code/2659 Author: victormote Date: 2023-01-02 02:09:49 +0000 (Mon, 02 Jan 2023) Log Message: ----------- Remove relative FontWeight enums .BOLDER and .LIGHTER. Modified Paths: -------------- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AreaTree.java trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontWeight.java Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AreaTree.java =================================================================== --- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AreaTree.java 2023-01-02 00:01:10 UTC (rev 2658) +++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AreaTree.java 2023-01-02 02:09:49 UTC (rev 2659) @@ -180,7 +180,6 @@ /** * Converts a resolved FO Tree "font-weight" value to its equivalent in the Font system. - * Input of {@link FontWeight#BOLDER} and {@link FontWeight#LIGHTER} are not supported, and will return null. * @param foFontWeight The FO Tree "font-weight" value to be converted to a font value. * @return The Font equivalent of {code foFontWeight}, or null for unsupported input. */ @@ -191,8 +190,6 @@ switch(foFontWeight) { case NORMAL: return Font.Weight.NORMAL; case BOLD: return Font.Weight.BOLD; -// case BOLDER: return null; -// case LIGHTER: return null; case N100: return Font.Weight.EXTREMELY_LIGHT; case N200: return Font.Weight.VERY_LIGHT; case N300: return Font.Weight.LIGHT; Modified: trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontWeight.java =================================================================== --- trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontWeight.java 2023-01-02 00:01:10 UTC (rev 2658) +++ trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontWeight.java 2023-01-02 02:09:49 UTC (rev 2659) @@ -28,8 +28,6 @@ * @see "XSL-FO Recommendation 1.1, Section 7.9.9" */ public enum FontWeight { - /* TODO: Handle BOLDER & LIGHTER some other way. This enum should probably be used only for resolved values instead - * of including notional values. */ /** Normal font-weight. */ NORMAL((short) 400, "normal"), @@ -37,12 +35,6 @@ /** Bold font-weight. */ BOLD((short) 700, "bold"), - /** Indicates request for a font weight that is bolder than the current font-weight. */ - BOLDER((short) -1, "bolder"), - - /** Indicates request for a font weight that is lighter (less bold) than the current font-weight. */ - LIGHTER((short) -1, "lighter"), - /** Numeric font-weight mapping to "extremely light". */ N100((short) 100, "100"), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |