[FOray-commit] SF.net SVN: foray:[14948] trunk/foray/foray-orthograp hy/src

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

Revision: 14948
          http://sourceforge.net/p/foray/code/14948
Author:   victormote
Date:     2026-07-29 22:32:37 +0000 (Wed, 29 Jul 2026)
Log Message:
-----------
Conform to aXSL change: Simplify language, script, and country attributes. Move size and source to the comments.

Modified Paths:
--------------
    trunk/foray/foray-orthography/src/main/data/orthographies/foray-orthography-config.xml
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/OrthographyParser.java
    trunk/foray/foray-orthography/src/test/resources/orthography-config.xml

Modified: trunk/foray/foray-orthography/src/main/data/orthographies/foray-orthography-config.xml
===================================================================
--- trunk/foray/foray-orthography/src/main/data/orthographies/foray-orthography-config.xml	2026-07-29 21:54:47 UTC (rev 14947)
+++ trunk/foray/foray-orthography/src/main/data/orthographies/foray-orthography-config.xml	2026-07-29 22:32:37 UTC (rev 14948)
@@ -162,7 +162,7 @@
     <resource-location parsed="false" url="file:../hyph-patterns/eng.xml"/>
   </hyphenation-patterns-resource>
 
-  <orthography language-iso-3char="eng" script-iso-4char="Latn" country-iso-3char="USA">
+  <orthography language="eng" script="Latn" country="USA">
     <match-rules reference="eng-Latn-match-rules"/>
     <dictionary reference="org.foray.eng.Latn.USA"/>
     <hyphenation-patterns reference="hyph-patterns-eng"/>
@@ -169,7 +169,7 @@
     <derivative-factories reference="eng-Latn-derivatives"/>
   </orthography>
 
-  <orthography language-iso-3char="eng" script-iso-4char="Latn" country-iso-3char="GBR">
+  <orthography language="eng" script="Latn" country="GBR">
     <match-rules reference="eng-Latn-match-rules"/>
     <dictionary reference="org.foray.eng.Latn.GBR"/>
     <hyphenation-patterns reference="hyph-patterns-eng"/>
@@ -176,7 +176,7 @@
     <derivative-factories reference="eng-Latn-derivatives"/>
   </orthography>
 
-  <orthography language-iso-3char="emen" script-iso-4char="Latn" country-iso-3char="ZZZ">
+  <orthography language="emen" script="Latn" country="ZZZ">
     <match-rules reference="eng-Latn-match-rules"/>
     <dictionary reference="org.foray.emen.Latn.ZZZ"/>
     <hyphenation-patterns reference="hyph-patterns-eng"/>
@@ -184,55 +184,55 @@
     <derivative-factory class="org.foray.orthography.inflection.emen.EmenLatnSuffix_eth_Factory"/>
   </orthography>
 
-  <orthography language-iso-3char="lat" script-iso-4char="Latn" country-iso-3char="ZZZ">
+  <orthography language="lat" script="Latn" country="ZZZ">
     <match-rules reference="lat-Latn-match-rules"/>
     <dictionary reference="org.foray.lat.Latn.ZZZ"/>
   </orthography>
 
-  <orthography language-iso-3char="ita" script-iso-4char="Latn" country-iso-3char="ZZZ">
+  <orthography language="ita" script="Latn" country="ZZZ">
     <dictionary reference="org.foray.ita.Latn.ZZZ"/>
   </orthography>
 
-  <orthography language-iso-3char="fre" script-iso-4char="Latn" country-iso-3char="ZZZ">
+  <orthography language="fre" script="Latn" country="ZZZ">
     <match-rules reference="fre-Latn-match-rules"/>
     <derivative-rules reference="fre-Latn-derivative-patterns"/>
     <dictionary reference="org.foray.fre.Latn.ZZZ"/>
   </orthography>
 
-  <orthography language-iso-3char="ger" script-iso-4char="Latn" country-iso-3char="ZZZ">
+  <orthography language="ger" script="Latn" country="ZZZ">
     <derivative-rules reference="ger-Latn-derivative-patterns"/>
     <dictionary reference="org.foray.ger.Latn.ZZZ"/>
   </orthography>
 
-  <orthography language-iso-3char="grc" script-iso-4char="Latn" country-iso-3char="ZZZ">
+  <orthography language="grc" script="Latn" country="ZZZ">
     <dictionary reference="org.foray.grc.Latn.ZZZ"/>
   </orthography>
 
-  <orthography language-iso-3char="grc" script-iso-4char="Grek" country-iso-3char="ZZZ">
+  <orthography language="grc" script="Grek" country="ZZZ">
     <dictionary reference="org.foray.grc.Grek.ZZZ"/>
   </orthography>
 
-  <orthography language-iso-3char="heb" script-iso-4char="Latn" country-iso-3char="ZZZ">
+  <orthography language="heb" script="Latn" country="ZZZ">
     <dictionary reference="org.foray.heb.Latn.ZZZ"/>
   </orthography>
 
   <!-- Aramaic. -->
-  <orthography language-iso-3char="arc" script-iso-4char="Latn" country-iso-3char="ZZZ">
+  <orthography language="arc" script="Latn" country="ZZZ">
     <dictionary reference="org.foray.arc.Latn.ZZZ"/>
   </orthography>
 
   <!-- Old Norse. -->
-  <orthography language-iso-3char="non" script-iso-4char="Latn" country-iso-3char="ZZZ">
+  <orthography language="non" script="Latn" country="ZZZ">
     <dictionary reference="org.foray.non.Latn.ZZZ"/>
   </orthography>
 
   <!-- Polish. -->
-  <orthography language-iso-3char="pol" script-iso-4char="Latn" country-iso-3char="ZZZ">
+  <orthography language="pol" script="Latn" country="ZZZ">
     <dictionary reference="org.foray.pol.Latn.ZZZ"/>
   </orthography>
 
   <!-- Portuguese. -->
-  <orthography language-iso-3char="por" script-iso-4char="Latn" country-iso-3char="ZZZ">
+  <orthography language="por" script="Latn" country="ZZZ">
     <dictionary reference="org.foray.por.Latn.ZZZ"/>
   </orthography>
 

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/OrthographyParser.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/OrthographyParser.java	2026-07-29 21:54:47 UTC (rev 14947)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/util/OrthographyParser.java	2026-07-29 22:32:37 UTC (rev 14948)
@@ -390,9 +390,9 @@
      * @return The parsed writing system.
      */
     private WritingSystem4a parseWritingSystem(final Attributes attributes) {
-        final String languageString = attributes.getValue("language-iso-3char");
-        final String countryString = attributes.getValue("country-iso-3char");
-        final String scriptString = attributes.getValue("script-iso-4char");
+        final String languageString = attributes.getValue("language");
+        final String countryString = attributes.getValue("country");
+        final String scriptString = attributes.getValue("script");
         final Language4a language = Language4a.findFrom3Char(languageString);
         if (language == null) {
             errorMessage("Unable to find language for: {}", languageString);

Modified: trunk/foray/foray-orthography/src/test/resources/orthography-config.xml
===================================================================
--- trunk/foray/foray-orthography/src/test/resources/orthography-config.xml	2026-07-29 21:54:47 UTC (rev 14947)
+++ trunk/foray/foray-orthography/src/test/resources/orthography-config.xml	2026-07-29 22:32:37 UTC (rev 14948)
@@ -97,47 +97,47 @@
     <resource-location parsed="false" url="file:../../main/data/hyph-patterns/spa.xml"/>
   </hyphenation-patterns-resource>
 
-  <orthography language-iso-3char="eng" script-iso-4char="Latn" country-iso-3char="USA">
+  <orthography language="eng" script="Latn" country="USA">
     <dictionary reference="org.foray.eng.Latn.ZZZ"/>
     <hyphenation-patterns reference="hyph-patterns-eng"/>
     <derivative-factories reference="derivatives-eng"/>
   </orthography>
 
-  <orthography language-iso-3char="eng" script-iso-4char="Zyyy" country-iso-3char="USA">
+  <orthography language="eng" script="Zyyy" country="USA">
     <dictionary reference="org.foray.eng.Latn.ZZZ"/>
     <hyphenation-patterns reference="hyph-patterns-eng"/>
     <derivative-factories reference="derivatives-eng"/>
   </orthography>
 
-  <orthography language-iso-3char="fin" script-iso-4char="Latn" country-iso-3char="FIN">
+  <orthography language="fin" script="Latn" country="FIN">
     <hyphenation-patterns reference="hyph-patterns-fin"/>
   </orthography>
 
-  <orthography language-iso-3char="hun" script-iso-4char="Latn" country-iso-3char="HUN">
+  <orthography language="hun" script="Latn" country="HUN">
     <hyphenation-patterns reference="hyph-patterns-hun"/>
   </orthography>
 
-  <orthography language-iso-3char="ita" script-iso-4char="Latn" country-iso-3char="ITA">
+  <orthography language="ita" script="Latn" country="ITA">
     <hyphenation-patterns reference="hyph-patterns-ita"/>
   </orthography>
 
-  <orthography language-iso-3char="pol" script-iso-4char="Latn" country-iso-3char="POL">
+  <orthography language="pol" script="Latn" country="POL">
     <hyphenation-patterns reference="hyph-patterns-pol"/>
   </orthography>
 
-  <orthography language-iso-3char="por" script-iso-4char="Latn" country-iso-3char="PRT">
+  <orthography language="por" script="Latn" country="PRT">
     <hyphenation-patterns reference="hyph-patterns-por"/>
   </orthography>
 
-  <orthography language-iso-3char="rus" script-iso-4char="Cyrl" country-iso-3char="RUS">
+  <orthography language="rus" script="Cyrl" country="RUS">
     <hyphenation-patterns reference="hyph-patterns-rus"/>
   </orthography>
     
-  <orthography language-iso-3char="spa" script-iso-4char="Latn" country-iso-3char="ESP">
+  <orthography language="spa" script="Latn" country="ESP">
     <hyphenation-patterns reference="hyph-patterns-spa"/>
   </orthography>
 
-  <orthography language-iso-3char="lat" script-iso-4char="Latn" country-iso-3char="ZZZ">
+  <orthography language="lat" script="Latn" country="ZZZ">
     <dictionary reference="org.foray.lat.Latn.ZZZ"/>
   </orthography>
 

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