axsl-commit — aXSL repository commit log messages

[aXSL-commit] SF.net SVN: axsl:[2658] trunk/axsl/axsl-fotree

[<vic...@us...>]

Revision: 2658
          http://sourceforge.net/p/axsl/code/2658
Author:   victormote
Date:     2023-01-02 00:01:10 +0000 (Mon, 02 Jan 2023)
Log Message:
-----------
Convert array return types to List or primitive sequences.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/build.gradle
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/Fo.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/Declarations.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/AllowedHeightScalePa.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/AllowedWidthScalePa.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAccessibilityPa.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/fo/prop/SwitchToPa.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/TextShadowPa.java

Modified: trunk/axsl/axsl-fotree/build.gradle
===================================================================
--- trunk/axsl/axsl-fotree/build.gradle	2023-01-01 22:51:14 UTC (rev 2657)
+++ trunk/axsl/axsl-fotree/build.gradle	2023-01-02 00:01:10 UTC (rev 2658)
@@ -26,6 +26,7 @@
     implementation      (project(':axsl-kp-model'))
     implementation      (project(':axsl-orthography'))
     implementation      (project(':axsl-value'))
+    implementation      (project(':axsl-primitive'))
 }
 
 /* Last line of script. */

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/Fo.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/Fo.java	2023-01-01 22:51:14 UTC (rev 2657)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/Fo.java	2023-01-02 00:01:10 UTC (rev 2658)
@@ -79,10 +79,10 @@
      *
      * <p>By using the sequential index, the external application can create an array-like data structure to store the
      * references.
-     * So, for example, if the Area Tree wants to store a list of Areas generated by each FONode, it can create a List[]
-     * or ArrayList&lt;List&gt; (or any other data structure with efficient direct access by index), containing such
-     * Lists.
-     * Then, instead of getting the List directly from the FONode, the index is obtained instead, then the List is
+     * So, for example, if the Area Tree wants to store a list of Areas generated by each FONode, it can create an array
+     * of {@link java.util.List} elements, a list of {@link java.util.List} elements, or any other data structure with
+     * efficient direct access by index), containing such Lists.
+     * Then, instead of getting the List directly from the {@link Fo}, the index is obtained instead, then the List is
      * obtained from the data structure.</p>
      *
      * <p>Note that the sequence of the indexes is not important, only their range.

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/Declarations.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/Declarations.java	2023-01-01 22:51:14 UTC (rev 2657)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/Declarations.java	2023-01-02 00:01:10 UTC (rev 2658)
@@ -25,6 +25,8 @@
 
 import org.axsl.fotree.Fo;
 
+import java.util.List;
+
 /**
  * An fo:declarations object in XSL-FO.
  * @see "XSL-FO Recommendation 1.0, Section 6.4.3"
@@ -33,9 +35,9 @@
 
     /**
      * Returns the array of color-profile elements available.
-     * @return The array of color-profile elements available. If none are
-     * available, an empty array is returned.
+     * @return The array of color-profile elements available.
+     * If none are available, an empty list is returned.
      */
-    ColorProfile[] getColorProfiles();
+    List<? extends ColorProfile> getColorProfiles();
 
 }

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/AllowedHeightScalePa.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/AllowedHeightScalePa.java	2023-01-01 22:51:14 UTC (rev 2657)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/AllowedHeightScalePa.java	2023-01-02 00:01:10 UTC (rev 2658)
@@ -24,6 +24,7 @@
 package org.axsl.fotree.fo.prop;
 
 import org.axsl.fotree.FoContext;
+import org.axsl.primitive.sequence.FloatSequence;
 
 /**
  * The XSL-FO allowed-height-scale property.
@@ -39,6 +40,6 @@
      * A value of {@link Float#POSITIVE_INFINITY} designates the value of "any".
      * @see "XSL-FO Recommendation 1.1, Section 7.15.1"
      */
-    float[] traitAllowedHeightScale(FoContext context);
+    FloatSequence traitAllowedHeightScale(FoContext context);
 
 }

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/AllowedWidthScalePa.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/AllowedWidthScalePa.java	2023-01-01 22:51:14 UTC (rev 2657)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/AllowedWidthScalePa.java	2023-01-02 00:01:10 UTC (rev 2658)
@@ -24,6 +24,7 @@
 package org.axsl.fotree.fo.prop;
 
 import org.axsl.fotree.FoContext;
+import org.axsl.primitive.sequence.FloatSequence;
 
 /**
  * The XSL-FO allowed-width-scale property.
@@ -38,6 +39,6 @@
      * A value of {@link Float#POSITIVE_INFINITY} designates the value of "any".
      * @see "XSL-FO Recommendation 1.1, Section 7.15.2"
      */
-    float[] traitAllowedWidthScale(FoContext context);
+    FloatSequence traitAllowedWidthScale(FoContext context);
 
 }

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAccessibilityPa.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAccessibilityPa.java	2023-01-01 22:51:14 UTC (rev 2657)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAccessibilityPa.java	2023-01-02 00:01:10 UTC (rev 2658)
@@ -26,6 +26,7 @@
 import org.axsl.fotree.FoContext;
 
 import java.net.URL;
+import java.util.List;
 
 /**
  * The XSL-FO Common Accessibility properties.
@@ -43,7 +44,7 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.4.1"
      * @see "XSL-FO Recommendation 1.1, Section 7.5.1"
      */
-    URL[] traitSourceDocument(FoContext context);
+    List<URL> traitSourceDocument(FoContext context);
 
     /**
      * Returns the "role" trait for this FO if that trait was created as a semantic identifier.

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-01 22:51:14 UTC (rev 2657)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralInheritedPa.java	2023-01-02 00:01:10 UTC (rev 2658)
@@ -30,6 +30,8 @@
 import org.axsl.value.SpeakNumeral;
 import org.axsl.value.SpeakPunctuation;
 
+import java.util.List;
+
 /**
  * The XSL-FO Common Aural properties.
  * @see "XSL-FO, 1.1, Section 7.7."
@@ -190,7 +192,7 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.6.17"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.17"
      */
-    String[] traitVoiceFamily(FoContext context);
+    List<String> traitVoiceFamily(FoContext context);
 
     /**
      * Returns the computed value for the "volume" property, expressed in 1/1000 of a volume unit.

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/SwitchToPa.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/SwitchToPa.java	2023-01-01 22:51:14 UTC (rev 2657)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/SwitchToPa.java	2023-01-02 00:01:10 UTC (rev 2658)
@@ -25,6 +25,8 @@
 
 import org.axsl.value.SwitchTo;
 
+import java.util.List;
+
 /**
  * The XSL-FO switch-to property.
  */
@@ -51,6 +53,6 @@
      * @see "XSL-FO Recommendation 1.1, Section 7.23.11"
      * @see #traitSwitchTo()
      */
-    String[] traitSwitchToNames();
+    List<String> traitSwitchToNames();
 
 }

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/TextShadowPa.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/TextShadowPa.java	2023-01-01 22:51:14 UTC (rev 2657)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/TextShadowPa.java	2023-01-02 00:01:10 UTC (rev 2658)
@@ -26,6 +26,8 @@
 import org.axsl.fotree.FoContext;
 import org.axsl.value.ShadowEffect;
 
+import java.util.List;
+
 /**
  * The XSL-FO text-shadow property.
  */
@@ -41,6 +43,6 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.16.5"
      * @see "XSL-FO Recommendation 1.1, Section 7.17.5"
      */
-    ShadowEffect[] traitTextShadow(FoContext context);
+    List<? extends ShadowEffect> traitTextShadow(FoContext context);
 
 }

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

[aXSL-commit] SF.net SVN: axsl:[2657] trunk/axsl/axsl-primitive/src/main/java/org/axsl/ primitive/sequence

[<vic...@us...>]

Revision: 2657
          http://sourceforge.net/p/axsl/code/2657
Author:   victormote
Date:     2023-01-01 22:51:14 +0000 (Sun, 01 Jan 2023)
Log Message:
-----------
Add primitive sequence interfaces for float and double.

Added Paths:
-----------
    trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoublePrimitiveIterator.java
    trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequence.java
    trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequenceMutable.java
    trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequencePlus.java
    trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatPrimitiveIterator.java
    trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequence.java
    trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequenceMutable.java
    trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequencePlus.java

Added: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoublePrimitiveIterator.java
===================================================================
--- trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoublePrimitiveIterator.java	                        (rev 0)
+++ trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoublePrimitiveIterator.java	2023-01-01 22:51:14 UTC (rev 2657)
@@ -0,0 +1,50 @@
+/*
+ * 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.primitive.sequence;
+
+import java.util.NoSuchElementException;
+
+/**
+ * Implementations iterate over some collection of {@link Double#TYPE}s.
+ */
+public interface DoublePrimitiveIterator {
+
+    /**
+     * Indicates whether this iterator has at least one more element.
+     * Follows the semantics of {@link java.util.Iterator#hasNext()}.
+     * @return True if and only if this iterator can return at least one more element.
+     * @see java.util.Iterator#hasNext()
+     */
+    boolean hasNext();
+
+    /**
+     * Returns the next element in the iteration.
+     * Follows the semantics of {@link java.util.Iterator#next()}.
+     * @return The next element in the iteration.
+     * @throws NoSuchElementException If the iteration has no more elements.
+     * Check {@link #hasNext()} first to avoid this exception.
+     * @see java.util.Iterator#next()
+     */
+    double nextDouble();
+
+}


Property changes on: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoublePrimitiveIterator.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequence.java
===================================================================
--- trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequence.java	                        (rev 0)
+++ trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequence.java	2023-01-01 22:51:14 UTC (rev 2657)
@@ -0,0 +1,61 @@
+/*
+ * 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.primitive.sequence;
+
+/**
+ * A readable sequence of {@link Double#TYPE} values, providing uniform, read-only access to such values.
+ * This is intended to be the equivalent of {@link CharSequence}, but for {@link Double#TYPE} instead of
+ * {@link Character#TYPE}.
+ */
+public interface DoubleSequence {
+
+    /**
+     * Returns the length of this double sequence.
+     * @return The number of {@link Double#TYPE}s in this sequence.
+     */
+    int length();
+
+    /**
+     * Returns the {@link Double#TYPE} value at the specified index.
+     * An index ranges from zero to {@code {@link #length()} - 1}.
+     * The first {@link Double#TYPE} value of the sequence is at index zero, the next at index one, and so on, as if
+     * the content were in an array.
+     * @param index The index of the {@link Double#TYPE} value to be returned.
+     * @return The specified {@link Double#TYPE} value.
+     */
+    double doubleAt(int index);
+
+    /**
+     * Returns this instance cast as {@link DoubleSequencePlus}, if possible.
+     * @return This instance cast as {@link DoubleSequencePlus}, or null if that is not possible.
+     */
+    DoubleSequencePlus asPlus();
+
+    /**
+     * Returns this instance cast as {@link DoubleSequenceMutable}, if possible.
+     * @return This instance cast as {@link DoubleSequenceMutable}, or null if that is not possible.
+     */
+    DoubleSequenceMutable asMutable();
+
+}


Property changes on: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequence.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequenceMutable.java
===================================================================
--- trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequenceMutable.java	                        (rev 0)
+++ trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequenceMutable.java	2023-01-01 22:51:14 UTC (rev 2657)
@@ -0,0 +1,154 @@
+/*
+ * 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.primitive.sequence;
+
+/**
+ * <p>A mutable sequence of {@link Double#TYPE}s.
+ * In addition to providing array-like capabilities, this sequence can also perform the function of a stack of primitive
+ * doubles, the methods {@link #push(double)}, {@link #pop()}, {@link #peek()}, and {@link #empty()} being provided for
+ * that purpose.</p>
+ */
+public interface DoubleSequenceMutable extends DoubleSequencePlus, Swappable {
+
+    /**
+     * Sets the new length of the sequence.
+     * Existing elements are left unchanged unless they are truncated by this operation.
+     * New elements are created as needed if this operation results in a larger array, and are initialized with zero.
+     * The {@code newLength} argument must be greater than or equal to {@code 0}.
+     * @param newLength The new length.
+     * @throws IndexOutOfBoundsException If the {@code newLength} argument is negative.
+     */
+    void setLength(int newLength);
+
+    /**
+     * The double at the specified index is set to {@code newDouble}.
+     * This sequence is altered to represent a new sequence that is identical to the old sequence, except that it
+     * contains the double {@code newDouble} at position {@code index}.
+     * @param index The index of the double to modify.
+     * This must be greater than or equal to {@code 0}, and less than the length of this sequence.
+     * @param newDouble The new double.
+     * @throws IndexOutOfBoundsException If {@code index} is negative or greater than or equal to {@link #length()}.
+     * @see java.lang.StringBuilder#setCharAt(int, char)
+     */
+    void setDoubleAt(int index, double newDouble);
+
+    /**
+     * Sorts this sequence into ascending numerical order.
+     * @see java.util.Arrays#sort(double[])
+     */
+    void sort();
+
+    /**
+     * Returns the current capacity.
+     * The capacity is the total size, in elements, of the internal buffer.
+     * Any excess of it over {@link #length()} is available for newly inserted elements.
+     * Adding elements beyong the capacity will result in an allocation.
+     * @return The current capacity.
+     */
+    int capacity();
+
+    /**
+     * Attempts to reduce storage used for the sequence.
+     * If the buffer is larger than necessary to hold its current sequence, then it may be resized to become more space
+     * efficient.
+     * Calling this method may, but is not required to, affect the value returned by a subsequent call to the
+     * {@link #capacity()} method.
+     */
+    void trimToSize();
+
+    /**
+     * Appends the specified item to this sequence.
+     * @param newItem The item to append.
+     * @return A reference to this.
+     * @see StringBuilder#append(char)
+     */
+    DoubleSequenceMutable append(double newItem);
+
+    /**
+     * Appends the specified items to this sequence.
+     * @param newItems The items to append.
+     * @return A reference to this.
+     * @see StringBuilder#append(char[])
+     */
+    DoubleSequenceMutable append(double ... newItems);
+
+    /**
+     * Appends the content of another sequence to this sequence.
+     * @param sequence The sequence to append.
+     * @return A reference to this.
+     * @see StringBuilder#append(CharSequence)
+     */
+    DoubleSequenceMutable append(DoubleSequence sequence);
+
+    /**
+     * Appends a subset of the content of another sequence to this sequence.
+     * @param sequence The sequence to append.
+     * @param start The index to the first element (inclusive) in {@code sequence} that should be appended.
+     * @param end The index to the last element (exclusive) in {@code sequence} that should be appended.
+     * @return A reference to this.
+     * @see StringBuilder#append(CharSequence, int, int)
+     */
+    DoubleSequenceMutable append(DoubleSequence sequence, int start, int end);
+
+    /**
+     * Treating this sequence as a stack, pushes (appends) the specified item to this sequence.
+     * @param newItem The item to be pushed.
+     * @return The {@code newItem} argument.
+     * @see java.util.Stack#push(Object)
+     */
+    double push(double newItem);
+
+    /**
+     * Treating this sequence as a stack, pops (removes) the item at the top of this stack (the last item in the
+     * sequence) and returns it.
+     * @return The item at the top of this stack (the last item in this sequence).
+     * @throws java.util.EmptyStackException If this stack is empty.
+     * @see java.util.Stack#pop()
+     */
+    double pop();
+
+    /**
+     * Treating this sequence as a stack, returns the item at the top of this stack (the last item in the sequence)
+     * without removing it from the stack.
+     * @return The object at the top of this stack (the last item in the sequence).
+     * @throws java.util.EmptyStackException If this stack is empty.
+     * @see java.util.Stack#peek()
+     */
+    double peek();
+
+    /**
+     * Treating this sequence as a stack, indicates whether there are any items in the stack.
+     * @return True if and only if there are no items on the stack.
+     * @see java.util.Stack#empty()
+     */
+    boolean empty();
+
+    /**
+     * Copies the content of this sequence into an immutable container.
+     * @return A new immutable sequence whose content is identical to that of this.
+     * @see java.lang.CharSequence#toString()
+     */
+    DoubleSequencePlus toImmutable();
+
+}


Property changes on: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequenceMutable.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequencePlus.java
===================================================================
--- trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequencePlus.java	                        (rev 0)
+++ trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequencePlus.java	2023-01-01 22:51:14 UTC (rev 2657)
@@ -0,0 +1,115 @@
+/*
+ * 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.primitive.sequence;
+
+import java.io.Serializable;
+
+/**
+ * <p>Sub-interface of {@link DoubleSequence} whose implementations provide additional read-only services.
+ * All methods in this interface must be read-only.</p>
+ */
+public interface DoubleSequencePlus extends DoubleSequence, Serializable {
+
+    /**
+     * Returns a new {@link DoubleSequence} that is a subsequence of this sequence.
+     * The subsequence starts with the {@link Double#TYPE} value at index {@code start} and ends with the
+     * {@link Double#TYPE} value at index {@code end - 1}.
+     * The length of the returned sequence is {@code end - start}, so if {@code start == end} then an empty sequence is
+     * returned.
+     * @param start The start index, inclusive.
+     * @param end The end index, exclusive.
+     * @return The specified subsequence
+     */
+    DoubleSequence subSequence(int start, int end);
+
+    /**
+     * Returns an array containing the {@link Double#TYPE}s in this sequence in the same order as this sequence.
+     * The length of the array will be the length of this sequence.
+     * @return A new array consisting of exactly this sequence of {@link Boolean#TYPE}s.
+     */
+    double[] toArray();
+
+    /**
+     * Returns an iterator over this sequence.
+     * @return A new iterator.
+     */
+    DoublePrimitiveIterator iterator();
+
+    /**
+     * Returns an iterator over this sequence that returns the elements in reverse order.
+     * @return A new iterator.
+     */
+    DoublePrimitiveIterator iteratorReverse();
+
+    /**
+     * <p>Pass-through call to {@link java.util.Arrays#binarySearch(double[], double)}.
+     * Performs a binary search to find a given value in this sequence.
+     * This sequence must first be sorted for this to be effective, and not all instances can be sorted.
+     * Client code is responsible to ensure that the content of this sequence is sortable and actually sorted before
+     * running this method.</p>
+     * @param value The value searched for.
+     * @return Same as for {@link java.util.Arrays#binarySearch(double[], double)}.
+     * Returns the index of {@code value}, or a negative value if {@code value} is not found in the sequence.
+     * @see java.util.Arrays#binarySearch(double[], double)
+     */
+    int binarySearch(double value);
+
+    /**
+     * Returns the index within this sequence of the first occurrence of {@code aDouble}.
+     * If a double with value {@code aDouble} occurs in the sequence represented by this object, then the index of the
+     * first such occurrence is returned.
+     * If no such double occurs in this sequence, then {@code -1} is returned.
+     * @param aDouble The double whose location is sought.
+     * @return  The index of the first occurrence of {@code aDouble} in the sequence represented by this object, or
+     * {@code -1} if that value does not occur.
+     * @see java.lang.String#indexOf(int)
+     */
+    int indexOf(double aDouble);
+
+    /**
+     * Indicates whether this sequence contains a given double.
+     * @param aDouble The double being tested.
+     * @return True if and only if this sequence contains at least one instance of {@code aDouble}.
+     */
+    boolean contains(double aDouble);
+
+    /**
+     * Returns the first element in this sequence.
+     * @return The element at index 0.
+     */
+    double firstElement();
+
+    /**
+     * Returns the last element in this sequence.
+     * @return The element at index {@link #length()} - 1.
+     */
+    double lastElement();
+
+    /**
+     * Indicates whether this sequence has any elements.
+     * @return True if and only if this sequence has no elements.
+     */
+    boolean isEmpty();
+
+}


Property changes on: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/DoubleSequencePlus.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatPrimitiveIterator.java
===================================================================
--- trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatPrimitiveIterator.java	                        (rev 0)
+++ trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatPrimitiveIterator.java	2023-01-01 22:51:14 UTC (rev 2657)
@@ -0,0 +1,50 @@
+/*
+ * 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.primitive.sequence;
+
+import java.util.NoSuchElementException;
+
+/**
+ * Implementations iterate over some collection of {@link Float#TYPE}s.
+ */
+public interface FloatPrimitiveIterator {
+
+    /**
+     * Indicates whether this iterator has at least one more element.
+     * Follows the semantics of {@link java.util.Iterator#hasNext()}.
+     * @return True if and only if this iterator can return at least one more element.
+     * @see java.util.Iterator#hasNext()
+     */
+    boolean hasNext();
+
+    /**
+     * Returns the next element in the iteration.
+     * Follows the semantics of {@link java.util.Iterator#next()}.
+     * @return The next element in the iteration.
+     * @throws NoSuchElementException If the iteration has no more elements.
+     * Check {@link #hasNext()} first to avoid this exception.
+     * @see java.util.Iterator#next()
+     */
+    float nextFloat();
+
+}


Property changes on: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatPrimitiveIterator.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequence.java
===================================================================
--- trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequence.java	                        (rev 0)
+++ trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequence.java	2023-01-01 22:51:14 UTC (rev 2657)
@@ -0,0 +1,61 @@
+/*
+ * 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.primitive.sequence;
+
+/**
+ * A readable sequence of {@link Float#TYPE} values, providing uniform, read-only access to such values.
+ * This is intended to be the equivalent of {@link CharSequence}, but for {@link Float#TYPE} instead of
+ * {@link Character#TYPE}.
+ */
+public interface FloatSequence {
+
+    /**
+     * Returns the length of this float sequence.
+     * @return The number of {@link Float#TYPE}s in this sequence.
+     */
+    int length();
+
+    /**
+     * Returns the {@link Float#TYPE} value at the specified index.
+     * An index ranges from zero to {@code {@link #length()} - 1}.
+     * The first {@link Float#TYPE} value of the sequence is at index zero, the next at index one, and so on, as if
+     * the content were in an array.
+     * @param index The index of the {@link Float#TYPE} value to be returned.
+     * @return The specified {@link Float#TYPE} value.
+     */
+    float floatAt(int index);
+
+    /**
+     * Returns this instance cast as {@link FloatSequencePlus}, if possible.
+     * @return This instance cast as {@link FloatSequencePlus}, or null if that is not possible.
+     */
+    FloatSequencePlus asPlus();
+
+    /**
+     * Returns this instance cast as {@link FloatSequenceMutable}, if possible.
+     * @return This instance cast as {@link FloatSequenceMutable}, or null if that is not possible.
+     */
+    FloatSequenceMutable asMutable();
+
+}


Property changes on: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequence.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequenceMutable.java
===================================================================
--- trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequenceMutable.java	                        (rev 0)
+++ trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequenceMutable.java	2023-01-01 22:51:14 UTC (rev 2657)
@@ -0,0 +1,154 @@
+/*
+ * 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.primitive.sequence;
+
+/**
+ * <p>A mutable sequence of {@link Float#TYPE}s.
+ * In addition to providing array-like capabilities, this sequence can also perform the function of a stack of primitive
+ * floats, the methods {@link #push(float)}, {@link #pop()}, {@link #peek()}, and {@link #empty()} being provided for
+ * that purpose.</p>
+ */
+public interface FloatSequenceMutable extends FloatSequencePlus, Swappable {
+
+    /**
+     * Sets the new length of the sequence.
+     * Existing elements are left unchanged unless they are truncated by this operation.
+     * New elements are created as needed if this operation results in a larger array, and are initialized with zero.
+     * The {@code newLength} argument must be greater than or equal to {@code 0}.
+     * @param newLength The new length.
+     * @throws IndexOutOfBoundsException If the {@code newLength} argument is negative.
+     */
+    void setLength(int newLength);
+
+    /**
+     * The float at the specified index is set to {@code newFloat}.
+     * This sequence is altered to represent a new sequence that is identical to the old sequence, except that it
+     * contains the float {@code newFloat} at position {@code index}.
+     * @param index The index of the float to modify.
+     * This must be greater than or equal to {@code 0}, and less than the length of this sequence.
+     * @param newFloat The new float.
+     * @throws IndexOutOfBoundsException If {@code index} is negative or greater than or equal to {@link #length()}.
+     * @see java.lang.StringBuilder#setCharAt(int, char)
+     */
+    void setFloatAt(int index, float newFloat);
+
+    /**
+     * Sorts this sequence into ascending numerical order.
+     * @see java.util.Arrays#sort(float[])
+     */
+    void sort();
+
+    /**
+     * Returns the current capacity.
+     * The capacity is the total size, in elements, of the internal buffer.
+     * Any excess of it over {@link #length()} is available for newly inserted elements.
+     * Adding elements beyong the capacity will result in an allocation.
+     * @return The current capacity.
+     */
+    int capacity();
+
+    /**
+     * Attempts to reduce storage used for the sequence.
+     * If the buffer is larger than necessary to hold its current sequence, then it may be resized to become more space
+     * efficient.
+     * Calling this method may, but is not required to, affect the value returned by a subsequent call to the
+     * {@link #capacity()} method.
+     */
+    void trimToSize();
+
+    /**
+     * Appends the specified item to this sequence.
+     * @param newItem The item to append.
+     * @return A reference to this.
+     * @see StringBuilder#append(char)
+     */
+    FloatSequenceMutable append(float newItem);
+
+    /**
+     * Appends the specified items to this sequence.
+     * @param newItems The items to append.
+     * @return A reference to this.
+     * @see StringBuilder#append(char[])
+     */
+    FloatSequenceMutable append(float ... newItems);
+
+    /**
+     * Appends the content of another sequence to this sequence.
+     * @param sequence The sequence to append.
+     * @return A reference to this.
+     * @see StringBuilder#append(CharSequence)
+     */
+    FloatSequenceMutable append(FloatSequence sequence);
+
+    /**
+     * Appends a subset of the content of another sequence to this sequence.
+     * @param sequence The sequence to append.
+     * @param start The index to the first element (inclusive) in {@code sequence} that should be appended.
+     * @param end The index to the last element (exclusive) in {@code sequence} that should be appended.
+     * @return A reference to this.
+     * @see StringBuilder#append(CharSequence, int, int)
+     */
+    FloatSequenceMutable append(FloatSequence sequence, int start, int end);
+
+    /**
+     * Treating this sequence as a stack, pushes (appends) the specified item to this sequence.
+     * @param newItem The item to be pushed.
+     * @return The {@code newItem} argument.
+     * @see java.util.Stack#push(Object)
+     */
+    float push(float newItem);
+
+    /**
+     * Treating this sequence as a stack, pops (removes) the item at the top of this stack (the last item in the
+     * sequence) and returns it.
+     * @return The item at the top of this stack (the last item in this sequence).
+     * @throws java.util.EmptyStackException If this stack is empty.
+     * @see java.util.Stack#pop()
+     */
+    float pop();
+
+    /**
+     * Treating this sequence as a stack, returns the item at the top of this stack (the last item in the sequence)
+     * without removing it from the stack.
+     * @return The object at the top of this stack (the last item in the sequence).
+     * @throws java.util.EmptyStackException If this stack is empty.
+     * @see java.util.Stack#peek()
+     */
+    float peek();
+
+    /**
+     * Treating this sequence as a stack, indicates whether there are any items in the stack.
+     * @return True if and only if there are no items on the stack.
+     * @see java.util.Stack#empty()
+     */
+    boolean empty();
+
+    /**
+     * Copies the content of this sequence into an immutable container.
+     * @return A new immutable sequence whose content is identical to that of this.
+     * @see java.lang.CharSequence#toString()
+     */
+    FloatSequencePlus toImmutable();
+
+}


Property changes on: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequenceMutable.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequencePlus.java
===================================================================
--- trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequencePlus.java	                        (rev 0)
+++ trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequencePlus.java	2023-01-01 22:51:14 UTC (rev 2657)
@@ -0,0 +1,115 @@
+/*
+ * 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.primitive.sequence;
+
+import java.io.Serializable;
+
+/**
+ * <p>Sub-interface of {@link FloatSequence} whose implementations provide additional read-only services.
+ * All methods in this interface must be read-only.</p>
+ */
+public interface FloatSequencePlus extends FloatSequence, Serializable {
+
+    /**
+     * Returns a new {@link FloatSequence} that is a subsequence of this sequence.
+     * The subsequence starts with the {@link Float#TYPE} value at index {@code start} and ends with the
+     * {@link Float#TYPE} value at index {@code end - 1}.
+     * The length of the returned sequence is {@code end - start}, so if {@code start == end} then an empty sequence is
+     * returned.
+     * @param start The start index, inclusive.
+     * @param end The end index, exclusive.
+     * @return The specified subsequence
+     */
+    FloatSequence subSequence(int start, int end);
+
+    /**
+     * Returns an array containing the {@link Float#TYPE}s in this sequence in the same order as this sequence.
+     * The length of the array will be the length of this sequence.
+     * @return A new array consisting of exactly this sequence of {@link Boolean#TYPE}s.
+     */
+    float[] toArray();
+
+    /**
+     * Returns an iterator over this sequence.
+     * @return A new iterator.
+     */
+    FloatPrimitiveIterator iterator();
+
+    /**
+     * Returns an iterator over this sequence that returns the elements in reverse order.
+     * @return A new iterator.
+     */
+    FloatPrimitiveIterator iteratorReverse();
+
+    /**
+     * <p>Pass-through call to {@link java.util.Arrays#binarySearch(float[], float)}.
+     * Performs a binary search to find a given value in this sequence.
+     * This sequence must first be sorted for this to be effective, and not all instances can be sorted.
+     * Client code is responsible to ensure that the content of this sequence is sortable and actually sorted before
+     * running this method.</p>
+     * @param value The value searched for.
+     * @return Same as for {@link java.util.Arrays#binarySearch(float[], float)}.
+     * Returns the index of {@code value}, or a negative value if {@code value} is not found in the sequence.
+     * @see java.util.Arrays#binarySearch(float[], float)
+     */
+    int binarySearch(float value);
+
+    /**
+     * Returns the index within this sequence of the first occurrence of {@code aFloat}.
+     * If a float with value {@code aFloat} occurs in the sequence represented by this object, then the index of the
+     * first such occurrence is returned.
+     * If no such float occurs in this sequence, then {@code -1} is returned.
+     * @param aFloat The float whose location is sought.
+     * @return  The index of the first occurrence of {@code aFloat} in the sequence represented by this object, or
+     * {@code -1} if that value does not occur.
+     * @see java.lang.String#indexOf(int)
+     */
+    int indexOf(float aFloat);
+
+    /**
+     * Indicates whether this sequence contains a given float.
+     * @param aFloat The float being tested.
+     * @return True if and only if this sequence contains at least one instance of {@code aFloat}.
+     */
+    boolean contains(float aFloat);
+
+    /**
+     * Returns the first element in this sequence.
+     * @return The element at index 0.
+     */
+    float firstElement();
+
+    /**
+     * Returns the last element in this sequence.
+     * @return The element at index {@link #length()} - 1.
+     */
+    float lastElement();
+
+    /**
+     * Indicates whether this sequence has any elements.
+     * @return True if and only if this sequence has no elements.
+     */
+    boolean isEmpty();
+
+}


Property changes on: trunk/axsl/axsl-primitive/src/main/java/org/axsl/primitive/sequence/FloatSequencePlus.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.

[aXSL-commit] SF.net SVN: axsl:[2656] trunk/axsl/axsl-font/src/main/java/org/axsl/font/ Font.java

[<vic...@us...>]

Revision: 2656
          http://sourceforge.net/p/axsl/code/2656
Author:   victormote
Date:     2023-01-01 21:33:00 +0000 (Sun, 01 Jan 2023)
Log Message:
-----------
Make some local copies of enum values immutable.

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-01 15:14:40 UTC (rev 2655)
+++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java	2023-01-01 21:33:00 UTC (rev 2656)
@@ -29,6 +29,9 @@
 import org.axsl.ps.Encoding;
 
 import java.awt.font.TextAttribute;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * The Font interface exposes a font resource to the client application.
@@ -62,7 +65,7 @@
         BACKSLANT("backslant");
 
         /** Keep a copy of the values for performance. */
-        private static final Font.Style[] VALUES = Style.values();
+        private static final List<Font.Style> VALUES = Collections.unmodifiableList(Arrays.asList(Style.values()));
 
         /** The external description of this style. */
         private String name;
@@ -92,8 +95,8 @@
             if (name == null) {
                 return null;
             }
-            for (int index = 0; index < VALUES.length; index ++) {
-                final Style style = VALUES[index];
+            for (int index = 0; index < VALUES.size(); index ++) {
+                final Style style = VALUES.get(index);
                 if (style.name.equals(name)) {
                     return style;
                 }
@@ -157,7 +160,7 @@
         BLACK((short) 900, "900");
 
         /** Keep a copy of the values for performance. */
-        private static final Font.Weight[] VALUES = Weight.values();
+        private static final List<Font.Weight> VALUES = Collections.unmodifiableList(Arrays.asList(Weight.values()));
 
         /** The numeric weight. */
         private short numericWeight;
@@ -202,8 +205,8 @@
             if (name == null) {
                 return null;
             }
-            for (int index = 0; index < VALUES.length; index ++) {
-                final Weight weight = VALUES[index];
+            for (int index = 0; index < VALUES.size(); index ++) {
+                final Weight weight = VALUES.get(index);
                 if (weight.name.equals(name)) {
                     return weight;
                 }
@@ -342,7 +345,7 @@
         SMALL_CAPS("small-caps");
 
         /** Keep a copy of the values for performance. */
-        private static final Font.Variant[] VALUES = Variant.values();
+        private static final List<Font.Variant> VALUES = Collections.unmodifiableList(Arrays.asList(Variant.values()));
 
         /** The external description of this variant. */
         private String name;
@@ -372,8 +375,8 @@
             if (name == null) {
                 return null;
             }
-            for (int index = 0; index < VALUES.length; index ++) {
-                final Variant variant = VALUES[index];
+            for (int index = 0; index < VALUES.size(); index ++) {
+                final Variant variant = VALUES.get(index);
                 if (variant.name.equals(name)) {
                     return variant;
                 }
@@ -419,7 +422,7 @@
         ULTRA_EXPANDED((byte) 90, "ultra-expanded");
 
         /** Keep a copy of the values for performance. */
-        private static final Font.Stretch[] VALUES = Stretch.values();
+        private static final List<Font.Stretch> VALUES = Collections.unmodifiableList(Arrays.asList(Stretch.values()));
 
         /** The numeric stretch value, smaller numbers being more condensed, larger numbers being more expanded. */
         private byte numericStretch;
@@ -464,8 +467,8 @@
             if (name == null) {
                 return null;
             }
-            for (int index = 0; index < VALUES.length; index ++) {
-                final Stretch stretch = VALUES[index];
+            for (int index = 0; index < VALUES.size(); index ++) {
+                final Stretch stretch = VALUES.get(index);
                 if (stretch.name.equals(name)) {
                     return stretch;
                 }
@@ -488,7 +491,8 @@
         AUTO("auto");
 
         /** Keep a copy of the values for performance. */
-        private static final Font.SelectionStrategy[] VALUES = SelectionStrategy.values();
+        private static final List<Font.SelectionStrategy> VALUES =
+                Collections.unmodifiableList(Arrays.asList(SelectionStrategy.values()));
 
         /** The external description of this strategy. */
         private String name;
@@ -518,8 +522,8 @@
             if (name == null) {
                 return null;
             }
-            for (int index = 0; index < VALUES.length; index ++) {
-                final SelectionStrategy strategy = VALUES[index];
+            for (int index = 0; index < VALUES.size(); index ++) {
+                final SelectionStrategy strategy = VALUES.get(index);
                 if (strategy.name.equals(name)) {
                     return strategy;
                 }

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

[aXSL-commit] SF.net SVN: axsl:[2655] trunk/axsl/axsl-fotree/src/main/java/org/axsl/ fotree/fo/Table.java

[<vic...@us...>]

Revision: 2655
          http://sourceforge.net/p/axsl/code/2655
Author:   victormote
Date:     2023-01-01 15:14:40 +0000 (Sun, 01 Jan 2023)
Log Message:
-----------
Change return type from array to List.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/Table.java

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/Table.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/Table.java	2023-01-01 12:41:24 UTC (rev 2654)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/Table.java	2023-01-01 15:14:40 UTC (rev 2655)
@@ -56,17 +56,16 @@
 import org.axsl.fotree.fo.prop.WritingModePa;
 import org.axsl.fotree.role.NormalBlockAreaGenerator;
 
+import java.util.List;
+
 /**
  * <p>An fo:table object in XSL-FO.</p>
  *
- * <p>Note the inclusion of {@link CommonMarginInlineOptimumPa} in the "extends"
- * list.
- * The "space-start" and "space-end" properties are not included in the list of
- * properties that apply to fo:table.
- * However, "margin-left", "margin-right", "margin-top", and "margin-bottom" are
- * included in that list, and, in the aXSL normalizations scheme, these can map
- * to "space-start" and "space-end". Therefore, access to those properties must
- * be made available to an fo:table.</p>
+ * <p>Note the inclusion of {@link CommonMarginInlineOptimumPa} in the "extends" list.
+ * The "space-start" and "space-end" properties are not included in the list of properties that apply to fo:table.
+ * However, "margin-left", "margin-right", "margin-top", and "margin-bottom" are included in that list, and, in the aXSL
+ * normalizations scheme, these can map to "space-start" and "space-end".
+ * Therefore, access to those properties must be made available to an fo:table.</p>
  *
  * @see "XSL-FO Recommendation 1.0, Section 6.7.3"
  */
@@ -112,42 +111,36 @@
      * Returns the columns for this table.
      * @return The child table columns defined for this table.
      */
-    TableColumn[] getTableColumns();
+    List<? extends TableColumn> getTableColumns();
 
     /**
      * Returns the number of columns defined for this table.
      * @return The number of columns in this table.
-     * Note that this value may be different than the length of
-     * {@link #getTableColumns()}, because a table-column may span and/or
-     * repeat.
+     * Note that this value may be different than the length of {@link #getTableColumns()}, because a table-column may
+     * span and/or repeat.
      */
     int numberOfColumns();
 
     /**
      * Returns the table-header for this table.
-     * @return Returns the table-header for this table, or null if there is
-     * none.
+     * @return Returns the table-header for this table, or null if there is none.
      */
     TableHeader getTableHeader();
 
     /**
      * Returns the table-footer for this table.
-     * @return Returns the table-footer for this table, or null if there is
-     * none.
+     * @return Returns the table-footer for this table, or null if there is none.
      */
     TableFooter getTableFooter();
 
     /**
-     * Indicates whether the "fixed" or "automatic" table layout algorithm
-     * should be used.
-     * Note that this is determined by more than just the value returned by
-     * {@link #traitTableLayout()}, as the type of specifier for the
-     * inline-progression-dimension property is also a factor.
-     * @return True if and only if the "fixed" layout algorithm should be used, or false
-     * if the "automatic" table layout algorithm should be used.
+     * Indicates whether the "fixed" or "automatic" table layout algorithm should be used.
+     * Note that this is determined by more than just the value returned by {@link #traitTableLayout()}, as the type of
+     * specifier for the inline-progression-dimension property is also a factor.
+     * @return True if and only if the "fixed" layout algorithm should be used, or false if the "automatic" table layout
+     * algorithm should be used.
      * @see "XSL-FO Recommendation 1.1, Section 6.7.3"
-     * @see <a href="http://www.w3.org/TR/REC-CSS2/tables.html#width-layout">
-     * CSS2 Specification, Section 17.5.2.</a>
+     * @see <a href="http://www.w3.org/TR/REC-CSS2/tables.html#width-layout">CSS2 Specification, Section 17.5.2.</a>
      */
     boolean isFixedLayout();
 

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

[aXSL-commit] SF.net SVN: axsl:[2654] trunk/axsl

[<vic...@us...>]

Revision: 2654
          http://sourceforge.net/p/axsl/code/2654
Author:   victormote
Date:     2023-01-01 12:41:24 +0000 (Sun, 01 Jan 2023)
Log Message:
-----------
Convert more return types from Number to 1000x int.

Modified Paths:
--------------
    trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/MeasurementConstants.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralInheritedPa.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-01 01:29:37 UTC (rev 2653)
+++ trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/MeasurementConstants.java	2023-01-01 12:41:24 UTC (rev 2654)
@@ -40,6 +40,9 @@
     /** 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. */
     public static final float CM_PER_INCH = (float) 2.54;
 

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-01 01:29:37 UTC (rev 2653)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralInheritedPa.java	2023-01-01 12:41:24 UTC (rev 2654)
@@ -90,24 +90,32 @@
     PitchRelative traitPitchRelative(FoContext context);
 
     /**
-     * Returns the "pitch-range" trait for this FO.
+     * Returns the "pitch-range" trait for this FO, expressed as 1/1000 of a pitch-range unit.
+     * 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 Hertz (Hz).
+     * @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.
      * @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>
      */
-    Number traitPitchRange(FoContext context);
+    int traitPitchRange(FoContext context);
 
     /**
-     * Returns the "richness" trait for this FO.
+     * Returns the "richness" trait for this FO, expressed as 1/1000 of a richness unit.
+     * 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.
+     * @return The "richness" trait, in 1/1000 of a richness unit, falling in the range of 0 inclusive to 100,000
+     * 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>
      */
-    Number traitRichness(FoContext context);
+    int traitRichness(FoContext context);
 
     /**
      * Returns the "speak" trait for this FO.
@@ -150,24 +158,29 @@
     SpeakPunctuation traitSpeakPunctuation(FoContext context);
 
     /**
-     * Returns the desired speech-rate, in words-per-minute.
+     * Returns the desired speech-rate, in 1/1000 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 words-per-minute.
+     * @return The desired speech-rate, in 1/1000 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>
      */
-    Number traitSpeechRate(FoContext context);
+    int traitSpeechRate(FoContext context);
 
     /**
-     * Returns the "stress" trait for this FO.
+     * Returns the "stress" trait for this FO, expressed in 1/1000 of a stress unit.
+     * 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.
+     * @return The "stress" trait, in 1/1000 of a stress unit, falling in the range of 0 inclusive to 100,000
+     * 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>
      */
-    Number traitStress(FoContext context);
+    int traitStress(FoContext context);
 
     /**
      * Returns the "voice-family" trait for this FO.
@@ -180,13 +193,16 @@
     String[] traitVoiceFamily(FoContext context);
 
     /**
-     * Returns the computed value for the "volume" property.
+     * Returns the computed value for the "volume" property, expressed in 1/1000 of a volume unit.
+     * 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 to 100, or a -1 for "silent".
+     * @return A value in the range from 0 inclusive to 100,000 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>
      */
-    Number traitVolume(FoContext context);
+    int traitVolume(FoContext context);
 
 }

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

[aXSL-commit] SF.net SVN: axsl:[2653] trunk/axsl/axsl-fotree/src/main/java/org/axsl/ fotree/fo/prop

[<vic...@us...>]

Revision: 2653
          http://sourceforge.net/p/axsl/code/2653
Author:   victormote
Date:     2023-01-01 01:29:37 +0000 (Sun, 01 Jan 2023)
Log Message:
-----------
Normalize angle property return values to millidegrees instead of fractional degrees.

Modified Paths:
--------------
    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/CommonAuralNotInheritedPa.java

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-01 00:57:08 UTC (rev 2652)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralInheritedPa.java	2023-01-01 01:29:37 UTC (rev 2653)
@@ -37,7 +37,7 @@
 public interface CommonAuralInheritedPa {
 
     /**
-     * Returns the "azimuth" trait for this FO.
+     * Returns the "azimuth" trait for this FO, in millidegrees.
      * This trait is inherited.
      * @param context An object that knows how to resolve FO Tree context issues.
      * @return The "azimuth" trait, in degrees.
@@ -44,10 +44,10 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.6.1"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.1"
      */
-    Number traitAzimuth(FoContext context);
+    int traitAzimuth(FoContext context);
 
     /**
-     * Returns the "elevation" trait for this FO.
+     * Returns the "elevation" trait for this FO, in millidegrees.
      * This trait is inherited.
      * @param context An object that knows how to resolve FO Tree context issues.
      * @return The "elevation" trait, in degrees.
@@ -54,7 +54,7 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.6.4"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.4"
      */
-    Number traitElevation(FoContext context);
+    int traitElevation(FoContext context);
 
     /**
      * Returns the frequency for the audio for the current voice.

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralNotInheritedPa.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralNotInheritedPa.java	2023-01-01 00:57:08 UTC (rev 2652)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralNotInheritedPa.java	2023-01-01 01:29:37 UTC (rev 2653)
@@ -58,7 +58,7 @@
     URL traitCueBefore(FoContext context);
 
     /**
-     * Returns the "pause-after" trait for this FO.
+     * Returns the "pause-after" trait for this FO, in milliseconds.
      * This trait is not inherited.
      * @param context An object that knows how to resolve FO Tree context issues.
      * @return The pause-after trait value, in milliseconds.
@@ -68,7 +68,7 @@
     int traitPauseAfter(FoContext context);
 
     /**
-     * Returns the "pause-before" trait for this FO.
+     * Returns the "pause-before" trait for this FO, in milliseconds.
      * This trait is not inherited.
      * @param context An object that knows how to resolve FO Tree context issues.
      * @return The pause-before trait value, in milliseconds.

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

[aXSL-commit] SF.net SVN: axsl:[2652] trunk/axsl

[<vic...@us...>]

Revision: 2652
          http://sourceforge.net/p/axsl/code/2652
Author:   victormote
Date:     2023-01-01 00:57:08 +0000 (Sun, 01 Jan 2023)
Log Message:
-----------
Add some constants related to conversions. Change return type for traitPitch to int, to express millihertz.

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	2022-12-30 20:25:48 UTC (rev 2651)
+++ trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/MeasurementConstants.java	2023-01-01 00:57:08 UTC (rev 2652)
@@ -31,6 +31,12 @@
     /** Well-known constant used to convert hertz to/from kilohertz, which is {@value}. */
     public static final short HERTZ_PER_KILOHERTZ = 1_000;
 
+    /** Well-known constant used to convert millihertz to/from hertz, which is {@value}. */
+    public static final short MILLIHERTZ_PER_HERTZ = 1_000;
+
+    /** Well-known constant used to convert millihertz to/from kilohertz, which is {@value}. */
+    public static final int MILLIHERTZ_PER_KILOHERTZ = HERTZ_PER_KILOHERTZ * MILLIHERTZ_PER_HERTZ;
+
     /** Well-known constant used to convert seconds to/from milliseconds, which is {@value}. */
     public static final short MILLISECONDS_PER_SECOND = 1_000;
 

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	2022-12-30 20:25:48 UTC (rev 2651)
+++ trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/NumericConstants.java	2023-01-01 00:57:08 UTC (rev 2652)
@@ -47,6 +47,9 @@
     /** The number of degrees in a circle, that is, 360. */
     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. */
     public static final short GRADS_PER_CIRCLE = 400;
 

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	2022-12-30 20:25:48 UTC (rev 2651)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralInheritedPa.java	2023-01-01 00:57:08 UTC (rev 2652)
@@ -60,29 +60,29 @@
      * Returns the frequency for the audio for the current voice.
      * This trait is inherited.
      * @param context An object that knows how to resolve FO Tree context issues.
-     * @return The frequency to be used by the voice for reading, in Hertz (Hz).
-     * A return value of {@link Double#NEGATIVE_INFINITY} indicates that a pitch relative to the voice family was
-     * specified instead of an actual frequency.
+     * @return The frequency to be used by the voice for reading, in Millihertz (mHz).
+     * A Millihertz is 1/1000  of a Hertz.
+     * A return value of -1 indicates that a pitch relative to the voice family was specified instead of an actual
+     * frequency.
      * To find that relative pitch, see {@link #traitPitchRelative(FoContext)}.
-     * @see <a href="http://www.w3.org/TR/REC-CSS2/aural.html#propdef-pitch">CSS
-     * definition of "pitch"</a>
+     * @see <a href="http://www.w3.org/TR/REC-CSS2/aural.html#propdef-pitch">CSS definition of "pitch"</a>
      * @see "XSL-FO Recommendation 1.0, Section 7.6.7"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.7"
      */
-    Number traitPitch(FoContext context);
+    int traitPitch(FoContext context);
 
     /**
      * Returns the frequency for the audio for the current voice, expressed as a value relative to the voice family.
      * This method will return null if an actual frequency was specified.
      * Check the return value from {@link #traitPitch} first.
-     * If that returns {@link Double#NEGATIVE_INFINITY}, then the return value of this method should be applied to the
-     * voice family to compute the desired frequency.
+     * If that returns -1, then the return value of this method should be applied to the voice family to compute the
+     * desired frequency.
      * The CSS documentation says "User agents should map these values to appropriate frequencies based on the voice
      * family and user environment. However, user agents must map these values in order (i.e., 'x-low' is a lower
      * frequency than 'low', etc.)."
      * This trait is inherited.
      * @param context An object that knows how to resolve FO Tree context issues.
-     * @return The frequency to be used by the voice for reading, in Hertz (Hz).
+     * @return The relative frequency to be used by the voice for reading.
      * @see <a href="http://www.w3.org/TR/REC-CSS2/aural.html#propdef-pitch">CSS definition of "pitch"</a>
      * @see "XSL-FO Recommendation 1.0, Section 7.6.7"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.7"

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	2022-12-30 20:25:48 UTC (rev 2651)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/package-info.java	2023-01-01 00:57:08 UTC (rev 2652)
@@ -32,12 +32,14 @@
  *
  * <p>Noteworthy design decisions:</p>
  * <ul>
+ *   <li>The granularity for methods returning lengths is millipoints, or 1/72,000 of an inch.</li>
+ *   <li>The granularity for methods returning frequencies is millihertz, or 1/1000 of a Hertz.</li>
+ *   <li>The granularity for methods returning angles is millidegrees, or 1/1000 of a degree.</li>
  *   <li>The granularity for methods returning times is milliseconds.
  *   XSL-FO specifies that the first part of a "time" is a "number", which would allow fractional milliseconds to be
  *   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.
- *   therefore </li>
+ *   specified, but think it doubtful that fractional milliseconds were intended.</li>
  * </ul>
  */
 

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

[aXSL-commit] SF.net SVN: axsl:[2651] trunk/axsl

[<vic...@us...>]

Revision: 2651
          http://sourceforge.net/p/axsl/code/2651
Author:   victormote
Date:     2022-12-30 20:25:48 +0000 (Fri, 30 Dec 2022)
Log Message:
-----------
Convert remaining double return values and parameters to Number.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonFontPa.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/IntrinsicScaleValuePa.java
    trunk/axsl/axsl-kp-model/src/main/java/org/axsl/kp/KpFitnessClass.java

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonFontPa.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonFontPa.java	2022-12-30 19:20:33 UTC (rev 2650)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonFontPa.java	2022-12-30 20:25:48 UTC (rev 2651)
@@ -88,7 +88,7 @@
      * made to the actual font-size.
      * @see "XSL-FO Recommendation 1.1, Section 7.9.6"
      */
-    double traitFontSizeAdjust(FoContext context);
+    Number traitFontSizeAdjust(FoContext context);
 
     /**
      * Returns the "actual" value for font-size, as distinguished from the "computed" value.

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/IntrinsicScaleValuePa.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/IntrinsicScaleValuePa.java	2022-12-30 19:20:33 UTC (rev 2650)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/IntrinsicScaleValuePa.java	2022-12-30 20:25:48 UTC (rev 2651)
@@ -37,6 +37,6 @@
      * @return The "intrinsic-scale-value" trait.
      * @see "XSL-FO Recommendation 1.1, Section 7.30.9"
      */
-    double traitIntrinsicScaleValue(FoContext context);
+    Number traitIntrinsicScaleValue(FoContext context);
 
 }

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	2022-12-30 19:20:33 UTC (rev 2650)
+++ trunk/axsl/axsl-kp-model/src/main/java/org/axsl/kp/KpFitnessClass.java	2022-12-30 20:25:48 UTC (rev 2651)
@@ -77,12 +77,13 @@
      * @param adjustmentRatio The adjustment ratio to be converted.
      * @return The instance of this enumeration that represents {@code adjustmentRatio}.
      */
-    public static KpFitnessClass fromAdjustmentRatio(final double adjustmentRatio) {
-        if (adjustmentRatio < TIGHT_TOP_THRESHOLD) {
+    public static KpFitnessClass fromAdjustmentRatio(final Number adjustmentRatio) {
+        final double adjustmentRatioAsDouble = adjustmentRatio.doubleValue();
+        if (adjustmentRatioAsDouble < TIGHT_TOP_THRESHOLD) {
             return TIGHT;
-        } else if (adjustmentRatio <= NORMAL_TOP_THRESHOLD) {
+        } else if (adjustmentRatioAsDouble <= NORMAL_TOP_THRESHOLD) {
             return NORMAL;
-        } else if (adjustmentRatio <= LOOSE_TOP_THRESHOLD) {
+        } else if (adjustmentRatioAsDouble <= LOOSE_TOP_THRESHOLD) {
             return LOOSE;
         } else {
             return VERY_LOOSE;

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

[aXSL-commit] SF.net SVN: axsl:[2650] trunk/axsl/axsl-fotree/src/main/java/org/axsl/ fotree/fo/prop

[<vic...@us...>]

Revision: 2650
          http://sourceforge.net/p/axsl/code/2650
Author:   victormote
Date:     2022-12-30 19:20:33 +0000 (Fri, 30 Dec 2022)
Log Message:
-----------
Convert some double return values to Number.

Modified Paths:
--------------
    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/CommonAuralInheritedPa.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	2022-12-30 18:44:42 UTC (rev 2649)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/ColumnWidthPa.java	2022-12-30 19:20:33 UTC (rev 2650)
@@ -47,6 +47,6 @@
      * @return The number of column-width table units specified for this column.
      * This value is used to proportionally divide available column width between columns.
      */
-    double traitColumnWidthTableUnits();
+    Number traitColumnWidthTableUnits();
 
 }

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	2022-12-30 18:44:42 UTC (rev 2649)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralInheritedPa.java	2022-12-30 19:20:33 UTC (rev 2650)
@@ -44,7 +44,7 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.6.1"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.1"
      */
-    double traitAzimuth(FoContext context);
+    Number traitAzimuth(FoContext context);
 
     /**
      * Returns the "elevation" trait for this FO.
@@ -54,7 +54,7 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.6.4"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.4"
      */
-    double traitElevation(FoContext context);
+    Number traitElevation(FoContext context);
 
     /**
      * Returns the frequency for the audio for the current voice.
@@ -69,7 +69,7 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.6.7"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.7"
      */
-    double traitPitch(FoContext context);
+    Number traitPitch(FoContext context);
 
     /**
      * Returns the frequency for the audio for the current voice, expressed as a value relative to the voice family.
@@ -97,7 +97,7 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.6.8"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.8"
      */
-    double traitPitchRange(FoContext context);
+    Number traitPitchRange(FoContext context);
 
     /**
      * Returns the "richness" trait for this FO.
@@ -107,7 +107,7 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.6.10"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.10"
      */
-    double traitRichness(FoContext context);
+    Number traitRichness(FoContext context);
 
     /**
      * Returns the "speak" trait for this FO.
@@ -157,7 +157,7 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.6.15"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.15"
      */
-    double traitSpeechRate(FoContext context);
+    Number traitSpeechRate(FoContext context);
 
     /**
      * Returns the "stress" trait for this FO.
@@ -167,7 +167,7 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.6.16"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.16"
      */
-    double traitStress(FoContext context);
+    Number traitStress(FoContext context);
 
     /**
      * Returns the "voice-family" trait for this FO.
@@ -187,6 +187,6 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.6.18"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.18"
      */
-    double traitVolume(FoContext context);
+    Number traitVolume(FoContext context);
 
 }

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

[aXSL-commit] SF.net SVN: axsl:[2649] trunk/axsl/axsl-fotree/src/main/java/org/axsl/ fotree

[<vic...@us...>]

Revision: 2649
          http://sourceforge.net/p/axsl/code/2649
Author:   victormote
Date:     2022-12-30 18:44:42 +0000 (Fri, 30 Dec 2022)
Log Message:
-----------
Change return types for <time> values from double to int.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralNotInheritedPa.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/package-info.java

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralNotInheritedPa.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralNotInheritedPa.java	2022-12-22 15:53:31 UTC (rev 2648)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/prop/CommonAuralNotInheritedPa.java	2022-12-30 18:44:42 UTC (rev 2649)
@@ -65,7 +65,7 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.6.5"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.5"
      */
-    double traitPauseAfter(FoContext context);
+    int traitPauseAfter(FoContext context);
 
     /**
      * Returns the "pause-before" trait for this FO.
@@ -75,7 +75,7 @@
      * @see "XSL-FO Recommendation 1.0, Section 7.6.6"
      * @see "XSL-FO Recommendation 1.1, Section 7.7.6"
      */
-    double traitPauseBefore(FoContext context);
+    int traitPauseBefore(FoContext context);
 
     /**
      * Returns the "URL" component of the "play-during" trait for this FO.

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	2022-12-22 15:53:31 UTC (rev 2648)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/package-info.java	2022-12-30 18:44:42 UTC (rev 2649)
@@ -29,6 +29,16 @@
  * <ul>
  *   <li>Interfaces whose names end with "Pa" are property accessors.<li>
  * </ul>
+ *
+ * <p>Noteworthy design decisions:</p>
+ * <ul>
+ *   <li>The granularity for methods returning times is milliseconds.
+ *   XSL-FO specifies that the first part of a "time" is a "number", which would allow fractional milliseconds to be
+ *   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.
+ *   therefore </li>
+ * </ul>
  */
 
 package org.axsl.fotree;

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

[aXSL-commit] SF.net SVN: axsl:[2648] trunk/axsl

[<vic...@us...>]

Revision: 2648
          http://sourceforge.net/p/axsl/code/2648
Author:   victormote
Date:     2022-12-22 15:53:31 +0000 (Thu, 22 Dec 2022)
Log Message:
-----------
Remove generic type from InstreamForeignObject. There was no value being added by it.

Modified Paths:
--------------
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/LineContentFactory.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoContext.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoVisitor.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java

Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/LineContentFactory.java
===================================================================
--- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/LineContentFactory.java	2022-12-19 22:15:39 UTC (rev 2647)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/LineContentFactory.java	2022-12-22 15:53:31 UTC (rev 2648)
@@ -107,7 +107,7 @@
      * @param ipd The inline-progression-dimension used by the foreign-object content.
      * @return The new line content instance.
      */
-    NormalInlineArea createForeignObjectArea(InstreamForeignObject<?> ifo, int ipd);
+    NormalInlineArea createForeignObjectArea(InstreamForeignObject ifo, int ipd);
 
     /**
      * Creates a new Area for inline content.

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoContext.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoContext.java	2022-12-19 22:15:39 UTC (rev 2647)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoContext.java	2022-12-22 15:53:31 UTC (rev 2648)
@@ -216,7 +216,7 @@
      * @param instreamForeign The XML document for which the intrinsic width is needed.
      * @return The intrinsic width, in millipoints, of {@code foreignXml}.
      */
-    int getIntrinsicWidth(InstreamForeignObject<?> instreamForeign);
+    int getIntrinsicWidth(InstreamForeignObject instreamForeign);
 
     /**
      * Returns the intrinsic height, in millipoints, of a given XML document.
@@ -223,6 +223,6 @@
      * @param instreamForeign The XML document for which the intrinsic height is needed.
      * @return The intrinsic height, in millipoints, of {@code foreignXml}.
      */
-    int getIntrinsicHeight(InstreamForeignObject<?> instreamForeign);
+    int getIntrinsicHeight(InstreamForeignObject instreamForeign);
 
 }

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoVisitor.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoVisitor.java	2022-12-19 22:15:39 UTC (rev 2647)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoVisitor.java	2022-12-22 15:53:31 UTC (rev 2648)
@@ -231,7 +231,7 @@
      * @param host The {@link InstreamForeignObject} instance to be visited.
      * @return An implementation-specific value, perhaps {@code host} or a wrapper around it.
      */
-    T visit(InstreamForeignObject<?> host);
+    T visit(InstreamForeignObject host);
 
     /**
      * Visits a {@link Leader} host.

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java	2022-12-19 22:15:39 UTC (rev 2647)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java	2022-12-22 15:53:31 UTC (rev 2648)
@@ -60,10 +60,9 @@
 
 /**
  * An fo:instream-foreign-object object in XSL-FO.
- * @param <D> The type of XML document wrapped.
  * @see "XSL-FO Recommendation 1.0, Section 6.6.6"
  */
-public interface InstreamForeignObject<D extends Document> extends Fo, FoScalable,
+public interface InstreamForeignObject extends Fo, FoScalable,
         CommonAccessibilityPa,
         CommonAuralPa,
         CommonBorderPaddingBgPa,
@@ -99,6 +98,6 @@
      * Returns the embedded XML document.
      * @return The embedded XML document.
      */
-    D getXmlDocument();
+    Document getXmlDocument();
 
 }

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

[aXSL-commit] SF.net SVN: axsl:[2647] trunk/axsl/axsl-fotree/src/main/java/org/axsl/ fotree

[<vic...@us...>]

Revision: 2647
          http://sourceforge.net/p/axsl/code/2647
Author:   victormote
Date:     2022-12-19 22:15:39 +0000 (Mon, 19 Dec 2022)
Log Message:
-----------
Remove the FoForeignXml interface as it is now not used.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java

Removed Paths:
-------------
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoForeignXml.java

Deleted: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoForeignXml.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoForeignXml.java	2022-12-19 21:58:35 UTC (rev 2646)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoForeignXml.java	2022-12-19 22:15:39 UTC (rev 2647)
@@ -1,41 +0,0 @@
-/*
- * Copyright 2005 The aXSL Project.
- *      http://www.axsl.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.axsl.fotree;
-
-import org.axsl.fotree.fo.InstreamForeignObject;
-
-import org.w3c.dom.Document;
-
-/**
- * <p>Super-interface for the root node of XML documents or document fragments that are wrapped inside of an
- * fo:instream-foreign-object.
- * Note that instances of this class are <em>not</em> the fo:instream-foreign-object itself, but rather its
- * contents.</p>
- *
- * @param <D> The type of XML document wrapped.
- * @see InstreamForeignObject
- */
-public interface FoForeignXml<D extends Document> {
-
-}

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java	2022-12-19 21:58:35 UTC (rev 2646)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java	2022-12-19 22:15:39 UTC (rev 2647)
@@ -24,7 +24,6 @@
 package org.axsl.fotree.fo;
 
 import org.axsl.fotree.Fo;
-import org.axsl.fotree.FoForeignXml;
 import org.axsl.fotree.FoScalable;
 import org.axsl.fotree.fo.prop.AlignmentAdjustPa;
 import org.axsl.fotree.fo.prop.AlignmentBaselinePa;
@@ -97,12 +96,6 @@
         WidthPa {
 
     /**
-     * Retrieve the embedded ForeignXML instance.
-     * @return The ForeignXML instance attached to this instream-foreign-object.
-     */
-    FoForeignXml<D> getForeignXml();
-
-    /**
      * Returns the embedded XML document.
      * @return The embedded XML document.
      */

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

[aXSL-commit] SF.net SVN: axsl:[2646] trunk/axsl/axsl-fotree/src/main/java/org/axsl/ fotree/FoForeignXml.java

[<vic...@us...>]

Revision: 2646
          http://sourceforge.net/p/axsl/code/2646
Author:   victormote
Date:     2022-12-19 21:58:35 +0000 (Mon, 19 Dec 2022)
Log Message:
-----------
Remove method returning the DOM Document from FoForeignXml.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoForeignXml.java

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoForeignXml.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoForeignXml.java	2022-12-19 21:41:21 UTC (rev 2645)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoForeignXml.java	2022-12-19 21:58:35 UTC (rev 2646)
@@ -38,10 +38,4 @@
  */
 public interface FoForeignXml<D extends Document> {
 
-    /**
-     * Returns the embedded XML document.
-     * @return The embedded XML document.
-     */
-    D getXmlDocument();
-
 }

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

[aXSL-commit] SF.net SVN: axsl:[2645] trunk/axsl/axsl-fotree/src/main/java/org/axsl/ fotree/FoContext.java

[<vic...@us...>]

Revision: 2645
          http://sourceforge.net/p/axsl/code/2645
Author:   victormote
Date:     2022-12-19 21:41:21 +0000 (Mon, 19 Dec 2022)
Log Message:
-----------
Get DOM Document information from the InstreamForeignObject instead of the FoForeignXml.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoContext.java

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoContext.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoContext.java	2022-12-19 21:01:49 UTC (rev 2644)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoContext.java	2022-12-19 21:41:21 UTC (rev 2645)
@@ -25,6 +25,7 @@
 
 import org.axsl.fotree.fo.ExternalGraphic;
 import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.fotree.fo.InstreamForeignObject;
 import org.axsl.fotree.fo.Marker;
 import org.axsl.fotree.fo.RetrieveMarker;
 import org.axsl.fotree.fo.RetrieveTableMarker;
@@ -212,16 +213,16 @@
 
     /**
      * Returns the intrinsic width, in millipoints, of a given XML document.
-     * @param foreignXml The XML document for which the intrinsic width is needed.
+     * @param instreamForeign The XML document for which the intrinsic width is needed.
      * @return The intrinsic width, in millipoints, of {@code foreignXml}.
      */
-    int getIntrinsicWidth(FoForeignXml<?> foreignXml);
+    int getIntrinsicWidth(InstreamForeignObject<?> instreamForeign);
 
     /**
      * Returns the intrinsic height, in millipoints, of a given XML document.
-     * @param foreignXml The XML document for which the intrinsic height is needed.
+     * @param instreamForeign The XML document for which the intrinsic height is needed.
      * @return The intrinsic height, in millipoints, of {@code foreignXml}.
      */
-    int getIntrinsicHeight(FoForeignXml<?> foreignXml);
+    int getIntrinsicHeight(InstreamForeignObject<?> instreamForeign);
 
 }

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

[aXSL-commit] SF.net SVN: axsl:[2644] trunk/axsl/axsl-fotree/src/main/java/org/axsl/ fotree/fo/InstreamForeignObject.java

[<vic...@us...>]

Revision: 2644
          http://sourceforge.net/p/axsl/code/2644
Author:   victormote
Date:     2022-12-19 21:01:49 +0000 (Mon, 19 Dec 2022)
Log Message:
-----------
Add method returning the wrapped Document.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java	2022-12-19 20:40:25 UTC (rev 2643)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java	2022-12-19 21:01:49 UTC (rev 2644)
@@ -102,4 +102,10 @@
      */
     FoForeignXml<D> getForeignXml();
 
+    /**
+     * Returns the embedded XML document.
+     * @return The embedded XML document.
+     */
+    D getXmlDocument();
+
 }

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

[aXSL-commit] SF.net SVN: axsl:[2643] trunk/axsl/axsl-fotree/src/main/java/org/axsl/ fotree/FoForeignXml.java

[<vic...@us...>]

Revision: 2643
          http://sourceforge.net/p/axsl/code/2643
Author:   victormote
Date:     2022-12-19 20:40:25 +0000 (Mon, 19 Dec 2022)
Log Message:
-----------
Remove FoForeignXml as implementation of Fo.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoForeignXml.java

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoForeignXml.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoForeignXml.java	2022-12-19 19:42:31 UTC (rev 2642)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoForeignXml.java	2022-12-19 20:40:25 UTC (rev 2643)
@@ -36,7 +36,7 @@
  * @param <D> The type of XML document wrapped.
  * @see InstreamForeignObject
  */
-public interface FoForeignXml<D extends Document> extends Fo {
+public interface FoForeignXml<D extends Document> {
 
     /**
      * Returns the embedded XML document.

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

[aXSL-commit] SF.net SVN: axsl:[2642] trunk/axsl

[<vic...@us...>]

Revision: 2642
          http://sourceforge.net/p/axsl/code/2642
Author:   victormote
Date:     2022-12-19 19:42:31 +0000 (Mon, 19 Dec 2022)
Log Message:
-----------
Make InstreamForeignObject generic by DOM Document type, in preparation for removing FoForeignXml.

Modified Paths:
--------------
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/LineContentFactory.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoVisitor.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java

Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/LineContentFactory.java
===================================================================
--- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/LineContentFactory.java	2022-12-19 06:34:54 UTC (rev 2641)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/LineContentFactory.java	2022-12-19 19:42:31 UTC (rev 2642)
@@ -107,7 +107,7 @@
      * @param ipd The inline-progression-dimension used by the foreign-object content.
      * @return The new line content instance.
      */
-    NormalInlineArea createForeignObjectArea(InstreamForeignObject ifo, int ipd);
+    NormalInlineArea createForeignObjectArea(InstreamForeignObject<?> ifo, int ipd);
 
     /**
      * Creates a new Area for inline content.

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoVisitor.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoVisitor.java	2022-12-19 06:34:54 UTC (rev 2641)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoVisitor.java	2022-12-19 19:42:31 UTC (rev 2642)
@@ -231,7 +231,7 @@
      * @param host The {@link InstreamForeignObject} instance to be visited.
      * @return An implementation-specific value, perhaps {@code host} or a wrapper around it.
      */
-    T visit(InstreamForeignObject host);
+    T visit(InstreamForeignObject<?> host);
 
     /**
      * Visits a {@link Leader} host.

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java	2022-12-19 06:34:54 UTC (rev 2641)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/InstreamForeignObject.java	2022-12-19 19:42:31 UTC (rev 2642)
@@ -61,9 +61,10 @@
 
 /**
  * An fo:instream-foreign-object object in XSL-FO.
+ * @param <D> The type of XML document wrapped.
  * @see "XSL-FO Recommendation 1.0, Section 6.6.6"
  */
-public interface InstreamForeignObject extends Fo, FoScalable,
+public interface InstreamForeignObject<D extends Document> extends Fo, FoScalable,
         CommonAccessibilityPa,
         CommonAuralPa,
         CommonBorderPaddingBgPa,
@@ -99,6 +100,6 @@
      * Retrieve the embedded ForeignXML instance.
      * @return The ForeignXML instance attached to this instream-foreign-object.
      */
-    FoForeignXml<? extends Document> getForeignXml();
+    FoForeignXml<D> getForeignXml();
 
 }

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

[aXSL-commit] SF.net SVN: axsl:[2641] trunk/axsl

[<vic...@us...>]

Revision: 2641
          http://sourceforge.net/p/axsl/code/2641
Author:   victormote
Date:     2022-12-19 06:34:54 +0000 (Mon, 19 Dec 2022)
Log Message:
-----------
Rename creational methods to new standard.

Modified Paths:
--------------
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AbstractTablePartContainer.java
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AreaTree.java
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AreaTreeFactory.java
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/ListBlockArea.java
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/ListItemArea.java
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/NormalBlockArea.java
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/PageCollection.java
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/TableArea.java
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/TableRowContainer.java
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/BlockLevelAreaFactory.java
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/LineContentFactory.java
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/RetrieveMarkerNodeFactory.java
    trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/RetrieveTableMarkerNodeFactory.java
    trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontServer.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoTree.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoTreeFactory.java
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/PageSequence.java
    trunk/axsl/axsl-graphic/src/main/java/org/axsl/graphic/GraphicServer.java
    trunk/axsl/axsl-layout/src/main/java/org/axsl/layout/LayoutFactory.java
    trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/PsServer.java

Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AbstractTablePartContainer.java
===================================================================
--- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AbstractTablePartContainer.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AbstractTablePartContainer.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -39,6 +39,6 @@
      * @param node The generating TableRow instance.
      * @return The new TableRowContainer instance.
      */
-    TableRowContainer makeTableRowContainer(TableRow node);
+    TableRowContainer createTableRowContainer(TableRow node);
 
 }

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	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AreaTree.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -42,7 +42,7 @@
 /**
  * <p>An AreaTree is a document that has been laid out on pages.
  * To obtain an AreaTree instance, use
- * {@link AreaTreeFactory#makeAreaTree(FoTree, FontServer, org.axsl.font.FontSelectionConstraints, GraphicServer)}.
+ * {@link AreaTreeFactory#createAreaTree(FoTree, FontServer, org.axsl.font.FontSelectionConstraints, GraphicServer)}.
  * Once created, the {@link AreaTree} itself becomes a factory for other area tree types.</p>
  *
  * <p>This interface contains static methods that convert font characteristics as found in {@link org.axsl.fotree}
@@ -88,7 +88,7 @@
      * @param pageSequence The FOTree {@link PageSequence} that is generating the new {@link PageCollection}.
      * @return A new {@link PageCollection} instance, or null if creation of the new instance failed.
      */
-    PageCollection makePageCollection(PageSequence pageSequence);
+    PageCollection createPageCollection(PageSequence pageSequence);
 
     /**
      * Returns the font server instance for this area tree.

Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AreaTreeFactory.java
===================================================================
--- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AreaTreeFactory.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/AreaTreeFactory.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -41,7 +41,7 @@
      * @param graphicServer The graphic server to be used by the new {@link AreaTree}.
      * @return An implementation-specific instance of an {@link AreaTree}.
      */
-    AreaTree makeAreaTree(FoTree foTree, FontServer fontServer, FontSelectionConstraints fontSelectionConstraints,
+    AreaTree createAreaTree(FoTree foTree, FontServer fontServer, FontSelectionConstraints fontSelectionConstraints,
             GraphicServer graphicServer);
 
 }

Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/ListBlockArea.java
===================================================================
--- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/ListBlockArea.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/ListBlockArea.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -35,6 +35,6 @@
      * @param listItem The FOTree ListItem that is generating the new ListItemArea.
      * @return A new child ListItemArea instance.
      */
-    ListItemArea makeListItemArea(ListItem listItem);
+    ListItemArea createListItemArea(ListItem listItem);
 
 }

Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/ListItemArea.java
===================================================================
--- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/ListItemArea.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/ListItemArea.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -38,7 +38,7 @@
      * parallel concepts to maintain consistency.
      * @return The new child instance.
      */
-    ListItemLabelContainer makeListItemLabelContainer(ListItemLabel listItemLabel);
+    ListItemLabelContainer createListItemLabelContainer(ListItemLabel listItemLabel);
 
     /**
      * Factory method for creation of {@link ListItemBodyContainer} instances.
@@ -47,6 +47,6 @@
      * parallel concepts to maintain consistency.
      * @return The new child instance.
      */
-    ListItemBodyContainer makeListItemBodyContainer(ListItemBody listItemBody);
+    ListItemBodyContainer createListItemBodyContainer(ListItemBody listItemBody);
 
 }

Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/NormalBlockArea.java
===================================================================
--- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/NormalBlockArea.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/NormalBlockArea.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -53,6 +53,6 @@
      * The implementation should ordinarily be able to create the new {@link LineArea}, so this usually indicates an
      * internal error.
      */
-    LineArea makeLineArea(boolean allowOverflow) throws AreaTreeException;
+    LineArea createLineArea(boolean allowOverflow) throws AreaTreeException;
 
 }

Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/PageCollection.java
===================================================================
--- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/PageCollection.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/PageCollection.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -70,6 +70,6 @@
      * parity.
      * @return The new PageArea instance, or null if the new page cannot be created.
      */
-    PageRa makePage(Force forceValue);
+    PageRa createPage(Force forceValue);
 
 }

Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/TableArea.java
===================================================================
--- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/TableArea.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/TableArea.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -40,7 +40,7 @@
      * @param tableBody The generating FO.
      * @return The new instance.
      */
-    TableBodyContainer makeTableBodyContainer(TableBody tableBody);
+    TableBodyContainer createTableBodyContainer(TableBody tableBody);
 
     /**
      * Returns the child TableBody container.
@@ -53,7 +53,7 @@
      * @param tableHeader The generating FO.
      * @return The new instance.
      */
-    TableHeaderContainer makeTableHeaderContainer(TableHeader tableHeader);
+    TableHeaderContainer createTableHeaderContainer(TableHeader tableHeader);
 
     /**
      * Returns the child TableHeader container.
@@ -66,7 +66,7 @@
      * @param tableFooter The generating FO.
      * @return The new TableBodyContainer instance.
      */
-    TableFooterContainer makeTableFooterContainer(TableFooter tableFooter);
+    TableFooterContainer createTableFooterContainer(TableFooter tableFooter);
 
     /**
      * Returns the child TableFooter container.

Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/TableRowContainer.java
===================================================================
--- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/TableRowContainer.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/TableRowContainer.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -40,6 +40,6 @@
      * @param node The parent TableCell FO.
      * @return The new TableCellArea instance.
      */
-    TableCellArea makeTableCellArea(TableCell node);
+    TableCellArea createTableCellArea(TableCell node);
 
 }

Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/BlockLevelAreaFactory.java
===================================================================
--- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/BlockLevelAreaFactory.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/BlockLevelAreaFactory.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -43,7 +43,7 @@
      * @param table The generating {@link Table} instance.
      * @return The new {@link TableArea} instance.
      */
-    TableArea makeTableArea(Table table);
+    TableArea createTableArea(Table table);
 
     /**
      * Create a new {@link NormalBlockArea} as a child of this Area.
@@ -50,7 +50,7 @@
      * @param block The generating {@link Block} instance.
      * @return The new {@link NormalBlockArea} instance.
      */
-    NormalBlockArea makeNormalBlockArea(Block block);
+    NormalBlockArea createNormalBlockArea(Block block);
 
     /**
      * Create a new {@link BlockLevelRa} as a child of this Area.
@@ -57,7 +57,7 @@
      * @param blockContainer The generating {@link BlockContainer} instance.
      * @return The new {@link BlockLevelRa} instance.
      */
-    BlockLevelRa makeBlockContainerArea(BlockContainer blockContainer);
+    BlockLevelRa createBlockContainerArea(BlockContainer blockContainer);
 
     /**
      * Create a new {@link ListBlockArea} as a child of this Area.
@@ -64,6 +64,6 @@
      * @param listBlock The generating {@link ListBlock} instance.
      * @return The new {@link ListBlockArea} instance.
      */
-    ListBlockArea makeListBlockArea(ListBlock listBlock);
+    ListBlockArea createListBlockArea(ListBlock listBlock);
 
 }

Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/LineContentFactory.java
===================================================================
--- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/LineContentFactory.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/LineContentFactory.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -57,7 +57,7 @@
      * @param bidiOverride The generating BidiOverride.
      * @return The new line content instance.
      */
-    AncestralNormalInlineArea makeBidiOverrideArea(BidiOverride bidiOverride);
+    AncestralNormalInlineArea createBidiOverrideArea(BidiOverride bidiOverride);
 
     /**
      * Create a new sequence of glyph-areas for {@link FoTextCharacters}.
@@ -78,7 +78,7 @@
      * line.
      * @return The new {@link GlyphAreaSequenceG5} instance, or null if there is no content.
      */
-    GlyphAreaSequenceG5 makeGlyphAreaSequence(FoTextCharacters characters, int startOffset, int sizeInChars, int ipd,
+    GlyphAreaSequenceG5 createGlyphAreaSequence(FoTextCharacters characters, int startOffset, int sizeInChars, int ipd,
             boolean hasDiscretionaryHyphen, boolean hasFauxSmallCaps, boolean isLastItemOnLine);
 
     /**
@@ -90,7 +90,7 @@
      * faux small caps.
      * @return The new {@link GlyphAreaSequenceG5} instance, or null if there is no content.
      */
-    GlyphAreaSequenceG5 makeGlyphAreaSequence(FoTextWords paragraph, TextTokenFlowLocation startLocation,
+    GlyphAreaSequenceG5 createGlyphAreaSequence(FoTextWords paragraph, TextTokenFlowLocation startLocation,
             TextTokenFlowLocation endLocation, boolean hasFauxSmallCaps);
 
     /**
@@ -99,7 +99,7 @@
      * @param ipd The inline-progression-dimension used by the external-graphic content.
      * @return The new line content instance.
      */
-    NormalInlineArea makeExternalGraphicArea(ExternalGraphic eg, int ipd);
+    NormalInlineArea createExternalGraphicArea(ExternalGraphic eg, int ipd);
 
     /**
      * Creates a new Area for foreign-object content.
@@ -107,7 +107,7 @@
      * @param ipd The inline-progression-dimension used by the foreign-object content.
      * @return The new line content instance.
      */
-    NormalInlineArea makeForeignObjectArea(InstreamForeignObject ifo, int ipd);
+    NormalInlineArea createForeignObjectArea(InstreamForeignObject ifo, int ipd);
 
     /**
      * Creates a new Area for inline content.
@@ -114,7 +114,7 @@
      * @param inline The generating Inline.
      * @return The new line content instance.
      */
-    AncestralNormalInlineArea makeInlineArea(Inline inline);
+    AncestralNormalInlineArea createInlineArea(Inline inline);
 
     /**
      * Creates a new Area for inline content.
@@ -121,7 +121,7 @@
      * @param inlineContainer The generating InlineContainer.
      * @return The new line content instance.
      */
-    InlineContainerArea makeInlineContainerArea(InlineContainer inlineContainer);
+    InlineContainerArea createInlineContainerArea(InlineContainer inlineContainer);
 
     /**
      * Creates a new Area for leader content.
@@ -131,7 +131,7 @@
      * @throws AreaTreeException If the minimum length is greater than the optimum length, or if the optimum length is
      * greater than the maximum length.
      */
-    AncestralNormalInlineArea makeLeaderArea(Leader leader, int ipd) throws AreaTreeException;
+    AncestralNormalInlineArea createLeaderArea(Leader leader, int ipd) throws AreaTreeException;
 
     /**
      * Creates a new Area for page-number content.
@@ -139,7 +139,7 @@
      * @param ipd The inline-progression-dimension used by the page-number content.
      * @return The new line content instance.
      */
-    AncestralNormalInlineArea makePageNumberArea(PageNumber pageNumber, int ipd);
+    AncestralNormalInlineArea createPageNumberArea(PageNumber pageNumber, int ipd);
 
     /**
      * Creates a new Area for page-number-citation content.
@@ -147,7 +147,7 @@
      * @param ipd The inline-progression-dimension used by the page-number-citation content.
      * @return The new line content instance.
      */
-    AncestralNormalInlineArea makePageNumberCitationArea(PageNumberCitation citation, int ipd);
+    AncestralNormalInlineArea createPageNumberCitationArea(PageNumberCitation citation, int ipd);
 
     /**
      * Creates a new Area for page-number-citation-last content.
@@ -155,7 +155,7 @@
      * @param ipd The inline-progression-dimension used by the page-number-citation-last content.
      * @return The new line content instance.
      */
-    AncestralNormalInlineArea makePageNumberCitationLastArea(PageNumberCitationLast citation, int ipd);
+    AncestralNormalInlineArea createPageNumberCitationLastArea(PageNumberCitationLast citation, int ipd);
 
     /**
      * Creates a new Area for scaling-value-citation content.
@@ -163,7 +163,7 @@
      * @param ipd The inline-progression-dimension used by the scaling-value-citation content.
      * @return The new line content instance.
      */
-    NormalInlineArea makeScalingValueCitationArea(ScalingValueCitation citation, int ipd);
+    NormalInlineArea createScalingValueCitationArea(ScalingValueCitation citation, int ipd);
 
     /**
      * Creates a new Area for basic-link content.
@@ -170,7 +170,7 @@
      * @param basicLink The generating basic-link.
      * @return The new line content instance.
      */
-    AncestralNormalInlineArea makeBasicLinkArea(BasicLink basicLink);
+    AncestralNormalInlineArea createBasicLinkArea(BasicLink basicLink);
 
     /* There is no factory method for fo:multi-toggle, because it does not
      * generate any areas. */
@@ -180,6 +180,6 @@
      * @param citationList The generating index-page-citation-list.
      * @return The new line content instance.
      */
-    AncestralNormalInlineArea makeIndexPageCitationListArea(IndexPageCitationList citationList);
+    AncestralNormalInlineArea createIndexPageCitationListArea(IndexPageCitationList citationList);
 
 }

Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/RetrieveMarkerNodeFactory.java
===================================================================
--- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/RetrieveMarkerNodeFactory.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/RetrieveMarkerNodeFactory.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -38,6 +38,6 @@
      * @param selectedMarker The marker whose content is grafted to {@code retrieveMarker}.
      * @return The new {@link RetrieveMarkerNode} instance.
      */
-    RetrieveMarkerNode makeRetrieveMarkerNode(RetrieveMarker retrieveMarker, Marker selectedMarker);
+    RetrieveMarkerNode createRetrieveMarkerNode(RetrieveMarker retrieveMarker, Marker selectedMarker);
 
 }

Modified: trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/RetrieveTableMarkerNodeFactory.java
===================================================================
--- trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/RetrieveTableMarkerNodeFactory.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-areatree/src/main/java/org/axsl/area/factory/RetrieveTableMarkerNodeFactory.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -38,6 +38,7 @@
      * @param selectedMarker The marker whose content is grafted to {@code retrieveTableMarker}.
      * @return The new {@link RetrieveTableMarkerNode} instance.
      */
-    RetrieveTableMarkerNode makeRetrieveTableMarkerNode(RetrieveTableMarker retrieveTableMarker, Marker selectedMarker);
+    RetrieveTableMarkerNode createRetrieveTableMarkerNode(RetrieveTableMarker retrieveTableMarker,
+            Marker selectedMarker);
 
 }

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	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontServer.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -259,6 +259,6 @@
      * This can be null, and, if so, there are no constraints on what the {@link FontConsumer} is allowed to return.
      * @return an implementation-specific {@link FontConsumer} instance.
      */
-    FontConsumer makeFontConsumer(FontSelectionConstraints constraints);
+    FontConsumer createFontConsumer(FontSelectionConstraints constraints);
 
 }

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoTree.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoTree.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoTree.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -33,7 +33,7 @@
  * <p>To obtain an {@link FoTree} instance:</p>
  * <ol>
  *   <li>Obtain an instance of {@link FoTreeFactory}.</li>
- *   <li>Use {@link FoTreeFactory#makeFoTreeParser()} to obtain an instance of {@link FoTreeParser}.</li>
+ *   <li>Use {@link FoTreeFactory#createFoTreeParser()} to obtain an instance of {@link FoTreeParser}.</li>
  *   <li>Use {@link FoTreeParser#registerListener(FoTreeListener)} to register any listeners.</li>
  *   <li>If needed, use {@link FoTreeParser#getFoTree()} to obtain the {@link FoTree} instance that will be parsed.
  *   <li>Use {@link FoTreeParser#parseFoTree(org.xml.sax.InputSource)} to parse the tree.</li>

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoTreeFactory.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoTreeFactory.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoTreeFactory.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -32,6 +32,6 @@
      * Create an {@link FoTreeParser}.
      * @return An implementation-specific instance of an {@link FoTreeParser}.
      */
-    FoTreeParser makeFoTreeParser();
+    FoTreeParser createFoTreeParser();
 
 }

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/PageSequence.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/PageSequence.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/fo/PageSequence.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -74,7 +74,7 @@
      * previous page-sequence.
      * @return The new {@link PageMasterResolver} instance.
      */
-    PageMasterResolver makePageMasterResolver(int lastPageNumber);
+    PageMasterResolver createPageMasterResolver(int lastPageNumber);
 
     /**
      * The fo:title item for this fo:page-sequence.

Modified: trunk/axsl/axsl-graphic/src/main/java/org/axsl/graphic/GraphicServer.java
===================================================================
--- trunk/axsl/axsl-graphic/src/main/java/org/axsl/graphic/GraphicServer.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-graphic/src/main/java/org/axsl/graphic/GraphicServer.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -44,7 +44,7 @@
      * @return The Graphic instance.
      * @exception GraphicException For errors during construction.
      */
-    Graphic makeGraphic(URL graphicLocation, boolean cacheThisGraphic) throws GraphicException;
+    Graphic procureGraphic(URL graphicLocation, boolean cacheThisGraphic) throws GraphicException;
 
     /**
      * Factory method to find or create an {@link SvgGraphic} instance from an already-parsed {@link SVGDocument}.
@@ -52,7 +52,7 @@
      * @return The newly-created {@link SvgGraphic} instance.
      * @exception GraphicException For errors during construction.
      */
-    SvgGraphic makeSvgGraphic(SVGDocument svgDocument) throws GraphicException;
+    SvgGraphic procureSvgGraphic(SVGDocument svgDocument) throws GraphicException;
 
     /**
      * Writes an SVG document to an output stream, perhaps with pretty-printing.
@@ -68,6 +68,6 @@
      * @return The newly-created {@link MathGraphic} instance.
      * @exception GraphicException For errors during construction.
      */
-    MathGraphic makeMathGraphic(MathMLDocument mathDocument) throws GraphicException;
+    MathGraphic procureMathGraphic(MathMLDocument mathDocument) throws GraphicException;
 
 }

Modified: trunk/axsl/axsl-layout/src/main/java/org/axsl/layout/LayoutFactory.java
===================================================================
--- trunk/axsl/axsl-layout/src/main/java/org/axsl/layout/LayoutFactory.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-layout/src/main/java/org/axsl/layout/LayoutFactory.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -32,6 +32,6 @@
      * Create a {@link Layout} instance.
      * @return An implementation-specific instance of an {@link Layout}.
      */
-    Layout makeLayout();
+    Layout createLayout();
 
 }

Modified: trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/PsServer.java
===================================================================
--- trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/PsServer.java	2022-12-19 00:50:45 UTC (rev 2640)
+++ trunk/axsl/axsl-ps/src/main/java/org/axsl/ps/PsServer.java	2022-12-19 06:34:54 UTC (rev 2641)
@@ -43,7 +43,7 @@
      * @param inputStream The underlying input stream to be filtered.
      * @return The newly-created filter.
      */
-    InputStream makeDecodeFilter(PsFilterType filterType, InputStream inputStream);
+    InputStream createDecodeFilter(PsFilterType filterType, InputStream inputStream);
 
     /**
      * Creates an encode filter of a specified type.
@@ -51,7 +51,7 @@
      * @param outputStream The underlying output stream to be filtered.
      * @return The newly-created filter.
      */
-    PsEncodeFilter makeEncodeFilter(PsFilterType filterType, OutputStream outputStream);
+    PsEncodeFilter createEncodeFilter(PsFilterType filterType, OutputStream outputStream);
 
     /**
      * Creates a {@link PsInput} instance from a File.
@@ -59,7 +59,7 @@
      * @return The newly-created PsInput.
      * @throws IOException For errors opening the file.
      */
-    PsInput makePsInput(File inputFile) throws IOException;
+    PsInput createPsInput(File inputFile) throws IOException;
 
     /**
      * Returns a read-only system dictionary.
@@ -93,7 +93,7 @@
      * @return A new interpreter.
      * @throws PsException For errors creating the interpreter.
      */
-    PsInterpreter makeInterpreter(PsInput psInput, PsSystemDict systemDict) throws PsException;
+    PsInterpreter createInterpreter(PsInput psInput, PsSystemDict systemDict) throws PsException;
 
     /**
      * Returns one of the predefined encodings.
@@ -122,7 +122,7 @@
      * @return The newly-created implementation-specific EncodingVector instance.
      * @see "https://docs.microsoft.com/en-us/typography/opentype/spec/maxp"
      */
-    PsEncoding makeEncodingVector(String name, IntSequence codePoints, IntSequence codePointIndexes);
+    PsEncoding createEncodingVector(String name, IntSequence codePoints, IntSequence codePointIndexes);
 
     /**
      * Parse an encoding vector from an input stream.
@@ -163,7 +163,7 @@
      * @param characterSet The array containing the code points in the new character set.
      * @return The newly-created implementation-specific CharSet instance.
      */
-    CharSet makeCharSet(String name, IntSequence characterSet);
+    CharSet createCharSet(String name, IntSequence characterSet);
 
     /**
      * Parse a character set from an input stream.
@@ -199,7 +199,7 @@
      * Setting this to the correct value gives the implementation an opportunity for more efficient processing.
      * @return The newly-created implementation-specific Cmap04 instance.
      */
-    Cmap04Ttf makeCmap04(String name, int expectedEntries);
+    Cmap04Ttf createCmap04(String name, int expectedEntries);
 
     /**
      * Creates a new Cmap12 with a given name and expected size.
@@ -208,6 +208,6 @@
      * Setting this to the correct value gives the implementation an opportunity for more efficient processing.
      * @return The newly-created implementation-specific Cmap12 instance.
      */
-    Cmap12Ttf makeCmap12(String name, int expectedEntries);
+    Cmap12Ttf createCmap12(String name, int expectedEntries);
 
 }

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

[aXSL-commit] SF.net SVN: axsl:[2640] trunk/axsl/axsl-fotree/build.gradle

[<vic...@us...>]

Revision: 2640
          http://sourceforge.net/p/axsl/code/2640
Author:   victormote
Date:     2022-12-19 00:50:45 +0000 (Mon, 19 Dec 2022)
Log Message:
-----------
Doc changes only.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/build.gradle

Modified: trunk/axsl/axsl-fotree/build.gradle
===================================================================
--- trunk/axsl/axsl-fotree/build.gradle	2022-12-18 19:59:41 UTC (rev 2639)
+++ trunk/axsl/axsl-fotree/build.gradle	2022-12-19 00:50:45 UTC (rev 2640)
@@ -6,13 +6,17 @@
 
 dependencies {
 
-    /* In order to keep axsl-fotree as clean and usable as possible, this project should ***NEVER*** have a dependency
-     * on any of the following libraries. There is no need to force client code into using them:
-     *     axsl-speech
-     *     axsl-font
-     *     axsl-graphic
-     *     Any XML document type, such as SVGDocument, which might be used in processing of instream-foreign-object.
-     *         These should be handled by implementations as needed.
+    /* In order to keep axsl-fotree as clean, lightweight, and usable as possible, this project should ***NEVER*** have
+     * a dependency on any of the following libraries. There is no need to force client code into using them:
+     *  1. axsl-speech
+     *     The fotree stores descriptions of voices, but resolution and use of them are downstream.
+     *  2. axsl-font
+     *     The fotree stores descriptions of fonts, but resolution and use of them are downstream.
+     *  3. axsl-graphic
+     *     The fotree stores locations of graphics, and in the case of instream-foreign-object, parses their XML
+     *     content, but resolution and use of them are downstream.
+     *  4. Any XML document type, such as SVGDocument, which might be used in processing of instream-foreign-object.
+     *     These should be handled by implementations as needed.
      */
 
     /* TODO: Either remove dependency on axsl-orthography and document why that should be permanent, or document why is

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

[aXSL-commit] SF.net SVN: axsl:[2639] trunk/axsl/axsl-constants/src/main/java/org/axsl/ constants/XmlConstants.java

[<vic...@us...>]

Revision: 2639
          http://sourceforge.net/p/axsl/code/2639
Author:   victormote
Date:     2022-12-18 19:59:41 +0000 (Sun, 18 Dec 2022)
Log Message:
-----------
Add SVG-related constants.

Modified Paths:
--------------
    trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/XmlConstants.java

Modified: trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/XmlConstants.java
===================================================================
--- trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/XmlConstants.java	2022-12-18 17:13:15 UTC (rev 2638)
+++ trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/XmlConstants.java	2022-12-18 19:59:41 UTC (rev 2639)
@@ -35,9 +35,6 @@
     /** The namespace URI for Extensible Stylesheet Language Transform (XSL-T), whose typical prefix is "xsl:". */
     public static final String XSLT_NS_URI = "http://www.w3.org/1999/XSL/Transform";
 
-    /** The namespace URI for Scalable Vector Graphics (SVG), whose typical prefix is "svg:". */
-    public static final String SVG_NS_URI = "http://www.w3.org/2000/svg";
-
     /** The namespace URI for Extensible Stylesheet Language Formatting Objects (XSL-FO), whose typical prefix is
      * "fo:". */
     public static final String XSLFO_NS_URI = "http://www.w3.org/1999/XSL/Format";
@@ -46,14 +43,29 @@
     public static final String AXSL_NS_URI = "http://org.axsl/xslfo-extensions/2007";
 
 
+/* ---------------------------------------- SVG ----------------------------------------------------------------------*/
 
+    /** The namespace URI for Scalable Vector Graphics (SVG), whose typical prefix is "svg:". */
+    public static final String SVG_NS_URI = "http://www.w3.org/2000/svg";
 
+    /** The name of the root element in an SVG document. */
+    public static final String SVG_ROOT_ELEMENT_NAME = "svg";
+
+    /** The public id of the DTD for an SVG document. */
+    public static final String SVG_PUBLIC_ID = "-//W3C//DTD SVG 1.1//EN";
+
+    /** The system id of the DTD for an SVG document. */
+    public static final String SVG_SYSTEM_ID = "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";
+
+    /** The typical abbreviation used to designate an element as being in the SVG namespace. */
+    public static final String SVG_NAMESPACE_SHORT = SVG_ROOT_ELEMENT_NAME;
+
+
+/* ---------------------------------------- MathML -------------------------------------------------------------------*/
+
     /** The namespace URI for Math Markup Language (MathML), whose typical prefix is "mathml:". */
     public static final String MATHML_NS_URI = "http://www.w3.org/1998/Math/MathML";
 
-    /** The typical abbreviation used to designate an element as being in the MathML namespace. */
-    public static final String MATHML_NAMESPACE_SHORT = "m";
-
     /** The name of the root element in a MathML document. */
     public static final String MATHML_ROOT_ELEMENT_NAME = "math";
 
@@ -63,7 +75,10 @@
     /** The system id of the DTD for a MathML document. */
     public static final String MATHML_SYSTEM_ID = "http://www.w3.org/TR/MathML2/dtd/mathml2.dtd";
 
+    /** The typical abbreviation used to designate an element as being in the MathML namespace. */
+    public static final String MATHML_NAMESPACE_SHORT = "m";
 
+
     /**
      * Private constructor. This class should never be instantiated.
      */

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

[aXSL-commit] SF.net SVN: axsl:[2638] trunk/axsl/axsl-constants/src/main/java/org/axsl/ constants/XmlConstants.java

[<vic...@us...>]

Revision: 2638
          http://sourceforge.net/p/axsl/code/2638
Author:   victormote
Date:     2022-12-18 17:13:15 +0000 (Sun, 18 Dec 2022)
Log Message:
-----------
Move MathML-related constants to aXSL.

Modified Paths:
--------------
    trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/XmlConstants.java

Modified: trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/XmlConstants.java
===================================================================
--- trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/XmlConstants.java	2022-12-18 15:12:21 UTC (rev 2637)
+++ trunk/axsl/axsl-constants/src/main/java/org/axsl/constants/XmlConstants.java	2022-12-18 17:13:15 UTC (rev 2638)
@@ -38,9 +38,6 @@
     /** The namespace URI for Scalable Vector Graphics (SVG), whose typical prefix is "svg:". */
     public static final String SVG_NS_URI = "http://www.w3.org/2000/svg";
 
-    /** The namespace URI for Math Markup Language (MathML), whose typical prefix is "mathml:". */
-    public static final String MATHML_NS_URI = "http://www.w3.org/1998/Math/MathML";
-
     /** The namespace URI for Extensible Stylesheet Language Formatting Objects (XSL-FO), whose typical prefix is
      * "fo:". */
     public static final String XSLFO_NS_URI = "http://www.w3.org/1999/XSL/Format";
@@ -48,6 +45,25 @@
     /** The namespace URI for aXSL extensions to XSL-FO, whose typical prefix is "axsl:". */
     public static final String AXSL_NS_URI = "http://org.axsl/xslfo-extensions/2007";
 
+
+
+
+    /** The namespace URI for Math Markup Language (MathML), whose typical prefix is "mathml:". */
+    public static final String MATHML_NS_URI = "http://www.w3.org/1998/Math/MathML";
+
+    /** The typical abbreviation used to designate an element as being in the MathML namespace. */
+    public static final String MATHML_NAMESPACE_SHORT = "m";
+
+    /** The name of the root element in a MathML document. */
+    public static final String MATHML_ROOT_ELEMENT_NAME = "math";
+
+    /** The public id of the DTD for a MathML document. */
+    public static final String MATHML_PUBLIC_ID = "-//W3C//DTD MathML 2.0//EN";
+
+    /** The system id of the DTD for a MathML document. */
+    public static final String MATHML_SYSTEM_ID = "http://www.w3.org/TR/MathML2/dtd/mathml2.dtd";
+
+
     /**
      * Private constructor. This class should never be instantiated.
      */

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

[aXSL-commit] SF.net SVN: axsl:[2637] trunk/axsl

[<vic...@us...>]

Revision: 2637
          http://sourceforge.net/p/axsl/code/2637
Author:   victormote
Date:     2022-12-18 15:12:21 +0000 (Sun, 18 Dec 2022)
Log Message:
-----------
Complete cleanup of font-related enumerations.

Modified Paths:
--------------
    trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java
    trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontConsumer.java
    trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontStretch.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	2022-12-18 14:28:58 UTC (rev 2636)
+++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java	2022-12-18 15:12:21 UTC (rev 2637)
@@ -29,7 +29,6 @@
 import org.axsl.ps.Encoding;
 
 import java.awt.font.TextAttribute;
-import java.util.Arrays;
 
 /**
  * The Font interface exposes a font resource to the client application.
@@ -39,8 +38,8 @@
     /** The String "normal", defined as a constant to avoid duplication. */
     String NORMAL_STRING = "normal";
 
-    /** The String "invalid", defined as a constant to avoid duplication. */
-    String INVALID_STRING = "invalid";
+    /** The String "any", defined as a constant to avoid duplication. */
+    String ANY_STRING = "any";
 
     /**
      * Enumeration of constants needed to describe the style of a font.
@@ -48,7 +47,7 @@
     enum Style {
 
         /** Font-style constant indicating no preference. */
-        ANY("any"),
+        ANY(ANY_STRING),
 
         /** Font-style constant indicating an upright (Roman) typeface. */
         NORMAL(NORMAL_STRING),
@@ -128,7 +127,7 @@
     enum Weight {
 
         /** Font-weight constant indicating no preference. */
-        ANY(Short.MIN_VALUE, Font.INVALID_STRING),
+        ANY(Short.MIN_VALUE, ANY_STRING),
 
         /** Font-weight constant indicating a weight of 100 (extremely light). */
         EXTREMELY_LIGHT((short) 100, "100"),
@@ -211,6 +210,7 @@
             }
             return null;
         }
+
         /**
          * Returns the next heaviest weight.
          * @return The next heaviest weight, null if this is not a valid weight, or if this is the heaviest weight,
@@ -333,7 +333,7 @@
     enum Variant {
 
         /** Font-variant constant indicating no preference. */
-        ANY(Font.INVALID_STRING),
+        ANY(ANY_STRING),
 
         /** Font-variant constant indicating that small-caps is <i>off</i>. */
         NORMAL(Font.NORMAL_STRING),
@@ -341,101 +341,55 @@
         /** Font-variant constant indicating that small-caps is <i>on</i>. */
         SMALL_CAPS("small-caps");
 
-        /** The String describing this variant in CSS. */
-        private String cssValue;
+        /** Keep a copy of the values for performance. */
+        private static final Font.Variant[] VALUES = Variant.values();
 
+        /** The external description of this variant. */
+        private String name;
+
         /**
          * Private Constructor.
-         * @param cssValue The String describing this variant in CSS.
+         * @param name The external description of this variant.
          */
-        Variant(final String cssValue) {
-            this.cssValue = cssValue;
+        Variant(final String name) {
+            this.name = name;
         }
 
         /**
-         * Returns the String describing this variant in CSS.
-         * @return The String describing this variant in CSS.
+         * Returns the external description of this variant.
+         * @return The external description of this variant.
          */
-        public String getCssValue() {
-            return this.cssValue;
+        public String getName() {
+            return this.name;
         }
 
         /**
-         * Returns the String describing this variant in XSL-FO.
-         * @return The String describing this variant in XSL-FO.
+         * Convert a string name of an instance into the instance itself.
+         * @param name The string name of the instance.
+         * @return The instance matching {@code name}, or null if none is found.
          */
-        public String getFoValue() {
-            /* For now, this is the same as for CSS. */
-            return this.cssValue;
-        }
-
-        /**
-         * Parses a CSS String (case-insensitive) into an instance of {@link Font.Variant}.
-         * @param input The CSS-style String to be converted.
-         * @return For input not matching any enumerated value, returns null.
-         * Otherwise, returns the matching instance of {@link Font.Variant}.
-         */
-        public static Font.Variant parseCss(final String input) {
-            return parseCss(input, false);
-        }
-
-        /**
-         * Parses a CSS2 String into an instance of {@link Font.Variant}.
-         * @param input The CSS2-style String to be converted.
-         * @param caseSensitive Set to true to insist that all input values be lowercase.
-         * There is some ambiguity about whether CSS is case-sensitive or not.
-         * If it is, all input should be lower case.
-         * @return An instance of {@link Font.Variant}, or null if the input is not valid.
-         */
-        public static Font.Variant parseCss(final String input, final boolean caseSensitive) {
-            if (input == null) {
+        public static Variant fromName(final String name) {
+            if (name == null) {
                 return null;
             }
-            String test = input;
-            if (! caseSensitive) {
-                test = input.toLowerCase();
+            for (int index = 0; index < VALUES.length; index ++) {
+                final Variant variant = VALUES[index];
+                if (variant.name.equals(name)) {
+                    return variant;
+                }
             }
-            if (test.equals(Font.Variant.NORMAL.getCssValue())) {
-                return Font.Variant.NORMAL;
-            }
-            if (test.equals(Font.Variant.SMALL_CAPS.getCssValue())) {
-                return Font.Variant.SMALL_CAPS;
-            }
             return null;
         }
 
-        /**
-         * Parses an XSL-FO String (case-insensitive) into an instance of {@link Font.Variant}.
-         * @param input The XSL-FO-style String to be converted.
-         * @return For input not matching any enumerated value, returns null.
-         * Otherwise, returns the matching instance of {@link Font.Variant}.
-         */
-        public static Font.Variant parseFo(final String input) {
-            return parseFo(input, false);
-        }
-
-        /**
-         * Parses an XSL-FO String into an instance of {@link Font.Variant}.
-         * @param input The XSL-FO-style String to be converted.
-         * @param caseSensitive Set to true to insist that all input values be lowercase.
-         * There is some ambiguity about whether XSL-FO is case-sensitive or not.
-         * If it is, all input should be lower case.
-         * @return An instance of {@link Font.Variant}, or null if the input is not valid.
-         */
-        public static Font.Variant parseFo(final String input, final boolean caseSensitive) {
-            return Font.Variant.parseCss(input, caseSensitive);
-        }
-
     }
 
     /**
-     * Enumeration of constants needed to describe the "stretch" value of a
-     * font.
+     * Enumeration of constants needed to describe the "stretch" value of a font.
      */
     enum Stretch {
 
         /** Font-stretch constant indicating no preference. */
-        ANY(Byte.MIN_VALUE, Font.INVALID_STRING),
+        ANY(Byte.MIN_VALUE, ANY_STRING),
 
         /** Font-stretch constant indicating ultra-condensed. */
         ULTRA_CONDENSED((byte) 10, "ultra-condensed"),
@@ -464,51 +418,24 @@
         /** Font-stretch constant indicating ultra-expanded. */
         ULTRA_EXPANDED((byte) 90, "ultra-expanded");
 
-        /** Array containing the valid font stretch input values, sorted alphabetically so that they can be binary
-         * searched. Indexes correspond to those in {@link #VALID_STRETCH_VALUES}. */
-        private static final String[] VALID_STRETCH_STRINGS = new String[] {
-            Font.Stretch.CONDENSED.getCssValue(),
-            Font.Stretch.EXPANDED.getCssValue(),
-            Font.Stretch.EXTRA_CONDENSED.getCssValue(),
-            Font.Stretch.EXTRA_EXPANDED.getCssValue(),
-            Font.Stretch.NORMAL.getCssValue(),
-            Font.Stretch.SEMI_CONDENSED.getCssValue(),
-            Font.Stretch.SEMI_EXPANDED.getCssValue(),
-            Font.Stretch.ULTRA_CONDENSED.getCssValue(),
-            Font.Stretch.ULTRA_EXPANDED.getCssValue(),
-        };
+        /** Keep a copy of the values for performance. */
+        private static final Font.Stretch[] VALUES = Stretch.values();
 
-        /** Array containing the parsed font stretch values that correspond to the Strings in
-         * {@link #VALID_STRETCH_STRINGS}. */
-        private static final Font.Stretch[] VALID_STRETCH_VALUES = new Font.Stretch[] {
-            Font.Stretch.CONDENSED,
-            Font.Stretch.EXPANDED,
-            Font.Stretch.EXTRA_CONDENSED,
-            Font.Stretch.EXTRA_EXPANDED,
-            Font.Stretch.NORMAL,
-            Font.Stretch.SEMI_CONDENSED,
-            Font.Stretch.SEMI_EXPANDED,
-            Font.Stretch.ULTRA_CONDENSED,
-            Font.Stretch.ULTRA_EXPANDED,
-        };
-
-        /**
-         * The numeric stretch value, smaller numbers being more condensed, larger numbers being more expanded.
-         */
+        /** The numeric stretch value, smaller numbers being more condensed, larger numbers being more expanded. */
         private byte numericStretch;
 
-        /** The String describing this stretch in CSS. */
-        private String cssValue;
+        /** The external description of this stretch. */
+        private String name;
 
         /**
          * Private Constructor.
          * @param numericStretch The numeric stretch value, smaller numbers being more condensed, larger numbers being
          * more expanded.
-         * @param cssValue The String describing this stretch in CSS.
+         * @param name The external description of this stretch.
          */
-        Stretch(final byte numericStretch, final String cssValue) {
+        Stretch(final byte numericStretch, final String name) {
             this.numericStretch = numericStretch;
-            this.cssValue = cssValue;
+            this.name = name;
         }
 
         /**
@@ -521,79 +448,31 @@
         }
 
         /**
-         * Returns the String describing this stretch in CSS.
-         * @return The String describing this stretch in CSS.
+         * Returns the external description of this stretch.
+         * @return The external description of this stretch.
          */
-        public String getCssValue() {
-            return this.cssValue;
+        public String getName() {
+            return this.name;
         }
 
         /**
-         * Returns the String describing this stretch in XSL-FO.
-         * @return The String describing this stretch in XSL-FO.
+         * Convert a string name of an instance into the instance itself.
+         * @param name The string name of the instance.
+         * @return The instance matching {@code name}, or null if none is found.
          */
-        public String getFoValue() {
-            /* For now, this is the same as for CSS. */
-            return this.cssValue;
-        }
-
-        /**
-         * Parses a CSS String (case-insensitive) into an instance of {@link Font.Stretch}.
-         * @param input The CSS-style String to be converted.
-         * @return For input not matching any enumerated value, returns null.
-         * Otherwise, returns the matching instance of {@link Font.Stretch}.
-         */
-        public static Font.Stretch parseCss(final String input) {
-            return parseCss(input, false);
-        }
-
-        /**
-         * Parses a CSS2 String into an instance of {@link Font.Stretch}.
-         * @param input The CSS2-style String to be converted.
-         * @param caseSensitive Set to true to insist that all input values be lowercase.
-         * There is some ambiguity about whether CSS is case-sensitive or not.
-         * If it is, all input should be lower case.
-         * @return An instance of {@link Font.Stretch}, or null if the input is not valid.
-         */
-        public static Font.Stretch parseCss(final String input,
-                final boolean caseSensitive) {
-            if (input == null) {
+        public static Stretch fromName(final String name) {
+            if (name == null) {
                 return null;
             }
-            String test = input;
-            if (! caseSensitive) {
-                test = input.toLowerCase();
+            for (int index = 0; index < VALUES.length; index ++) {
+                final Stretch stretch = VALUES[index];
+                if (stretch.name.equals(name)) {
+                    return stretch;
+                }
             }
-            final int index = Arrays.binarySearch(Font.Stretch.VALID_STRETCH_STRINGS,
-                    test);
-            if (index < 0) {
-                return null;
-            }
-            return Font.Stretch.VALID_STRETCH_VALUES[index];
+            return null;
         }
 
-        /**
-         * Parses an XSL-FO String (case-insensitive) into an instance of {@link Font.Stretch}.
-         * @param input The XSL-FO-style String to be converted.
-         * @return For input not matching any enumerated value, returns null.
-         * Otherwise, returns the matching instance of {@link Font.Stretch}.
-         */
-        public static Font.Stretch parseFo(final String input) {
-            return parseFo(input, false);
-        }
-
-        /**
-         * Parses an XSL-FO String into an instance of {@link Font.Stretch}.
-         * @param input The XSL-FO-style String to be converted.
-         * @param caseSensitive Set to true to insist that all input values be lowercase.
-         * There is some ambiguity about whether XSL-FO is case-sensitive or not.
-         * If it is, all input should be lower case.
-         * @return An instance of {@link Font.Stretch}, or null if the input is not valid.
-         */
-        public static Font.Stretch parseFo(final String input, final boolean caseSensitive) {
-            return Font.Stretch.parseCss(input, caseSensitive);
-        }
-
     }
 
     /**
@@ -603,31 +482,48 @@
     enum SelectionStrategy {
 
         /** Font-selection-strategy constant indicating "character-by-character". */
-        CHARACTER_BY_CHARACTER,
+        CHARACTER_BY_CHARACTER("character-by-character"),
 
         /** Font-selection-strategy constant indicating "auto". */
-        AUTO;
+        AUTO("auto");
 
+        /** Keep a copy of the values for performance. */
+        private static final Font.SelectionStrategy[] VALUES = SelectionStrategy.values();
+
+        /** The external description of this strategy. */
+        private String name;
+
         /**
-         * Parses XSL-FO String input into an instance of {@link Font.SelectionStrategy}.
-         * @param input The XSL-FO-style String to be converted.
-         * @param caseSensitive Set to true to insist that all input values be lowercase.
-         * @return The valid instance, or null if the input is invalid.
+         * Private Constructor.
+         * @param name The external description of this strategy.
          */
-        public static Font.SelectionStrategy parseFo(final String input, final boolean caseSensitive) {
-            if (input == null) {
+        SelectionStrategy(final String name) {
+            this.name = name;
+        }
+
+        /**
+         * Returns the external description of this stretch.
+         * @return The external description of this stretch.
+         */
+        public String getName() {
+            return this.name;
+        }
+
+        /**
+         * Convert a string name of an instance into the instance itself.
+         * @param name The string name of the instance.
+         * @return The instance matching {@code name}, or null if none is found.
+         */
+        public static SelectionStrategy fromName(final String name) {
+            if (name == null) {
                 return null;
             }
-            String test = input;
-            if (! caseSensitive) {
-                test = input.toLowerCase();
+            for (int index = 0; index < VALUES.length; index ++) {
+                final SelectionStrategy strategy = VALUES[index];
+                if (strategy.name.equals(name)) {
+                    return strategy;
+                }
             }
-            if (test.equals("character-by-character")) {
-                return Font.SelectionStrategy.CHARACTER_BY_CHARACTER;
-            }
-            if (test.equals("auto")) {
-                return Font.SelectionStrategy.AUTO;
-            }
             return null;
         }
 

Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontConsumer.java
===================================================================
--- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontConsumer.java	2022-12-18 14:28:58 UTC (rev 2636)
+++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontConsumer.java	2022-12-18 15:12:21 UTC (rev 2637)
@@ -43,8 +43,7 @@
     /**
      * Accepts the client's description of the desired font, and returns the best-fitting Font found, using the
      * algorithm specified by the XSL-FO 1.1 Recommendation.
-     * @param selectionStrategy One of {@link Font.SelectionStrategy#CHARACTER_BY_CHARACTER} (for
-     * "character-by-character" selection) or {@link Font.SelectionStrategy#AUTO} (for "auto" selection").
+     * @param selectionStrategy The font-selection strategy to be used.
      * @param familyList The list of possible font family names from which to choose the font.
      * The most desirable font-family name is listed first, then the next most desirable, etc.
      * Elements should not contain leading or trailing quotation marks or spaces.
@@ -55,12 +54,9 @@
      * @param weight The weight of the font desired.
      * Use {@link Font.Weight#fromName(String)} to convert String input.
      * @param variant The variant (normal or small-caps) of the font desired.
-     * Valid values are {@link Font.Variant#NORMAL} and {@link Font.Variant#SMALL_CAPS}.
-     * Client applications may use {@link Font.Variant#parseFo(String, boolean)} to convert String input into the value
-     * expected here.
+     * Use {@link Font.Variant#fromName(String)} to convert String input.
      * @param stretch The stretch of the font desired.
-     * Client applications may use {@link Font.Stretch#parseFo(String, boolean)} to convert String input into the value
-     * expected here.
+     * Use {@link Font.Stretch#fromName(String)} to convert String input.
      * @param size The size (in millipoints) of the font.
      * This is only meaningful for bitmapped fonts.
      * @param codePoint The first character to be painted using the selected {@link FontUse}.
@@ -88,11 +84,9 @@
      * @param weight See {@link #selectFontXsl}.
      * Use {@link Font.Weight#fromName(String)} to convert String input.
      * @param variant See {@link #selectFontXsl}.
-     * Client applications may use {@link Font.Variant#parseCss(String, boolean)} to convert String input into the value
-     * expected here.
+     * Use {@link Font.Variant#fromName(String)} to convert String input.
      * @param stretch See {@link #selectFontXsl}.
-     * Client applications may use {@link Font.Stretch#parseCss(String, boolean)} to convert String input into the value
-     * expected here.
+     * Use {@link Font.Stretch#fromName(String)} to convert String input.
      * @param size The size (in millipoints) of the font.
      * This is only meaningful for bitmapped fonts.
      * @param codePoint The first character to be painted using the selected {@link FontUse}.

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	2022-12-18 14:28:58 UTC (rev 2636)
+++ trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontStretch.java	2022-12-18 15:12:21 UTC (rev 2637)
@@ -28,6 +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),

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

[aXSL-commit] SF.net SVN: axsl:[2636] trunk/axsl

[<vic...@us...>]

Revision: 2636
          http://sourceforge.net/p/axsl/code/2636
Author:   victormote
Date:     2022-12-18 14:28:58 +0000 (Sun, 18 Dec 2022)
Log Message:
-----------
Partial cleanup of font-related enumerations, after splitting out the related XSL-FO concepts.

Modified Paths:
--------------
    trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java
    trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontConsumer.java
    trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontStyle.java
    trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontWeight.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	2022-12-18 12:47:56 UTC (rev 2635)
+++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/Font.java	2022-12-18 14:28:58 UTC (rev 2636)
@@ -48,10 +48,10 @@
     enum Style {
 
         /** Font-style constant indicating no preference. */
-        ANY(Font.INVALID_STRING),
+        ANY("any"),
 
         /** Font-style constant indicating an upright (Roman) typeface. */
-        NORMAL(Font.NORMAL_STRING),
+        NORMAL(NORMAL_STRING),
 
         /** Font-style constant indicating an italic typeface. */
         ITALIC("italic"),
@@ -62,106 +62,47 @@
         /** Font-style constant indicating a backslant typeface. */
         BACKSLANT("backslant");
 
-        /** The String describing this style in CSS. */
-        private String cssValue;
+        /** Keep a copy of the values for performance. */
+        private static final Font.Style[] VALUES = Style.values();
 
+        /** The external description of this style. */
+        private String name;
+
         /**
          * Private Constructor.
-         * @param cssValue The String describing this style in CSS.
+         * @param name The external description of this style.
          */
-        Style(final String cssValue) {
-            this.cssValue = cssValue;
+        Style(final String name) {
+            this.name = name;
         }
 
         /**
-         * Returns the String describing this style in CSS.
-         * @return The String describing this style in CSS.
+         * Returns the external description of this style.
+         * @return The external description of this style.
          */
-        public String getCssValue() {
-            return this.cssValue;
+        public String getName() {
+            return this.name;
         }
 
         /**
-         * Returns the String describing this style in XSL-FO.
-         * @return The String describing this style in XSL-FO.
+         * Convert a string name of an instance into the instance itself.
+         * @param name The string name of the instance.
+         * @return The instance matching {@code name}, or null if none is found.
          */
-        public String getFoValue() {
-            /* For now, this is the same as for CSS. */
-            return this.cssValue;
-        }
-
-        /**
-         * Parses a CSS String (case-insensitive) into an instance of {@link Font.Style}.
-         * @param input The CSS-style String to be converted.
-         * @return For input not matching any enumerated value, returns null.
-         * Otherwise, returns the matching instance of {@link Font.Style}.
-         */
-        public static Font.Style parseCss(final String input) {
-            return parseCss(input, false);
-        }
-
-        /**
-         * Parses a CSS2-style String into an instance of {@link Font.Style}.
-         * @param input The CSS2-style String to be converted.
-         * @param caseSensitive Set to true to insist that all input values be lowercase.
-         * There is some ambiguity about whether CSS is case-sensitive or not.
-         * If it is, all input should be lower case.
-         * @return An instance of {@link Font.Style}, or null if the input is not valid.
-         */
-        public static Font.Style parseCss(final String input, final boolean caseSensitive) {
-            if (input == null) {
+        public static Style fromName(final String name) {
+            if (name == null) {
                 return null;
             }
-            String test = input;
-            if (! caseSensitive) {
-                test = input.toLowerCase();
+            for (int index = 0; index < VALUES.length; index ++) {
+                final Style style = VALUES[index];
+                if (style.name.equals(name)) {
+                    return style;
+                }
             }
-            if (test.equals(Font.Style.NORMAL.getCssValue())) {
-                return Font.Style.NORMAL;
-            }
-            if (test.equals(Font.Style.ITALIC.getCssValue())) {
-                return Font.Style.ITALIC;
-            }
-            if (test.equals(Font.Style.OBLIQUE.getCssValue())) {
-                return Font.Style.OBLIQUE;
-            }
             return null;
         }
 
         /**
-         * Parses an XSL-FO String (case-insensitive) into an instance of {@link Font.Style}.
-         * @param input The XSL-FO-style String to be converted.
-         * @return For input not matching any enumerated value, returns null.
-         * Otherwise, returns the matching instance of {@link Font.Style}.
-         */
-        public static Font.Style parseFo(final String input) {
-            return parseFo(input, false);
-        }
-
-        /**
-         * Parses an XSL-FO String into an instance of {@link Font.Style}.
-         * @param input The XSL-FO-style String to be converted.
-         * @param caseSensitive Set to true to insist that all input values be lowercase.
-         * There is some ambiguity about whether XSL-FO is case-sensitive or not.
-         * If it is, all input should be lower case.
-         * @return An instance of {@link Font.Style}, or null if the input is not valid.
-         */
-        public static Font.Style parseFo(final String input, final boolean caseSensitive) {
-            final Font.Style returnValue = Font.Style.parseCss(input, caseSensitive);
-            if (returnValue != null) {
-                return returnValue;
-            }
-            String test = input;
-            if (! caseSensitive) {
-                test = input.toLowerCase();
-            }
-            if (test.equals(Font.Style.BACKSLANT.getFoValue())) {
-                return Font.Style.BACKSLANT;
-            }
-            return null;
-        }
-
-        /**
          * Converts a {@link TextAttribute} posture value to an instance of this enumeration.
          * @param posture The numeric text attribute posture value.
          * @return The instance of this enumeration that most closely matches {@code posture}.
@@ -178,6 +119,7 @@
             }
             return ITALIC;
         }
+
     }
 
     /**
@@ -215,53 +157,23 @@
         /** Font-weight constant indicating a weight of 900 (black). */
         BLACK((short) 900, "900");
 
-        /** Array containing the valid font weight input values, sorted alphabetically so that they can be binary
-         * searched.
-         * Indexes correspond to those in {@link #VALID_WEIGHT_VALUES}. */
-        private static final String[] VALID_WEIGHT_STRINGS = new String[] {
-            Integer.toString(Font.Weight.EXTREMELY_LIGHT.getNumericWeight()),
-            Integer.toString(Font.Weight.VERY_LIGHT.getNumericWeight()),
-            Integer.toString(Font.Weight.LIGHT.getNumericWeight()),
-            Integer.toString(Font.Weight.NORMAL.getNumericWeight()),
-            Integer.toString(Font.Weight.DARK.getNumericWeight()),
-            Integer.toString(Font.Weight.SEMI_BOLD.getNumericWeight()),
-            Integer.toString(Font.Weight.BOLD.getNumericWeight()),
-            Integer.toString(Font.Weight.EXTRA_BOLD.getNumericWeight()),
-            Integer.toString(Font.Weight.BLACK.getNumericWeight()),
-            Font.Weight.BOLD.getCssValue(),
-            Font.Weight.NORMAL.getCssValue(),
-        };
+        /** Keep a copy of the values for performance. */
+        private static final Font.Weight[] VALUES = Weight.values();
 
-        /** Array containing the parsed font weight values that correspond to the Strings in
-         * {@link #VALID_WEIGHT_STRINGS}. */
-        private static final Font.Weight[] VALID_WEIGHT_VALUES = new Font.Weight[] {
-            Font.Weight.EXTREMELY_LIGHT,
-            Font.Weight.VERY_LIGHT,
-            Font.Weight.LIGHT,
-            Font.Weight.NORMAL,
-            Font.Weight.DARK,
-            Font.Weight.SEMI_BOLD,
-            Font.Weight.BOLD,
-            Font.Weight.EXTRA_BOLD,
-            Font.Weight.BLACK,
-            Font.Weight.BOLD,
-            Font.Weight.NORMAL,
-        };
-
         /** The numeric weight. */
         private short numericWeight;
 
-        /** The String describing this weight in CSS. */
-        private String cssValue;
+        /** The external description of this weight. */
+        private String name;
 
         /**
          * Private constructor.
          * @param numericWeight The numeric weight for this weight.
-         * @param cssValue The String describing this weight in CSS.
+         * @param name The external description of this weight.
          */
-        Weight(final short numericWeight, final String cssValue) {
+        Weight(final short numericWeight, final String name) {
             this.numericWeight = numericWeight;
-            this.cssValue = cssValue;
+            this.name = name;
         }
 
         /**
@@ -275,21 +187,30 @@
         }
 
         /**
-         * Returns the String describing this weight in CSS.
-         * @return The String describing this weight in CSS.
+         * Returns the external description of this weight.
+         * @return The external description of this weight.
          */
-        public String getCssValue() {
-            return this.cssValue;
+        public String getName() {
+            return this.name;
         }
 
         /**
-         * Returns the String describing this weight in XSL-FO.
-         * @return The String describing this weight in XSL-FO.
+         * Convert a string name of an instance into the instance itself.
+         * @param name The string name of the instance.
+         * @return The instance matching {@code name}, or null if none is found.
          */
-        public String getFoValue() {
-            return this.cssValue;
+        public static Weight fromName(final String name) {
+            if (name == null) {
+                return null;
+            }
+            for (int index = 0; index < VALUES.length; index ++) {
+                final Weight weight = VALUES[index];
+                if (weight.name.equals(name)) {
+                    return weight;
+                }
+            }
+            return null;
         }
-
         /**
          * Returns the next heaviest weight.
          * @return The next heaviest weight, null if this is not a valid weight, or if this is the heaviest weight,
@@ -356,62 +277,6 @@
         }
 
         /**
-         * Parses a CSS String (case-insensitive) into an instance of {@link Font.Weight}.
-         * @param input The CSS-style String to be converted.
-         * @return For input not matching any enumerated value, returns null.
-         * Otherwise, returns the matching instance of {@link Font.Weight}.
-         */
-        public static Font.Weight parseCss(final String input) {
-            return parseCss(input, false);
-        }
-
-        /**
-         * Parses a CSS2 String into an instance of {@link Font.Weight}.
-         * @param input The CSS2-style String to be converted.
-         * @param caseSensitive Set to true to insist that all input values be lowercase.
-         * There is some ambiguity about whether CSS is case-sensitive or not.
-         * If it is, all input should be lower case.
-         * @return An instance of {@link Font.Weight}, or null if the input is not valid.
-         */
-        public static Font.Weight parseCss(final String input, final boolean caseSensitive) {
-            if (input == null) {
-                return Font.Weight.NORMAL;
-            }
-            String test = input;
-            if (! caseSensitive) {
-                test = input.toLowerCase();
-            }
-            final int index = Arrays.binarySearch(Font.Weight.VALID_WEIGHT_STRINGS,
-                    test);
-            if (index < 0) {
-                return null;
-            }
-            return Font.Weight.VALID_WEIGHT_VALUES[index];
-        }
-
-        /**
-         * Parses an XSL-FO String (case-insensitive) into an instance of {@link Font.Weight}.
-         * @param input The XSL-FO-style String to be converted.
-         * @return For input not matching any enumerated value, returns null.
-         * Otherwise, returns the matching instance of {@link Font.Weight}.
-         */
-        public static Font.Weight parseFo(final String input) {
-            return parseFo(input, false);
-        }
-
-        /**
-         * Parses an XSL-FO String into an instance of {@link Font.Weight}.
-         * @param input The XSL-FO-style String to be converted.
-         * @param caseSensitive Set to true to insist that all input values be lowercase.
-         * There is some ambiguity about whether XSL-FO is case-sensitive or not.
-         * If it is, all input should be lower case.
-         * @return An instance of {@link Font.Weight}, or null if the input is not valid.
-         */
-        public static Font.Weight parseFo(final String input, final boolean caseSensitive) {
-            return parseCss(input, caseSensitive);
-        }
-
-        /**
          * Converts a {@link TextAttribute} weight value to an instance of this enumeration.
          * @param weight The numeric text attribute weight value.
          * @return The instance of this enumeration that most closely matches {@code weight}.

Modified: trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontConsumer.java
===================================================================
--- trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontConsumer.java	2022-12-18 12:47:56 UTC (rev 2635)
+++ trunk/axsl/axsl-font/src/main/java/org/axsl/font/FontConsumer.java	2022-12-18 14:28:58 UTC (rev 2636)
@@ -51,11 +51,9 @@
      * Client applications may use {@link FontUtility#foFontFamily(CharSequence)} to convert String input into the value
      * expected here.
      * @param style The style of the font desired.
-     * Client applications may use {@link Font.Style#parseFo(String, boolean)} to convert String input into the value
-     * expected here.
+     * Use {@link Font.Style#fromName(String)} to convert String input.
      * @param weight The weight of the font desired.
-     * Client applications may use {@link Font.Weight#parseFo(String, boolean)} to convert String input into the value
-     * expected here.
+     * Use {@link Font.Weight#fromName(String)} to convert String input.
      * @param variant The variant (normal or small-caps) of the font desired.
      * Valid values are {@link Font.Variant#NORMAL} and {@link Font.Variant#SMALL_CAPS}.
      * Client applications may use {@link Font.Variant#parseFo(String, boolean)} to convert String input into the value
@@ -86,11 +84,9 @@
      * Client applications may use {@link FontUtility#cssFontFamily(CharSequence)} to convert String input into the
      * value expected here.
      * @param style See {@link #selectFontXsl}.
-     * Client applications may use {@link Font.Style#parseCss(String, boolean)} to convert String input into the value
-     * expected here.
+     * Use {@link Font.Style#fromName(String)} to convert String input.
      * @param weight See {@link #selectFontXsl}.
-     * Client applications may use {@link Font.Weight#parseCss(String, boolean)} to convert String input into the value
-     * expected here.
+     * Use {@link Font.Weight#fromName(String)} to convert String input.
      * @param variant See {@link #selectFontXsl}.
      * Client applications may use {@link Font.Variant#parseCss(String, boolean)} to convert String input into the value
      * expected here.

Modified: trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontStyle.java
===================================================================
--- trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontStyle.java	2022-12-18 12:47:56 UTC (rev 2635)
+++ trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontStyle.java	2022-12-18 14:28:58 UTC (rev 2636)
@@ -30,15 +30,114 @@
 public enum FontStyle {
 
     /** Normal font-style. */
-    NORMAL,
+    NORMAL("normal"),
 
     /** Italic font-style. */
-    ITALIC,
+    ITALIC("italic"),
 
     /** Oblique font-style. */
-    OBLIQUE,
+    OBLIQUE("oblique"),
 
     /** Backslant font-style. */
-    BACKSLANT;
+    BACKSLANT("backslant");
 
+    /** The String describing this style in CSS and/or XSL-FO. */
+    private String name;
+
+    /**
+     * Private Constructor.
+     * @param name The String describing this style in CSS and/or XSL-FO.
+     */
+    FontStyle(final String name) {
+        this.name = name;
+    }
+
+    /**
+     * Returns the String describing this style in CSS.
+     * @return The String describing this style in CSS.
+     */
+    public String getCssValue() {
+        return this.name;
+    }
+
+    /**
+     * Returns the String describing this style in XSL-FO.
+     * @return The String describing this style in XSL-FO.
+     */
+    public String getFoValue() {
+        /* For now, this is the same as for CSS. */
+        return this.name;
+    }
+
+    /**
+     * Parses a CSS String (case-insensitive) into an instance of {@link FontStyle}.
+     * @param input The CSS-style String to be converted.
+     * @return For input not matching any enumerated value, returns null.
+     * Otherwise, returns the matching instance of {@link FontStyle}.
+     */
+    public static FontStyle parseCss(final String input) {
+        return parseCss(input, false);
+    }
+
+    /**
+     * Parses a CSS2-style String into an instance of {@link FontStyle}.
+     * @param input The CSS2-style String to be converted.
+     * @param caseSensitive Set to true to insist that all input values be lowercase.
+     * There is some ambiguity about whether CSS is case-sensitive or not.
+     * If it is, all input should be lower case.
+     * @return An instance of {@link FontStyle}, or null if the input is not valid.
+     */
+    public static FontStyle parseCss(final String input, final boolean caseSensitive) {
+        if (input == null) {
+            return null;
+        }
+        String test = input;
+        if (! caseSensitive) {
+            test = input.toLowerCase();
+        }
+        if (test.equals(FontStyle.NORMAL.getCssValue())) {
+            return FontStyle.NORMAL;
+        }
+        if (test.equals(FontStyle.ITALIC.getCssValue())) {
+            return FontStyle.ITALIC;
+        }
+        if (test.equals(FontStyle.OBLIQUE.getCssValue())) {
+            return FontStyle.OBLIQUE;
+        }
+        return null;
+    }
+
+    /**
+     * Parses an XSL-FO String (case-insensitive) into an instance of {@link FontStyle}.
+     * @param input The XSL-FO-style String to be converted.
+     * @return For input not matching any enumerated value, returns null.
+     * Otherwise, returns the matching instance of {@link FontStyle}.
+     */
+    public static FontStyle parseFo(final String input) {
+        return parseFo(input, false);
+    }
+
+    /**
+     * Parses an XSL-FO String into an instance of {@link FontStyle}.
+     * @param input The XSL-FO-style String to be converted.
+     * @param caseSensitive Set to true to insist that all input values be lowercase.
+     * There is some ambiguity about whether XSL-FO is case-sensitive or not.
+     * If it is, all input should be lower case.
+     * @return An instance of {@link FontStyle}, or null if the input is not valid.
+     */
+    public static FontStyle parseFo(final String input, final boolean caseSensitive) {
+        final FontStyle returnValue = FontStyle.parseCss(input, caseSensitive);
+        if (returnValue != null) {
+            return returnValue;
+        }
+        String test = input;
+        if (! caseSensitive) {
+            test = input.toLowerCase();
+        }
+        if (test.equals(FontStyle.BACKSLANT.getFoValue())) {
+            return FontStyle.BACKSLANT;
+        }
+        return null;
+    }
+
 }

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	2022-12-18 12:47:56 UTC (rev 2635)
+++ trunk/axsl/axsl-value/src/main/java/org/axsl/value/FontWeight.java	2022-12-18 14:28:58 UTC (rev 2636)
@@ -32,43 +32,43 @@
      * of including notional values. */
 
     /** Normal font-weight. */
-    NORMAL((short) 400),
+    NORMAL((short) 400, "normal"),
 
     /** Bold font-weight. */
-    BOLD((short) 700),
+    BOLD((short) 700, "bold"),
 
     /** Indicates request for a font weight that is bolder than the current font-weight. */
-    BOLDER((short) -1),
+    BOLDER((short) -1, "bolder"),
 
     /** Indicates request for a font weight that is lighter (less bold) than the current font-weight. */
-    LIGHTER((short) -1),
+    LIGHTER((short) -1, "lighter"),
 
     /** Numeric font-weight mapping to "extremely light". */
-    N100((short) 100),
+    N100((short) 100, "100"),
 
     /** Numeric font-weight mapping to "very light". */
-    N200((short) 200),
+    N200((short) 200, "200"),
 
     /** Numeric font-weight mapping to "light". */
-    N300((short) 300),
+    N300((short) 300, "300"),
 
     /** Numeric font-weight mapping to "normal". */
-    N400((short) 400),
+    N400((short) 400, "400"),
 
     /** Numeric font-weight mapping to "dark". */
-    N500((short) 500),
+    N500((short) 500, "500"),
 
     /** Numeric font-weight mapping to "semi-bold". */
-    N600((short) 600),
+    N600((short) 600, "600"),
 
     /** Numeric font-weight mapping to "bold". */
-    N700((short) 700),
+    N700((short) 700, "700"),
 
     /** Numeric font-weight mapping to "extra bold". */
-    N800((short) 800),
+    N800((short) 800, "800"),
 
     /** Numeric font-weight mapping to "black". */
-    N900((short) 900);
+    N900((short) 900, "900");
 
     /** The interval between the numeric values. */
     private static final int NUMERIC_INTERVAL = 100;
@@ -79,15 +79,37 @@
     /** The numeric weight. */
     private short numericWeight;
 
+    /** The String describing this style in CSS and/or XSL-FO. */
+    private String name;
+
     /**
      * Private constructor.
      * @param numericWeight The numeric weight for this weight.
+     * @param name The String describing this style in CSS and/or XSL-FO.
      */
-    FontWeight(final short numericWeight) {
+    FontWeight(final short numericWeight, final String name) {
         this.numericWeight = numericWeight;
+        this.name = name;
     }
 
     /**
+     * Returns the String describing this weight in CSS.
+     * @return The String describing this weight in CSS.
+     */
+    public String getCssValue() {
+        return this.name;
+    }
+
+    /**
+     * Returns the String describing this style in XSL-FO.
+     * @return The String describing this style in XSL-FO.
+     */
+    public String getFoValue() {
+        /* For now, this is the same as for CSS. */
+        return this.name;
+    }
+
+    /**
      * Returns the instance corresponding to a given numeric weight.
      * @param numericWeight The numeric weight for which a constant is needed.
      * This should be 100, 200, 300, 400, 500, 600, 700, 800, or 900.

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

[aXSL-commit] SF.net SVN: axsl:[2635] trunk/axsl

[<vic...@us...>]

Revision: 2635
          http://sourceforge.net/p/axsl/code/2635
Author:   victormote
Date:     2022-12-18 12:47:56 +0000 (Sun, 18 Dec 2022)
Log Message:
-----------
Add javadoc overview document.

Modified Paths:
--------------
    trunk/axsl/build.gradle

Added Paths:
-----------
    trunk/axsl/doc/
    trunk/axsl/doc/javadoc/
    trunk/axsl/doc/javadoc/overview.html

Modified: trunk/axsl/build.gradle
===================================================================
--- trunk/axsl/build.gradle	2022-12-18 01:34:53 UTC (rev 2634)
+++ trunk/axsl/build.gradle	2022-12-18 12:47:56 UTC (rev 2635)
@@ -6,6 +6,11 @@
            Normal build checking for compile errors and test failures.
     2. gradle publishToMavenLocal
            Builds and publishes the artifacts to the local maven repository.
+    3. gradle allJavadoc
+           Builds the aggregate javadocs for all Java code in axsl.
+       OR
+       gradle aggregateJavadoc
+           Builds the aggregate javadocs using the Freefair Aggregate Javadoc plugin
     3. gradle zipAllJavadoc
            Builds the aggregate javadocs for all Java code in axsl and puts them in a zip file.
     4. gradle validateWeb
@@ -18,6 +23,7 @@
     id 'axsl.common-conventions'
     id 'java'
     id "com.autonomousapps.dependency-analysis" version "1.0.0-rc02"
+    id 'io.freefair.aggregate-javadoc' version "6.5.1"
 }
 
 task allJavadoc(type: Javadoc) {

Added: trunk/axsl/doc/javadoc/overview.html
===================================================================
--- trunk/axsl/doc/javadoc/overview.html	                        (rev 0)
+++ trunk/axsl/doc/javadoc/overview.html	2022-12-18 12:47:56 UTC (rev 2635)
@@ -0,0 +1,50 @@
+<h1>About aXSL</h1>
+<p>aXSL is a set of libraries, made up mostly of interfaces and enumerations, that do very little actual work, but
+instead provide a framework upon which publishing applications can be built.
+You will not be able to actually process anything with it.
+Instead, you will need to find or build an implementation of at least part of it to do any real work.
+It has been designed to provide interoperability between implementations, to encourage use of best-of-breed
+implementations.
+aXSL breaks up the publishing application into small discrete parts, with these parts interacting loosely with each
+other if at all.
+In our opinion, this forces a cleaner and better design.</p>
+
+<h1>Coding Standards</h1>
+<p>In some cases, these standards are aspirational.
+This section is intended to document what <em>should</em> be true so that, as changes are made, developers know
+<em>how</em> they should change.</p>
+
+<h2>Method Names</h2>
+<table>
+  <thead>
+    <tr>
+      <th>Method Purpose</th>
+      <th>Method Name (Prefix)</th>
+      <th>Comments</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Return a property value or other value expected to exist already.</td>
+      <td>get</td>
+      <td>widely-used Java convention</td>
+    </tr>
+    <tr>
+      <td>Set the value of a property.</td>
+      <td>set</td>
+      <td>widely-used Java convention</td>
+    </tr>
+    <tr>
+      <td>Create and return a new object.</td>
+      <td>create</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>If the specified object already exists, return it, otherwise create it and return it.</td>
+      <td>procure</td>
+      <td>Semantically similar to "get". Intended to convey the notion that there may have been more effort than
+      "get".</td>
+    </tr>
+  </tbody>
+</table>
+


Property changes on: trunk/axsl/doc/javadoc/overview.html
___________________________________________________________________
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.

[aXSL-commit] SF.net SVN: axsl:[2634] trunk/axsl/axsl-fotree/src/main/java/org/axsl/ fotree/FoTree.java

[<vic...@us...>]

Revision: 2634
          http://sourceforge.net/p/axsl/code/2634
Author:   victormote
Date:     2022-12-18 01:34:53 +0000 (Sun, 18 Dec 2022)
Log Message:
-----------
Remove resource search path concept from FoTree, leaving it with the FoTreeParser instead.

Modified Paths:
--------------
    trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoTree.java

Modified: trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoTree.java
===================================================================
--- trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoTree.java	2022-12-18 00:25:39 UTC (rev 2633)
+++ trunk/axsl/axsl-fotree/src/main/java/org/axsl/fotree/FoTree.java	2022-12-18 01:34:53 UTC (rev 2634)
@@ -27,9 +27,6 @@
 import org.axsl.fotree.text.FoOrthographyServer;
 import org.axsl.orthography.OrthographyServer;
 
-import java.net.URL;
-import java.util.List;
-
 /**
  * <p>An {@link FoTree} is created for each document that is processed.</p>
  *
@@ -83,13 +80,4 @@
      */
     FoOrthographyServer getOrthographyServer();
 
-    /**
-     * Allows the client application to set an array of URLs that should be
-     * searched when looking for external graphic files during FO tree parsing
-     * or building.
-     * @param graphicSearchPath The array of URLs that should be searched when
-     * looking for external graphic files during FO tree parsing or building.
-     */
-    void setGraphicSearchPath(List<URL> graphicSearchPath);
-
 }

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