From 00387a4879d3b92d0972162091f063939efabb04 Mon Sep 17 00:00:00 2001
From: Tony Graham <tgraham@antenna.co.jp>
Date: Thu, 17 Aug 2023 21:01:34 +0100
Subject: [PATCH] Releasing ahfsettings 7.3.4.

---
 add-on.xml       |  4 ++--
 build.properties |  2 +-
 schema/axs.dtd   | 10 +++++-----
 schema/axs.rng   | 29 +++++++++++++++++------------
 schema/axs.xsd   | 25 ++++++++++++++++---------
 5 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/add-on.xml b/add-on.xml
index 527ec80..f41db8a 100644
--- a/add-on.xml
+++ b/add-on.xml
@@ -3,8 +3,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.oxygenxml.com/ns/extension http://www.oxygenxml.com/ns/extension/extensions.xsd">
     <xt:extension id="ahfsettings">
-        <xt:location href="https://github.com/AntennaHouse/ahfsettings/releases/download/v7.3.2/ahfsettings-framework-7.3.2.zip"/>
-        <xt:version>7.3.2</xt:version>
+        <xt:location href="https://github.com/AntennaHouse/ahfsettings/releases/download/v7.3.4/ahfsettings-framework-7.3.4.zip"/>
+        <xt:version>7.3.4</xt:version>
         <xt:oxy_version>14.0+</xt:oxy_version>
         <xt:type>framework</xt:type>
         <xt:author>Antenna House, Inc.</xt:author>
diff --git a/build.properties b/build.properties
index 21cffc7..4e93477 100644
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,6 @@
 # Version of current code base.  Included in generated files.
 # See instructions in 'build.xml'.
-version=7.3.2
+version=7.3.4
 
 # Location of .jar for Saxon XSLT 2.0 (or later) processor
 saxon.jar.windows=C:/saxon/saxon9he.jar
diff --git a/schema/axs.dtd b/schema/axs.dtd
index 7103205..113e83e 100644
--- a/schema/axs.dtd
+++ b/schema/axs.dtd
@@ -63,9 +63,9 @@ limitations under the License.
 
 <!ENTITY % formatter-config.model "formatter-settings?,font-settings?,
                                    pdf-settings?,ps-settings?,
-                                   svg-render-settings?,svg-settings?,
-                                   text-settings?,mathml-settings?,
-                                   cgm-settings?,xslt-settings?,
+                                   mathml-settings?,svg-settings?,
+                                   svg-render-settings?,cgm-settings?,
+                                   text-settings?,xslt-settings?,
                                    analyzer-settings?">
 
 <!-- start = formatter-config -->
@@ -102,8 +102,8 @@ limitations under the License.
   condensed-text-align-last (%ah.boolean;|justify) #IMPLIED
   css-allow-bare-expression (%ah.boolean;) #IMPLIED
   css-child-match-root (%ah.boolean;) #IMPLIED
-  css-child-match-root (%ah.boolean;) #IMPLIED
-  css-float-in-float NMTOKEN #IMPLIED
+  css-float-in-float (%ah.boolean;) #IMPLIED
+  css-media-type CDATA #IMPLIED
   default-CJK NMTOKEN #IMPLIED
   default-color CDATA #IMPLIED
   default-font-size NMTOKEN #IMPLIED
diff --git a/schema/axs.rng b/schema/axs.rng
index 3638cc6..f2f93c5 100644
--- a/schema/axs.rng
+++ b/schema/axs.rng
@@ -186,13 +186,17 @@
       <value>Khmr</value>
       <value>Laoo</value>
       <value>Mymr</value>
-      <value>Kana</value>
-      <value>Hira</value>
+      <!--
+        | 'Kana'
+        | 'Hira'
+      -->
       <value>Hang</value>
-      <value>Hani</value>
+      <!-- | 'Hani' -->
       <value>Hans</value>
       <value>Hant</value>
       <value>Jpan</value>
+      <value>Zsye</value>
+      <value>Zsym</value>
       <value>.</value>
       <value/>
     </choice>
@@ -231,19 +235,19 @@
       <ref name="ps-settings"/>
     </optional>
     <optional>
-      <ref name="svg-render-settings"/>
+      <ref name="mathml-settings"/>
     </optional>
     <optional>
       <ref name="svg-settings"/>
     </optional>
     <optional>
-      <ref name="text-settings"/>
+      <ref name="svg-render-settings"/>
     </optional>
     <optional>
-      <ref name="mathml-settings"/>
+      <ref name="cgm-settings"/>
     </optional>
     <optional>
-      <ref name="cgm-settings"/>
+      <ref name="text-settings"/>
     </optional>
     <optional>
       <ref name="xslt-settings"/>
@@ -403,19 +407,19 @@
     </optional>
     <optional>
       <attribute name="css-child-match-root">
+        <a:documentation>Whether pseudo-classes match root element: true | false</a:documentation>
         <ref name="ah.boolean"/>
       </attribute>
     </optional>
     <optional>
-      <attribute name="css-child-match-root">
-        <a:documentation>Whether pseudo-classes match root element: true | false</a:documentation>
+      <attribute name="css-float-in-float">
+        <a:documentation>Whether nested floats are allowed in CSS: true | false</a:documentation>
         <ref name="ah.boolean"/>
       </attribute>
     </optional>
     <optional>
-      <attribute name="css-float-in-float">
-        <a:documentation>Whether nested floats are allowed in CSS: true | false</a:documentation>
-        <data type="NCName"/>
+      <attribute name="css-media-type">
+        <a:documentation>@media tokens that apply to Antenna House Formatter</a:documentation>
       </attribute>
     </optional>
     <optional>
@@ -1711,6 +1715,7 @@
     </optional>
     <optional>
       <attribute name="new-tagging-mode">
+        <a:documentation>Whether to enable the role map and axf:pdftag="''" support: true | false</a:documentation>
         <ref name="ah.boolean"/>
       </attribute>
     </optional>
diff --git a/schema/axs.xsd b/schema/axs.xsd
index 35286bb..4409d38 100644
--- a/schema/axs.xsd
+++ b/schema/axs.xsd
@@ -197,13 +197,12 @@
       <xs:enumeration value="Khmr"/>
       <xs:enumeration value="Laoo"/>
       <xs:enumeration value="Mymr"/>
-      <xs:enumeration value="Kana"/>
-      <xs:enumeration value="Hira"/>
       <xs:enumeration value="Hang"/>
-      <xs:enumeration value="Hani"/>
       <xs:enumeration value="Hans"/>
       <xs:enumeration value="Hant"/>
       <xs:enumeration value="Jpan"/>
+      <xs:enumeration value="Zsye"/>
+      <xs:enumeration value="Zsym"/>
       <xs:enumeration value="."/>
       <xs:enumeration value=""/>
     </xs:restriction>
@@ -233,11 +232,11 @@
       <xs:element minOccurs="0" ref="font-settings"/>
       <xs:element minOccurs="0" ref="pdf-settings"/>
       <xs:element minOccurs="0" ref="ps-settings"/>
-      <xs:element minOccurs="0" ref="svg-render-settings"/>
-      <xs:element minOccurs="0" ref="svg-settings"/>
-      <xs:element minOccurs="0" ref="text-settings"/>
       <xs:element minOccurs="0" ref="mathml-settings"/>
+      <xs:element minOccurs="0" ref="svg-settings"/>
+      <xs:element minOccurs="0" ref="svg-render-settings"/>
       <xs:element minOccurs="0" ref="cgm-settings"/>
+      <xs:element minOccurs="0" ref="text-settings"/>
       <xs:element minOccurs="0" ref="xslt-settings"/>
       <xs:element minOccurs="0" ref="analyzer-settings"/>
     </xs:sequence>
@@ -351,17 +350,21 @@
         <xs:documentation>Whether expressions not enclosed in 'calc()' are allowed: true | false</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="css-child-match-root" type="ah.boolean"/>
     <xs:attribute name="css-child-match-root" type="ah.boolean">
       <xs:annotation>
         <xs:documentation>Whether pseudo-classes match root element: true | false</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="css-float-in-float" type="xs:NCName">
+    <xs:attribute name="css-float-in-float" type="ah.boolean">
       <xs:annotation>
         <xs:documentation>Whether nested floats are allowed in CSS: true | false</xs:documentation>
       </xs:annotation>
     </xs:attribute>
+    <xs:attribute name="css-media-type">
+      <xs:annotation>
+        <xs:documentation>@media tokens that apply to Antenna House Formatter</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
     <xs:attribute name="default-CJK" type="xs:NCName"/>
     <xs:attribute name="default-color"/>
     <xs:attribute name="default-font-size" type="xs:NMTOKEN"/>
@@ -1175,7 +1178,11 @@
         </xs:restriction>
       </xs:simpleType>
     </xs:attribute>
-    <xs:attribute name="new-tagging-mode" type="ah.boolean"/>
+    <xs:attribute name="new-tagging-mode" type="ah.boolean">
+      <xs:annotation>
+        <xs:documentation>Whether to enable the role map and axf:pdftag="''" support: true | false</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
     <xs:attribute name="no-accessibility" type="ah.boolean">
       <xs:annotation>
         <xs:documentation>Whether to permit text access for screen reader devices of PDF files: false | true</xs:documentation>