foray-commit — FOray repository commit log messages

[FOray-commit] SF.net SVN: foray:[12751] trunk/foray

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

Revision: 12751
          http://sourceforge.net/p/foray/code/12751
Author:   victormote
Date:     2022-11-30 03:25:10 +0000 (Wed, 30 Nov 2022)
Log Message:
-----------
Move SAX-related code to new utility class.

Modified Paths:
--------------
    trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/ValidateChars.java
    trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayPretty.java
    trunk/foray/foray-xml/src/main/java/org/foray/xml/XmlStreamUtils.java

Added Paths:
-----------
    trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxUtils.java

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java	2022-11-30 03:13:24 UTC (rev 12750)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java	2022-11-30 03:25:10 UTC (rev 12751)
@@ -28,10 +28,6 @@
 
 package org.foray.common.primitive;
 
-import org.apache.xml.resolver.CatalogManager;
-import org.apache.xml.resolver.tools.CatalogResolver;
-import org.xml.sax.EntityResolver;
-
 /**
  * Utility class containing constants and methods useful in parsing or building XML.
  * @see javax.xml.XMLConstants
@@ -133,41 +129,4 @@
         return changes + spacesToRemove;
     }
 
-    /**
-     * Creates an EntityResolver.
-     * @param catalog The catalog which should be encapsulated in an EntityResolver.
-     * @return The created EntityResolver.
-     */
-    public static EntityResolver getEntityResolver(final String catalog) {
-        final String[] catalogs = new String[] {catalog};
-        return XmlUtils.getEntityResolver(catalogs);
-    }
-
-    /**
-     * Creates an EntityResolver for one or more XML catalogs.
-     * @param catalogs The array of URIs indicating where the XML catalogs are located.
-     * @return The created EntityResolver.
-     */
-    public static CatalogResolver getEntityResolver(final String[] catalogs) {
-        if (catalogs == null
-                || catalogs.length < 1) {
-            return null;
-        }
-        final CatalogManager manager = new CatalogManager();
-        manager.setPreferPublic(true);
-        /* Unless we ignore missing properties, the CatalogManager will insist on a CatalogManager.properties file, the
-         * default way of configuring it. */
-        manager.setIgnoreMissingProperties(true);
-        final StringBuilder fileListString = new StringBuilder();
-        for (int i = 0; i < catalogs.length; i++) {
-            fileListString.append(catalogs[i]);
-            if (i < (catalogs.length - 1)) {
-                fileListString.append(";");
-            }
-        }
-        manager.setCatalogFiles(fileListString.toString());
-        final CatalogResolver resolver = new CatalogResolver(manager);
-        return resolver;
-    }
-
 }

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/ValidateChars.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/ValidateChars.java	2022-11-30 03:13:24 UTC (rev 12750)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/ValidateChars.java	2022-11-30 03:25:10 UTC (rev 12751)
@@ -29,11 +29,11 @@
 package org.foray.orthography.util;
 
 import org.foray.common.i18n.Language4a;
-import org.foray.common.primitive.XmlUtils;
 import org.foray.common.url.UrlFactory;
 import org.foray.orthography.OrthographyServer4a;
 import org.foray.orthography.OrthographyServerConfig;
 import org.foray.xml.SaxParser;
+import org.foray.xml.SaxUtils;
 
 import org.axsl.i18n.Language;
 import org.axsl.orthography.OrthographyException;
@@ -111,7 +111,7 @@
      */
     public ValidateChars(final OrthographyServer4a server, final String catalog, final String languageCode) {
         this.server = server;
-        this.entityResolver = XmlUtils.getEntityResolver(catalog);
+        this.entityResolver = SaxUtils.getEntityResolver(catalog);
         this.languageCode = languageCode;
         this.iso639 = Language4a.findFromAlpha(languageCode);
         if (this.iso639 == null) {

Modified: trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayPretty.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayPretty.java	2022-11-30 03:13:24 UTC (rev 12750)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayPretty.java	2022-11-30 03:25:10 UTC (rev 12751)
@@ -198,7 +198,7 @@
 
     @Override
     public Object parse(final InputSource inputSource) throws IOException, ParserConfigurationException, SAXException {
-        final EntityResolver entityResolver = XmlUtils.getEntityResolver(catalogs);
+        final EntityResolver entityResolver = SaxUtils.getEntityResolver(catalogs);
         final XMLReader parser = createSax2Parser(true, true, true, entityResolver, true);
         parser.parse(inputSource);
         cleanup();

Added: trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxUtils.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxUtils.java	                        (rev 0)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxUtils.java	2022-11-30 03:25:10 UTC (rev 12751)
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2022 The FOray Project.
+ *      http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ *      Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.xml;
+
+import org.apache.xml.resolver.CatalogManager;
+import org.apache.xml.resolver.tools.CatalogResolver;
+import org.xml.sax.EntityResolver;
+
+/**
+ * Constants and utilities supporting SAX parsing.
+ */
+public final class SaxUtils {
+
+    /**
+     * Private constructor. This is a utility class and should never be instantiated.
+     */
+    private SaxUtils() { }
+
+    /**
+     * Creates an EntityResolver.
+     * @param catalog The catalog which should be encapsulated in an EntityResolver.
+     * @return The created EntityResolver.
+     */
+    public static EntityResolver getEntityResolver(final String catalog) {
+        final String[] catalogs = new String[] {catalog};
+        return SaxUtils.getEntityResolver(catalogs);
+    }
+
+    /**
+     * Creates an EntityResolver for one or more XML catalogs.
+     * @param catalogs The array of URIs indicating where the XML catalogs are located.
+     * @return The created EntityResolver.
+     */
+    public static CatalogResolver getEntityResolver(final String[] catalogs) {
+        if (catalogs == null
+                || catalogs.length < 1) {
+            return null;
+        }
+        final CatalogManager manager = new CatalogManager();
+        manager.setPreferPublic(true);
+        /* Unless we ignore missing properties, the CatalogManager will insist on a CatalogManager.properties file, the
+         * default way of configuring it. */
+        manager.setIgnoreMissingProperties(true);
+        final StringBuilder fileListString = new StringBuilder();
+        for (int i = 0; i < catalogs.length; i++) {
+            fileListString.append(catalogs[i]);
+            if (i < (catalogs.length - 1)) {
+                fileListString.append(";");
+            }
+        }
+        manager.setCatalogFiles(fileListString.toString());
+        final CatalogResolver resolver = new CatalogResolver(manager);
+        return resolver;
+    }
+
+}


Property changes on: trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxUtils.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Modified: trunk/foray/foray-xml/src/main/java/org/foray/xml/XmlStreamUtils.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/XmlStreamUtils.java	2022-11-30 03:13:24 UTC (rev 12750)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/XmlStreamUtils.java	2022-11-30 03:25:10 UTC (rev 12751)
@@ -28,8 +28,6 @@
 
 package org.foray.xml;
 
-import org.foray.common.primitive.XmlUtils;
-
 import org.apache.xml.resolver.tools.CatalogResolver;
 import org.xml.sax.InputSource;
 
@@ -50,7 +48,7 @@
      * @return The created EntityResolver.
      */
     public static XMLResolver getXMLResolver(final String[] catalogs) {
-        final CatalogResolver catalogResolver = XmlUtils.getEntityResolver(catalogs);
+        final CatalogResolver catalogResolver = SaxUtils.getEntityResolver(catalogs);
         final XMLResolver resolver = new XMLResolver() {
             public Object resolveEntity(final String publicID, final String systemID, final String baseURI,
                     final String namespace) throws XMLStreamException {

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

[FOray-commit] SF.net SVN: foray:[12750] trunk/foray

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

Revision: 12750
          http://sourceforge.net/p/foray/code/12750
Author:   victormote
Date:     2022-11-30 03:13:24 +0000 (Wed, 30 Nov 2022)
Log Message:
-----------
Move some XmlStream code to the XML project.

Modified Paths:
--------------
    trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java
    trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayXdiff.java

Added Paths:
-----------
    trunk/foray/foray-xml/src/main/java/org/foray/xml/XmlStreamUtils.java

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java	2022-11-30 02:57:53 UTC (rev 12749)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java	2022-11-30 03:13:24 UTC (rev 12750)
@@ -31,11 +31,7 @@
 import org.apache.xml.resolver.CatalogManager;
 import org.apache.xml.resolver.tools.CatalogResolver;
 import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
 
-import javax.xml.stream.XMLResolver;
-import javax.xml.stream.XMLStreamException;
-
 /**
  * Utility class containing constants and methods useful in parsing or building XML.
  * @see javax.xml.XMLConstants
@@ -174,21 +170,4 @@
         return resolver;
     }
 
-    /**
-     * Creates an XMLResolver for one or more XML catalogs.
-     * @param catalogs The array of URIs indicating where the XML catalogs are located.
-     * @return The created EntityResolver.
-     */
-    public static XMLResolver getXMLResolver(final String[] catalogs) {
-        final CatalogResolver catalogResolver = XmlUtils.getEntityResolver(catalogs);
-        final XMLResolver resolver = new XMLResolver() {
-            public Object resolveEntity(final String publicID, final String systemID, final String baseURI,
-                    final String namespace) throws XMLStreamException {
-                final InputSource inputSource = catalogResolver.resolveEntity(publicID, systemID);
-                return inputSource.getByteStream();
-            }
-        };
-        return resolver;
-    }
-
 }

Modified: trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayXdiff.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayXdiff.java	2022-11-30 02:57:53 UTC (rev 12749)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayXdiff.java	2022-11-30 03:13:24 UTC (rev 12750)
@@ -176,7 +176,7 @@
 
         if (catalog != null) {
             final String[] catalogs = new String[] {catalog};
-            final XMLResolver resolver = XmlUtils.getXMLResolver(catalogs);
+            final XMLResolver resolver = XmlStreamUtils.getXMLResolver(catalogs);
             factory.setProperty(XMLInputFactory.RESOLVER, resolver);
         }
 

Added: trunk/foray/foray-xml/src/main/java/org/foray/xml/XmlStreamUtils.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/XmlStreamUtils.java	                        (rev 0)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/XmlStreamUtils.java	2022-11-30 03:13:24 UTC (rev 12750)
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2022 The FOray Project.
+ *      http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ *      Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.xml;
+
+import org.foray.common.primitive.XmlUtils;
+
+import org.apache.xml.resolver.tools.CatalogResolver;
+import org.xml.sax.InputSource;
+
+import javax.xml.stream.XMLResolver;
+import javax.xml.stream.XMLStreamException;
+
+/**
+ * Constants and utilities supporting XML Stream parsers.
+ */
+public final class XmlStreamUtils {
+
+    /** Private constructor. This is a utility class, and should never be instantiated. */
+    private XmlStreamUtils() { }
+
+    /**
+     * Creates an XMLResolver for one or more XML catalogs.
+     * @param catalogs The array of URIs indicating where the XML catalogs are located.
+     * @return The created EntityResolver.
+     */
+    public static XMLResolver getXMLResolver(final String[] catalogs) {
+        final CatalogResolver catalogResolver = XmlUtils.getEntityResolver(catalogs);
+        final XMLResolver resolver = new XMLResolver() {
+            public Object resolveEntity(final String publicID, final String systemID, final String baseURI,
+                    final String namespace) throws XMLStreamException {
+                final InputSource inputSource = catalogResolver.resolveEntity(publicID, systemID);
+                return inputSource.getByteStream();
+            }
+        };
+        return resolver;
+    }
+
+}


Property changes on: trunk/foray/foray-xml/src/main/java/org/foray/xml/XmlStreamUtils.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.

[FOray-commit] SF.net SVN: foray:[12749] trunk/foray/foray-xml/src/main/java/org/foray/ xml/ForayXdiff.java

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

Revision: 12749
          http://sourceforge.net/p/foray/code/12749
Author:   victormote
Date:     2022-11-30 02:57:53 +0000 (Wed, 30 Nov 2022)
Log Message:
-----------
Replace URI-type identifiers with standard values from XMLInputFactory.

Modified Paths:
--------------
    trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayXdiff.java

Modified: trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayXdiff.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayXdiff.java	2022-11-29 04:41:04 UTC (rev 12748)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayXdiff.java	2022-11-30 02:57:53 UTC (rev 12749)
@@ -156,15 +156,15 @@
         this.readers = new XMLStreamReader[streams.length];
         final XMLInputFactory factory = XMLInputFactory.newInstance();
         /* Turn off validation. */
-        factory.setProperty("javax.xml.stream.isValidating", Boolean.FALSE);
+        factory.setProperty(XMLInputFactory.IS_VALIDATING, Boolean.FALSE);
         /* Turn on namespace awareness. */
-        factory.setProperty("javax.xml.stream.isNamespaceAware", Boolean.TRUE);
+        factory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, Boolean.TRUE);
         /* Make parsers coalesce adjacent character data. */
-        factory.setProperty("javax.xml.stream.isCoalescing", Boolean.TRUE);
+        factory.setProperty(XMLInputFactory.IS_COALESCING, Boolean.TRUE);
         /* Turn off replacement of entity references. We want them raw. */
-        factory.setProperty("javax.xml.stream.isReplacingEntityReferences", Boolean.FALSE);
+        factory.setProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, Boolean.FALSE);
         /* Turn off resolution of external entities. */
-        factory.setProperty("javax.xml.stream.isSupportingExternalEntities", Boolean.FALSE);
+        factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
 
         /* The following setting is troublesome. We originally set it to TRUE. However, this seemed to make the parsers
          * try to find the Dtd and parse that, which in some cases causes what seemed like unnecessary network traffic
@@ -172,12 +172,12 @@
          * However, if we set it to FALSE, some JRE/JDKs will complain that the document has entities that are not
          * declared, even when they are declared in the Dtd. So it appears that this needs to be TRUE. See setting
          * below where we allow a catalog to be used to alleviate the network traffic. */
-        factory.setProperty("javax.xml.stream.supportDTD", Boolean.TRUE);
+        factory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.TRUE);
 
         if (catalog != null) {
             final String[] catalogs = new String[] {catalog};
             final XMLResolver resolver = XmlUtils.getXMLResolver(catalogs);
-            factory.setProperty("javax.xml.stream.resolver", resolver);
+            factory.setProperty(XMLInputFactory.RESOLVER, resolver);
         }
 
         for (int i = 0; i < streams.length; i++) {

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

[FOray-commit] SF.net SVN: foray:[12748] trunk/foray

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

Revision: 12748
          http://sourceforge.net/p/foray/code/12748
Author:   victormote
Date:     2022-11-29 04:41:04 +0000 (Tue, 29 Nov 2022)
Log Message:
-----------
Standardize location of SAX standard features and properties.

Modified Paths:
--------------
    trunk/foray/foray-app/src/main/java/org/foray/demo/embed/tools/AbstractObjectReader.java
    trunk/foray/foray-xml/src/main/java/org/foray/xml/DocumentReader.java
    trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxParser.java

Added Paths:
-----------
    trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxStdFeatures.java
    trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxStdProperties.java

Modified: trunk/foray/foray-app/src/main/java/org/foray/demo/embed/tools/AbstractObjectReader.java
===================================================================
--- trunk/foray/foray-app/src/main/java/org/foray/demo/embed/tools/AbstractObjectReader.java	2022-11-28 18:55:21 UTC (rev 12747)
+++ trunk/foray/foray-app/src/main/java/org/foray/demo/embed/tools/AbstractObjectReader.java	2022-11-29 04:41:04 UTC (rev 12748)
@@ -28,7 +28,7 @@
 
 package org.foray.demo.embed.tools;
 
-import org.foray.xml.DocumentReader;
+import org.foray.xml.SaxStdFeatures;
 
 import org.xml.sax.ContentHandler;
 import org.xml.sax.DTDHandler;
@@ -46,7 +46,6 @@
  * This class can be used as base class for XMLReaders that generate SAX
  * events from Java objects.
  */
-
 public abstract class AbstractObjectReader implements XMLReader {
 
     /** Map of the SAX features for this reader. */
@@ -66,8 +65,8 @@
      * Constructor for the AbstractObjectReader object.
      */
     public AbstractObjectReader() {
-        setFeature(DocumentReader.FEATURE_NAMESPACES, false);
-        setFeature(DocumentReader.FEATURE_NAMESPACE_PREFIXES, false);
+        setFeature(SaxStdFeatures.NAMESPACES.getUri(), false);
+        setFeature(SaxStdFeatures.NAMESPACE_PREFIXES.getUri(), false);
     }
 
     /* ============ XMLReader interface ============ */
@@ -130,7 +129,7 @@
      * @return boolean true if enabled
      */
     protected boolean isNamespaces() {
-        return getFeature(DocumentReader.FEATURE_NAMESPACES);
+        return getFeature(SaxStdFeatures.NAMESPACES.getUri());
     }
 
     /**
@@ -138,7 +137,7 @@
      * @return boolean true if enabled
      */
     protected boolean isNamespacePrefixes() {
-        return getFeature(DocumentReader.FEATURE_NAMESPACE_PREFIXES);
+        return getFeature(SaxStdFeatures.NAMESPACE_PREFIXES.getUri());
     }
 
     @Override

Modified: trunk/foray/foray-xml/src/main/java/org/foray/xml/DocumentReader.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/DocumentReader.java	2022-11-28 18:55:21 UTC (rev 12747)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/DocumentReader.java	2022-11-29 04:41:04 UTC (rev 12748)
@@ -55,14 +55,6 @@
 
 public class DocumentReader implements XMLReader {
 
-    /** Constant for the feature name for "namespaces". */
-    public static final String FEATURE_NAMESPACES
-            = "http://xml.org/sax/features/namespaces";
-
-    /** Constant for the feature name for "namespace-prefixes". */
-    public static final String FEATURE_NAMESPACE_PREFIXES
-            = "http://xml.org/sax/features/namespace-prefixes";
-
     /** Configuration variable. */
     private boolean namespaces = true;
 
@@ -84,9 +76,9 @@
     @Override
     public boolean getFeature(final String name)
             throws SAXNotRecognizedException, SAXNotSupportedException {
-        if (DocumentReader.FEATURE_NAMESPACES.equals(name)) {
+        if (SaxStdFeatures.NAMESPACES.getUri().equals(name)) {
             return this.namespaces;
-        } else if (DocumentReader.FEATURE_NAMESPACE_PREFIXES.equals(name)) {
+        } else if (SaxStdFeatures.NAMESPACE_PREFIXES.getUri().equals(name)) {
             return this.namespacePrefixes;
         } else {
             throw new SAXNotRecognizedException("Feature '" + name
@@ -98,9 +90,9 @@
     @Override
     public void setFeature(final String name, final boolean value)
             throws SAXNotRecognizedException, SAXNotSupportedException {
-        if (DocumentReader.FEATURE_NAMESPACES.equals(name)) {
+        if (SaxStdFeatures.NAMESPACES.getUri().equals(name)) {
             this.namespaces = value;
-        } else if (DocumentReader.FEATURE_NAMESPACE_PREFIXES.equals(name)) {
+        } else if (SaxStdFeatures.NAMESPACE_PREFIXES.getUri().equals(name)) {
             this.namespacePrefixes = value;
         } else {
             throw new SAXNotRecognizedException("Feature '" + name

Modified: trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxParser.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxParser.java	2022-11-28 18:55:21 UTC (rev 12747)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxParser.java	2022-11-29 04:41:04 UTC (rev 12748)
@@ -203,13 +203,13 @@
         final SAXParserFactory spf = javax.xml.parsers.SAXParserFactory.newInstance();
         spf.setNamespaceAware(namespaceAware);
         final XMLReader xmlReader = spf.newSAXParser().getXMLReader();
-        xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", namespacePrefixes);
+        xmlReader.setFeature(SaxStdFeatures.NAMESPACE_PREFIXES.getUri(), namespacePrefixes);
         xmlReader.setEntityResolver(entityResolver);
 
         /* Turn on validation if it is available. */
         if (validate) {
             try {
-                xmlReader.setFeature("http://xml.org/sax/features/validation", true);
+                xmlReader.setFeature(SaxStdFeatures.VALIDATION.getUri(), true);
             } catch (final SAXNotRecognizedException e) {
                 this.logger.warn("Parser does not recognize validation.");
             } catch (final SAXNotSupportedException e) {
@@ -219,7 +219,7 @@
 
         /* Bind the LexicalHandler to the XMLReader if possible. */
         try {
-            xmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", this);
+            xmlReader.setProperty(SaxStdProperties.LEXICAL_HANDLER.getUri(), this);
         } catch (final SAXNotSupportedException e1) {
             this.logger.error("Parser does not support LexicalHandler.");
         }
@@ -226,7 +226,7 @@
 
         /* Bind the DeclHandler to the XMLReader if possible. */
         try {
-            xmlReader.setProperty("http://xml.org/sax/properties/declaration-handler", this);
+            xmlReader.setProperty(SaxStdProperties.DECLARATION_HANDLER.getUri(), this);
         } catch (final SAXNotSupportedException e) {
             this.logger.error("Parser does not support Declaration Handler.");
         }
@@ -233,7 +233,8 @@
 
         if (notifyCharRefs) {
             /* Let any exceptions thrown here bubble up. If this feature has been requested, it is a fatal error if it
-             * is not available. */
+             * is not available. Note that this is a feature defined by Apache Xerces, NOT a standard SAX feature.
+             * See https://xerces.apache.org/xerces2-j/features.html. */
             xmlReader.setFeature("http://apache.org/xml/features/scanner/notify-char-refs", true);
         }
 

Added: trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxStdFeatures.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxStdFeatures.java	                        (rev 0)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxStdFeatures.java	2022-11-29 04:41:04 UTC (rev 12748)
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2022 The FOray Project.
+ *      http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ *      Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.xml;
+
+/**
+ * Enumeration of valid Sax2 Features.
+ * These features are used to configure/report on an {@link javax.xml.parsers.SAXParserFactory}.
+ * @see <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description">org.xml.sax
+ * package javadocs</a>
+ */
+public enum SaxStdFeatures {
+
+    /* TODO: Only currently-used features are included in this enumeration. Add remaining features as needed. */
+
+
+    /** SAX feature "namespaces". A value of "true" indicates namespace URIs and unprefixed local names for element and
+     * attribute names will be available. */
+    NAMESPACES("http://xml.org/sax/features/namespaces"),
+
+    /** SAX feature "namespace-prefixes". A value of "true" indicates that XML qualified names (with prefixes) and
+     * attributes (including xmlns* attributes) will be available. Read/write, default false. */
+    NAMESPACE_PREFIXES("http://xml.org/sax/features/namespace-prefixes"),
+
+    /** SAX feature "validation". Controls whether the parser is reporting all validity errors; if true, all external
+     * entities will be read. Read/write, default unspecified. */
+    VALIDATION("http://xml.org/sax/features/validation"),
+
+    /** SAX feature "xml-1.1". Returns "true" if the parser supports both XML 1.1 and XML 1.0. Returns "false" if the
+     * parser supports only XML 1.0. Read-only. */
+    XML_1_1("http://xml.org/sax/features/xml-1.1");
+
+    /** The URI used to identify the feature. */
+    private String uri;
+
+    /**
+     * Constructor.
+     * @param uri The URI used to identify the feature.
+     */
+    SaxStdFeatures(final String uri) {
+        this.uri = uri;
+    }
+
+    /**
+     * Returns the URI used to identify this feature.
+     * @return The URI used to identify this feature.
+     */
+    public String getUri() {
+        return this.uri;
+    }
+
+}


Property changes on: trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxStdFeatures.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxStdProperties.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxStdProperties.java	                        (rev 0)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxStdProperties.java	2022-11-29 04:41:04 UTC (rev 12748)
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2022 The FOray Project.
+ *      http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ *      Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.xml;
+
+/**
+ * Enumeration of valid Sax2 Handler and Property IDs.
+ * These features are used to configure/report on an {@link javax.xml.parsers.SAXParserFactory}.
+ * @see <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description">org.xml.sax
+ * package javadocs</a>
+ */
+public enum SaxStdProperties {
+
+    /** SAX property "declaration-handler". Used to see most DTD declarations except those treated as lexical ("document
+     * element name is ...") or which are mandatory for all SAX parsers (DTDHandler). The Object must implement
+     * org.xml.sax.ext.DeclHandler. */
+    DECLARATION_HANDLER("http://xml.org/sax/properties/declaration-handler"),
+
+    /** SAX property "document-xml-version". May be examined only during a parse, after the startDocument() callback has
+     * been completed; read-only. This property is a literal string describing the actual XML version of the document,
+     * such as "1.0" or "1.1". */
+    DOCUMENT_XML_VERSION("http://xml.org/sax/properties/document-xml-version"),
+
+    /** SAX property "dom-node". For "DOM Walker" style parsers, which ignore their parser.parse() parameters, this is
+     * used to specify the DOM (sub)tree being walked by the parser. The Object must implement the org.w3c.dom.Node
+     * interface. */
+    DOM_NODE("http://xml.org/sax/properties/dom-node"),
+
+    /** SAX property "lexical-handler". Used to see some syntax events that are essential in some applications:
+     * comments, CDATA delimiters, selected general entity inclusions, and the start and end of the DTD (and declaration
+     * of document element name). The Object must implement org.xml.sax.ext.LexicalHandler. */
+    LEXICAL_HANDLER("http://xml.org/sax/properties/lexical-handler"),
+
+    /** SAX property "xml-string". Readable only during a parser callback, this exposes a TBS chunk of characters
+     * responsible for the current event. */
+    XML_STRING("http://xml.org/sax/properties/xml-string");
+
+    /** The URI used to identify the property. */
+    private String uri;
+
+    /**
+     * Constructor.
+     * @param uri The URI used to identify the property.
+     */
+    SaxStdProperties(final String uri) {
+        this.uri = uri;
+    }
+
+    /**
+     * Returns the URI used to identify this property.
+     * @return The URI used to identify this property.
+     */
+    public String getUri() {
+        return this.uri;
+    }
+
+}


Property changes on: trunk/foray/foray-xml/src/main/java/org/foray/xml/SaxStdProperties.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.

[FOray-commit] SF.net SVN: foray:[12747] trunk/foray

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

Revision: 12747
          http://sourceforge.net/p/foray/code/12747
Author:   victormote
Date:     2022-11-28 18:55:21 +0000 (Mon, 28 Nov 2022)
Log Message:
-----------
Remove some constants in XmlUtils in favor of those existing in standard class javax.xml.XMLConstants.

Modified Paths:
--------------
    trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/SpellChecker.java
    trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
    trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayPretty.java

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java	2022-11-28 16:36:32 UTC (rev 12746)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java	2022-11-28 18:55:21 UTC (rev 12747)
@@ -38,32 +38,13 @@
 
 /**
  * Utility class containing constants and methods useful in parsing or building XML.
+ * @see javax.xml.XMLConstants
  */
 public final class XmlUtils {
 
-    /**
-     * The namespace URI used for namespace declarations, assigned to the reserved prefix "xmlns". Example:
-     * {@code
-     * <pre>
-     * <svg width="140" height="170"
-     *     xmlns="http://www.w3.org/2000/svg"/>
-     * </pre>}
-     * @see "http://www.w3.org/2000/xmlns/"
-     */
-    public static final String XMLNS_NS_URI = "http://www.w3.org/2000/xmlns/";
-
-    /** The namespace URI assigned to the reserved prefix "xml:". */
-    public static final String XML_NS_URI = "http://www.w3.org/XML/1998/namespace";
-
     /** The namespace URI for XLink, whose typical prefix is "xlink:". */
     public static final String XLINK_NS_URI = "http://www.w3.org/1999/xlink";
 
-    /** The namespace URI for XML Schema, whose typical prefix is "xs:". */
-    public static final String XML_SHEMA_NS_URI = "http://www.w3.org/2001/XMLSchema";
-
-    /** The namespace URI for XML Schema Instance, whose typical prefix is "xsi:". */
-    public static final String XSI_SHEMA_NS_URI = "http://www.w3.org/2001/XMLSchema-instance";
-
     /** 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";
 

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java	2022-11-28 16:36:32 UTC (rev 12746)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java	2022-11-28 18:55:21 UTC (rev 12747)
@@ -28,7 +28,6 @@
 
 package org.foray.fotree.xml;
 
-import org.foray.common.primitive.XmlUtils;
 import org.foray.fotree.FoObj;
 import org.foray.fotree.FoTree4a;
 import org.foray.fotree.FoTreeParser4a;
@@ -42,6 +41,8 @@
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 
+import javax.xml.XMLConstants;
+
 /**
  * This class manages the namespace that is used for elements with the "xml:"
  * prefix.
@@ -57,7 +58,7 @@
 
     @Override
     public String getNamespaceURI() {
-        return XmlUtils.XML_NS_URI;
+        return XMLConstants.XML_NS_URI;
     }
 
     @Override

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/SpellChecker.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/SpellChecker.java	2022-11-28 16:36:32 UTC (rev 12746)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/SpellChecker.java	2022-11-28 18:55:21 UTC (rev 12747)
@@ -32,7 +32,6 @@
 import org.foray.common.primitive.CharacterUtils;
 import org.foray.common.primitive.ObjectUtils;
 import org.foray.common.primitive.StringUtils;
-import org.foray.common.primitive.XmlUtils;
 import org.foray.orthography.LexerJavaBreakIterator;
 import org.foray.orthography.Orthography4a;
 import org.foray.orthography.OrthographyServer4a;
@@ -74,6 +73,7 @@
 import java.util.Map;
 import java.util.Stack;
 
+import javax.xml.XMLConstants;
 import javax.xml.parsers.ParserConfigurationException;
 
 /**
@@ -149,7 +149,7 @@
     public static final byte STATUS_PARSING_ERROR = 3;
 
     /** The "xml:lang" attribute. */
-    private static final DtdAttribute XML_LANG_ATTRIBUTE = new DtdAttribute(XmlUtils.XML_NS_URI, "lang");
+    private static final DtdAttribute XML_LANG_ATTRIBUTE = new DtdAttribute(XMLConstants.XML_NS_URI, "lang");
 
     /** The output stream to which the output should be sent. */
     private PrintStream output;

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2022-11-28 16:36:32 UTC (rev 12746)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2022-11-28 18:55:21 UTC (rev 12747)
@@ -66,6 +66,8 @@
 import java.awt.geom.Rectangle2D;
 import java.io.IOException;
 
+import javax.xml.XMLConstants;
+
 /**
  * A {@link Renderer4a} implementation that writes the document as SVG.
  */
@@ -568,9 +570,9 @@
 
         // this fixes a problem where the xmlns is repeated sometimes
         final Element ele = (Element) newsvg;
-        ele.setAttributeNS(XmlUtils.XMLNS_NS_URI, "xmlns", XmlUtils.SVG_NS_URI);
-        if (ele.hasAttributeNS(null, "xmlns")) {
-           ele.removeAttributeNS(null, "xmlns");
+        ele.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, XMLConstants.XMLNS_ATTRIBUTE, XmlUtils.SVG_NS_URI);
+        if (ele.hasAttributeNS(null, XMLConstants.XMLNS_ATTRIBUTE)) {
+           ele.removeAttributeNS(null, XMLConstants.XMLNS_ATTRIBUTE);
         }
 
         view.appendChild(newsvg);

Modified: trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayPretty.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayPretty.java	2022-11-28 16:36:32 UTC (rev 12746)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayPretty.java	2022-11-28 18:55:21 UTC (rev 12747)
@@ -62,6 +62,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.xml.XMLConstants;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.stream.StreamSource;
 
@@ -1109,7 +1110,7 @@
      */
     private void checkSchema(final Attributes attributes) throws SAXException {
         for (int index = 0; index < attributes.getLength(); index ++) {
-            if (XmlUtils.XSI_SHEMA_NS_URI.equals(attributes.getURI(index))
+            if (XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI.equals(attributes.getURI(index))
                     && "schemaLocation".equals(attributes.getLocalName(index))) {
                 final String schemaUrlString = attributes.getValue(index);
                 InputStream is = null;

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

[FOray-commit] SF.net SVN: foray:[12746] trunk/foray/buildSrc/src/main/groovy/ foray.test-conventions.gradle

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

Revision: 12746
          http://sourceforge.net/p/foray/code/12746
Author:   victormote
Date:     2022-11-28 16:36:32 +0000 (Mon, 28 Nov 2022)
Log Message:
-----------
Remove logging of passed tests.

Modified Paths:
--------------
    trunk/foray/buildSrc/src/main/groovy/foray.test-conventions.gradle

Modified: trunk/foray/buildSrc/src/main/groovy/foray.test-conventions.gradle
===================================================================
--- trunk/foray/buildSrc/src/main/groovy/foray.test-conventions.gradle	2022-11-27 20:54:31 UTC (rev 12745)
+++ trunk/foray/buildSrc/src/main/groovy/foray.test-conventions.gradle	2022-11-28 16:36:32 UTC (rev 12746)
@@ -1,4 +1,4 @@
-/* Precompiled script plugin for FOray library projects that use JUnit tests. */
+/* Precompiled script plugin for FOray projects that use JUnit tests. */
 
 plugins {
     id 'foray.common-conventions'
@@ -15,7 +15,8 @@
 test {
     useJUnitPlatform()
     testLogging {
-        events "passed", "skipped", "failed"
+        /* Don't log "passed" events, as it is too much noise. */
+        events "skipped", "failed"
     }
 }
 

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

[FOray-commit] SF.net SVN: foray:[12745] trunk/foray

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

Revision: 12745
          http://sourceforge.net/p/foray/code/12745
Author:   victormote
Date:     2022-11-27 20:54:31 +0000 (Sun, 27 Nov 2022)
Log Message:
-----------
Put logback implementation jars into a resource directory, and export Eclipse user library that uses them. Remove references to them in module build files.

Modified Paths:
--------------
    trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
    trunk/foray/foray-app/build.gradle
    trunk/foray/foray-orthography/build.gradle

Added Paths:
-----------
    trunk/foray/foray-00-master/ide/eclipse/user-libraries/
    trunk/foray/foray-00-master/ide/eclipse/user-libraries/logback.userlibraries
    trunk/foray/foray-00-master/resources/
    trunk/foray/foray-00-master/resources/logger-impl/
    trunk/foray/foray-00-master/resources/logger-impl/00-readme.txt
    trunk/foray/foray-00-master/resources/logger-impl/logback-classic-1.3.5.jar
    trunk/foray/foray-00-master/resources/logger-impl/logback-core-1.3.5.jar

Modified: trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
===================================================================
--- trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-27 20:02:15 UTC (rev 12744)
+++ trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-27 20:54:31 UTC (rev 12745)
@@ -45,9 +45,9 @@
     mockito:            '4.9.0',            // Latest is 4.9.0        as of 2022-11-26. See Note 5.
 
 
-    /* Runtime-only dependencies that should never be permanently used in build.gradle files. They are included here
-    for convenience of testing. */
-    logbackClassic:     '1.3.5',            // Latest is 1.3.5        as of 2022-11-26.
+    /* See foray-00-master/resources/logger-impl/00-readme.txt for information about logging implementations.
+       Bottom line is that logging implementations are not and should not be part of any FOray dependencies. */
+//    logbackClassic:   '1.3.5',            // Latest is 1.3.5        as of 2022-11-26.
 
     /* Build-time-only dependencies that should never be permanently used in build.gradle files. */
     checkstyle:         '8.39',             // Latest is 10.4         as of 2022-11-26.

Added: trunk/foray/foray-00-master/ide/eclipse/user-libraries/logback.userlibraries
===================================================================
--- trunk/foray/foray-00-master/ide/eclipse/user-libraries/logback.userlibraries	                        (rev 0)
+++ trunk/foray/foray-00-master/ide/eclipse/user-libraries/logback.userlibraries	2022-11-27 20:54:31 UTC (rev 12745)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<eclipse-userlibraries version="2">
+    <library name="logback" systemlibrary="false">
+        <archive path="/foray-00-master/resources/logger-impl/logback-classic-1.3.5.jar"/>
+        <archive path="/foray-00-master/resources/logger-impl/logback-core-1.3.5.jar"/>
+    </library>
+</eclipse-userlibraries>


Property changes on: trunk/foray/foray-00-master/ide/eclipse/user-libraries/logback.userlibraries
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/foray/foray-00-master/resources/logger-impl/00-readme.txt
===================================================================
--- trunk/foray/foray-00-master/resources/logger-impl/00-readme.txt	                        (rev 0)
+++ trunk/foray/foray-00-master/resources/logger-impl/00-readme.txt	2022-11-27 20:54:31 UTC (rev 12745)
@@ -0,0 +1,17 @@
+FOray has purposely been coded in such a way as to have no dependencies
+on any logger implementation. The jar files in this directory are
+included in a user library in Eclipse that can be used as a convenience
+for developers at development time only. Until we design a way to
+provide the user with a default logging implementation that doesn't
+interfere with their own logging intentions, these jar files should not
+be part of any FOray distribution.
+
+According to https://logback.qos.ch/dependencies.html, the following
+are functionally equivalent:
+1. Logback 1.3.x, supports Java EE ("javax" namespace),      JDK 8. 
+2. Logback 1.4.x, supports Jakarta EE ("jakarta" namespace), JDK 11.
+
+Since our development environment is currently JDK 8, we have chosen
+the 1.3.x version.
+
+Victor Mote, Nov. 27, 2022


Property changes on: trunk/foray/foray-00-master/resources/logger-impl/00-readme.txt
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: trunk/foray/foray-00-master/resources/logger-impl/logback-classic-1.3.5.jar
===================================================================
(Binary files differ)

Index: trunk/foray/foray-00-master/resources/logger-impl/logback-classic-1.3.5.jar
===================================================================
--- trunk/foray/foray-00-master/resources/logger-impl/logback-classic-1.3.5.jar	2022-11-27 20:02:15 UTC (rev 12744)
+++ trunk/foray/foray-00-master/resources/logger-impl/logback-classic-1.3.5.jar	2022-11-27 20:54:31 UTC (rev 12745)

Property changes on: trunk/foray/foray-00-master/resources/logger-impl/logback-classic-1.3.5.jar
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/foray/foray-00-master/resources/logger-impl/logback-core-1.3.5.jar
===================================================================
(Binary files differ)

Index: trunk/foray/foray-00-master/resources/logger-impl/logback-core-1.3.5.jar
===================================================================
--- trunk/foray/foray-00-master/resources/logger-impl/logback-core-1.3.5.jar	2022-11-27 20:02:15 UTC (rev 12744)
+++ trunk/foray/foray-00-master/resources/logger-impl/logback-core-1.3.5.jar	2022-11-27 20:54:31 UTC (rev 12745)

Property changes on: trunk/foray/foray-00-master/resources/logger-impl/logback-core-1.3.5.jar
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/foray/foray-app/build.gradle
===================================================================
--- trunk/foray/foray-app/build.gradle	2022-11-27 20:02:15 UTC (rev 12744)
+++ trunk/foray/foray-app/build.gradle	2022-11-27 20:54:31 UTC (rev 12745)
@@ -48,9 +48,6 @@
 
 
     testImplementation group: 'org.mockito', name: 'mockito-core',    version: versions.mockito
-
-    /* Runtime-only bindings for developer convenience, but which should remain commented when committed. */
-//    runtimeOnly group: 'ch.qos.logback',  name: 'logback-classic', version: versions.logbackClassic
 }
 
 javadoc {

Modified: trunk/foray/foray-orthography/build.gradle
===================================================================
--- trunk/foray/foray-orthography/build.gradle	2022-11-27 20:02:15 UTC (rev 12744)
+++ trunk/foray/foray-orthography/build.gradle	2022-11-27 20:54:31 UTC (rev 12745)
@@ -24,9 +24,6 @@
     api project(':foray-xml')
 
     testImplementation group: 'org.mockito', name: 'mockito-core',          version: versions.mockito
-
-    /* Runtime-only bindings for developer convenience, but which should remain commented when committed. */
-//    runtimeOnly group: 'ch.qos.logback', name: 'logback-classic', version: versions.logbackClassic
 }
 
 

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

[FOray-commit] SF.net SVN: foray:[12744] trunk/foray

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

Revision: 12744
          http://sourceforge.net/p/foray/code/12744
Author:   victormote
Date:     2022-11-27 20:02:15 +0000 (Sun, 27 Nov 2022)
Log Message:
-----------
Upgrade Mockito. Fix compile problem related to Mockito version by using 1.8 compiler. Fixed a handful of javadoc problems related to the compiler change.

Modified Paths:
--------------
    trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
    trunk/foray/foray-common/src/main/java/org/foray/common/i18n/Script4a.java
    trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteArrayBuilder.java
    trunk/foray/foray-common/src/main/java/org/foray/common/sequence/CharArrayBuilder.java
    trunk/foray/foray-common/src/main/java/org/foray/common/sequence/LongArrayBuilder.java
    trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ShortArrayBuilder.java

Modified: trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
===================================================================
--- trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-27 16:07:39 UTC (rev 12743)
+++ trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-27 20:02:15 UTC (rev 12744)
@@ -42,7 +42,7 @@
     icu4j:              '72.1',             // Latest is 72.1         as of 2022-11-26.
 
     junit:              '5.9.1',            // Latest is 5.9.1        as of 2022-11-26.
-    mockito:            '4.5.1',            // Latest is 4.9.0        as of 2022-11-26. See Note 5.
+    mockito:            '4.9.0',            // Latest is 4.9.0        as of 2022-11-26. See Note 5.
 
 
     /* Runtime-only dependencies that should never be permanently used in build.gradle files. They are included here
@@ -68,8 +68,9 @@
  *     "jeuclid-core" and the same general release numbering sequence.
  *     The latest version for group net.sourceforge.jeuclid as of 2021-01-12 is 3.1.9 per www.mvnrepository.com.  
  *
- *  5. Mockito versions from 4.6.0 to 4.9.0 cause breakage in FOray code for unknown reasons that need to be
- *     researched.
+ *  5. Mockito versions from 4.6.0 to 4.9.0 cause breakage at build time for reasons that seem to be related to the
+ *     Java version used to start Gradle. For now, using a JDK that matches the javaTargetCompatibility value above
+ *     seems to solve the problem.
  */
 
 

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/i18n/Script4a.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/i18n/Script4a.java	2022-11-27 16:07:39 UTC (rev 12743)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/i18n/Script4a.java	2022-11-27 20:02:15 UTC (rev 12744)
@@ -350,8 +350,8 @@
     /**
      * Constructor.
      * Client code should not ordinarily use this constructor, but should use {@link #findFromAlpha(String)},
-     * {@link #findFromNumeric(int)}, {@link #findFromIcu4jCode(int)}, or {@link #findFromUnicodeScript(UnicodeScript)}
-     * to obtain an instance of this class.
+     * {@link #findFromNumeric(int)}, {@link #findFromIcu4jCode(int)}, or
+     * {@link #findFromUnicodeScript(java.lang.Character.UnicodeScript)} to obtain an instance of this class.
      * If a new instance does need to be created, it must then be registered using {@link #register(Script4a)} for the
      * methods mentioned above to be able to find it.
      * @param alpha The ISO-15924 alpha code for this script.

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteArrayBuilder.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteArrayBuilder.java	2022-11-27 16:07:39 UTC (rev 12743)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteArrayBuilder.java	2022-11-27 20:02:15 UTC (rev 12744)
@@ -60,8 +60,8 @@
      * The maximum size of array to allocate (unless necessary).
      * Some VMs reserve some header words in an array.
      * Attempts to allocate larger arrays may result in OutOfMemoryError: Requested array size exceeds VM limit.
-     * This value is based on {@link java.lang.AbstractStringBuilder}.MAX_ARRAY_SIZE.
-     * @see java.lang.AbstractStringBuilder
+     * This value is based on the private constant java.lang.AbstractStringBuilder.MAX_ARRAY_SIZE.
+     * @see "The package-visible class java.lang.AbstractStringBuilder."
      */
     public static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
 

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/CharArrayBuilder.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/CharArrayBuilder.java	2022-11-27 16:07:39 UTC (rev 12743)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/CharArrayBuilder.java	2022-11-27 20:02:15 UTC (rev 12744)
@@ -48,8 +48,8 @@
      * The maximum size of array to allocate (unless necessary).
      * Some VMs reserve some header words in an array.
      * Attempts to allocate larger arrays may result in OutOfMemoryError: Requested array size exceeds VM limit.
-     * This value is based on {@link java.lang.AbstractStringBuilder}.MAX_ARRAY_SIZE.
-     * @see java.lang.AbstractStringBuilder
+     * This value is based on the private constant java.lang.AbstractStringBuilder.MAX_ARRAY_SIZE.
+     * @see "The package-visible class java.lang.AbstractStringBuilder."
      */
     public static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
 

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/LongArrayBuilder.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/LongArrayBuilder.java	2022-11-27 16:07:39 UTC (rev 12743)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/LongArrayBuilder.java	2022-11-27 20:02:15 UTC (rev 12744)
@@ -150,7 +150,7 @@
      * </ul>
      * If the {@code minimumCapacity} argument is nonpositive, this method takes no action and simply returns.
      * @param minimumCapacity The minimum desired capacity.
-     * @see java.lang.AbstractStringBuilder#ensureCapacity(int)
+     * @see "java.lang.AbstractStringBuilder#ensureCapacity(int)"
      */
     public void ensureCapacity(final int minimumCapacity) {
         if (minimumCapacity > this.backingArray.length) {

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ShortArrayBuilder.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ShortArrayBuilder.java	2022-11-27 16:07:39 UTC (rev 12743)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ShortArrayBuilder.java	2022-11-27 20:02:15 UTC (rev 12744)
@@ -131,7 +131,7 @@
      * </ul>
      * If the {@code minimumCapacity} argument is nonpositive, this method takes no action and simply returns.
      * @param minimumCapacity The minimum desired capacity.
-     * @see java.lang.AbstractStringBuilder#ensureCapacity(int)
+     * @see "java.lang.AbstractStringBuilder#ensureCapacity(int)"
      */
     public void ensureCapacity(final int minimumCapacity) {
         if (minimumCapacity > this.backingArray.length) {

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

[FOray-commit] SF.net SVN: foray:[12743] trunk/foray/foray-00-master/ide/eclipse/ launch-configurations

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

Revision: 12743
          http://sourceforge.net/p/foray/code/12743
Author:   victormote
Date:     2022-11-27 16:07:39 +0000 (Sun, 27 Nov 2022)
Log Message:
-----------
Update Eclipse launch configurations to include a logging implementation in runtime classpath.

Modified Paths:
--------------
    trunk/foray/foray-00-master/ide/eclipse/launch-configurations/PatternSerializer.launch
    trunk/foray/foray-00-master/ide/eclipse/launch-configurations/fonts-basic.launch
    trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch

Modified: trunk/foray/foray-00-master/ide/eclipse/launch-configurations/PatternSerializer.launch
===================================================================
--- trunk/foray/foray-00-master/ide/eclipse/launch-configurations/PatternSerializer.launch	2022-11-27 15:57:07 UTC (rev 12742)
+++ trunk/foray/foray-00-master/ide/eclipse/launch-configurations/PatternSerializer.launch	2022-11-27 16:07:39 UTC (rev 12743)
@@ -7,7 +7,15 @@
         <listEntry value="1"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/&quot; javaProject=&quot;foray-orthography&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;    &lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;foray-orthography&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.USER_LIBRARY/logback&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.foray.orthography.util.PatternSerializer"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="foray-orthography"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--input ${project_loc}/../foray-orthography/src/main/data/hyph-patterns&#13;&#10;--output ${project_loc}/../foray-orthography/src/main/resources/resources/org/foray/orthography/patterns&#13;&#10;--pattern &quot;.*\.xml&quot;"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="foray-orthography"/>
 </launchConfiguration>

Modified: trunk/foray/foray-00-master/ide/eclipse/launch-configurations/fonts-basic.launch
===================================================================
--- trunk/foray/foray-00-master/ide/eclipse/launch-configurations/fonts-basic.launch	2022-11-27 15:57:07 UTC (rev 12742)
+++ trunk/foray/foray-00-master/ide/eclipse/launch-configurations/fonts-basic.launch	2022-11-27 16:07:39 UTC (rev 12743)
@@ -9,8 +9,8 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
         <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
-        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.USER_LIBRARY/logback&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
         <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;    &lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;foray-app&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.USER_LIBRARY/logback&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
     </listAttribute>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
     <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>

Modified: trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch
===================================================================
--- trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch	2022-11-27 15:57:07 UTC (rev 12742)
+++ trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch	2022-11-27 16:07:39 UTC (rev 12743)
@@ -9,8 +9,8 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
         <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
-        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.USER_LIBRARY/logback&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
         <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;    &lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;foray-app&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.USER_LIBRARY/logback&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
     </listAttribute>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
     <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>

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

[FOray-commit] SF.net SVN: foray:[12742] trunk/foray/buildSrc/src/main/groovy/ foray.common-conventions.gradle

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

Revision: 12742
          http://sourceforge.net/p/foray/code/12742
Author:   victormote
Date:     2022-11-27 15:57:07 +0000 (Sun, 27 Nov 2022)
Log Message:
-----------
Upgrade versions on several dependencies.

Modified Paths:
--------------
    trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle

Modified: trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
===================================================================
--- trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-27 15:06:06 UTC (rev 12741)
+++ trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-27 15:57:07 UTC (rev 12742)
@@ -30,19 +30,19 @@
     /* End of aXSL-related dependencies. */
 
     slf4j:              '2.0.5',            // Latest is 2.0.5        as of 2022-11-26.
-    commonsIo:          '2.6',              // Latest is 2.8.0        as of 2021-01-12. See Note 3.
-    commonsDiscovery:   '0.5',              // Latest is 0.5          as of 2021-01-12.
-    commonsCli:         '1.4',              // Latest is 1.4          as of 2021-01-12.
-    xmlResolver:        '1.2',              // Latest is 1.2          as of 2021-01-12. See Note 4.
-    ant:                '1.9.15',           // Latest is 1.10.9       as of 2021-01-12. See Note 5.
-    servletApi:         '3.1.0',            // Latest is 4.0.1        as of 2021-01-12. See Note 6.
+    commonsIo:          '2.11.0',           // Latest is 2.11.0       as of 2022-11-26.
+    commonsDiscovery:   '0.5',              // Latest is 0.5          as of 2022-11-26.
+    commonsCli:         '1.5.0',            // Latest is 1.5.0        as of 2022-11-26.
+    xmlResolver:        '1.2',              // Latest is 1.2          as of 2022-11-26. See Note 3.
+    ant:                '1.10.12',          // Latest is 1.10.12      as of 2022-11-26.
+    servletApi:         '4.0.1',            // Latest is 4.0.1        as of 2022-11-26.
     xmlgraphicsCommons: '2.6',              // Latest is 2.6          as of 2022-01-17.
     batik:              '1.14',             // Latest is 1.14         as of 2022-01-17.
-    jeuclid:            '3.1.14',           // Latest is 3.1.14       as of 2021-01-12. See Note 7.
-    icu4j:              '71.1',             // Latest is 71.1         as of 2022-07-09.
+    jeuclid:            '3.1.14',           // Latest is 3.1.14       as of 2022-11-26. See Note 4.
+    icu4j:              '72.1',             // Latest is 72.1         as of 2022-11-26.
 
     junit:              '5.9.1',            // Latest is 5.9.1        as of 2022-11-26.
-    mockito:            '4.5.1',            // Latest is 4.9.0        as of 2022-11-26. See Note 8.
+    mockito:            '4.5.1',            // Latest is 4.9.0        as of 2022-11-26. See Note 5.
 
 
     /* Runtime-only dependencies that should never be permanently used in build.gradle files. They are included here
@@ -50,7 +50,7 @@
     logbackClassic:     '1.3.5',            // Latest is 1.3.5        as of 2022-11-26.
 
     /* Build-time-only dependencies that should never be permanently used in build.gradle files. */
-    checkstyle:         '8.39',             // Latest is 8.39         as of 2021-01-12.
+    checkstyle:         '8.39',             // Latest is 10.4         as of 2022-11-26.
 ]
 /*
  * Notes on Dependency Releases (See above for references)
@@ -61,25 +61,14 @@
  *  2. At the moment, and for the foreseeable future, aXSL is controlled by FOray, as we attempt to get the module APIs
  *     cleaned up and robust.
  *
- *  3. Apache Commons IO releases, starting at 2.7, are compiled with Java 1.8 (major version 52), which produces
- *     compile-time warnings when we try to build with Java 1.7.
- *     We have therefore stayed with the highest version that supports the Java 1.7 compiler, which is 2.6.
+ *  3. TODO: Remove this dependency when we upgrade to Java 1.9, as it looks like the catalog resolver code is part of
+ *     that release.
  *
- *  4. It looks like the catalog resolver code is part of Java 1.9.
- *
- *  5. Ant 1.10.9 is compiled with Java 1.8 (major version 52), which produces compile-time warnings when we try to
- *     build with Java 1.7.
- *     We have therefore stayed with the highest version of 1.9, which is 1.9.15.
- *
- *  6. Servlet-api 4.0.1 is compiled with Java 1.8 (major version 52), which produces compile-time warnings when we try
- *     to build with Java 1.7.
- *     We have therefore stayed with the highest version of 3.x, which is 3.1.0.
- *
- *  7. JEuclid has moved from group net.sourceforge.jeuclid to de.rototor.jeuclid, but continues to use the name
+ *  4. JEuclid has moved from group net.sourceforge.jeuclid to de.rototor.jeuclid, but continues to use the name
  *     "jeuclid-core" and the same general release numbering sequence.
  *     The latest version for group net.sourceforge.jeuclid as of 2021-01-12 is 3.1.9 per www.mvnrepository.com.  
  *
- *  8. Mockito versions from 4.6.0 to 4.9.0 cause breakage in FOray code for unknown reasons that need to be
+ *  5. Mockito versions from 4.6.0 to 4.9.0 cause breakage in FOray code for unknown reasons that need to be
  *     researched.
  */
 

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

[FOray-commit] SF.net SVN: foray:[12741] trunk/foray

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

Revision: 12741
          http://sourceforge.net/p/foray/code/12741
Author:   victormote
Date:     2022-11-27 15:06:06 +0000 (Sun, 27 Nov 2022)
Log Message:
-----------
Upgrade JUnit to 5.9.1, creating plugin to manage same.

Modified Paths:
--------------
    trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
    trunk/foray/foray-app/build.gradle
    trunk/foray/foray-areatree/build.gradle
    trunk/foray/foray-common/build.gradle
    trunk/foray/foray-font/build.gradle
    trunk/foray/foray-fotree/build.gradle
    trunk/foray/foray-graphic/build.gradle
    trunk/foray/foray-linebreak/build.gradle
    trunk/foray/foray-orthography/build.gradle
    trunk/foray/foray-pdf/build.gradle
    trunk/foray/foray-ps/build.gradle
    trunk/foray/foray-render/build.gradle
    trunk/foray/foray-xml/build.gradle
    trunk/foray/foray-zz-attic/build.gradle

Added Paths:
-----------
    trunk/foray/buildSrc/src/main/groovy/foray.test-conventions.gradle

Modified: trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
===================================================================
--- trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-27 13:10:50 UTC (rev 12740)
+++ trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -24,7 +24,7 @@
     javaTargetCompatibility: JavaVersion.VERSION_1_8,
 
     /* Dependencies related to aXSL. These should be maintained at the same versions used by aXSL. */    
-    axsl:               '0.3-SNAPSHOT',     // Latest is 0.3-SNAPSHOT as of 2021-01-12. See Note 2.
+    axsl:               '0.3-SNAPSHOT',     // Latest is 0.3-SNAPSHOT as of 2022-11-26. See Note 2.
     svgDom:             '1.1',              // See aXSL master/build.gradle
     mathMlDom:          '2.0',              // See aXSL master/build.gradle
     /* End of aXSL-related dependencies. */
@@ -41,8 +41,8 @@
     jeuclid:            '3.1.14',           // Latest is 3.1.14       as of 2021-01-12. See Note 7.
     icu4j:              '71.1',             // Latest is 71.1         as of 2022-07-09.
 
-    junit:              '4.13.2',           // Latest is 5.8.2        as of 2022-01-17. See Note 8.
-    mockito:            '4.5.1',            // Latest is 4.9.0        as of 2022-11-26. See Note 9.
+    junit:              '5.9.1',            // Latest is 5.9.1        as of 2022-11-26.
+    mockito:            '4.5.1',            // Latest is 4.9.0        as of 2022-11-26. See Note 8.
 
 
     /* Runtime-only dependencies that should never be permanently used in build.gradle files. They are included here
@@ -79,11 +79,7 @@
  *     "jeuclid-core" and the same general release numbering sequence.
  *     The latest version for group net.sourceforge.jeuclid as of 2021-01-12 is 3.1.9 per www.mvnrepository.com.  
  *
- *  8. JUnit is compiled with Java 8 (major version 52) starting with release 5.0.0, and the artifact appears to be
- *     named org.junit.jupiter:junit-jupiter-api also starting with that release.
- *     We have therefore stayed with the highest version supporting Java 7, which is 4.13.2 as of Jan. 17, 2022.
- *
- *  9. Mockito versions from 4.6.0 to 4.9.0 cause breakage in FOray code for unknown reasons that need to be
+ *  8. Mockito versions from 4.6.0 to 4.9.0 cause breakage in FOray code for unknown reasons that need to be
  *     researched.
  */
 

Added: trunk/foray/buildSrc/src/main/groovy/foray.test-conventions.gradle
===================================================================
--- trunk/foray/buildSrc/src/main/groovy/foray.test-conventions.gradle	                        (rev 0)
+++ trunk/foray/buildSrc/src/main/groovy/foray.test-conventions.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -0,0 +1,22 @@
+/* Precompiled script plugin for FOray library projects that use JUnit tests. */
+
+plugins {
+    id 'foray.common-conventions'
+}
+
+dependencies {
+    testImplementation (platform
+                            (group: 'org.junit',            name: 'junit-bom',            version: versions.junit))
+    testImplementation      (group: 'org.junit.jupiter',    name: 'junit-jupiter')
+    /* TODO: After all tests are converted to JUnit Jupiter, remove the dependency on JUnit Vintage. */
+    testImplementation      (group: 'org.junit.vintage',    name: 'junit-vintage-engine')
+}
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+}
+
+/* Last line of script. */


Property changes on: trunk/foray/buildSrc/src/main/groovy/foray.test-conventions.gradle
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Modified: trunk/foray/foray-app/build.gradle
===================================================================
--- trunk/foray/foray-app/build.gradle	2022-11-27 13:10:50 UTC (rev 12740)
+++ trunk/foray/foray-app/build.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -1,5 +1,6 @@
 plugins {
     id 'foray.app-conventions'
+    id 'foray.test-conventions'
 }
 
 description = 'foray-app'
@@ -46,7 +47,6 @@
     implementation project(':foray-linebreak')
 
 
-    testImplementation group: 'junit',       name: 'junit',           version: versions.junit
     testImplementation group: 'org.mockito', name: 'mockito-core',    version: versions.mockito
 
     /* Runtime-only bindings for developer convenience, but which should remain commented when committed. */

Modified: trunk/foray/foray-areatree/build.gradle
===================================================================
--- trunk/foray/foray-areatree/build.gradle	2022-11-27 13:10:50 UTC (rev 12740)
+++ trunk/foray/foray-areatree/build.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -1,5 +1,6 @@
 plugins {
     id 'foray.library-conventions'
+    id 'foray.test-conventions'
 }
 
 description = 'foray-areatree'
@@ -24,8 +25,6 @@
     implementation group: "org.axsl", name: "axsl-unicode", version: versions.axsl
 
     api project(':foray-common')
-
-    testImplementation group: 'junit',      name: 'junit',              version: versions.junit
 }
 
 javadoc {

Modified: trunk/foray/foray-common/build.gradle
===================================================================
--- trunk/foray/foray-common/build.gradle	2022-11-27 13:10:50 UTC (rev 12740)
+++ trunk/foray/foray-common/build.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -1,5 +1,6 @@
 plugins {
     id 'foray.library-conventions'
+    id 'foray.test-conventions'
 }
 
 description = 'foray-common'
@@ -19,8 +20,6 @@
     api                 (group: 'org.axsl', name: 'axsl-font', version: versions.axsl)
     implementation      (group: 'org.axsl', name: 'axsl-unicode', version: versions.axsl)
     api                 (group: 'org.axsl', name: 'axsl-value', version: versions.axsl)
-
-    testImplementation  (group: 'junit', name: 'junit', version: versions.junit)
 }
 
 javadoc {

Modified: trunk/foray/foray-font/build.gradle
===================================================================
--- trunk/foray/foray-font/build.gradle	2022-11-27 13:10:50 UTC (rev 12740)
+++ trunk/foray/foray-font/build.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -1,5 +1,6 @@
 plugins {
     id 'foray.library-conventions'
+    id 'foray.test-conventions'
     /* Allow creation of test fixtures. */
     id 'java-test-fixtures'
 }
@@ -23,7 +24,6 @@
     api project(':foray-common')
     api (project(':foray-xml'))
 
-    testImplementation group: 'junit',         name: 'junit',               version: versions.junit
     testImplementation group: 'org.mockito',   name: 'mockito-core',        version: versions.mockito
     testRuntimeOnly (project(':foray-ps'))
 }

Modified: trunk/foray/foray-fotree/build.gradle
===================================================================
--- trunk/foray/foray-fotree/build.gradle	2022-11-27 13:10:50 UTC (rev 12740)
+++ trunk/foray/foray-fotree/build.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -1,5 +1,6 @@
 plugins {
     id 'foray.library-conventions'
+    id 'foray.test-conventions'
 }
 
 description = 'foray-fotree'
@@ -25,7 +26,6 @@
     api project(':foray-xml')
 
 
-    testImplementation group: 'junit',          name: 'junit',                  version: versions.junit
     testImplementation group: 'org.mockito',    name: 'mockito-core',           version: versions.mockito
 }
 

Modified: trunk/foray/foray-graphic/build.gradle
===================================================================
--- trunk/foray/foray-graphic/build.gradle	2022-11-27 13:10:50 UTC (rev 12740)
+++ trunk/foray/foray-graphic/build.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -1,5 +1,6 @@
 plugins {
     id 'foray.library-conventions'
+    id 'foray.test-conventions'
 }
 
 description = 'foray-graphic'
@@ -30,9 +31,6 @@
 
     api (project(':foray-common'))
     implementation (project(':foray-xml'))
-
-
-    testImplementation group: 'junit',      name: 'junit',                  version: versions.junit
 }
 
 javadoc {

Modified: trunk/foray/foray-linebreak/build.gradle
===================================================================
--- trunk/foray/foray-linebreak/build.gradle	2022-11-27 13:10:50 UTC (rev 12740)
+++ trunk/foray/foray-linebreak/build.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -1,5 +1,6 @@
 plugins {
     id 'foray.library-conventions'
+    id 'foray.test-conventions'
 }
 
 description = 'foray-linebreak'
@@ -11,7 +12,6 @@
 
     api project(':foray-common')
 
-    testImplementation group: 'junit',       name: 'junit',           version: versions.junit
     testImplementation group: 'org.mockito', name: 'mockito-core',    version: versions.mockito
     
     testImplementation project(':foray-orthography')

Modified: trunk/foray/foray-orthography/build.gradle
===================================================================
--- trunk/foray/foray-orthography/build.gradle	2022-11-27 13:10:50 UTC (rev 12740)
+++ trunk/foray/foray-orthography/build.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -1,5 +1,6 @@
 plugins {
     id 'foray.library-conventions'
+    id 'foray.test-conventions'
 }
 
 description = 'foray-orthography'
@@ -22,7 +23,6 @@
     api project(':foray-common')
     api project(':foray-xml')
 
-    testImplementation group: 'junit',      name: 'junit',                  version: versions.junit
     testImplementation group: 'org.mockito', name: 'mockito-core',          version: versions.mockito
 
     /* Runtime-only bindings for developer convenience, but which should remain commented when committed. */

Modified: trunk/foray/foray-pdf/build.gradle
===================================================================
--- trunk/foray/foray-pdf/build.gradle	2022-11-27 13:10:50 UTC (rev 12740)
+++ trunk/foray/foray-pdf/build.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -1,5 +1,6 @@
 plugins {
     id 'foray.library-conventions'
+    id 'foray.test-conventions'
 }
 
 description = 'foray-pdf'
@@ -19,10 +20,6 @@
 
     api (project(':foray-common'))
 
-
-    testImplementation group: 'junit',          name: 'junit',              version: versions.junit
-//    testImplementation group: 'org.mockito',    name: 'mockito-core',       version: versions.mockito
-
     testImplementation project(':foray-font')
     testImplementation(project(":foray-ps"))
 }

Modified: trunk/foray/foray-ps/build.gradle
===================================================================
--- trunk/foray/foray-ps/build.gradle	2022-11-27 13:10:50 UTC (rev 12740)
+++ trunk/foray/foray-ps/build.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -1,5 +1,6 @@
 plugins {
     id 'foray.library-conventions'
+    id 'foray.test-conventions'
 }
 
 description = 'foray-ps'
@@ -14,7 +15,6 @@
 
     implementation project(':foray-common')
 
-    testImplementation group: 'junit',          name: 'junit',                      version: versions.junit
     testImplementation group: 'commons-io',                    name: 'commons-io',                 version: versions.commonsIo
 }
 

Modified: trunk/foray/foray-render/build.gradle
===================================================================
--- trunk/foray/foray-render/build.gradle	2022-11-27 13:10:50 UTC (rev 12740)
+++ trunk/foray/foray-render/build.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -1,5 +1,6 @@
 plugins {
     id 'foray.library-conventions'
+    id 'foray.test-conventions'
 }
 
 description = 'foray-render'
@@ -19,8 +20,6 @@
 
     implementation (project(':foray-common'))
     api (project(':foray-output'))
-
-    testImplementation group: 'junit',      name: 'junit',                  version: versions.junit
 }
 
 javadoc {

Modified: trunk/foray/foray-xml/build.gradle
===================================================================
--- trunk/foray/foray-xml/build.gradle	2022-11-27 13:10:50 UTC (rev 12740)
+++ trunk/foray/foray-xml/build.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -1,5 +1,6 @@
 plugins {
     id 'foray.library-conventions'
+    id 'foray.test-conventions'
 }
 
 description = 'foray-xml'
@@ -12,8 +13,6 @@
                                              name: 'xmlschema-core',  version: '2.3.0'
 
     implementation project(':foray-common')
-
-    testImplementation group: 'junit',       name: 'junit',           version: versions.junit
 }
 
 javadoc {

Modified: trunk/foray/foray-zz-attic/build.gradle
===================================================================
--- trunk/foray/foray-zz-attic/build.gradle	2022-11-27 13:10:50 UTC (rev 12740)
+++ trunk/foray/foray-zz-attic/build.gradle	2022-11-27 15:06:06 UTC (rev 12741)
@@ -1,5 +1,6 @@
 plugins {
     id 'foray.library-conventions'
+    id 'foray.test-conventions'
 }
 
 description = 'foray-zz-attic'
@@ -10,8 +11,6 @@
     
     implementation (group: 'org.axsl',                 name: 'axsl-utility',           version: versions.axsl)
     api (project(':foray-common'))
-
-    testImplementation group: 'junit',      name: 'junit',                  version: versions.junit
 }
 
 javadoc {

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

[FOray-commit] SF.net SVN: foray:[12740] trunk/foray/buildSrc/src/main/groovy/ foray.common-conventions.gradle

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

Revision: 12740
          http://sourceforge.net/p/foray/code/12740
Author:   victormote
Date:     2022-11-27 13:10:50 +0000 (Sun, 27 Nov 2022)
Log Message:
-----------
Bump Mockito dependency to 4.6.0.

Modified Paths:
--------------
    trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle

Modified: trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
===================================================================
--- trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-27 01:12:54 UTC (rev 12739)
+++ trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-27 13:10:50 UTC (rev 12740)
@@ -42,12 +42,12 @@
     icu4j:              '71.1',             // Latest is 71.1         as of 2022-07-09.
 
     junit:              '4.13.2',           // Latest is 5.8.2        as of 2022-01-17. See Note 8.
-    mockito:            '2.28.2',           // Latest is 3.7.0        as of 2021-01-12. See Note 9.
+    mockito:            '4.5.1',            // Latest is 4.9.0        as of 2022-11-26. See Note 9.
 
 
     /* Runtime-only dependencies that should never be permanently used in build.gradle files. They are included here
     for convenience of testing. */
-//    logbackClassic:     '1.3.5',            // Latest is 1.3.5        as of 2022-11-26.
+    logbackClassic:     '1.3.5',            // Latest is 1.3.5        as of 2022-11-26.
 
     /* Build-time-only dependencies that should never be permanently used in build.gradle files. */
     checkstyle:         '8.39',             // Latest is 8.39         as of 2021-01-12.
@@ -83,9 +83,8 @@
  *     named org.junit.jupiter:junit-jupiter-api also starting with that release.
  *     We have therefore stayed with the highest version supporting Java 7, which is 4.13.2 as of Jan. 17, 2022.
  *
- *  9. Mockito is compiled with Java 8 (major version 52) starting with release 3.0.0.
- *     We have therefore stayed with the highest version supporting Java 7, which 2.28.2.
- *
+ *  9. Mockito versions from 4.6.0 to 4.9.0 cause breakage in FOray code for unknown reasons that need to be
+ *     researched.
  */
 
 

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

[FOray-commit] SF.net SVN: foray:[12739] trunk/foray

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

Revision: 12739
          http://sourceforge.net/p/foray/code/12739
Author:   victormote
Date:     2022-11-27 01:12:54 +0000 (Sun, 27 Nov 2022)
Log Message:
-----------
Upgrade logback to 1.3.5. Use library to configure logging for Eclipse launches.

Modified Paths:
--------------
    trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
    trunk/foray/foray-00-master/ide/eclipse/launch-configurations/fonts-basic.launch
    trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch

Removed Paths:
-------------
    trunk/foray/foray-00-master/ide/eclipse/user-libraries/

Modified: trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
===================================================================
--- trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-27 00:49:27 UTC (rev 12738)
+++ trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-27 01:12:54 UTC (rev 12739)
@@ -47,7 +47,7 @@
 
     /* Runtime-only dependencies that should never be permanently used in build.gradle files. They are included here
     for convenience of testing. */
-    logbackClassic:     '1.3.3',            // Latest is 1.3.3        as of 2022-11-26.
+//    logbackClassic:     '1.3.5',            // Latest is 1.3.5        as of 2022-11-26.
 
     /* Build-time-only dependencies that should never be permanently used in build.gradle files. */
     checkstyle:         '8.39',             // Latest is 8.39         as of 2021-01-12.

Modified: trunk/foray/foray-00-master/ide/eclipse/launch-configurations/fonts-basic.launch
===================================================================
--- trunk/foray/foray-00-master/ide/eclipse/launch-configurations/fonts-basic.launch	2022-11-27 00:49:27 UTC (rev 12738)
+++ trunk/foray/foray-00-master/ide/eclipse/launch-configurations/fonts-basic.launch	2022-11-27 01:12:54 UTC (rev 12739)
@@ -9,6 +9,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
         <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.USER_LIBRARY/logback&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
         <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;    &lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;foray-app&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
     </listAttribute>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>

Modified: trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch
===================================================================
--- trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch	2022-11-27 00:49:27 UTC (rev 12738)
+++ trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch	2022-11-27 01:12:54 UTC (rev 12739)
@@ -9,6 +9,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
         <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.USER_LIBRARY/logback&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
         <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;    &lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;foray-app&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
     </listAttribute>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>

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

[FOray-commit] SF.net SVN: foray:[12738] trunk/foray/foray-00-master/ide/eclipse

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

Revision: 12738
          http://sourceforge.net/p/foray/code/12738
Author:   victormote
Date:     2022-11-27 00:49:27 +0000 (Sun, 27 Nov 2022)
Log Message:
-----------
Export user library for logback.

Added Paths:
-----------
    trunk/foray/foray-00-master/ide/eclipse/user-libraries/
    trunk/foray/foray-00-master/ide/eclipse/user-libraries/logback.userlibraries

Added: trunk/foray/foray-00-master/ide/eclipse/user-libraries/logback.userlibraries
===================================================================
--- trunk/foray/foray-00-master/ide/eclipse/user-libraries/logback.userlibraries	                        (rev 0)
+++ trunk/foray/foray-00-master/ide/eclipse/user-libraries/logback.userlibraries	2022-11-27 00:49:27 UTC (rev 12738)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<eclipse-userlibraries version="2">
+    <library name="logback" systemlibrary="false">
+        <archive path="C:/rsrc/logback/logback-1.2.3/logback-access-1.2.3.jar"/>
+        <archive path="C:/rsrc/logback/logback-1.2.3/logback-classic-1.2.3.jar"/>
+        <archive path="C:/rsrc/logback/logback-1.2.3/logback-core-1.2.3.jar"/>
+    </library>
+</eclipse-userlibraries>


Property changes on: trunk/foray/foray-00-master/ide/eclipse/user-libraries/logback.userlibraries
___________________________________________________________________
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.

[FOray-commit] SF.net SVN: foray:[12737] trunk/foray/foray-00-master/ide/eclipse/ launch-configurations

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

Revision: 12737
          http://sourceforge.net/p/foray/code/12737
Author:   victormote
Date:     2022-11-27 00:44:33 +0000 (Sun, 27 Nov 2022)
Log Message:
-----------
Fix JRE on launch configurations.

Modified Paths:
--------------
    trunk/foray/foray-00-master/ide/eclipse/launch-configurations/fonts-basic.launch
    trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch

Modified: trunk/foray/foray-00-master/ide/eclipse/launch-configurations/fonts-basic.launch
===================================================================
--- trunk/foray/foray-00-master/ide/eclipse/launch-configurations/fonts-basic.launch	2022-11-26 20:16:20 UTC (rev 12736)
+++ trunk/foray/foray-00-master/ide/eclipse/launch-configurations/fonts-basic.launch	2022-11-27 00:44:33 UTC (rev 12737)
@@ -8,7 +8,7 @@
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6/&quot; javaProject=&quot;foray-app&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
         <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;    &lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;foray-app&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
     </listAttribute>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>

Modified: trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch
===================================================================
--- trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch	2022-11-26 20:16:20 UTC (rev 12736)
+++ trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch	2022-11-27 00:44:33 UTC (rev 12737)
@@ -8,7 +8,7 @@
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6/&quot; javaProject=&quot;foray-app&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+        <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
         <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;    &lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;foray-app&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
     </listAttribute>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>

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

[FOray-commit] SF.net SVN: foray:[12736] trunk/foray

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

Revision: 12736
          http://sourceforge.net/p/foray/code/12736
Author:   victormote
Date:     2022-11-26 20:16:20 +0000 (Sat, 26 Nov 2022)
Log Message:
-----------
1. Upgrade logging system to latest releases. 2. Remove runtime dependency on logging implementations.

Modified Paths:
--------------
    trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
    trunk/foray/foray-app/build.gradle
    trunk/foray/foray-orthography/build.gradle

Modified: trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
===================================================================
--- trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-26 19:30:13 UTC (rev 12735)
+++ trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-26 20:16:20 UTC (rev 12736)
@@ -29,7 +29,7 @@
     mathMlDom:          '2.0',              // See aXSL master/build.gradle
     /* End of aXSL-related dependencies. */
 
-    slf4j:              '1.7.30',           // Latest is 1.7.30       as of 2021-01-12.
+    slf4j:              '2.0.5',            // Latest is 2.0.5        as of 2022-11-26.
     commonsIo:          '2.6',              // Latest is 2.8.0        as of 2021-01-12. See Note 3.
     commonsDiscovery:   '0.5',              // Latest is 0.5          as of 2021-01-12.
     commonsCli:         '1.4',              // Latest is 1.4          as of 2021-01-12.
@@ -43,8 +43,13 @@
 
     junit:              '4.13.2',           // Latest is 5.8.2        as of 2022-01-17. See Note 8.
     mockito:            '2.28.2',           // Latest is 3.7.0        as of 2021-01-12. See Note 9.
-    logbackClassic:     '1.2.3',            // Latest is 1.2.3        as of 2021-01-12.
-    
+
+
+    /* Runtime-only dependencies that should never be permanently used in build.gradle files. They are included here
+    for convenience of testing. */
+    logbackClassic:     '1.3.3',            // Latest is 1.3.3        as of 2022-11-26.
+
+    /* Build-time-only dependencies that should never be permanently used in build.gradle files. */
     checkstyle:         '8.39',             // Latest is 8.39         as of 2021-01-12.
 ]
 /*

Modified: trunk/foray/foray-app/build.gradle
===================================================================
--- trunk/foray/foray-app/build.gradle	2022-11-26 19:30:13 UTC (rev 12735)
+++ trunk/foray/foray-app/build.gradle	2022-11-26 20:16:20 UTC (rev 12736)
@@ -6,7 +6,6 @@
 
 dependencies {
     implementation group: 'org.slf4j',              name: 'slf4j-api',          version: versions.slf4j
-    runtimeOnly group: 'ch.qos.logback',  name: 'logback-classic', version: versions.logbackClassic
 
     implementation group: 'javax.servlet',          name: 'javax.servlet-api',  version: versions.servletApi
     implementation group: 'xml-resolver',           name: 'xml-resolver',       version: versions.xmlResolver
@@ -49,6 +48,9 @@
 
     testImplementation group: 'junit',       name: 'junit',           version: versions.junit
     testImplementation group: 'org.mockito', name: 'mockito-core',    version: versions.mockito
+
+    /* Runtime-only bindings for developer convenience, but which should remain commented when committed. */
+//    runtimeOnly group: 'ch.qos.logback',  name: 'logback-classic', version: versions.logbackClassic
 }
 
 javadoc {

Modified: trunk/foray/foray-orthography/build.gradle
===================================================================
--- trunk/foray/foray-orthography/build.gradle	2022-11-26 19:30:13 UTC (rev 12735)
+++ trunk/foray/foray-orthography/build.gradle	2022-11-26 20:16:20 UTC (rev 12736)
@@ -6,7 +6,6 @@
 
 dependencies {
     api (group: 'org.slf4j', name: 'slf4j-api', version: versions.slf4j)
-    runtimeOnly group: 'ch.qos.logback', name: 'logback-classic', version: versions.logbackClassic
 
     api group: 'commons-cli',               name: 'commons-cli',            version: versions.commonsCli
     api group: 'commons-io',                name: 'commons-io',             version: versions.commonsIo
@@ -25,6 +24,9 @@
 
     testImplementation group: 'junit',      name: 'junit',                  version: versions.junit
     testImplementation group: 'org.mockito', name: 'mockito-core',          version: versions.mockito
+
+    /* Runtime-only bindings for developer convenience, but which should remain commented when committed. */
+//    runtimeOnly group: 'ch.qos.logback', name: 'logback-classic', version: versions.logbackClassic
 }
 
 

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

[FOray-commit] SF.net SVN: foray:[12735] trunk/foray/buildSrc/src/main/groovy/ foray.common-conventions.gradle

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

Revision: 12735
          http://sourceforge.net/p/foray/code/12735
Author:   victormote
Date:     2022-11-26 19:30:13 +0000 (Sat, 26 Nov 2022)
Log Message:
-----------
Upgrade FOray to Java 1.8.

Modified Paths:
--------------
    trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle

Modified: trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
===================================================================
--- trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-26 18:24:24 UTC (rev 12734)
+++ trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle	2022-11-26 19:30:13 UTC (rev 12735)
@@ -20,8 +20,8 @@
 
 /******************** See Note 1 below for information about dependency releases. ********************/
 ext.versions = [
-    javaSourceCompatibility: JavaVersion.VERSION_1_7,
-    javaTargetCompatibility: JavaVersion.VERSION_1_7,
+    javaSourceCompatibility: JavaVersion.VERSION_1_8,
+    javaTargetCompatibility: JavaVersion.VERSION_1_8,
 
     /* Dependencies related to aXSL. These should be maintained at the same versions used by aXSL. */    
     axsl:               '0.3-SNAPSHOT',     // Latest is 0.3-SNAPSHOT as of 2021-01-12. See Note 2.
@@ -93,33 +93,40 @@
     options.encoding = 'UTF-8'
 
     /*
-     * We wish to continue building FOray in Java 1.7, primarily to maximize the potential audience.
-     * Some modern compilers will no longer compile to that target, or will log warnings due to its end-of-life or
+     * Compiling with an older compiler or cross-compiling
+     * ===========================================================
+     * For some time, we wished to continue building FOray in Java 1.7, primarily to maximize the potential audience.
+     * Some modern compilers would no longer compile to that target, or would log warnings due to its end-of-life or
      * near-end-of-life status.
-     * Therefore, we need to compile with an older compiler. In your personal gradle.properties file, set
-     * property forayJdkHome to the home directory of the JDK you wish to use for the compile process.
-     * For example:
-     *     forayJdkHome = c:/Program Files/Java/jdk1.8.0_162
+     * In that case, we needed to compile with an older compiler.
+     * We leave these legacy instructions in case we need to return to a similar case in the future.
+     * 1. To use an older compiler:
+     *    In your personal gradle.properties file, set property forayJdkHome to the home directory of the JDK you wish
+     *    to use for the compile process.
+     *    For example:
+     *      forayJdkHome = c:/Program Files/Java/jdk1.8.0_162
+     * 2. If a more recent compiler than 1.7 is used, you will be cross-compiling.
+     *    In the example above, we are using a 1.8 compiler to cross-compile to 1.7.
+     *    The Java 1.8 compiler will want a boot classpath containing the 1.7 runtime classes, to avoid compiling
+     *    against classes and methods that are actually missing in the 1.7 runtime.
+     *    You can provide the path to the jar containing those runtime classes by setting, in your personal
+     *    gradle.properties file, the property forayTargetRuntimeJar.
+     *    For example:
+     *      forayTargetRuntimeJar = c:/Program Files/Java/jdk1.7.0_80/jre/lib/rt.jar
+     * 3. For both of these cases, see commented code below that uses these settings in the compile processes.
      *
-     * If a more recent compiler than 1.7 is used, you will be cross-compiling.
-     * In the example above, we are using a 1.8 compiler to cross-compile to 1.7.
-     * The Java 1.8 compiler will want a boot classpath containing the 1.7 runtime classes, to avoid compiling
-     * against classes and methods that are actually missing in the 1.7 runtime.
-     * You can provide the path to the jar containing those runtime classes by setting, in your personal
-     * gradle.properties file, the property forayTargetRuntimeJar.
-     * For example:
-     *     forayTargetRuntimeJar = c:/Program Files/Java/jdk1.7.0_80/jre/lib/rt.jar
-     *
      * See the following for more information about cross-compiling:
      * https://stackoverflow.com/questions/15882586/bootstrap-class-path-not-set
      */
-    compileJava.options.fork = true
-    compileJava.options.forkOptions.javaHome = file(project.property('forayJdkHome'))
+
+     /* Compile options when using an older compiler or cross-compiling. */
+//    compileJava.options.fork = true
+//    compileJava.options.forkOptions.javaHome = file(project.property('forayJdkHome'))
 //    options.bootstrapClasspath = files(file(project.property('forayTargetRuntimeJar')))
 
-    /* Set test options also. */
-    compileTestJava.options.fork = true
-    compileTestJava.options.forkOptions.javaHome = file(project.property('forayJdkHome'))
+    /* Compile options for test code when using an older compiler or cross-compiling. */
+//    compileTestJava.options.fork = true
+//    compileTestJava.options.forkOptions.javaHome = file(project.property('forayJdkHome'))
  }
 
 task packageSources(type: Jar, dependsOn:classes) {

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

[FOray-commit] SF.net SVN: foray:[12734] trunk/foray/foray-xml/build.gradle

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

Revision: 12734
          http://sourceforge.net/p/foray/code/12734
Author:   victormote
Date:     2022-11-26 18:24:24 +0000 (Sat, 26 Nov 2022)
Log Message:
-----------
Fix ugly build config problem.

Modified Paths:
--------------
    trunk/foray/foray-xml/build.gradle

Modified: trunk/foray/foray-xml/build.gradle
===================================================================
--- trunk/foray/foray-xml/build.gradle	2022-11-26 18:03:27 UTC (rev 12733)
+++ trunk/foray/foray-xml/build.gradle	2022-11-26 18:24:24 UTC (rev 12734)
@@ -13,7 +13,6 @@
 
     implementation project(':foray-common')
 
-    runtime group: 
     testImplementation group: 'junit',       name: 'junit',           version: versions.junit
 }
 

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

[FOray-commit] SF.net SVN: foray:[12733] trunk/foray/foray-xml

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

Revision: 12733
          http://sourceforge.net/p/foray/code/12733
Author:   victormote
Date:     2022-11-26 18:03:27 +0000 (Sat, 26 Nov 2022)
Log Message:
-----------
Rough-in code to parse XML schema.

Modified Paths:
--------------
    trunk/foray/foray-xml/build.gradle
    trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayPretty.java

Modified: trunk/foray/foray-xml/build.gradle
===================================================================
--- trunk/foray/foray-xml/build.gradle	2022-11-26 16:16:20 UTC (rev 12732)
+++ trunk/foray/foray-xml/build.gradle	2022-11-26 18:03:27 UTC (rev 12733)
@@ -8,9 +8,12 @@
     implementation group: 'org.slf4j',       name: 'slf4j-api',       version: versions.slf4j
     implementation group: 'commons-cli',     name: 'commons-cli',     version: versions.commonsCli
     implementation group: 'xml-resolver',    name: 'xml-resolver',    version: versions.xmlResolver
+    implementation group: 'org.apache.ws.xmlschema',
+                                             name: 'xmlschema-core',  version: '2.3.0'
 
     implementation project(':foray-common')
 
+    runtime group: 
     testImplementation group: 'junit',       name: 'junit',           version: versions.junit
 }
 

Modified: trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayPretty.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayPretty.java	2022-11-26 16:16:20 UTC (rev 12732)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/ForayPretty.java	2022-11-26 18:03:27 UTC (rev 12733)
@@ -40,6 +40,7 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.Attributes;
@@ -57,10 +58,12 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.stream.StreamSource;
 
 /**
  * Command-line application that reads an XML file and writes a pretty-printed
@@ -90,9 +93,12 @@
     /** The name of the root element of this document. */
     private String rootElement;
 
-    /** The Dtd for this document. */
+    /** The Dtd for this document, which can be null. */
     private Dtd dtd = new Dtd();
 
+    /** The XML Schema for this document, which can be null. */
+    private XmlSchemaCollection schemaCollection = new XmlSchemaCollection();
+
     /** The element stack. */
     private ElementStack elementStack = new ElementStack();
 
@@ -221,10 +227,14 @@
     }
 
     @Override
-    public void startElement(final String uri, final String local,
-            final String qName, final Attributes attributes) {
+    public void startElement(final String uri, final String local, final String qName, final Attributes attributes)
+            throws SAXException {
         flushCharacters();
         ensureTopElementWritten(false);
+        checkSchema(attributes);
+
+
+
         /* Cache the parameters in instance variable for later processing.
          * We don't want to write the element yet, because the next event
          * received might be the close of the same element, and empty elements
@@ -1092,6 +1102,28 @@
         this.indentBlocksInsideMixedContent = indent;
     }
 
+    /**
+     * Checks a set of attributes to see whether they contain a reference to a schema that needs to be parsed.
+     * @param attributes The attributes being tested.
+     * @throws IOException For problems opening, reading, or closing the schema file.
+     */
+    private void checkSchema(final Attributes attributes) throws SAXException {
+        for (int index = 0; index < attributes.getLength(); index ++) {
+            if (XmlUtils.XSI_SHEMA_NS_URI.equals(attributes.getURI(index))
+                    && "schemaLocation".equals(attributes.getLocalName(index))) {
+                final String schemaUrlString = attributes.getValue(index);
+                InputStream is = null;
+                try {
+                    final URL schemaUrl = new URL(schemaUrlString);
+                    is = schemaUrl.openStream();
+                } catch (final IOException e) {
+                    throw new SAXException(e);
+                }
+                this.schemaCollection.read(new StreamSource(is));
+            }
+        }
+    }
+
     @Override
     public void reset() {
         throw new UnsupportedOperationException();

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

[FOray-commit] SF.net SVN: foray:[12732] trunk/foray

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

Revision: 12732
          http://sourceforge.net/p/foray/code/12732
Author:   victormote
Date:     2022-11-26 16:16:20 +0000 (Sat, 26 Nov 2022)
Log Message:
-----------
Consolidate another namespace-related constant into one location. Add some others that are probably relevant to future work.

Modified Paths:
--------------
    trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java
    trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgUtilities.java

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java	2022-11-26 14:38:24 UTC (rev 12731)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java	2022-11-26 16:16:20 UTC (rev 12732)
@@ -42,7 +42,7 @@
 public final class XmlUtils {
 
     /**
-     * The namespace used for namespace declarations, assigned to the reserved prefix "xmlns". Example:
+     * The namespace URI used for namespace declarations, assigned to the reserved prefix "xmlns". Example:
      * {@code
      * <pre>
      * <svg width="140" height="170"
@@ -52,23 +52,35 @@
      */
     public static final String XMLNS_NS_URI = "http://www.w3.org/2000/xmlns/";
 
-    /** The namespace declaration assigned to the reserved prefix "xml:". */
+    /** The namespace URI assigned to the reserved prefix "xml:". */
     public static final String XML_NS_URI = "http://www.w3.org/XML/1998/namespace";
 
-    /** The namespace designation for Scalable Vector Graphics (SVG), whose typical prefix is "svg:". */
+    /** The namespace URI for XLink, whose typical prefix is "xlink:". */
+    public static final String XLINK_NS_URI = "http://www.w3.org/1999/xlink";
+
+    /** The namespace URI for XML Schema, whose typical prefix is "xs:". */
+    public static final String XML_SHEMA_NS_URI = "http://www.w3.org/2001/XMLSchema";
+
+    /** The namespace URI for XML Schema Instance, whose typical prefix is "xsi:". */
+    public static final String XSI_SHEMA_NS_URI = "http://www.w3.org/2001/XMLSchema-instance";
+
+    /** 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 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";
+
+    /** 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 designation for Math Markup Language (MathML), whose typical prefix is "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 namespace designation 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";
-
-    /** The namespace designation for aXSL extensions to XSL-FO, whose typical prefix is "axsl:". */
+    /** 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 designation for FOray extensions to XSL-FO, whose typical prefix is "foray:". */
+    /** The namespace URI for FOray extensions to XSL-FO, whose typical prefix is "foray:". */
     public static final String FORAY_NS_URI = "http://org.foray/fo-extensions/2004";
 
     /**
@@ -77,8 +89,7 @@
     private XmlUtils() { }
 
     /**
-     * Converts all whitespace characters to spaces, then compresses all
-     * sequences of spaces to one space.
+     * Converts all whitespace characters to spaces, then compresses all sequences of spaces to one space.
      * @param input The String that should be converted.
      * @return The converted String.
      * @see #normalizeWhitespace(StringBuilder)
@@ -93,8 +104,7 @@
     }
 
     /**
-     * Converts all whitespace characters to spaces, then compresses all
-     * sequences of spaces to one space.
+     * Converts all whitespace characters to spaces, then compresses all sequences of spaces to one space.
      * @param buffer The StringBuffer that should be converted.
      * @return The number of changes made to buffer.
      * @see #normalizeWhitespace(String)

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgUtilities.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgUtilities.java	2022-11-26 14:38:24 UTC (rev 12731)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgUtilities.java	2022-11-26 16:16:20 UTC (rev 12732)
@@ -225,10 +225,8 @@
      */
     public static Element createImage(final Document doc,
             final String ref, final float width, final float height) {
-        final Element border = doc.createElementNS(XmlUtils.SVG_NS_URI,
-                "image");
-        border.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href",
-                              ref);
+        final Element border = doc.createElementNS(XmlUtils.SVG_NS_URI, "image");
+        border.setAttributeNS(XmlUtils.XLINK_NS_URI, "xlink:href", ref);
         border.setAttributeNS(null, "width", "" + width);
         border.setAttributeNS(null, "height", "" + height);
         return border;

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

[FOray-commit] SF.net SVN: foray:[12731] trunk/foray

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

Revision: 12731
          http://sourceforge.net/p/foray/code/12731
Author:   victormote
Date:     2022-11-26 14:38:24 +0000 (Sat, 26 Nov 2022)
Log Message:
-----------
Consolidate more namespace-related constants into one location.

Modified Paths:
--------------
    trunk/foray/foray-common/src/main/java/org/foray/common/MathMlUtil.java
    trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/math/MathNamespace.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/math/MathMlDocument4a.java

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/MathMlUtil.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/MathMlUtil.java	2022-11-26 13:52:10 UTC (rev 12730)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/MathMlUtil.java	2022-11-26 14:38:24 UTC (rev 12731)
@@ -33,9 +33,6 @@
  */
 public final class MathMlUtil {
 
-    /** The namespace URI for MathML. */
-    public static final String MATHML_NAMESPACE = "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";
 

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java	2022-11-26 13:52:10 UTC (rev 12730)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java	2022-11-26 14:38:24 UTC (rev 12731)
@@ -37,12 +37,12 @@
 import javax.xml.stream.XMLStreamException;
 
 /**
- * Utility class containing methods useful in parsing or building XML.
+ * Utility class containing constants and methods useful in parsing or building XML.
  */
 public final class XmlUtils {
 
     /**
-     * The namespace used for namespace declarations. Example:
+     * The namespace used for namespace declarations, assigned to the reserved prefix "xmlns". Example:
      * {@code
      * <pre>
      * <svg width="140" height="170"
@@ -55,9 +55,22 @@
     /** The namespace declaration assigned to the reserved prefix "xml:". */
     public static final String XML_NS_URI = "http://www.w3.org/XML/1998/namespace";
 
-    /** The namespace designation for Scalable Vector Graphics (SVG). */
+    /** The namespace designation 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 designation 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 designation 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";
+
+    /** The namespace designation 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 designation for FOray extensions to XSL-FO, whose typical prefix is "foray:". */
+    public static final String FORAY_NS_URI = "http://org.foray/fo-extensions/2004";
+
     /**
      * This class should never be instantiated.
      */

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java	2022-11-26 13:52:10 UTC (rev 12730)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeParser4a.java	2022-11-26 14:38:24 UTC (rev 12731)
@@ -29,6 +29,7 @@
 package org.foray.fotree;
 
 import org.foray.common.primitive.StringUtils;
+import org.foray.common.primitive.XmlUtils;
 import org.foray.fotree.fo.obj.BookmarkTitle4a;
 import org.foray.fotree.fo.obj.FoTextCharacters4a;
 import org.foray.fotree.fo.obj.FoTextWords4a;
@@ -358,14 +359,12 @@
             return;
         }
         if (fobj.getName().equals("root")) {
-            final FoTreeException fote = new FoTreeException("Root element is "
-                    + "missing the namespace declaration: "
-                    + "http://www.w3.org/1999/XSL/Format");
+            final FoTreeException fote = new FoTreeException("Root element is missing the namespace declaration: "
+                    + XmlUtils.XSLFO_NS_URI);
             fote.setContextMessage(fobj.getContextMessage());
             throw new SAXException(fote);
         }
-        final FoTreeException fote = new FoTreeException("Root element must be "
-                + "root, not " + fobj.getName());
+        final FoTreeException fote = new FoTreeException("Root element must be  root, not " + fobj.getName());
         fote.setContextMessage(fobj.getContextMessage());
         throw new SAXException(new FoTreeException(fote));
     }

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java	2022-11-26 13:52:10 UTC (rev 12730)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java	2022-11-26 14:38:24 UTC (rev 12731)
@@ -28,6 +28,7 @@
 
 package org.foray.fotree.axsl;
 
+import org.foray.common.primitive.XmlUtils;
 import org.foray.fotree.FoObj;
 import org.foray.fotree.FoTree4a;
 import org.foray.fotree.FoTreeParser4a;
@@ -55,7 +56,7 @@
 
     @Override
     public String getNamespaceURI() {
-        return "http://org.axsl/xslfo-extensions/2007";
+        return XmlUtils.AXSL_NS_URI;
     }
 
     @Override

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java	2022-11-26 13:52:10 UTC (rev 12730)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java	2022-11-26 14:38:24 UTC (rev 12731)
@@ -28,6 +28,7 @@
 
 package org.foray.fotree.fo;
 
+import org.foray.common.primitive.XmlUtils;
 import org.foray.fotree.FoObj;
 import org.foray.fotree.FoTree4a;
 import org.foray.fotree.FoTreeParser4a;
@@ -55,7 +56,7 @@
 
     @Override
     public String getNamespaceURI() {
-        return "http://www.w3.org/1999/XSL/Format";
+        return XmlUtils.XSLFO_NS_URI;
     }
 
     @Override

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java	2022-11-26 13:52:10 UTC (rev 12730)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java	2022-11-26 14:38:24 UTC (rev 12731)
@@ -28,6 +28,7 @@
 
 package org.foray.fotree.foray;
 
+import org.foray.common.primitive.XmlUtils;
 import org.foray.fotree.FoObj;
 import org.foray.fotree.FoTree4a;
 import org.foray.fotree.FoTreeParser4a;
@@ -56,7 +57,7 @@
 
     @Override
     public String getNamespaceURI() {
-        return "http://org.foray/fo-extensions/2004";
+        return XmlUtils.FORAY_NS_URI;
     }
 
     @Override

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/math/MathNamespace.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/math/MathNamespace.java	2022-11-26 13:52:10 UTC (rev 12730)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/math/MathNamespace.java	2022-11-26 14:38:24 UTC (rev 12731)
@@ -28,6 +28,7 @@
 
 package org.foray.fotree.math;
 
+import org.foray.common.primitive.XmlUtils;
 import org.foray.fotree.FoObj;
 import org.foray.fotree.FoTree4a;
 import org.foray.fotree.FoTreeParser4a;
@@ -57,7 +58,7 @@
 
     @Override
     public String getNamespaceURI() {
-        return "http://www.w3.org/1998/Math/MathML";
+        return XmlUtils.MATHML_NS_URI;
     }
 
     @Override

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java	2022-11-26 13:52:10 UTC (rev 12730)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java	2022-11-26 14:38:24 UTC (rev 12731)
@@ -28,6 +28,7 @@
 
 package org.foray.fotree.xml;
 
+import org.foray.common.primitive.XmlUtils;
 import org.foray.fotree.FoObj;
 import org.foray.fotree.FoTree4a;
 import org.foray.fotree.FoTreeParser4a;
@@ -56,7 +57,7 @@
 
     @Override
     public String getNamespaceURI() {
-        return "http://www.w3.org/XML/1998/namespace";
+        return XmlUtils.XML_NS_URI;
     }
 
     @Override

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java	2022-11-26 13:52:10 UTC (rev 12730)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java	2022-11-26 14:38:24 UTC (rev 12731)
@@ -404,7 +404,7 @@
             throws GraphicException {
         /* Do some basic validation of the DOM document. */
         final Element rootElement = dom.getDocumentElement();
-        if (! MathMlUtil.MATHML_NAMESPACE.equals(rootElement.getNamespaceURI())) {
+        if (! XmlUtils.MATHML_NS_URI.equals(rootElement.getNamespaceURI())) {
             throw new GraphicException("Document is not in the MathML "
                     + "namespace");
         }

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/math/MathMlDocument4a.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/math/MathMlDocument4a.java	2022-11-26 13:52:10 UTC (rev 12730)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/math/MathMlDocument4a.java	2022-11-26 14:38:24 UTC (rev 12731)
@@ -29,6 +29,7 @@
 package org.foray.graphic.math;
 
 import org.foray.common.MathMlUtil;
+import org.foray.common.primitive.XmlUtils;
 
 import org.apache.batik.dom.GenericDocument;
 import org.w3c.dom.DOMImplementation;
@@ -80,7 +81,7 @@
         this.referrer = referrer;
         this.domain = domain;
         this.uri = uri;
-        final Element root = this.createElementNS(MathMlUtil.MATHML_NAMESPACE, MathMlUtil.MATHML_ROOT_ELEMENT_NAME);
+        final Element root = this.createElementNS(XmlUtils.MATHML_NS_URI, MathMlUtil.MATHML_ROOT_ELEMENT_NAME);
         this.appendChild(root);
     }
 

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

[FOray-commit] SF.net SVN: foray:[12730] trunk/foray

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

Revision: 12730
          http://sourceforge.net/p/foray/code/12730
Author:   victormote
Date:     2022-11-26 13:52:10 +0000 (Sat, 26 Nov 2022)
Log Message:
-----------
Consolidate some namespace-related constants into one location.

Modified Paths:
--------------
    trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/NamespaceSvg.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/SpellChecker.java
    trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgUtilities.java
    trunk/foray/foray-xml/src/main/java/org/foray/xml/DomUtil.java

Removed Paths:
-------------
    trunk/foray/foray-common/src/main/java/org/foray/common/SvgUtil.java

Deleted: trunk/foray/foray-common/src/main/java/org/foray/common/SvgUtil.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/SvgUtil.java	2022-09-30 22:54:40 UTC (rev 12729)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/SvgUtil.java	2022-11-26 13:52:10 UTC (rev 12730)
@@ -1,45 +0,0 @@
-/*
- * Copyright 2007 The FOray Project.
- *      http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- *      Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.common;
-
-/**
- * Utility class containing some useful SVG-related tools.
- */
-public final class SvgUtil {
-
-    /** The namespace designation for SVG. */
-    public static final String SVG_NAMESPACE_URI = "http://www.w3.org/2000/svg";
-
-    /**
-     * Private Constructor. This class is a utility class, and should never be
-     * instantiated.
-     */
-    private SvgUtil() { }
-
-}

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java	2022-09-30 22:54:40 UTC (rev 12729)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/primitive/XmlUtils.java	2022-11-26 13:52:10 UTC (rev 12730)
@@ -42,16 +42,22 @@
 public final class XmlUtils {
 
     /**
-     * The namespace declaration to be assigned to the namespace definition in XML documents.
+     * The namespace used for namespace declarations. Example:
+     * {@code
+     * <pre>
+     * <svg width="140" height="170"
+     *     xmlns="http://www.w3.org/2000/svg"/>
+     * </pre>}
      * @see "http://www.w3.org/2000/xmlns/"
      */
-    public static final String XMLNS_NAMESPACE_URI = "http://www.w3.org/2000/xmlns/";
+    public static final String XMLNS_NS_URI = "http://www.w3.org/2000/xmlns/";
 
-    /**
-     * The namespace declaration assigned to the reserved prefix "xml:".
-     */
-    public static final String XML_NAMESPACE_URI = "http://www.w3.org/XML/1998/namespace";
+    /** The namespace declaration assigned to the reserved prefix "xml:". */
+    public static final String XML_NS_URI = "http://www.w3.org/XML/1998/namespace";
 
+    /** The namespace designation for Scalable Vector Graphics (SVG). */
+    public static final String SVG_NS_URI = "http://www.w3.org/2000/svg";
+
     /**
      * This class should never be instantiated.
      */

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/NamespaceSvg.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/NamespaceSvg.java	2022-09-30 22:54:40 UTC (rev 12729)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/NamespaceSvg.java	2022-11-26 13:52:10 UTC (rev 12730)
@@ -28,7 +28,7 @@
 
 package org.foray.fotree.svg;
 
-import org.foray.common.SvgUtil;
+import org.foray.common.primitive.XmlUtils;
 import org.foray.fotree.FoObj;
 import org.foray.fotree.FoTree4a;
 import org.foray.fotree.FoTreeParser4a;
@@ -57,7 +57,7 @@
 
     @Override
     public String getNamespaceURI() {
-        return SvgUtil.SVG_NAMESPACE_URI;
+        return XmlUtils.SVG_NS_URI;
     }
 
     @Override

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java	2022-09-30 22:54:40 UTC (rev 12729)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GraphicServer4a.java	2022-11-26 13:52:10 UTC (rev 12730)
@@ -29,7 +29,7 @@
 package org.foray.graphic;
 
 import org.foray.common.MathMlUtil;
-import org.foray.common.SvgUtil;
+import org.foray.common.primitive.XmlUtils;
 import org.foray.common.url.UrlUtil;
 import org.foray.graphic.factory.BmpFactory;
 import org.foray.graphic.factory.EpsFactory;
@@ -304,7 +304,7 @@
     public SVGDocument makeSvgDocument() throws GraphicException {
         final DOMImplementation impl =
                 SVGDOMImplementation.getDOMImplementation();
-        final String svgNS = SvgUtil.SVG_NAMESPACE_URI;
+        final String svgNS = XmlUtils.SVG_NS_URI;
         final Document dom = impl.createDocument(svgNS, "svg", null);
         return (SVGDocument) dom;
     }

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/SpellChecker.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/SpellChecker.java	2022-09-30 22:54:40 UTC (rev 12729)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/SpellChecker.java	2022-11-26 13:52:10 UTC (rev 12730)
@@ -149,7 +149,7 @@
     public static final byte STATUS_PARSING_ERROR = 3;
 
     /** The "xml:lang" attribute. */
-    private static final DtdAttribute XML_LANG_ATTRIBUTE = new DtdAttribute(XmlUtils.XML_NAMESPACE_URI, "lang");
+    private static final DtdAttribute XML_LANG_ATTRIBUTE = new DtdAttribute(XmlUtils.XML_NS_URI, "lang");
 
     /** The output stream to which the output should be sent. */
     private PrintStream output;

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2022-09-30 22:54:40 UTC (rev 12729)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java	2022-11-26 13:52:10 UTC (rev 12730)
@@ -29,7 +29,6 @@
 package org.foray.render.svg;
 
 import org.foray.common.FontSelectionConstraints4a;
-import org.foray.common.SvgUtil;
 import org.foray.common.WellKnownConstants;
 import org.foray.common.primitive.XmlUtils;
 import org.foray.render.Renderer4a;
@@ -286,7 +285,7 @@
                 + (this.totalHeight - this.pageHeight) + ")");
 
         final Element lastPageLink = this.svgDocument.createElementNS(
-                SvgUtil.SVG_NAMESPACE_URI, "a");
+                XmlUtils.SVG_NS_URI, "a");
         if (this.lastLink != null) {
             lastPageLink.setAttributeNS(null, "xlink:href",
                     "#svgView(viewBox(0, " + (this.totalHeight - this.pageHeight
@@ -306,7 +305,7 @@
         lastPageLink.appendChild(rect);
 
         this.lastLink = this.svgDocument.createElementNS(
-                SvgUtil.SVG_NAMESPACE_URI, "a");
+                XmlUtils.SVG_NS_URI, "a");
         rect = SvgUtilities.createRect(this.svgDocument, this.pageWidth / 2, 0,
                 this.pageWidth / 2, this.pageHeight);
         rect.setAttributeNS(null, "style", "fill:blue;visibility:hidden");
@@ -561,7 +560,7 @@
         }
         final SVGSVGElement svg = ((SVGDocument) doc).getRootElement();
         final Element view = this.svgDocument.createElementNS(
-                SvgUtil.SVG_NAMESPACE_URI, "svg");
+                XmlUtils.SVG_NS_URI, "svg");
         final Node newsvg = this.svgDocument.importNode(svg, true);
         //view.setAttributeNS(null, "viewBox", "0 0 ");
         view.setAttributeNS(null, "x", "" + x);
@@ -569,8 +568,7 @@
 
         // this fixes a problem where the xmlns is repeated sometimes
         final Element ele = (Element) newsvg;
-        ele.setAttributeNS(XmlUtils.XMLNS_NAMESPACE_URI, "xmlns",
-                SvgUtil.SVG_NAMESPACE_URI);
+        ele.setAttributeNS(XmlUtils.XMLNS_NS_URI, "xmlns", XmlUtils.SVG_NS_URI);
         if (ele.hasAttributeNS(null, "xmlns")) {
            ele.removeAttributeNS(null, "xmlns");
         }

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgUtilities.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgUtilities.java	2022-09-30 22:54:40 UTC (rev 12729)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgUtilities.java	2022-11-26 13:52:10 UTC (rev 12730)
@@ -28,7 +28,7 @@
 
 package org.foray.render.svg;
 
-import org.foray.common.SvgUtil;
+import org.foray.common.primitive.XmlUtils;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -106,7 +106,7 @@
      */
     public static Element createLine(final Document doc, final float x,
             final float y, final float x2, final float y2) {
-        final Element ellipse = doc.createElementNS(SvgUtil.SVG_NAMESPACE_URI,
+        final Element ellipse = doc.createElementNS(XmlUtils.SVG_NS_URI,
                 "line");
         ellipse.setAttributeNS(null, "x1", "" + x);
         ellipse.setAttributeNS(null, "x2", "" + x2);
@@ -126,7 +126,7 @@
      */
     public static Element createEllipse(final Document doc,
             final float cx, final float cy, final float rx, final float ry) {
-        final Element ellipse = doc.createElementNS(SvgUtil.SVG_NAMESPACE_URI,
+        final Element ellipse = doc.createElementNS(XmlUtils.SVG_NS_URI,
                 "ellipse");
         ellipse.setAttributeNS(null, "cx", "" + cx);
         ellipse.setAttributeNS(null, "rx", "" + rx);
@@ -143,7 +143,7 @@
      */
     public static Element createPath(final Document doc,
             final String str) {
-        final Element path = doc.createElementNS(SvgUtil.SVG_NAMESPACE_URI,
+        final Element path = doc.createElementNS(XmlUtils.SVG_NS_URI,
                 "path");
         path.setAttributeNS(null, "d", str);
         return path;
@@ -159,7 +159,7 @@
      */
     public static Element createText(final Document doc, final float x,
             final float y, final String str) {
-        final Element textGraph = doc.createElementNS(SvgUtil.SVG_NAMESPACE_URI,
+        final Element textGraph = doc.createElementNS(XmlUtils.SVG_NS_URI,
                 "text");
         textGraph.setAttributeNS(null, "x", "" + x);
         textGraph.setAttributeNS(null, "y", "" + y);
@@ -179,7 +179,7 @@
      */
     public static Element createRect(final Document doc, final float x,
             final float y, final float width, final float height) {
-        final Element border = doc.createElementNS(SvgUtil.SVG_NAMESPACE_URI,
+        final Element border = doc.createElementNS(XmlUtils.SVG_NS_URI,
                 "rect");
         border.setAttributeNS(null, "x", "" + x);
         border.setAttributeNS(null, "y", "" + y);
@@ -194,7 +194,7 @@
      * @return The DOM Element representing the group in SVG.
      */
     public static Element createG(final Document doc) {
-        final Element border = doc.createElementNS(SvgUtil.SVG_NAMESPACE_URI,
+        final Element border = doc.createElementNS(XmlUtils.SVG_NS_URI,
                 "g");
         return border;
     }
@@ -208,7 +208,7 @@
      */
     public static Element createClip(final Document doc, final Element els,
             final String id) {
-        final Element border = doc.createElementNS(SvgUtil.SVG_NAMESPACE_URI,
+        final Element border = doc.createElementNS(XmlUtils.SVG_NS_URI,
                 "clipPath");
         border.setAttributeNS(null, "id", id);
         border.appendChild(els);
@@ -225,7 +225,7 @@
      */
     public static Element createImage(final Document doc,
             final String ref, final float width, final float height) {
-        final Element border = doc.createElementNS(SvgUtil.SVG_NAMESPACE_URI,
+        final Element border = doc.createElementNS(XmlUtils.SVG_NS_URI,
                 "image");
         border.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href",
                               ref);

Modified: trunk/foray/foray-xml/src/main/java/org/foray/xml/DomUtil.java
===================================================================
--- trunk/foray/foray-xml/src/main/java/org/foray/xml/DomUtil.java	2022-09-30 22:54:40 UTC (rev 12729)
+++ trunk/foray/foray-xml/src/main/java/org/foray/xml/DomUtil.java	2022-11-26 13:52:10 UTC (rev 12730)
@@ -44,13 +44,6 @@
  */
 public final class DomUtil {
 
-    /**
-     * The namespace declaration to be assigned to the namespace definition
-     * in XML documents.
-     * @see "http://www.w3.org/2000/xmlns/"
-     */
-    public static final String XMLNS_NAMESPACE_URI = "http://www.w3.org/2000/xmlns/";
-
     /** The registry of DOM Implementations available. */
     private static DOMImplementationRegistry domImplementationRegistry;
 

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

[FOray-commit] SF.net SVN: foray:[12729] trunk/foray/foray-orthography/src/main/data/ dictionaries

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

Revision: 12729
          http://sourceforge.net/p/foray/code/12729
Author:   victormote
Date:     2022-09-30 22:54:40 +0000 (Fri, 30 Sep 2022)
Log Message:
-----------
Handle embedded spaces within abbreviations by using non-breaking space.

Modified Paths:
--------------
    trunk/foray/foray-orthography/src/main/data/dictionaries/eng-Latn-ZZZ.dict.xml
    trunk/foray/foray-orthography/src/main/data/dictionaries/lat-Latn-ZZZ.dict.xml

Modified: trunk/foray/foray-orthography/src/main/data/dictionaries/eng-Latn-ZZZ.dict.xml
===================================================================
--- trunk/foray/foray-orthography/src/main/data/dictionaries/eng-Latn-ZZZ.dict.xml	2022-09-30 22:30:22 UTC (rev 12728)
+++ trunk/foray/foray-orthography/src/main/data/dictionaries/eng-Latn-ZZZ.dict.xml	2022-09-30 22:54:40 UTC (rev 12729)
@@ -73369,6 +73369,8 @@
 <w><t>hy-zone</t></w>
 <w><t>i/c</t></w>
 <w><t>I/O</t></w>
+<w><t>i.e</t><abbrev referenced-word="id est"/></w>
+<w><t>i.&#x00A0;e</t><abbrev referenced-word="id est"/><comment>Contains embedded non-breaking space.</comment></w>
 <w><t>I-ac-chus</t></w>
 <w><t>I-a-che</t></w>
 <w><t>IAEA</t></w>

Modified: trunk/foray/foray-orthography/src/main/data/dictionaries/lat-Latn-ZZZ.dict.xml
===================================================================
--- trunk/foray/foray-orthography/src/main/data/dictionaries/lat-Latn-ZZZ.dict.xml	2022-09-30 22:30:22 UTC (rev 12728)
+++ trunk/foray/foray-orthography/src/main/data/dictionaries/lat-Latn-ZZZ.dict.xml	2022-09-30 22:54:40 UTC (rev 12729)
@@ -37,7 +37,8 @@
 <w><t>hoc</t></w>
 <w><t>ho-mi-nem</t></w>
 <w><t>hy-dro-ma-ni-a</t></w>
-<w><t>i.e</t><abbrev referenced-word="id est"/><comment>Until "i.e." can be handled properly.</comment></w>
+<w><t>i.e</t><abbrev referenced-word="id est"/></w>
+<w><t>i.&#x00A0;e</t><abbrev referenced-word="id est"/><comment>Contains embedded non-breaking space.</comment></w>
 <w><t>im-mer-go</t></w>
 <w><t>in</t></w>
 <w><t>in-fi-del-i-um</t></w>

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

[FOray-commit] SF.net SVN: foray:[12728] trunk/foray/foray-orthography/src/main

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

Revision: 12728
          http://sourceforge.net/p/foray/code/12728
Author:   victormote
Date:     2022-09-30 22:30:22 +0000 (Fri, 30 Sep 2022)
Log Message:
-----------
Improvements to spell-checking, esp. dictionaries.

Modified Paths:
--------------
    trunk/foray/foray-orthography/src/main/data/dictionaries/eng-Latn-ZZZ-archaic.dict.xml
    trunk/foray/foray-orthography/src/main/data/dictionaries/eng-Latn-ZZZ.dict.xml
    trunk/foray/foray-orthography/src/main/data/dictionaries/fre-Latn-ZZZ.dict.xml
    trunk/foray/foray-orthography/src/main/data/dictionaries/grc-Latn-ZZZ.dict.xml
    trunk/foray/foray-orthography/src/main/data/dictionaries/heb-Latn-ZZZ.dict.xml
    trunk/foray/foray-orthography/src/main/data/dictionaries/lat-Latn-ZZZ.dict.xml
    trunk/foray/foray-orthography/src/main/data/orthographies/foray-orthography-config.xml
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/SpellChecker.java

Modified: trunk/foray/foray-orthography/src/main/data/dictionaries/eng-Latn-ZZZ-archaic.dict.xml
===================================================================
--- trunk/foray/foray-orthography/src/main/data/dictionaries/eng-Latn-ZZZ-archaic.dict.xml	2022-09-07 12:03:17 UTC (rev 12727)
+++ trunk/foray/foray-orthography/src/main/data/dictionaries/eng-Latn-ZZZ-archaic.dict.xml	2022-09-30 22:30:22 UTC (rev 12728)
@@ -17,6 +17,7 @@
 <w><t>ex-pound-eth</t><verb><regular-root value="false"/></verb></w>
 <w><t>ex-ult-eth</t><verb><regular-root value="false"/></verb></w>
 <w><t>go-eth</t><verb/></w>
+<w><t>hat-eth</t></w>
 <w><t>hum-bleth</t><verb><regular-root value="false"/></verb></w>
 <w><t>Jno</t><abbrev referenced-word="John"/></w>
 <w><t>Kal-a-bar</t><comment>Calabar</comment></w>

Modified: trunk/foray/foray-orthography/src/main/data/dictionaries/eng-Latn-ZZZ.dict.xml
===================================================================
--- trunk/foray/foray-orthography/src/main/data/dictionaries/eng-Latn-ZZZ.dict.xml	2022-09-07 12:03:17 UTC (rev 12727)
+++ trunk/foray/foray-orthography/src/main/data/dictionaries/eng-Latn-ZZZ.dict.xml	2022-09-30 22:30:22 UTC (rev 12728)
@@ -474,7 +474,8 @@
 <w><t>a-brad-ed</t></w>
 <w><t>a-brad-er</t></w>
 <w><t>a-brad-ing</t></w>
-<w><t>A-bra-ham</t></w>
+<w><t>A-bra-ham</t><noun><convertible-to-possessive/></noun></w>
+<w><t>A-bra-ham-ic</t><adjective><extensible value="false"/></adjective></w>
 <w><t>A-bram</t></w>
 <w><t>a-bran-chi-al</t></w>
 <w><t>a-bran-chi-ate</t></w>
@@ -642,7 +643,7 @@
 <w><t>ab-struse-ness</t></w>
 <w><t>ab-stru-si-ty</t></w>
 <w><t>ab-surd</t></w>
-<w><t>ab-surd-i-ty</t></w>
+<w><t>ab-surd-i-ty</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>ab-surd-ly</t></w>
 <w><t>ab-surd-ness</t></w>
 <w><t>Ab-syr-tus</t></w>
@@ -1010,7 +1011,7 @@
 <w><t>ac-cu-sa-to-ri-al</t></w>
 <w><t>ac-cu-sa-to-ri-al-ly</t></w>
 <w><t>ac-cu-sa-to-ry</t></w>
-<w><t>ac-cuse</t></w>
+<w><t>ac-cuse</t><verb><regular-root/></verb></w>
 <w><t>ac-cused</t></w>
 <w><t>ac-cus-er</t></w>
 <w><t>ac-cus-ing</t></w>
@@ -1564,7 +1565,7 @@
 <w><t>ac-ti-no-ther-a-py</t></w>
 <w><t>ac-ti-no-u-ra-ni-um</t></w>
 <w><t>ac-ti-no-zo-an</t></w>
-<w><t>ac-tion</t></w>
+<w><t>ac-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>ac-tion-a-ble</t></w>
 <w><t>ac-tion-a-bly</t></w>
 <w><t>ac-tion-less</t></w>
@@ -1833,8 +1834,7 @@
 <w><t>ad-freez-ing</t></w>
 <w><t>ad-froze</t></w>
 <w><t>ad-fro-zen</t></w>
-<w><t>ad-here</t></w>
-<w><t>ad-hered</t></w>
+<w><t>ad-here</t><verb><regular-root/></verb></w>
 <w><t>ad-her-ence</t></w>
 <w><t>ad-her-end</t></w>
 <w><t>ad-her-ent</t></w>
@@ -2007,7 +2007,7 @@
 <w><t>ad-mis-si-ble</t></w>
 <w><t>ad-mis-si-ble-ness</t></w>
 <w><t>ad-mis-si-bly</t></w>
-<w><t>ad-mis-sion</t></w>
+<w><t>ad-mis-sion</t><noun><pluralizable/></noun></w>
 <w><t>ad-mis-sive</t></w>
 <w><t>ad-mit</t><verb><regular-root/></verb></w>
 <w><t>ad-mit-ta-ble</t></w>
@@ -2057,7 +2057,7 @@
 <w><t>Ad-o-ni-jah</t></w>
 <w><t>A-do-nis</t></w>
 <w><t>A-do-noy</t></w>
-<w><t>a-dopt</t></w>
+<w><t>a-dopt</t><verb><regular-root/></verb></w>
 <w><t>a-dopt-a-bil-i-ty</t></w>
 <w><t>a-dopt-a-ble</t></w>
 <w><t>a-dopt-ed</t></w>
@@ -2233,7 +2233,7 @@
 <w><t>ad-ver-sa</t></w>
 <w><t>ad-ver-sa-ri-a</t></w>
 <w><t>ad-ver-sar-ies</t></w>
-<w><t>ad-ver-sar-y</t></w>
+<w><t>ad-ver-sar-y</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>ad-ver-sa-tive</t></w>
 <w><t>ad-ver-sa-tive-ly</t></w>
 <w><t>ad-verse</t></w>
@@ -2263,15 +2263,15 @@
 <w><t>ad-vis-a-ble</t></w>
 <w><t>ad-vis-a-ble-ness</t></w>
 <w><t>ad-vis-a-bly</t></w>
-<w><t>ad-vise</t></w>
+<w><t>ad-vise</t><verb><regular-root/></verb></w>
 <w><t>ad-vised</t></w>
 <w><t>ad-vis-ed-ly</t></w>
 <w><t>ad-vis-ed-ness</t></w>
 <w><t>ad-vis-ee</t></w>
 <w><t>ad-vise-ment</t></w>
-<w><t>ad-vis-er</t></w>
+<w><t>ad-vis-er</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>ad-vis-er-ship</t></w>
-<w><t>ad-vi-sor</t></w>
+<w><t>ad-vi-sor</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>ad-vi-so-ri-ly</t></w>
 <w><t>ad-vi-so-ry</t></w>
 <w><t>ad-vo-caat</t></w>
@@ -3115,7 +3115,7 @@
 <w><t>A-grau-los</t></w>
 <w><t>a-grav-ic</t></w>
 <w><t>a-gré-a-tion</t></w>
-<w><t>a-gree</t></w>
+<w><t>a-gree</t><verb><regular-root/></verb></w>
 <w><t>a-gree-a-bil-i-ty</t></w>
 <w><t>a-gree-a-ble</t></w>
 <w><t>a-gree-a-ble-ness</t></w>
@@ -4392,12 +4392,12 @@
 <w><t>al-lud-ing</t></w>
 <w><t>al-lure</t></w>
 <w><t>al-lured</t></w>
-<w><t>al-lure-ment</t></w>
+<w><t>al-lure-ment</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>al-lur-er</t></w>
 <w><t>al-lur-ing</t></w>
 <w><t>al-lur-ing-ly</t></w>
 <w><t>al-lur-ing-ness</t></w>
-<w><t>al-lu-sion</t></w>
+<w><t>al-lu-sion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>al-lu-sive</t></w>
 <w><t>al-lu-sive-ly</t></w>
 <w><t>al-lu-sive-ness</t></w>
@@ -4617,7 +4617,7 @@
 <w><t>alt-az-i-muth</t></w>
 <w><t>Alt-dorf</t></w>
 <w><t>Alt-dor-fer</t></w>
-<w><t>al-ter</t></w>
+<w><t>al-ter</t><verb><regular-root/></verb></w>
 <w><t>al-ter-a-bil-i-ty</t></w>
 <w><t>al-ter-a-ble</t></w>
 <w><t>al-ter-a-ble-ness</t></w>
@@ -5564,7 +5564,7 @@
 <w><t>an-a-bae-na</t></w>
 <w><t>an-a-ban-tid</t></w>
 <w><t>An-a-bap-tism</t></w>
-<w><t>An-a-bap-tist</t></w>
+<w><t>An-a-bap-tist</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>An-a-bap-tis-ti-cal-ly</t></w>
 <w><t>an-a-bas</t></w>
 <w><t>A-na-base</t></w>
@@ -6553,7 +6553,7 @@
 <w><t>an-no-tate</t></w>
 <w><t>an-no-tat-ed</t></w>
 <w><t>an-no-tat-ing</t></w>
-<w><t>an-no-ta-tion</t></w>
+<w><t>an-no-ta-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>an-no-ta-tive</t></w>
 <w><t>an-no-ta-tor</t></w>
 <w><t>an-no-ta-to-ry</t></w>
@@ -8435,7 +8435,7 @@
 <w><t>ap-pel-lee</t></w>
 <w><t>ap-pel-lor</t></w>
 <w><t>ap-pels</t></w>
-<w><t>ap-pend</t></w>
+<w><t>ap-pend</t><verb><regular-root/></verb></w>
 <w><t>ap-pend-age</t></w>
 <w><t>ap-pend-aged</t></w>
 <w><t>ap-pend-ance</t></w>
@@ -9820,7 +9820,7 @@
 <w><t>art-i-est</t></w>
 <w><t>ar-ti-fact</t></w>
 <w><t>ar-ti-fac-ti-tious</t></w>
-<w><t>ar-ti-fice</t></w>
+<w><t>ar-ti-fice</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>ar-tif-i-cer</t></w>
 <w><t>ar-ti-fi-cial</t></w>
 <phrase><t>ar-ti-fi-cial feel</t></phrase>
@@ -10256,7 +10256,7 @@
 <w><t>as-sas-si-na-tive</t></w>
 <w><t>as-sas-si-na-tor</t></w>
 <phrase><t>as-sas-sin bug</t></phrase>
-<w><t>as-sault</t></w>
+<w><t>as-sault</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <w><t>as-sault-a-ble</t></w>
 <phrase><t>as-sault and bat-ter-y</t></phrase>
 <w><t>as-sault-er</t></w>
@@ -11063,7 +11063,7 @@
 <w><t>at-tra-hent</t></w>
 <w><t>attrib</t></w>
 <w><t>at-trib-ut-a-ble</t></w>
-<w><t>at-trib-ute</t></w>
+<w><t>at-trib-ute</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <w><t>at-trib-ut-ed</t></w>
 <w><t>at-trib-ut-er</t></w>
 <w><t>at-trib-ut-ing</t></w>
@@ -12164,7 +12164,7 @@
 <w><t>ba-bul</t></w>
 <w><t>Ba-bur</t></w>
 <w><t>ba-bush-ka</t></w>
-<w><t>ba-by</t></w>
+<w><t>ba-by</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>ba-by=blue=eyes</t></w>
 <phrase><t>ba-by bo-nus</t></phrase>
 <w><t>Ba-by=bounc-er</t></w>
@@ -13959,7 +13959,7 @@
 <w><t>bat-fowl</t></w>
 <w><t>bat-fowl-er</t></w>
 <w><t>Bath</t></w>
-<w><t>bath</t></w>
+<w><t>bath</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>bathe</t><verb><regular-root/></verb></w>
 <w><t>bath-er</t></w>
 <w><t>bath-ers</t></w>
@@ -14508,7 +14508,7 @@
 <w><t>be-dimmed</t></w>
 <w><t>be-dim-ming</t></w>
 <w><t>Bed-i-vere</t></w>
-<w><t>be-di-zen</t></w>
+<w><t>be-di-zen</t><verb><regular-root/></verb></w>
 <w><t>be-di-zen-ment</t></w>
 <w><t>bed-lam</t></w>
 <w><t>bed-lam-ise</t></w>
@@ -15470,7 +15470,7 @@
 <w><t>be-shrew</t></w>
 <w><t>be-side</t></w>
 <w><t>be-sides</t></w>
-<w><t>be-siege</t></w>
+<w><t>be-siege</t><verb><regular-root/></verb></w>
 <w><t>be-sieged</t></w>
 <w><t>be-siege-ment</t></w>
 <w><t>be-sieg-er</t></w>
@@ -15833,6 +15833,7 @@
 <w><t>bib-li-og-o-ny</t></w>
 <w><t>bib-li-og-ra-pher</t></w>
 <w><t>bib-li-o-graph-ic</t></w>
+<w><t>bib-li-o-graph-i-cal</t><adjective><extensible value="false"/></adjective></w>
 <w><t>bib-li-o-graph-i-cal-ly</t></w>
 <w><t>bib-li-og-ra-phy</t></w>
 <w><t>bib-li-o-klept</t></w>
@@ -16787,7 +16788,7 @@
 <w><t>blab-ber-mouth</t></w>
 <w><t>blab-bing</t></w>
 <w><t>Bla-cher</t></w>
-<w><t>black</t></w>
+<w><t>black</t><adjective><extensible/></adjective></w>
 <w><t>Black</t></w>
 <w><t>black-a-cre</t></w>
 <w><t>black-a-moor</t></w>
@@ -18421,7 +18422,7 @@
 <w><t>Bor-ro-mi-ni</t></w>
 <w><t>Bor-ro-vi-an</t></w>
 <w><t>Bor-row</t></w>
-<w><t>bor-row</t></w>
+<w><t>bor-row</t><verb><regular-root/></verb></w>
 <w><t>bor-row-er</t></w>
 <w><t>bor-row-ing</t></w>
 <w><t>Bors</t></w>
@@ -19315,7 +19316,7 @@
 <w><t>BRCS</t></w>
 <w><t>Br-e</t></w>
 <w><t>Bre-a</t></w>
-<w><t>breach</t></w>
+<w><t>breach</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>breach-er</t></w>
 <phrase><t>breach of prom-ise</t></phrase>
 <w><t>bread</t></w>
@@ -20746,9 +20747,10 @@
 <w><t>bun-gee</t></w>
 <w><t>bung-er</t></w>
 <w><t>bung-hole</t></w>
-<w><t>bun-gle</t></w>
+<w><t>bun-gle</t><verb><regular-root/></verb></w>
 <w><t>bun-gler</t></w>
 <w><t>bun-gle-some</t></w>
+<w><t>bun-gling</t><adjective><extensible value="false"/></adjective></w>
 <w><t>bun-gling-ly</t></w>
 <w><t>bung-start-er</t></w>
 <w><t>Bu-nin</t></w>
@@ -23387,7 +23389,7 @@
 <w><t>car-i-bou</t></w>
 <phrase><t>Car-i-bou Es-ki-mo</t></phrase>
 <w><t>car-i-ca-tur-a-ble</t></w>
-<w><t>car-i-ca-ture</t></w>
+<w><t>car-i-ca-ture</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>car-i-ca-tured</t></w>
 <w><t>car-i-ca-tur-ing</t></w>
 <w><t>car-i-ca-tur-ist</t></w>
@@ -24217,7 +24219,7 @@
 <w><t>cat-e-chised</t></w>
 <w><t>cat-e-chis-er</t></w>
 <w><t>cat-e-chis-ing</t></w>
-<w><t>cat-e-chism</t></w>
+<w><t>cat-e-chism</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>cat-e-chis-mal</t></w>
 <w><t>cat-e-chist</t></w>
 <w><t>cat-e-chis-tic</t></w>
@@ -24608,7 +24610,7 @@
 <w><t>cav-il-ing-ly</t></w>
 <w><t>cav-il-ing-ness</t></w>
 <w><t>cav-illed</t></w>
-<w><t>cav-il-ler</t></w>
+<w><t>cav-il-ler</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>cav-il-ling-ly</t></w>
 <w><t>cav-il-ling-ness</t></w>
 <w><t>cav-ing</t></w>
@@ -25576,7 +25578,7 @@
 <w><t>cham-pi-gnon</t></w>
 <w><t>cham-pi-gnons</t></w>
 <w><t>Cham-pi-gny=sur=Marne</t></w>
-<w><t>cham-pi-on</t></w>
+<w><t>cham-pi-on</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <w><t>cham-pi-on-less</t></w>
 <w><t>cham-pi-on-like</t></w>
 <w><t>cham-pi-on-ship</t></w>
@@ -28137,7 +28139,7 @@
 <w><t>cist-ed</t></w>
 <w><t>Cis-ter-cian</t></w>
 <w><t>Cis-ter-cian-ism</t></w>
-<w><t>cis-tern</t></w>
+<w><t>cis-tern</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>cis-tern-a</t></w>
 <w><t>cis-ter-na</t></w>
 <w><t>cis-ter-nal</t></w>
@@ -30580,7 +30582,7 @@
 <w><t>com-men-su-rate-ly</t></w>
 <w><t>com-men-su-rate-ness</t></w>
 <w><t>com-men-su-ra-tion</t></w>
-<w><t>com-ment</t></w>
+<w><t>com-ment</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <w><t>com-ment-a-ble</t></w>
 <w><t>com-men-tar-i-al</t></w>
 <w><t>com-men-tar-ies</t></w>
@@ -30587,7 +30589,7 @@
 <w><t>com-men-tar-y</t></w>
 <w><t>com-men-tate</t></w>
 <w><t>com-men-ta-tive</t></w>
-<w><t>com-men-ta-tor</t></w>
+<w><t>com-men-ta-tor</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>com-men-ta-to-ri-al</t></w>
 <w><t>com-men-ta-to-ri-al-ly</t></w>
 <w><t>com-ment-er</t></w>
@@ -30875,7 +30877,7 @@
 <w><t>com-par-a-tive-ness</t></w>
 <w><t>com-par-a-tor</t></w>
 <w><t>com-pa-ra-tor</t></w>
-<w><t>com-pare</t></w>
+<w><t>com-pare</t><verb><regular-root/></verb></w>
 <w><t>com-pared</t></w>
 <w><t>com-par-er</t></w>
 <w><t>com-par-ing</t></w>
@@ -30982,7 +30984,7 @@
 <w><t>com-plain-er</t></w>
 <w><t>com-plain-ing-ly</t></w>
 <w><t>com-plain-ing-ness</t></w>
-<w><t>com-plaint</t></w>
+<w><t>com-plaint</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>com-plai-sance</t></w>
 <w><t>com-plai-sant</t></w>
 <w><t>com-plai-sant-ly</t></w>
@@ -31263,7 +31265,7 @@
 <w><t>con-ceal-ed-ness</t></w>
 <w><t>con-ceal-er</t></w>
 <w><t>con-ceal-ment</t></w>
-<w><t>con-cede</t></w>
+<w><t>con-cede</t><verb><regular-root/></verb></w>
 <w><t>con-ced-ed</t></w>
 <w><t>con-ced-ed-ly</t></w>
 <w><t>con-ced-er</t></w>
@@ -32025,7 +32027,7 @@
 <w><t>Con-nel-ly</t></w>
 <w><t>Con-ne-ma-ra</t></w>
 <w><t>Con-ners-ville</t></w>
-<w><t>con-nex-ion</t></w>
+<w><t>con-nex-ion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Con-nie</t></w>
 <w><t>con-ning</t></w>
 <phrase><t>con-ning tow-er</t></phrase>
@@ -32347,7 +32349,7 @@
 <w><t>con-struct</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <w><t>con-struct-er</t></w>
 <w><t>con-struct-i-ble</t></w>
-<w><t>con-struc-tion</t></w>
+<w><t>con-struc-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>con-struc-tion-al</t></w>
 <w><t>con-struc-tion-al-ly</t></w>
 <w><t>con-struc-tion-ism</t></w>
@@ -35085,7 +35087,7 @@
 <w><t>creed-less</t></w>
 <w><t>creed-less-ness</t></w>
 <w><t>Creek</t></w>
-<w><t>creek</t></w>
+<w><t>creek</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>creel</t></w>
 <w><t>Creel</t></w>
 <w><t>creep</t></w>
@@ -35707,7 +35709,7 @@
 <w><t>Cro-ton=on=Hud-son</t></w>
 <w><t>Cro-to-pus</t></w>
 <w><t>Cro-tus</t></w>
-<w><t>crouch</t></w>
+<w><t>crouch</t><verb><regular-root/></verb></w>
 <w><t>crouch-er</t></w>
 <w><t>crouch-ing-ly</t></w>
 <w><t>croup</t></w>
@@ -36368,7 +36370,7 @@
 <w><t>cun-ning-ly</t></w>
 <w><t>cun-ning-ness</t></w>
 <w><t>cunt</t></w>
-<w><t>cup</t></w>
+<w><t>cup</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Cu-pa-vo</t></w>
 <w><t>cup-bear-er</t></w>
 <w><t>cup-board</t></w>
@@ -36580,7 +36582,7 @@
 <w><t>curst-ness</t></w>
 <w><t>curt</t></w>
 <w><t>Curt</t></w>
-<w><t>cur-tail</t></w>
+<w><t>cur-tail</t><verb><regular-root/></verb></w>
 <w><t>cur-tailed-ly</t></w>
 <w><t>cur-tail-er</t></w>
 <w><t>cur-tail-ment</t></w>
@@ -36698,7 +36700,7 @@
 <phrase><t>cus-toms un-ion</t></phrase>
 <w><t>cus-tos</t></w>
 <w><t>cus-tu-mal</t></w>
-<w><t>cut</t></w>
+<w><t>cut</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root value="false"/></verb></w>
 <phrase><t>cut a-cross</t></phrase>
 <phrase><t>cut a-long</t></phrase>
 <w><t>cut=and=cov-er</t></w>
@@ -37822,7 +37824,7 @@
 <w><t>da-tu-ra</t></w>
 <w><t>da-tu-ric</t></w>
 <w><t>dau</t></w>
-<w><t>daub</t></w>
+<w><t>daub</t><verb><regular-root/></verb></w>
 <w><t>daube</t></w>
 <w><t>daub-er</t></w>
 <w><t>daub-er-y</t></w>
@@ -39065,7 +39067,7 @@
 <w><t>de-greased</t></w>
 <w><t>de-greas-er</t></w>
 <w><t>de-greas-ing</t></w>
-<w><t>de-gree</t></w>
+<w><t>de-gree</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <phrase><t>de-gree day</t></phrase>
 <w><t>de-gree=day</t></w>
 <w><t>de-gree-less</t></w>
@@ -39156,7 +39158,7 @@
 <w><t>de-i-form-i-ty</t></w>
 <w><t>de-i-fy</t></w>
 <w><t>de-i-fy-ing</t></w>
-<w><t>deign</t></w>
+<w><t>deign</t><verb><regular-root/></verb></w>
 <w><t>deil</t></w>
 <w><t>Dei-mos</t></w>
 <w><t>De-ï-on</t></w>
@@ -39984,7 +39986,7 @@
 <w><t>de-nun-ci-a-tor</t></w>
 <w><t>de-nun-ci-a-to-ry</t></w>
 <w><t>Den-ver</t></w>
-<w><t>de-ny</t></w>
+<w><t>de-ny</t><verb><regular-root/></verb></w>
 <w><t>de-ny-ing</t></w>
 <w><t>Den-ys</t></w>
 <w><t>de-o-dand</t></w>
@@ -42928,7 +42930,7 @@
 <w><t>dis-guis-ed-ness</t></w>
 <w><t>dis-guis-er</t></w>
 <w><t>dis-guis-ing</t></w>
-<w><t>dis-gust</t></w>
+<w><t>dis-gust</t><noun/><verb><regular-root/></verb></w>
 <w><t>dis-gust-ed-ly</t></w>
 <w><t>dis-gust-ed-ness</t></w>
 <w><t>dis-gust-ful</t></w>
@@ -43263,7 +43265,7 @@
 <w><t>dis-pos-er</t></w>
 <w><t>dis-pos-ing</t></w>
 <w><t>dis-pos-ing-ly</t></w>
-<w><t>dis-po-si-tion</t></w>
+<w><t>dis-po-si-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>dis-po-si-tion-al</t></w>
 <w><t>dis-pos-sess</t></w>
 <w><t>dis-pos-sessed</t></w>
@@ -44347,7 +44349,7 @@
 <w><t>Do-men-i-kos</t></w>
 <w><t>domes-day</t></w>
 <phrase><t>Domes-day Book</t></phrase>
-<w><t>do-mes-tic</t></w>
+<w><t>do-mes-tic</t><noun><pluralizable/><convertible-to-possessive/></noun><adjective><extensible value="false"/></adjective></w>
 <w><t>do-mes-ti-ca-ble</t></w>
 <w><t>do-mes-ti-cal-ly</t></w>
 <w><t>do-mes-ti-cate</t></w>
@@ -44443,7 +44445,7 @@
 <w><t>do-nat-ing</t></w>
 <w><t>do-na-tion</t></w>
 <w><t>Don-a-tism</t></w>
-<w><t>Don-a-tist</t></w>
+<w><t>Don-a-tist</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Don-a-tis-tic</t></w>
 <w><t>Don-a-tis-ti-cal</t></w>
 <w><t>don-a-tive</t></w>
@@ -44933,7 +44935,7 @@
 <w><t>dou-zi-èmes</t></w>
 <w><t>DOVAP</t></w>
 <w><t>Dove</t></w>
-<w><t>dove</t></w>
+<w><t>dove</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>dove-cot</t></w>
 <w><t>dove-cote</t></w>
 <w><t>dove-key</t></w>
@@ -47080,7 +47082,7 @@
 <w><t>ed-it</t><verb><regular-root/></verb></w>
 <w><t>E-dith</t></w>
 <w><t>E-dithe</t></w>
-<w><t>e-di-tion</t></w>
+<w><t>e-di-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <phrase><t>e-di-ti-o prin-ceps</t></phrase>
 <w><t>ed-i-tor</t></w>
 <w><t>ed-i-to-ri-al</t></w>
@@ -48268,6 +48270,7 @@
 <w><t>El-ze-vier</t></w>
 <w><t>El-ze-vir</t></w>
 <w><t>El-ze-vir-i-an</t></w>
+<w><t>’em</t><contraction referenced-word="them"/></w>
 <w><t>e-ma-ci-ate</t></w>
 <w><t>e-ma-ci-at-ed</t></w>
 <w><t>e-ma-ci-at-ing</t></w>
@@ -49116,7 +49119,7 @@
 <w><t>en-do-pter-y-gote</t></w>
 <phrase><t>end or-gan</t></phrase>
 <w><t>en-dors-a-ble</t></w>
-<w><t>en-dorse</t></w>
+<w><t>en-dorse</t><verb><regular-root/></verb></w>
 <w><t>en-dorsed</t></w>
 <w><t>en-dor-see</t></w>
 <w><t>en-dorse-ment</t></w>
@@ -49340,7 +49343,7 @@
 <w><t>en-gorge-ment</t></w>
 <w><t>en-gorg-ing</t></w>
 <w><t>engr</t></w>
-<w><t>en-graft</t></w>
+<w><t>en-graft</t><verb><regular-root/></verb></w>
 <w><t>en-graf-ta-tion</t></w>
 <w><t>en-graft-ment</t></w>
 <w><t>en-grail</t></w>
@@ -49607,7 +49610,7 @@
 <w><t>en-sued</t></w>
 <w><t>en-su-ing</t></w>
 <w><t>en-su-ing-ly</t></w>
-<w><t>en-sure</t></w>
+<w><t>en-sure</t><verb><regular-root/></verb></w>
 <w><t>en-sured</t></w>
 <w><t>en-sur-er</t></w>
 <w><t>en-sur-ing</t></w>
@@ -50429,7 +50432,7 @@
 <w><t>eq-ua-ble</t></w>
 <w><t>eq-ua-ble-ness</t></w>
 <w><t>eq-ua-bly</t></w>
-<w><t>e-qual</t></w>
+<w><t>e-qual</t><noun><pluralizable/></noun></w>
 <w><t>e-qual=ar-e-a</t></w>
 <w><t>e-qualed</t></w>
 <w><t>e-qual-ing</t></w>
@@ -51116,7 +51119,7 @@
 <w><t>es-tab-lish-a-ble</t></w>
 <phrase><t>Es-tab-lished Church</t></phrase>
 <w><t>es-tab-lish-er</t></w>
-<w><t>es-tab-lish-ment</t></w>
+<w><t>es-tab-lish-ment</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Es-tab-lish-ment</t></w>
 <w><t>es-tab-lish-men-tar-i-an</t></w>
 <w><t>es-tab-lish-men-tar-i-an-ism</t></w>
@@ -51884,7 +51887,7 @@
 <w><t>e-van-ge-lis-er</t></w>
 <w><t>e-van-ge-lis-ing</t></w>
 <w><t>e-van-ge-lism</t></w>
-<w><t>e-van-ge-list</t></w>
+<w><t>e-van-ge-list</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>E-van-ge-list</t></w>
 <w><t>E-van-ge-lis-ta</t></w>
 <w><t>e-van-ge-lis-ta-ry</t></w>
@@ -52104,7 +52107,7 @@
 <w><t>ex-ac-er-bat-ing</t></w>
 <w><t>ex-ac-er-bat-ing-ly</t></w>
 <w><t>ex-ac-er-ba-tion</t></w>
-<w><t>ex-act</t></w>
+<w><t>ex-act</t><verb><regular-root/></verb><adjective><extensible value="false"/></adjective></w>
 <w><t>ex-act-a-ble</t></w>
 <w><t>ex-act-er</t></w>
 <w><t>ex-act-ing</t></w>
@@ -52437,7 +52440,7 @@
 <w><t>ex-e-get-ics</t></w>
 <w><t>ex-e-ge-tist</t></w>
 <w><t>ex-em-pla</t></w>
-<w><t>ex-em-plar</t></w>
+<w><t>ex-em-plar</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>ex-em-pla-ri-ly</t></w>
 <w><t>ex-em-pla-ri-ness</t></w>
 <w><t>ex-em-plar-ism</t></w>
@@ -52938,7 +52941,7 @@
 <w><t>ex-pos-tu-la-tive</t></w>
 <w><t>ex-pos-tu-la-tor</t></w>
 <w><t>ex-pos-tu-la-to-ry</t></w>
-<w><t>ex-po-sure</t></w>
+<w><t>ex-po-sure</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <phrase><t>ex-po-sure me-ter</t></phrase>
 <w><t>ex-pound</t></w>
 <w><t>ex-pound-er</t></w>
@@ -53432,7 +53435,7 @@
 <w><t>Fa-bi-an-ism</t></w>
 <phrase><t>Fa-bi-an So-ci-e-ty</t></phrase>
 <phrase><t>Fa-bi-us Max-i-mus</t></phrase>
-<w><t>fa-ble</t></w>
+<w><t>fa-ble</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>fa-bled</t></w>
 <w><t>fa-bler</t></w>
 <w><t>Fa-bles</t></w>
@@ -55208,7 +55211,7 @@
 <w><t>fick-le-ness</t></w>
 <w><t>fi-co</t></w>
 <w><t>fic-tile</t></w>
-<w><t>fic-tion</t></w>
+<w><t>fic-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>fic-tion-al</t></w>
 <w><t>fic-tion-al-ise</t></w>
 <w><t>fic-tion-al-i-za-tion</t></w>
@@ -55828,7 +55831,7 @@
 <phrase><t>fir-ing par-ty</t></phrase>
 <phrase><t>fir-ing pin</t></phrase>
 <phrase><t>fir-ing squad</t></phrase>
-<w><t>fir-kin</t></w>
+<w><t>fir-kin</t><noun><pluralizable/></noun></w>
 <w><t>firm</t><noun><pluralizable/><convertible-to-possessive/></noun><adjective><extensible/></adjective></w>
 <w><t>fir-ma-ment</t></w>
 <w><t>fir-ma-men-tal</t></w>
@@ -55959,7 +55962,7 @@
 <w><t>fis-tu-lized</t></w>
 <w><t>fis-tu-liz-ing</t></w>
 <w><t>fis-tu-lous</t></w>
-<w><t>fit</t></w>
+<w><t>fit</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Fitch</t></w>
 <w><t>fitch</t></w>
 <w><t>Fitch-burg</t></w>
@@ -57243,7 +57246,7 @@
 <w><t>Fons</t></w>
 <w><t>Fon-se-ca</t></w>
 <phrase><t>fons et or-i-go</t></phrase>
-<w><t>font</t></w>
+<w><t>font</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Fon-taine</t></w>
 <w><t>Fon-taine-bleau</t></w>
 <w><t>font-al</t></w>
@@ -57387,7 +57390,7 @@
 <w><t>for-bear-ing-ly</t></w>
 <w><t>Forbes</t></w>
 <w><t>Forbes=Rob-ert-son</t></w>
-<w><t>for-bid</t></w>
+<w><t>for-bid</t><verb><regular-root value="false"/></verb></w>
 <w><t>for-bid-dance</t></w>
 <w><t>for-bid-den</t></w>
 <phrase><t>For-bid-den Cit-y</t></phrase>
@@ -57397,6 +57400,7 @@
 <w><t>for-bid-ding</t></w>
 <w><t>for-bid-ding-ly</t></w>
 <w><t>for-bid-ding-ness</t></w>
+<w><t>for-bids</t><verb><regular-root value="false"/></verb></w>
 <w><t>for-bore</t></w>
 <w><t>for-borne</t></w>
 <w><t>for-by</t></w>
@@ -58067,7 +58071,7 @@
 <phrase><t>found-ry proof</t></phrase>
 <w><t>fount</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Fount</t></w>
-<w><t>foun-tain</t></w>
+<w><t>foun-tain</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>foun-tained</t></w>
 <w><t>foun-tain-head</t></w>
 <w><t>foun-tain-less</t></w>
@@ -62450,7 +62454,7 @@
 <w><t>glo-ri-ous-ness</t></w>
 <phrase><t>Glo-ri-ous Rev-o-lu-tion</t></phrase>
 <w><t>Glo-ry</t></w>
-<w><t>glo-ry</t></w>
+<w><t>glo-ry</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <phrase><t>glo-ry box</t></phrase>
 <phrase><t>glo-ry hole</t></phrase>
 <w><t>glo-ry-ing</t></w>
@@ -62459,7 +62463,7 @@
 <w><t>glo-ry=of=the=sun</t></w>
 <w><t>glo-ry=pea</t></w>
 <w><t>Glos</t></w>
-<w><t>gloss</t></w>
+<w><t>gloss</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Glos-sa</t></w>
 <w><t>glos-sa</t></w>
 <w><t>glos-sal</t></w>
@@ -62874,7 +62878,7 @@
 <w><t>go-de-tia</t></w>
 <w><t>go=dev-il</t></w>
 <w><t>Go-dey</t></w>
-<w><t>god-fa-ther</t></w>
+<w><t>god-fa-ther</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>god=fear-ing</t></w>
 <w><t>God=fear-ing</t></w>
 <w><t>god-for-sak-en</t></w>
@@ -64759,7 +64763,7 @@
 <w><t>ground-wood</t></w>
 <w><t>ground-work</t></w>
 <phrase><t>ground ze-ro</t></phrase>
-<w><t>group</t></w>
+<w><t>group</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <phrase><t>group cap-tain</t></phrase>
 <phrase><t>group dy-nam-ics</t></phrase>
 <w><t>group-er</t></w>
@@ -66968,7 +66972,7 @@
 <phrase><t>Har-ald I</t></phrase>
 <w><t>ha-ram</t></w>
 <w><t>ha-ram-bee</t></w>
-<w><t>ha-rangue</t></w>
+<w><t>ha-rangue</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>ha-rangued</t></w>
 <w><t>ha-rangue-ful</t></w>
 <w><t>ha-rangu-er</t></w>
@@ -69048,7 +69052,7 @@
 <phrase><t>he-ro-ic ten-or</t></phrase>
 <phrase><t>he-ro-ic verse</t></phrase>
 <w><t>her-o-in</t></w>
-<w><t>her-o-ine</t></w>
+<w><t>her-o-ine</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>her-o-ism</t></w>
 <w><t>Hé-rold</t></w>
 <w><t>he-ro-like</t></w>
@@ -70886,7 +70890,7 @@
 <w><t>hoo-doo</t></w>
 <w><t>hoo-dooed</t></w>
 <w><t>hoo-doo-ing</t></w>
-<w><t>hood-wink</t></w>
+<w><t>hood-wink</t><verb><regular-root/></verb></w>
 <w><t>hood-wink-a-ble</t></w>
 <w><t>hood-wink-er</t></w>
 <w><t>hoo-ey</t></w>
@@ -71011,7 +71015,7 @@
 <w><t>Ho-qui-am</t></w>
 <w><t>hor</t></w>
 <w><t>ho-ra</t></w>
-<w><t>Hor-ace</t></w>
+<w><t>Hor-ace</t><noun><convertible-to-possessive/></noun></w>
 <w><t>Ho-rae</t></w>
 <w><t>ho-ral</t></w>
 <w><t>ho-ra-ry</t></w>
@@ -73080,7 +73084,7 @@
 <w><t>hy-po-crin-i-a</t></w>
 <w><t>hy-po-cri-nism</t></w>
 <w><t>hy-poc-ri-sy</t></w>
-<w><t>hyp-o-crite</t></w>
+<w><t>hyp-o-crite</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>hyp-o-crit-i-cal</t></w>
 <w><t>hyp-o-crit-i-cal-ly</t></w>
 <w><t>hy-po-cy-cloid</t></w>
@@ -74330,7 +74334,7 @@
 <w><t>im-mersed</t></w>
 <w><t>im-mers-i-ble</t></w>
 <w><t>im-mers-ing</t></w>
-<w><t>im-mer-sion</t></w>
+<w><t>im-mer-sion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <phrase><t>im-mer-sion heat-er</t></phrase>
 <w><t>im-mer-sion-ism</t><noun><singular/><convertible-to-possessive/></noun></w>
 <w><t>im-mer-sion-ist</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
@@ -74727,7 +74731,7 @@
 <w><t>Imp-hal</t></w>
 <w><t>Im-phal</t></w>
 <w><t>im-pi</t></w>
-<w><t>im-pi-e-ty</t></w>
+<w><t>im-pi-e-ty</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>im-pig-no-rate</t></w>
 <w><t>im-pig-no-rat-ed</t></w>
 <w><t>im-pig-no-rat-ing</t></w>
@@ -74797,7 +74801,7 @@
 <w><t>im-plo-sive-ly</t></w>
 <w><t>im-plu-vi-a</t></w>
 <w><t>im-plu-vi-um</t></w>
-<w><t>im-ply</t></w>
+<w><t>im-ply</t><verb><regular-root/></verb></w>
 <w><t>im-ply-ing</t></w>
 <w><t>im-pol-der</t></w>
 <w><t>im-pol-i-cy</t></w>
@@ -75886,7 +75890,7 @@
 <w><t>in-di-can</t></w>
 <w><t>in-di-cant</t></w>
 <w><t>in-di-cat-a-ble</t></w>
-<w><t>in-di-cate</t></w>
+<w><t>in-di-cate</t><verb><regular-root/></verb></w>
 <w><t>in-di-cat-ed</t></w>
 <w><t>in-di-cat-ing</t></w>
 <w><t>in-di-ca-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
@@ -77661,7 +77665,7 @@
 <w><t>in-tem-per-ate</t></w>
 <w><t>in-tem-per-ate-ly</t></w>
 <w><t>in-tem-per-ate-ness</t></w>
-<w><t>in-tend</t></w>
+<w><t>in-tend</t><verb><regular-root/></verb></w>
 <w><t>in-tend-ance</t></w>
 <w><t>in-tend-an-cy</t></w>
 <w><t>in-tend-ant</t></w>
@@ -77694,7 +77698,7 @@
 <w><t>in-ten-sive-ly</t></w>
 <w><t>in-ten-sive-ness</t></w>
 <w><t>in-tent</t></w>
-<w><t>in-ten-tion</t></w>
+<w><t>in-ten-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>in-ten-tion-al</t></w>
 <w><t>in-ten-tion-al-i-ty</t></w>
 <w><t>in-ten-tion-al-ly</t></w>
@@ -78563,8 +78567,7 @@
 <w><t>in-ter-por-tal</t></w>
 <w><t>in-ter-pos-a-ble</t></w>
 <w><t>in-ter-pos-al</t></w>
-<w><t>in-ter-pose</t></w>
-<w><t>in-ter-posed</t></w>
+<w><t>in-ter-pose</t><verb><regular-root/></verb></w>
 <w><t>in-ter-pos-er</t></w>
 <w><t>in-ter-pos-ing</t></w>
 <w><t>in-ter-pos-ing-ly</t></w>
@@ -80322,7 +80325,7 @@
 <w><t>I=spy</t></w>
 <w><t>Is-ra-el</t><noun><convertible-to-possessive/></noun></w>
 <w><t>Is-rae-li</t></w>
-<w><t>Is-ra-el-ite</t></w>
+<w><t>Is-ra-el-ite</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Is-ra-el-it-ic</t></w>
 <w><t>Is-ra-el-it-ish</t></w>
 <w><t>Is-ra-fil</t></w>
@@ -80334,7 +80337,7 @@
 <w><t>is-su-a-bly</t></w>
 <w><t>is-su-ance</t></w>
 <w><t>is-su-ant</t></w>
-<w><t>is-sue</t></w>
+<w><t>is-sue</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <w><t>is-sued</t></w>
 <w><t>is-sue-less</t></w>
 <w><t>is-su-er</t></w>
@@ -80397,7 +80400,7 @@
 <w><t>i-tal-i-cise</t></w>
 <w><t>I-tal-i-cism</t></w>
 <w><t>i-tal-i-ci-za-tion</t></w>
-<w><t>i-tal-i-cize</t></w>
+<w><t>i-tal-i-cize</t><verb><regular-root/></verb></w>
 <w><t>i-tal-i-cized</t></w>
 <w><t>i-tal-i-ciz-ing</t></w>
 <w><t>I-ta-lo</t></w>
@@ -81972,7 +81975,7 @@
 <w><t>jug-ging</t></w>
 <w><t>jug-gins</t></w>
 <w><t>jug-gins-es</t></w>
-<w><t>jug-gle</t></w>
+<w><t>jug-gle</t><verb><regular-root/></verb></w>
 <w><t>jug-gler</t></w>
 <w><t>jug-gler-y</t></w>
 <w><t>jug-gling-ly</t></w>
@@ -82844,7 +82847,7 @@
 <w><t>keen-ly</t></w>
 <w><t>keen-ness</t></w>
 <w><t>kee-no</t></w>
-<w><t>keep</t></w>
+<w><t>keep</t><verb><regular-root value="false"/></verb></w>
 <w><t>keep-a-ble</t></w>
 <phrase><t>keep a-way</t></phrase>
 <w><t>keep-er</t></w>
@@ -82853,6 +82856,7 @@
 <w><t>keep-er-ship</t></w>
 <w><t>keep-ing</t></w>
 <w><t>keep-net</t></w>
+<w><t>keeps</t><verb><regular-root value="false"/></verb></w>
 <w><t>keep-sake</t></w>
 <phrase><t>keep un-der</t></phrase>
 <w><t>kees-hond</t></w>
@@ -85161,7 +85165,7 @@
 <w><t>la-ma-ser-ies</t></w>
 <w><t>la-ma-ser-y</t></w>
 <w><t>Lamb</t></w>
-<w><t>lamb</t></w>
+<w><t>lamb</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Lam-ba-r-n</t></w>
 <w><t>lam-bast</t></w>
 <w><t>lam-baste</t></w>
@@ -85991,7 +85995,7 @@
 <w><t>launce</t></w>
 <w><t>Laun-ce-lot</t></w>
 <w><t>Laun-ces-ton</t></w>
-<w><t>launch</t></w>
+<w><t>launch</t><verb><regular-root/></verb></w>
 <w><t>launch-a-ble</t></w>
 <w><t>launch-er</t></w>
 <phrase><t>launch-ing pad</t></phrase>
@@ -87435,7 +87439,7 @@
 <w><t>lib-er-tine</t></w>
 <w><t>lib-er-tin-ism</t></w>
 <w><t>Lib-er-ty</t></w>
-<w><t>lib-er-ty</t></w>
+<w><t>lib-er-ty</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <phrase><t>lib-er-ty bod-ice</t></phrase>
 <phrase><t>lib-er-ty cap</t></phrase>
 <phrase><t>lib-er-ty hall</t></phrase>
@@ -88677,7 +88681,7 @@
 <w><t>loam-i-ness</t></w>
 <w><t>loam-less</t></w>
 <w><t>loam-y</t></w>
-<w><t>loan</t></w>
+<w><t>loan</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>loan-a-ble</t></w>
 <w><t>loan-blend</t></w>
 <phrase><t>loan col-lec-tion</t></phrase>
@@ -91557,7 +91561,7 @@
 <w><t>man-age-ment</t></w>
 <phrase><t>man-age-ment ac-count-ing</t></phrase>
 <w><t>man-age-men-tal</t></w>
-<w><t>man-ag-er</t></w>
+<w><t>man-ag-er</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>man-ag-er-ess</t></w>
 <w><t>man-a-ge-ri-al</t></w>
 <w><t>man-a-ge-ri-al-ly</t></w>
@@ -92399,7 +92403,7 @@
 <phrase><t>mar-row pea</t></phrase>
 <phrase><t>mar-row squash</t></phrase>
 <w><t>Mar-rue-cos</t></w>
-<w><t>mar-ry</t></w>
+<w><t>mar-ry</t><verb><regular-root/></verb></w>
 <w><t>Mar-ry-at</t></w>
 <w><t>mar-ry-ing</t></w>
 <phrase><t>mar-ry in-to</t></phrase>
@@ -92635,7 +92639,7 @@
 <w><t>mas-och-is-tic</t></w>
 <w><t>mas-och-is-ti-cal-ly</t></w>
 <w><t>ma-son</t></w>
-<w><t>Ma-son</t></w>
+<w><t>Ma-son</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <phrase><t>ma-son bee</t></phrase>
 <phrase><t>Ma-son=Dix-on Line</t></phrase>
 <w><t>ma-son-ic</t></w>
@@ -94072,7 +94076,7 @@
 <w><t>men-i-sper-ma-ceous</t></w>
 <w><t>Men-ku-re</t></w>
 <w><t>Men-ning-er</t></w>
-<w><t>Men-non-ite</t></w>
+<w><t>Men-non-ite</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Men-no-nit-ism</t></w>
 <w><t>me-no</t></w>
 <w><t>Me-nod-i-ce</t></w>
@@ -96088,7 +96092,7 @@
 <w><t>mis-ap-praise</t></w>
 <w><t>mis-ap-praised</t></w>
 <w><t>mis-ap-prais-ing</t></w>
-<w><t>mis-ap-pre-hend</t></w>
+<w><t>mis-ap-pre-hend</t><verb><regular-root/></verb></w>
 <w><t>mis-ap-pre-hend-ing-ly</t></w>
 <w><t>mis-ap-pre-hen-sion</t></w>
 <w><t>mis-ap-pre-hen-sive</t></w>
@@ -96238,7 +96242,7 @@
 <w><t>mis-deal</t></w>
 <w><t>mis-deal-ing</t></w>
 <w><t>mis-dealt</t></w>
-<w><t>mis-deed</t></w>
+<w><t>mis-deed</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>mis-deem</t></w>
 <w><t>mis-de-fine</t></w>
 <w><t>mis-de-fined</t></w>
@@ -96570,7 +96574,7 @@
 <w><t>mis-ren-der</t></w>
 <w><t>mis-re-port</t></w>
 <w><t>mis-re-port-er</t></w>
-<w><t>mis-rep-re-sent</t></w>
+<w><t>mis-rep-re-sent</t><verb><regular-root/></verb></w>
 <w><t>mis-rep-re-sen-ta-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>mis-rep-re-sen-ta-tive</t></w>
 <w><t>mis-rep-re-sent-er</t></w>
@@ -96639,7 +96643,7 @@
 <w><t>mis-spok-en</t></w>
 <w><t>mis-start</t></w>
 <w><t>mis-state</t></w>
-<w><t>mis-state-ment</t></w>
+<w><t>mis-state-ment</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>mis-stat-er</t></w>
 <w><t>mis-stat-ing</t></w>
 <w><t>mis-steer</t></w>
@@ -96656,7 +96660,7 @@
 <w><t>mis-syl-lab-i-fied</t></w>
 <w><t>mis-syl-lab-i-fy</t></w>
 <w><t>mis-syl-lab-i-fy-ing</t></w>
-<w><t>mist</t></w>
+<w><t>mist</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>mis-tak-a-ble</t></w>
 <w><t>mis-tak-a-ble-ness</t></w>
 <w><t>mis-tak-a-bly</t></w>
@@ -99766,7 +99770,7 @@
 <w><t>Nai-da</t></w>
 <w><t>na-if</t></w>
 <w><t>na-ïf</t></w>
-<w><t>nail</t></w>
+<w><t>nail</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>nail=bit-ing</t></w>
 <w><t>nail-brush</t></w>
 <w><t>nail-er</t></w>
@@ -108333,7 +108337,7 @@
 <w><t>ob-scu-rant-ism</t></w>
 <w><t>ob-scu-rant-ist</t></w>
 <w><t>ob-scu-ra-tion</t></w>
-<w><t>ob-scure</t></w>
+<w><t>ob-scure</t><verb><regular-root/></verb></w>
 <w><t>ob-scur-ed-ly</t></w>
 <w><t>ob-scure-ness</t></w>
 <w><t>ob-scu-ri-ty</t></w>
@@ -108947,6 +108951,7 @@
 <w><t>oft</t></w>
 <w><t>of-ten</t><adjective><extensible/></adjective></w>
 <w><t>of-ten-ness</t></w>
+<w><t>of-ten-times</t><adverb/></w>
 <w><t>oft-times</t></w>
 <w><t>Og-a-den</t></w>
 <w><t>O-gal-lal-a</t></w>
@@ -109787,7 +109792,7 @@
 <w><t>op-pi-lat-ing</t></w>
 <w><t>op-pi-la-tion</t></w>
 <w><t>op-po-nen-cy</t></w>
-<w><t>op-po-nent</t></w>
+<w><t>op-po-nent</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>op-por-tune</t></w>
 <w><t>op-por-tune-ly</t></w>
 <w><t>op-por-tune-ness</t></w>
@@ -115999,6 +116004,7 @@
 <w><t>pass-key</t></w>
 <w><t>pass-less</t></w>
 <w><t>Pass-o-ver</t></w>
+<w><t>pass-o-ver</t></w>
 <phrase><t>pass o-ver</t></phrase>
 <w><t>pass-port</t></w>
 <w><t>pass-port-less</t></w>
@@ -116327,7 +116333,7 @@
 <w><t>pau-cal</t></w>
 <w><t>pau-ci-ty</t></w>
 <w><t>paugh-ty</t></w>
-<w><t>Paul</t></w>
+<w><t>Paul</t><noun><convertible-to-possessive/></noun></w>
 <w><t>Pau-la</t></w>
 <w><t>Paul=Bon-cour</t></w>
 <w><t>Paul-ding</t></w>
@@ -118011,7 +118017,7 @@
 <w><t>per-se-cu-tion-al</t></w>
 <phrase><t>per-se-cu-tion com-plex</t></phrase>
 <w><t>per-se-cu-tive</t></w>
-<w><t>per-se-cu-tor</t></w>
+<w><t>per-se-cu-tor</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Per-se-id</t></w>
 <w><t>per-se-i-ty</t></w>
 <w><t>Per-seph-o-ne</t></w>
@@ -118197,7 +118203,7 @@
 <w><t>per-verse</t></w>
 <w><t>per-verse-ly</t></w>
 <w><t>per-verse-ness</t></w>
-<w><t>per-ver-sion</t></w>
+<w><t>per-ver-sion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>per-ver-si-ty</t></w>
 <w><t>per-ver-sive</t></w>
 <w><t>per-vert</t></w>
@@ -118407,7 +118413,7 @@
 <phrase><t>pe=tsai cab-bage</t></phrase>
 <w><t>Pet-sa-mo</t></w>
 <w><t>pet-ted</t></w>
-<w><t>pet-ti-coat</t></w>
+<w><t>pet-ti-coat</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>pet-ti-coat-ed</t></w>
 <w><t>pet-ti-coat-less</t></w>
 <w><t>pet-ti-er</t></w>
@@ -118553,7 +118559,7 @@
 <w><t>Phar-i-sa-i-cal-ly</t></w>
 <w><t>Phar-i-sa-i-cal-ness</t></w>
 <w><t>Phar-i-sa-ism</t></w>
-<w><t>Phar-i-see</t></w>
+<w><t>Phar-i-see</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Phar-i-see-ism</t></w>
 <w><t>Pharm</t></w>
 <w><t>pharm</t></w>
@@ -120258,7 +120264,7 @@
 <w><t>pit-a-pat-ting</t></w>
 <w><t>Pi-ta-tus</t></w>
 <phrase><t>Pit-cairn Is-land</t></phrase>
-<w><t>pitch</t></w>
+<w><t>pitch</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <w><t>pitch-a-ble</t></w>
 <phrase><t>pitch ac-cent</t></phrase>
 <w><t>pitch-blende</t></w>
@@ -120803,7 +120809,7 @@
 <w><t>play-wright</t></w>
 <w><t>play-writ-ing</t></w>
 <w><t>pla-za</t></w>
-<w><t>plea</t></w>
+<w><t>plea</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>pleach</t></w>
 <w><t>plead</t></w>
 <w><t>plead-a-ble</t></w>
@@ -121521,8 +121527,9 @@
 <w><t>pole-cat</t></w>
 <w><t>pole-jump-er</t></w>
 <w><t>pol-e-march</t></w>
-<w><t>po-lem-ic</t></w>
-<w><t>po-lem-i-cal-ly</t></w>
+<w><t>po-lem-ic</t><noun/></w>
+<w><t>po-lem-i-cal</t><adjective><extensible value="false"/></adjective></w>
+<w><t>po-lem-i-cal-ly</t><adverb/></w>
 <w><t>po-lem-i-cist</t></w>
 <w><t>po-lem-ics</t></w>
 <w><t>pol-e-mist</t></w>
@@ -122382,7 +122389,7 @@
 <w><t>P-os</t></w>
 <w><t>po-sa-da</t></w>
 <w><t>Po-sa-das</t></w>
-<w><t>pose</t></w>
+<w><t>pose</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <w><t>Po-sei-don</t></w>
 <w><t>Po-sen</t></w>
 <w><t>pos-er</t></w>
@@ -123178,6 +123185,7 @@
 <w><t>poz-zu-o-la-nic</t></w>
 <w><t>Poz-zuo-li</t></w>
 <w><t>poz-zy</t></w>
+<w><t>pp</t><abbrev referenced-word="pages"/></w>
 <w><t>ppd</t></w>
 <w><t>PPE</t></w>
 <w><t>ppm</t></w>
@@ -123849,7 +123857,7 @@
 <w><t>pre-clothe</t></w>
 <w><t>pre-clothed</t></w>
 <w><t>pre-cloth-ing</t></w>
-<w><t>pre-clude</t></w>
+<w><t>pre-clude</t><verb><regular-root/></verb></w>
 <w><t>pre-clud-ed</t></w>
 <w><t>pre-clud-ing</t></w>
 <w><t>pre-coc-cyg-e-al</t></w>
@@ -124414,7 +124422,7 @@
 <w><t>pre-dic-tate</t></w>
 <w><t>pre-dic-tat-ed</t></w>
 <w><t>pre-dic-tat-ing</t></w>
-<w><t>pre-dic-tion</t></w>
+<w><t>pre-dic-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>pre-dic-tive-ly</t></w>
 <w><t>pre-dic-tive-ness</t></w>
 <w><t>pre-dic-tor</t></w>
@@ -125535,7 +125543,7 @@
 <w><t>pre-mil-len-ni-al-ly</t></w>
 <w><t>pre-min-is-ter</t></w>
 <w><t>pre-min-is-try</t></w>
-<w><t>prem-ise</t></w>
+<w><t>prem-ise</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <w><t>prem-is-es</t></w>
 <w><t>pre-mis-rep-re-sent</t></w>
 <w><t>pre-mis-rep-re-sen-ta-tion</t></w>
@@ -125853,7 +125861,7 @@
 <w><t>pre-pon-der-at-ing</t></w>
 <w><t>pre-por-tray</t></w>
 <w><t>pre-por-tray-al</t></w>
-<w><t>prep-o-si-tion</t></w>
+<w><t>prep-o-si-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>prep-o-si-tion-al</t></w>
 <w><t>prep-o-si-tion-al-ly</t></w>
 <w><t>pre-pos-i-tive</t></w>
@@ -126135,7 +126143,7 @@
 <w><t>pres-by-cu-sis</t></w>
 <w><t>pres-by-ope</t></w>
 <w><t>pres-by-o-pi-a</t></w>
-<w><t>pres-by-ter</t></w>
+<w><t>pres-by-ter</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>pres-byt-er-al</t></w>
 <w><t>pres-byt-er-ate</t></w>
 <w><t>pres-by-ter-i-al</t></w>
@@ -127213,7 +127221,7 @@
 <w><t>prob</t></w>
 <w><t>prob-a-bil-ism</t></w>
 <w><t>prob-a-bi-lism</t></w>
-<w><t>prob-a-bil-i-ty</t></w>
+<w><t>prob-a-bil-i-ty</t><noun><pluralizable/></noun></w>
 <w><t>prob-a-ble</t></w>
 <phrase><t>prob-a-ble cause</t></phrase>
 <w><t>prob-a-bly</t></w>
@@ -128103,7 +128111,7 @@
 <w><t>pro-posed</t></w>
 <w><t>pro-pos-er</t></w>
 <w><t>pro-pos-ing</t></w>
-<w><t>prop-o-si-tion</t></w>
+<w><t>prop-o-si-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>prop-o-si-tion-al</t></w>
 <phrase><t>prop-o-si-tion-al cal-cu-lus</t></phrase>
 <w><t>prop-o-si-tion-al-ly</t></w>
@@ -128224,7 +128232,7 @@
 <w><t>prose-like</t></w>
 <w><t>pros-e-lyt-adj</t></w>
 <w><t>pros-e-lyte</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
-<w><t>pros-e-lyt-er</t></w>
+<w><t>pros-e-lyt-er</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>pros-e-lyt-i-cal</t></w>
 <w><t>pros-e-lyt-ise</t></w>
 <w><t>pros-e-lyt-ised</t></w>
@@ -129465,7 +129473,7 @@
 <w><t>pub-lic=u-til-i-ty</t></w>
 <phrase><t>pub-lic works</t></phrase>
 <w><t>pub-lish</t><verb><regular-root/></verb></w>
-<w><t>pub-lish-er</t></w>
+<w><t>pub-lish-er</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>pub-lish-ing</t></w>
 <w><t>pub-lish-ment</t></w>
 <w><t>pu-ca</t></w>
@@ -129982,7 +129990,7 @@
 <w><t>pus-tule</t></w>
 <w><t>pus-tuled</t></w>
 <w><t>pus-tu-lous</t></w>
-<w><t>put</t></w>
+<w><t>put</t><verb><regular-root value="false"/></verb></w>
 <phrase><t>put a-bout</t></phrase>
 <phrase><t>put a-cross</t></phrase>
 <w><t>pu-ta-men</t></w>
@@ -130018,6 +130026,7 @@
 <w><t>pu-tri-lage</t></w>
 <w><t>pu-tri-lag-i-nous</t></w>
 <w><t>pu-tri-lag-i-nous-ly</t></w>
+<w><t>puts</t><verb><regular-root value="false"/></verb></w>
 <w><t>Putsch</t></w>
 <w><t>putt</t></w>
 <w><t>put-tee</t></w>
@@ -131685,7 +131694,7 @@
 <w><t>quot-a-ble</t></w>
 <w><t>quo-ta-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <phrase><t>quo-ta-tion mark</t></phrase>
-<w><t>quote</t></w>
+<w><t>quote</t><verb><regular-root/></verb></w>
 <w><t>quot-ed</t></w>
 <w><t>quot-er</t></w>
 <w><t>quote-wor-thy</t></w>
@@ -132598,6 +132607,8 @@
 <w><t>ra-tion-al-is-er</t></w>
 <w><t>ra-tion-al-is-ing</t></w>
 <w><t>ra-tion-al-ism</t></w>
+<w><t>ra-tion-al-ist</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
+<w><t>ra-tion-al-is-tic</t><adjective><extensible value="false"/></adjective></w>
 <w><t>ra-tion-al-i-ty</t></w>
 <w><t>ra-tion-al-i-za-tion</t></w>
 <w><t>ra-tion-al-ize</t></w>
@@ -132981,6 +132992,7 @@
 <w><t>re-al-iz-a-ble</t></w>
 <w><t>re-al-iz-a-ble-ness</t></w>
 <w><t>re-al-iz-a-bly</t></w>
+<w><t>re-al-i-za-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>re-al-ize</t><verb><regular-root/></verb></w>
 <w><t>re-al-ized</t></w>
 <w><t>re-al-iz-er</t></w>
@@ -133592,7 +133604,7 @@
 <w><t>rec-og-niz-a-ble</t></w>
 <w><t>rec-og-niz-a-bly</t></w>
 <w><t>re-cog-ni-zance</t></w>
-<w><t>rec-og-nize</t></w>
+<w><t>rec-og-nize</t><verb><regular-root/></verb></w>
 <w><t>rec-og-nized</t></w>
 <w><t>re-cog-ni-zee</t></w>
 <w><t>rec-og-niz-er</t></w>
@@ -134612,7 +134624,7 @@
 <w><t>refer</t></w>
 <w><t>re-fer</t><verb><regular-root/></verb></w>
 <w><t>ref-er-ee</t></w>
-<w><t>ref-er-ence</t></w>
+<w><t>ref-er-ence</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <phrase><t>ref-er-ence book</t></phrase>
 <w><t>ref-er-enced</t></w>
 <w><t>ref-er-enc-ing</t></w>
@@ -134730,7 +134742,7 @@
 <w><t>re-formed</t></w>
 <w><t>Re-formed</t></w>
 <w><t>re-form-ed-ly</t></w>
-<w><t>re-form-er</t></w>
+<w><t>re-form-er</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>re-form-ing-ly</t></w>
 <w><t>re-form-ism</t></w>
 <w><t>re-form-is-tic</t></w>
@@ -134838,10 +134850,10 @@
 <w><t>re-fu-ta-ble</t></w>
 <w><t>ref-u-ta-bly</t></w>
 <w><t>re-fut-al</t></w>
-<w><t>ref-u-ta-tion</t></w>
+<w><t>ref-u-ta-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>re-fut-a-tive</t></w>
 <w><t>re-fut-a-to-ry</t></w>
-<w><t>re-fute</t></w>
+<w><t>re-fute</t><verb><regular-root/></verb></w>
 <w><t>re-fut-ed</t></w>
 <w><t>re-fut-er</t></w>
 <w><t>re-fut-ing</t></w>
@@ -135446,7 +135458,7 @@
 <w><t>re-i-tem-ized</t></w>
 <w><t>re-i-tem-iz-ing</t></w>
 <w><t>re-it-er-ant</t></w>
-<w><t>re-it-er-ate</t></w>
+<w><t>re-it-er-ate</t><verb><regular-root/></verb></w>
 <w><t>re-it-er-a-tive</t></w>
 <w><t>Reith</t></w>
 <w><t>reive</t></w>
@@ -135899,7 +135911,7 @@
 <w><t>Re-mon-strance</t></w>
 <w><t>Re-mon-strant</t></w>
 <w><t>re-mon-strant</t></w>
-<w><t>re-mon-strate</t></w>
+<w><t>re-mon-strate</t><verb><regular-root/></verb></w>
 <w><t>re-mon-strat-ing-ly</t></w>
 <w><t>re-mon-stra-tion</t></w>
 <w><t>re-mon-stra-tive</t></w>
@@ -136702,7 +136714,7 @@
 <w><t>re-sched-uled</t></w>
 <w><t>re-sched-ul-ing</t></w>
 <w><t>re-school</t></w>
-<w><t>re-scind</t></w>
+<w><t>re-scind</t><verb><regular-root/></verb></w>
 <w><t>re-scis-si-ble</t></w>
 <w><t>re-scis-sion</t></w>
 <w><t>re-scis-so-ry</t></w>
@@ -136719,7 +136731,7 @@
 <w><t>res-cu-ing</t></w>
 <w><t>re-seal</t></w>
 <w><t>re-seal-a-ble</t></w>
-<w><t>re-search</t></w>
+<w><t>re-search</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <w><t>re-search-er</t></w>
 <w><t>re-search-ist</t></w>
 <w><t>re-sea-son</t></w>
@@ -136750,7 +136762,7 @@
 <w><t>re-sell</t></w>
 <w><t>re-sell-er</t></w>
 <w><t>re-sell-ing</t></w>
-<w><t>re-sem-blance</t></w>
+<w><t>re-sem-blance</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>re-sem-blant</t></w>
 <w><t>re-sem-ble</t><verb><regular-root/></verb></w>
 <w><t>re-sem-bling-ly</t></w>
@@ -136794,7 +136806,7 @@
 <w><t>re-serv-ic-ing</t></w>
 <w><t>re-serv-ing</t></w>
 <w><t>re-serv-ist</t></w>
-<w><t>res-er-voir</t></w>
+<w><t>res-er-voir</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>re-set</t></w>
 <w><t>re-set-ter</t></w>
 <w><t>re-set-ting</t></w>
@@ -136947,7 +136959,7 @@
 <w><t>re-solv-a-bil-i-ty</t></w>
 <w><t>re-solv-a-ble</t></w>
 <w><t>re-solv-a-ble-ness</t></w>
-<w><t>re-solve</t></w>
+<w><t>re-solve</t><verb><regular-root/></verb></w>
 <w><t>re-solved</t></w>
 <w><t>re-solv-ed-ly</t></w>
 <w><t>re-solv-ed-ness</t></w>
@@ -137288,7 +137300,7 @@
 <w><t>re-tail-er</t></w>
 <w><t>re-tain</t><verb><regular-root/></verb></w>
 <phrase><t>re-tained ob-ject</t></phrase>
-<w><t>re-tain-er</t></w>
+<w><t>re-tain-er</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <phrase><t>re-tain-ing wall</t></phrase>
 <w><t>re-take</t></w>
 <w><t>re-tak-er</t></w>
@@ -142634,7 +142646,7 @@
 <w><t>Scotts-ville</t></w>
 <w><t>Scot-ty</t></w>
 <w><t>Sco-tus</t></w>
-<w><t>scoun-drel</t></w>
+<w><t>scoun-drel</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>scoun-drel-ly</t></w>
 <w><t>scour</t></w>
 <w><t>scour-er</t></w>
@@ -142685,7 +142697,7 @@
 <w><t>scran</t></w>
 <w><t>scran-nel</t></w>
 <w><t>Scran-ton</t></w>
-<w><t>scrap</t></w>
+<w><t>scrap</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>scrap-a-ble</t></w>
 <w><t>scrap-book</t></w>
 <w><t>scrape</t></w>
@@ -142927,7 +142939,7 @@
 <w><t>scurf-i-est</t></w>
 <w><t>scur-ried</t></w>
 <w><t>scur-rile</t></w>
-<w><t>scur-ril-i-ty</t></w>
+<w><t>scur-ril-i-ty</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>scur-ril-ous</t></w>
 <w><t>scur-ril-ous-ly</t></w>
 <w><t>scur-ril-ous-ness</t></w>
@@ -143250,8 +143262,7 @@
 <w><t>sec-tar-i-an-ized</t></w>
 <w><t>sec-tar-i-an-iz-ing</t></w>
 <w><t>sec-tar-i-an-ly</t></w>
-<w><t>sec-tar-y</t></w>
-<w><t>sec-ta-ry</t></w>
+<w><t>sec-ta-ry</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>sec-tile</t></w>
 <w><t>sec-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>sec-tion-al</t></w>
@@ -147500,7 +147511,7 @@
 <w><t>sig-nal-ment</t></w>
 <phrase><t>sig-nal=to=noise ra-ti-o</t></phrase>
 <w><t>sig-na-to-ry</t></w>
-<w><t>sig-na-ture</t></w>
+<w><t>sig-na-ture</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>sig-na-ture-less</t></w>
 <phrase><t>sig-na-ture tune</t></phrase>
 <phrase><t>sign a-way</t></phrase>
@@ -147513,13 +147524,13 @@
 <w><t>sig-nif-i-cant</t></w>
 <phrase><t>sig-nif-i-cant dig-its</t></phrase>
 <phrase><t>sig-nif-i-cant fig-ures</t></phrase>
-<w><t>sig-ni-fi-ca-tion</t></w>
+<w><t>sig-ni-fi-ca-tion</t><noun><pluralizable/></noun></w>
 <w><t>sig-nif-i-ca-tive</t></w>
 <w><t>sig-nif-i-ca-tive-ly</t></w>
 <w><t>sig-nif-i-ca-tive-ness</t></w>
 <w><t>sig-nif-ics</t></w>
 <w><t>sig-ni-fied</t></w>
-<w><t>sig-ni-fy</t></w>
+<w><t>sig-ni-fy</t><verb><regular-root/></verb></w>
 <w><t>sig-ni-fy-ing</t></w>
 <w><t>si-gnior</t></w>
 <phrase><t>sign lan-guage</t></phrase>
@@ -148502,7 +148513,7 @@
 <w><t>sku-a</t></w>
 <w><t>Skuld</t></w>
 <w><t>skul-dug-ger-y</t></w>
-<w><t>skulk</t></w>
+<w><t>skulk</t><verb><regular-root/></verb></w>
 <w><t>skulk-er</t></w>
 <w><t>skulk-ing-ly</t></w>
 <w><t>skull</t></w>
@@ -148586,7 +148597,8 @@
 <w><t>sla-lom</t></w>
 <w><t>slam</t></w>
 <w><t>slam-ming</t></w>
-<w><t>slan-der</t></w>
+<w><t>slan-der</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
+<w><t>slan-der-er</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>slan-der-ous-ly</t></w>
 <w><t>slan-der-ous-ness</t></w>
 <w><t>slang</t></w>
@@ -149963,7 +149975,7 @@
 <w><t>sol-fe-ri-no</t></w>
 <w><t>Sol-fe-ri-no</t></w>
 <w><t>so-li</t></w>
-<w><t>so-lic-it</t></w>
+<w><t>so-lic-it</t><verb><regular-root/></verb></w>
 <w><t>so-lic-i-ta-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>so-lic-i-tor</t></w>
 <phrase><t>So-lic-i-tor Gen-er-al</t></phrase>
@@ -151763,7 +151775,7 @@
 <w><t>spon-gy</t></w>
 <w><t>spon-sion</t></w>
 <w><t>spon-son</t></w>
-<w><t>spon-sor</t></w>
+<w><t>spon-sor</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <w><t>spon-ta-ne-i-ty</t></w>
 <w><t>spon-ta-ne-ous</t></w>
 <phrase><t>spon-ta-ne-ous com-bus-tion</t></phrase>
@@ -151954,8 +151966,8 @@
 <w><t>spright-li-ness</t></w>
 <w><t>spright-ly</t></w>
 <w><t>sprig-tail</t></w>
-<w><t>spring</t></w>
-<w><t>Spring</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
+<w><t>spring</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root value="false"/></verb></w>
+<w><t>Spring</t></w>
 <w><t>spring-ald</t></w>
 <phrase><t>spring bal-ance</t></phrase>
 <w><t>spring-board</t></w>
@@ -152104,7 +152116,7 @@
 <w><t>squa-lid-i-ty</t></w>
 <w><t>squal-id-ly</t></w>
 <w><t>squal-id-ness</t></w>
-<w><t>squall</t></w>
+<w><t>squall</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <w><t>squall-er</t></w>
 <w><t>squal-li-er</t></w>
 <w><t>squal-li-est</t></w>
@@ -152321,7 +152333,7 @@
 <w><t>sta-bi-liz-er</t></w>
 <w><t>sta-bi-li-zer</t></w>
 <w><t>sta-bi-liz-ing</t></w>
-<w><t>sta-ble</t></w>
+<w><t>sta-ble</t><noun><pluralizable/></noun></w>
 <w><t>sta-ble-boy</t></w>
 <phrase><t>sta-ble door</t></phrase>
 <phrase><t>sta-ble fly</t></phrase>
@@ -153115,7 +153127,7 @@
 <w><t>steph-an-ite</t></w>
 <w><t>steph-a-no-tis</t></w>
 <w><t>step-head</t></w>
-<w><t>Ste-phen</t></w>
+<w><t>Ste-phen</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Ste-phens</t></w>
 <w><t>Ste-phen-son</t></w>
 <w><t>Ste-phen-ville</t></w>
@@ -155829,7 +155841,7 @@
 <w><t>sub-sim-i-ous</t></w>
 <w><t>sub-sim-ple</t></w>
 <w><t>sub-sin-u-ous</t></w>
-<w><t>sub-sist</t></w>
+<w><t>sub-sist</t><verb><regular-root/></verb></w>
 <w><t>sub-sist-ence</t></w>
 <phrase><t>sub-sist-ence al-low-ance</t></phrase>
 <phrase><t>sub-sist-ence farm-ing</t></phrase>
@@ -159738,7 +159750,7 @@
 <w><t>tang-i-er</t></w>
 <w><t>Tan-gier</t></w>
 <w><t>tang-i-est</t></w>
-<w><t>tan-gle</t></w>
+<w><t>tan-gle</t><verb><regular-root/></verb></w>
 <w><t>tan-gle-ber-ry</t></w>
 <w><t>tan-gled</t></w>
 <w><t>tan-gle-ment</t></w>
@@ -160789,7 +160801,7 @@
 <w><t>ten-den-cious</t></w>
 <w><t>ten-den-cious-ly</t></w>
 <w><t>ten-den-cious-ness</t></w>
-<w><t>ten-den-cy</t></w>
+<w><t>ten-den-cy</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>ten-den-tial</t></w>
 <w><t>ten-den-tial-ly</t></w>
 <w><t>ten-den-tious</t></w>
@@ -160837,7 +160849,7 @@
 <w><t>Ten-er-iffe</t></w>
 <w><t>Ten-es</t></w>
 <w><t>te-nes-mus</t></w>
-<w><t>ten-et</t></w>
+<w><t>ten-et</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>ten-fold</t></w>
 <phrase><t>ten=gal-lon hat</t></phrase>
 <phrase><t>Ten-gri Khan</t></phrase>
@@ -161224,7 +161236,7 @@
 <w><t>test-a-ble</t></w>
 <w><t>tes-ta-cean</t></w>
 <w><t>tes-ta-ceous</t></w>
-<w><t>tes-ta-ment</t></w>
+<w><t>tes-ta-ment</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>Tes-ta-ment</t></w>
 <w><t>tes-ta-men-tal</t></w>
 <w><t>tes-ta-men-ta-ry</t></w>
@@ -161248,7 +161260,7 @@
 <w><t>tes-ti-mo-ni-al-is-ing</t></w>
 <w><t>tes-ti-mo-ni-al-ize</t></w>
 <w><t>tes-ti-mo-ni-al-ized</t></w>
-<w><t>tes-ti-mo-ny</t></w>
+<w><t>tes-ti-mo-ny</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>test-ing-ly</t></w>
 <w><t>tes-tis</t></w>
 <w><t>test-match</t></w>
@@ -161410,7 +161422,7 @@
 <phrase><t>Tex-as fe-ver</t></phrase>
 <phrase><t>Tex-as Rang-ers</t></phrase>
 <w><t>tex-ile</t></w>
-<w><t>text</t></w>
+<w><t>text</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>text-book</t></w>
 <w><t>text-book-ish</t></w>
 <w><t>tex-tile</t></w>
@@ -161639,7 +161651,7 @@
 <w><t>The-o-dore</t></w>
 <w><t>Thé-o-dore</t></w>
 <w><t>The-od-o-ric</t></w>
-<w><t>The-o-do-si-a</t></w>
+<w><t>The-o-do-si-a</t><noun><convertible-to-possessive/></noun></w>
 <w><t>The-o-do-sian</t></w>
 <phrase><t>The-o-do-si-us I</t></phrase>
 <w><t>the-o-gon-ic</t></w>
@@ -162986,7 +162998,7 @@
 <w><t>tip-toe-ing</t></w>
 <w><t>Tip-ton</t></w>
 <w><t>tip-top</t></w>
-<w><t>ti-rade</t></w>
+<w><t>ti-rade</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>ti-rail-leur</t></w>
 <w><t>Ti-ran</t></w>
 <w><t>Ti-ra-n</t></w>
@@ -163349,7 +163361,7 @@
 <w><t>tol-u-ol</t></w>
 <w><t>tol-u-yl</t></w>
 <w><t>tol-yl</t></w>
-<w><t>Tom</t></w>
+<w><t>Tom</t><noun><convertible-to-possessive/></noun></w>
 <w><t>tom</t></w>
 <w><t>To-mah</t></w>
 <w><t>Tom-a-hawk</t></w>
@@ -164441,7 +164453,7 @@
 <w><t>trans=Ger-man-ic</t></w>
 <w><t>trans=Gram-pi-an</t></w>
 <w><t>trans-gress</t></w>
-<w><t>trans-gres-sion</t></w>
+<w><t>trans-gres-sion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>trans-gres-sive</t></w>
 <w><t>trans-gres-sive-ly</t></w>
 <w><t>trans=Him-a-lay-an</t></w>
@@ -164517,7 +164529,8 @@
 <w><t>trans=Li-be-ri-an</t></w>
 <w><t>trans=Lib-y-an</t></w>
 <w><t>trans-light</t></w>
-<w><t>trans-lit-er-ate</t></w>
+<w><t>trans-lit-er-ate</t><verb><regular-root/></verb></w>
+<w><t>trans-lit-er-a-tion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>trans-lo-cate</t></w>
 <w><t>trans-lo-cat-ed</t></w>
 <w><t>trans-lo-cat-ing</t></w>
@@ -165941,8 +165954,9 @@
 <w><t>trust-wor-thi-ness</t></w>
 <w><t>trust-wor-thy</t></w>
 <w><t>trust-y</t></w>
-<w><t>truth</t></w>
-<w><t>truth-ful</t></w>
+<w><t>truth</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
+<w><t>truth-ful</t><adjective><extensible value="false"/></adjective></w>
+<w><t>truth-ful-ly</t><adverb/></w>
 <w><t>truth=func-tion</t></w>
 <w><t>truth=func-tion-al</t></w>
 <w><t>truth=func-tion-al-ly</t></w>
@@ -166669,13 +166683,16 @@
 <w><t>twist-ed-ly</t></w>
 <w><t>twist-er</t></w>
 <w><t>twist-ing-ly</t></w>
-<w><t>twit</t></w>
+<w><t>twit</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root value="false"/></verb></w>
 <w><t>twitch</t></w>
 <w><t>twite</t></w>
+<w><t>twits</t><verb><regular-root value="false"/></verb></w>
+<w><t>twit-ted</t><verb><regular-root value="false"/></verb></w>
 <w><t>twit-ter</t></w>
 <w><t>twit-ter-er</t></w>
 <w><t>twit-ter-ing-ly</t></w>
 <w><t>twit-ter-y</t></w>
+<w><t>twit-ting</t><verb><regular-root value="false"/></verb></w>
 <w><t>twixt</t></w>
 <w><t>two</t><cardinal/></w>
 <phrase><t>Two=and=a=half In-ter-na-tion-al</t></phrase>
@@ -168616,7 +168633,7 @@
 <w><t>un-chron-i-cal-ly</t></w>
 <w><t>un-chron-i-cled</t></w>
 <w><t>un-chron-o-log-i-cal</t></w>
-<w><t>un-church</t></w>
+<w><t>un-church</t><verb><regular-root/></verb></w>
 <w><t>un-churched</t><adjective></adjective></w>
 <w><t>un-church-ly</t></w>
 <w><t>un-churl-ish</t></w>
@@ -170346,7 +170363,7 @@
 <w><t>un-der-stand-a-ble</t></w>
 <w><t>un-der-stand-a-ble-ness</t></w>
 <w><t>un-der-stand-a-bly</t></w>
-<w><t>un-der-stand-ing</t></w>
+<w><t>un-der-stand-ing</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>un-der-stand-ing-ly</t></w>
 <w><t>un-der-stand-ing-ness</t></w>
 <w><t>un-der-stands</t><verb/></w>
@@ -179024,7 +179041,8 @@
 <w><t>un-wor-ship-ing</t></w>
 <w><t>un-wor-shipped</t></w>
 <w><t>un-wor-ship-ping</t></w>
-<w><t>un-wor-thy</t></w>
+<w><t>un-wor-thi-ness</t><noun/></w>
+<w><t>un-wor-thy</t><adjective><extensible/></adjective></w>
 <w><t>un-wound</t></w>
 <w><t>un-wound-ed</t></w>
 <w><t>un-wove</t></w>
@@ -179465,7 +179483,7 @@
 <w><t>us-ance</t></w>
 <w><t>Us-beg</t></w>
 <w><t>Us-bek</t></w>
-<w><t>use</t></w>
+<w><t>use</t><noun><pluralizable/><convertible-to-possessive/></noun><verb><regular-root/></verb></w>
 <w><t>use-a-ble</t></w>
 <w><t>used</t></w>
 <w><t>use-ful</t></w>
@@ -180769,7 +180787,7 @@
 <w><t>ver-sin</t></w>
 <w><t>ver-sine</t></w>
 <w><t>Ver-sion</t></w>
-<w><t>ver-sion</t></w>
+<w><t>ver-sion</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>ver-sion-al</t></w>
 <w><t>ver-sion-li-bristes</t></w>
 <phrase><t>vers li-bre</t></phrase>
@@ -182739,7 +182757,7 @@
 <w><t>wash-i-est</t></w>
 <w><t>wash-in</t></w>
 <w><t>wash-i-ness</t></w>
-<w><t>wash-ing</t></w>
+<w><t>wash-ing</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <phrase><t>wash-ing ma-chine</t></phrase>
 <phrase><t>wash-ing pow-der</t></phrase>
 <phrase><t>wash-ing so-da</t></phrase>
@@ -183413,7 +183431,7 @@
 <w><t>wel-kin</t></w>
 <w><t>Wel-kom</t></w>
 <w><t>we’ll</t></w>
-<w><t>well</t></w>
+<w><t>well</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>well=a-bol-ished</t></w>
 <w><t>well=a-bound-ing</t></w>
 <w><t>well=ab-sorbed</t></w>
@@ -185136,7 +185154,7 @@
 <w><t>win-i-er</t></w>
 <w><t>win-i-est</t></w>
 <w><t>win-ish</t></w>
-<w><t>wink</t></w>
+<w><t>wink</t><verb><regular-root/></verb></w>
 <w><t>Win-kel-ried</t></w>
 <w><t>wink-er</t></w>
 <w><t>wink-ing-ly</t></w>

Modified: trunk/foray/foray-orthography/src/main/data/dictionaries/fre-Latn-ZZZ.dict.xml
===================================================================
--- trunk/foray/foray-orthography/src/main/data/dictionaries/fre-Latn-ZZZ.dict.xml	2022-09-07 12:03:17 UTC (rev 12727)
+++ trunk/foray/foray-orthography/src/main/data/dictionaries/fre-Latn-ZZZ.dict.xml	2022-09-30 22:30:22 UTC (rev 12728)
@@ -14,10 +14,13 @@
 <w><t>de</t></w>
 <w><t>en</t></w>
 <w><t>France</t></w>
+<w><t>guerre</t></w>
 <w><t>jér-é-mi-ade</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>la</t></w>
 <w><t>lit-er-a-teur</t><noun><pluralizable/><convertible-to-possessive/></noun></w>
 <w><t>masse</t></w>
+<w><t>nom</t></w>
+<w><t>role</t></w>
 <w><t>route</t></w>
 <w><t>voy-age</t></w>
 

Modified: trunk/foray/foray-orthography/src/main/data/dictionaries/grc-Latn-ZZZ.dict.xml
===================================================================
--- trunk/foray/foray-orthography/src/main/data/dictionaries/grc-Latn-ZZZ.dict.xml	2022-09-07 12:03:17 UTC (rev 12727)
+++ trunk/foray/foray-orthography/src/main/data/dictionaries/grc-Latn-ZZZ.dict.xml	2022-09-30 22:30:22 UTC (rev 12728)
@@ -11,5 +11,19 @@
 Dictionary of Ancient Greek words that are transliterated into Latin script.
 -->
 
-<w><t>bap-ti-zo</t><noun></...
 
[truncated message content]

[FOray-commit] SF.net SVN: foray:[12727] trunk/foray/foray-orthography/src/main/java/org/ foray/orthography/LexerIcu4jBreakIterator.java

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

Revision: 12727
          http://sourceforge.net/p/foray/code/12727
Author:   victormote
Date:     2022-09-07 12:03:17 +0000 (Wed, 07 Sep 2022)
Log Message:
-----------
Use non-String method, for performance.

Modified Paths:
--------------
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/LexerIcu4jBreakIterator.java

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/LexerIcu4jBreakIterator.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/LexerIcu4jBreakIterator.java	2022-08-30 18:39:31 UTC (rev 12726)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/LexerIcu4jBreakIterator.java	2022-09-07 12:03:17 UTC (rev 12727)
@@ -60,7 +60,7 @@
     @Override
     protected IntSequence findRawBreaks(final CharSequence sequence) {
         final IntArrayBuilder result = new IntArrayBuilder(sequence.length());
-        this.wordIterator.setText(sequence.toString());
+        this.wordIterator.setText(sequence);
         int boundary = this.wordIterator.first();
 
         while (boundary != BreakIterator.DONE) {

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