Releasing focheck 0.5.2.

AntennaHouse · May 15, 2017 · 40630ab · 40630ab
1 parent 08601bf
commit 40630ab
Show file tree

Hide file tree

Showing 15 changed files with 195 additions and 38 deletions.
diff --git a/add-on-ja.xml b/add-on-ja.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="focheck">
-        <xt:location href="https://github.com/AntennaHouse/focheck/releases/download/v0.5.1/focheck-framework-ja-0.5.1.zip"/>
-        <xt:version>0.5.1</xt:version>
+        <xt:location href="https://github.com/AntennaHouse/focheck/releases/download/v0.5.2/focheck-framework-ja-0.5.2.zip"/>
+        <xt:version>0.5.2</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/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="focheck">
-        <xt:location href="https://github.com/AntennaHouse/focheck/releases/download/v0.5.1/focheck-framework-0.5.1.zip"/>
-        <xt:version>0.5.1</xt:version>
+        <xt:location href="https://github.com/AntennaHouse/focheck/releases/download/v0.5.2/focheck-framework-0.5.2.zip"/>
+        <xt:version>0.5.2</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
@@ -1,6 +1,6 @@
 # Version of current code base.  Included in generated files.
 # See instructions in 'build.xml'.
-version=0.5.1
+version=0.5.2
 
 # Location of .jar for Saxon XSLT 2.0 (or later) processor
 saxon.jar.windows=C:/saxon/saxon9he.jar

diff --git a/build/expanded.sch b/build/expanded.sch
@@ -3499,6 +3499,19 @@
 	  </sqf:fix>
 	</rule>
 
+	<!-- axf:indent-here -->
+	<!-- none | <length> -->
+	<!-- Inherited: yes -->
+	<!-- Shorthand: no -->
+	<!-- http://www.antennahouse.com/product/ahf64/ahf-ext.html#axf.indent-here -->
+	<rule context="fo:*/@axf:indent-here">
+	  <let name="expression" value="ahf:parser-runner(.)"/>
+	  <assert test="local-name($expression) = ('EnumerationToken', 'Length', 'EMPTY')">axf:indent-here="<value-of select="."/>" should be EnumerationToken or Length.  '<value-of select="."/>' is a <value-of select="local-name($expression)"/>.</assert>
+	  <report test="$expression instance of element(EnumerationToken) and not($expression/@token = ('none'))">axf:indent-here="<value-of select="."/>" enumeration token is '<value-of select="$expression/@token"/>'.  Token should be 'none'.</report>
+	  <report test="local-name($expression) = 'EMPTY'" role="Warning">axf:indent-here="" should be EnumerationToken or Length.</report>
+	  <report test="local-name($expression) = 'ERROR'">Syntax error: axf:indent-here="<value-of select="."/>"</report>
+	</rule>
+
 	<!-- axf:line-number-background-color -->
 	<!-- <color> | transparent -->
 	<!-- Inherited: yes -->

diff --git a/build/schematron.xsl b/build/schematron.xsl
@@ -16701,7 +16701,7 @@
 
 	  <!--RULE axf-1-->
    <xsl:template match="axf:document-info[@name = ('author-title', 'description-writer', 'copyright-status', 'copyright-notice', 'copyright-info-url')]"
-                 priority="1035"
+                 priority="1036"
                  mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="axf:document-info[@name = ('author-title', 'description-writer', 'copyright-status', 'copyright-notice', 'copyright-info-url')]"
@@ -16731,7 +16731,7 @@
 
 	  <!--RULE -->
    <xsl:template match="axf:document-info[@name = 'title']"
-                 priority="1034"
+                 priority="1035"
                  mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="axf:document-info[@name = 'title']"/>
@@ -16758,7 +16758,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="fo:*/@axf:annotation-color" priority="1033" mode="M11">
+   <xsl:template match="fo:*/@axf:annotation-color" priority="1034" mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:annotation-color"/>
       <xsl:variable name="expression" select="ahf:parser-runner(.)"/>
@@ -16816,7 +16816,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="fo:*/@axf:annotation-contents" priority="1032" mode="M11">
+   <xsl:template match="fo:*/@axf:annotation-contents" priority="1033" mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:annotation-contents"/>
 
@@ -16842,7 +16842,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="fo:*/@axf:background-color" priority="1031" mode="M11">
+   <xsl:template match="fo:*/@axf:background-color" priority="1032" mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:background-color"/>
       <xsl:variable name="expression" select="ahf:parser-runner(.)"/>
@@ -16906,7 +16906,7 @@
 
 	  <!--RULE -->
    <xsl:template match="fo:*/@axf:background-content-height"
-                 priority="1030"
+                 priority="1031"
                  mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:background-content-height"/>
@@ -16983,7 +16983,7 @@
 
 	  <!--RULE -->
    <xsl:template match="fo:*/@axf:background-content-type"
-                 priority="1029"
+                 priority="1030"
                  mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:background-content-type"/>
@@ -17060,7 +17060,7 @@
 
 	  <!--RULE -->
    <xsl:template match="fo:*/@axf:background-content-width"
-                 priority="1028"
+                 priority="1029"
                  mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:background-content-width"/>
@@ -17136,7 +17136,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="fo:*/@axf:background-color" priority="1027" mode="M11">
+   <xsl:template match="fo:*/@axf:background-color" priority="1028" mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:background-color"/>
       <xsl:variable name="expression" select="ahf:parser-runner(.)"/>
@@ -17194,7 +17194,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="fo:*/@axf:background-image" priority="1026" mode="M11">
+   <xsl:template match="fo:*/@axf:background-image" priority="1027" mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:background-image"/>
       <xsl:variable name="expression" select="ahf:parser-runner(.)"/>
@@ -17269,7 +17269,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="fo:*/@background-position" priority="1025" mode="M11">
+   <xsl:template match="fo:*/@background-position" priority="1026" mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@background-position"/>
 
@@ -17289,7 +17289,7 @@
 
 	  <!--RULE -->
    <xsl:template match="fo:*/@axf:background-position-horizontal"
-                 priority="1024"
+                 priority="1025"
                  mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:background-position-horizontal"/>
@@ -17366,7 +17366,7 @@
 
 	  <!--RULE -->
    <xsl:template match="fo:*/@axf:background-position-vertical"
-                 priority="1023"
+                 priority="1024"
                  mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:background-position-vertical"/>
@@ -17442,7 +17442,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="fo:*/@axf:background-repeat" priority="1022" mode="M11">
+   <xsl:template match="fo:*/@axf:background-repeat" priority="1023" mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:background-repeat"/>
       <xsl:variable name="expression" select="ahf:parser-runner(.)"/>
@@ -17517,7 +17517,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="fo:*/@axf:baseline-block-snap" priority="1021" mode="M11">
+   <xsl:template match="fo:*/@axf:baseline-block-snap" priority="1022" mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:baseline-block-snap"/>
 
@@ -17540,7 +17540,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="fo:*/@axf:outline-color" priority="1020" mode="M11">
+   <xsl:template match="fo:*/@axf:outline-color" priority="1021" mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:outline-color"/>
       <xsl:variable name="expression" select="ahf:parser-runner(.)"/>
@@ -17582,7 +17582,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="fo:*/@axf:outline-level" priority="1019" mode="M11">
+   <xsl:template match="fo:*/@axf:outline-level" priority="1020" mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:outline-level"/>
       <xsl:variable name="expression" select="ahf:parser-runner(.)"/>
@@ -17624,7 +17624,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="fo:*/@axf:background-scaling" priority="1018" mode="M11">
+   <xsl:template match="fo:*/@axf:background-scaling" priority="1019" mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:background-scaling"/>
       <xsl:variable name="expression" select="ahf:parser-runner(.)"/>
@@ -17699,7 +17699,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="fo:*/@axf:hyphenation-zone" priority="1017" mode="M11">
+   <xsl:template match="fo:*/@axf:hyphenation-zone" priority="1018" mode="M11">
       <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                        context="fo:*/@axf:hyphenation-zone"/>
       <xsl:variable name="expression" select="ahf:parser-runner(.)"/>
@@ -17790,6 +17790,80 @@
       </xsl:if>
    </xsl:template>
 
+	  <!--RULE -->
+   <xsl:template match="fo:*/@axf:indent-here" priority="1017" mode="M11">
+      <svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl" context="fo:*/@axf:indent-here"/>
+      <xsl:variable name="expression" select="ahf:parser-runner(.)"/>
+
+		    <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="local-name($expression) = ('EnumerationToken', 'Length', 'EMPTY')"/>
+         <xsl:otherwise>
+            <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
+                                test="local-name($expression) = ('EnumerationToken', 'Length', 'EMPTY')">
+               <xsl:attribute name="location">
+                  <xsl:apply-templates select="." mode="schematron-select-full-path"/>
+               </xsl:attribute>
+               <xsl:attribute name="line-number" select="saxon:line-number()"/>
+               <xsl:attribute name="column-number" select="saxon:column-number()"/>
+               <svrl:text>axf:indent-here="<xsl:text/>
+                  <xsl:value-of select="."/>
+                  <xsl:text/>" should be EnumerationToken or Length.  '<xsl:text/>
+                  <xsl:value-of select="."/>
+                  <xsl:text/>' is a <xsl:text/>
+                  <xsl:value-of select="local-name($expression)"/>
+                  <xsl:text/>.</svrl:text>
+            </svrl:failed-assert>
+         </xsl:otherwise>
+      </xsl:choose>
+
+		    <!--REPORT -->
+      <xsl:if test="$expression instance of element(EnumerationToken) and not($expression/@token = ('none'))">
+         <svrl:successful-report xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
+                                 test="$expression instance of element(EnumerationToken) and not($expression/@token = ('none'))">
+            <xsl:attribute name="location">
+               <xsl:apply-templates select="." mode="schematron-select-full-path"/>
+            </xsl:attribute>
+            <xsl:attribute name="line-number" select="saxon:line-number()"/>
+            <xsl:attribute name="column-number" select="saxon:column-number()"/>
+            <svrl:text>axf:indent-here="<xsl:text/>
+               <xsl:value-of select="."/>
+               <xsl:text/>" enumeration token is '<xsl:text/>
+               <xsl:value-of select="$expression/@token"/>
+               <xsl:text/>'.  Token should be 'none'.</svrl:text>
+         </svrl:successful-report>
+      </xsl:if>
+
+		    <!--REPORT Warning-->
+      <xsl:if test="local-name($expression) = 'EMPTY'">
+         <svrl:successful-report xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
+                                 test="local-name($expression) = 'EMPTY'">
+            <xsl:attribute name="role">Warning</xsl:attribute>
+            <xsl:attribute name="location">
+               <xsl:apply-templates select="." mode="schematron-select-full-path"/>
+            </xsl:attribute>
+            <xsl:attribute name="line-number" select="saxon:line-number()"/>
+            <xsl:attribute name="column-number" select="saxon:column-number()"/>
+            <svrl:text>axf:indent-here="" should be EnumerationToken or Length.</svrl:text>
+         </svrl:successful-report>
+      </xsl:if>
+
+		    <!--REPORT -->
+      <xsl:if test="local-name($expression) = 'ERROR'">
+         <svrl:successful-report xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
+                                 test="local-name($expression) = 'ERROR'">
+            <xsl:attribute name="location">
+               <xsl:apply-templates select="." mode="schematron-select-full-path"/>
+            </xsl:attribute>
+            <xsl:attribute name="line-number" select="saxon:line-number()"/>
+            <xsl:attribute name="column-number" select="saxon:column-number()"/>
+            <svrl:text>Syntax error: axf:indent-here="<xsl:text/>
+               <xsl:value-of select="."/>
+               <xsl:text/>"</svrl:text>
+         </svrl:successful-report>
+      </xsl:if>
+   </xsl:template>
+
 	  <!--RULE -->
    <xsl:template match="fo:*/@axf:line-number-background-color"
                  priority="1016"

diff --git a/build/unabstract.sch b/build/unabstract.sch
@@ -3481,6 +3481,19 @@
 
 
 
+	<rule context="fo:*/@axf:indent-here">
+	  <let name="expression" value="ahf:parser-runner(.)"/>
+	  <assert test="local-name($expression) = ('EnumerationToken', 'Length', 'EMPTY')">axf:indent-here="<value-of select="."/>" should be EnumerationToken or Length.  '<value-of select="."/>' is a <value-of select="local-name($expression)"/>.</assert>
+	  <report test="$expression instance of element(EnumerationToken) and not($expression/@token = ('none'))">axf:indent-here="<value-of select="."/>" enumeration token is '<value-of select="$expression/@token"/>'.  Token should be 'none'.</report>
+	  <report test="local-name($expression) = 'EMPTY'" role="Warning">axf:indent-here="" should be EnumerationToken or Length.</report>
+	  <report test="local-name($expression) = 'ERROR'">Syntax error: axf:indent-here="<value-of select="."/>"</report>
+	</rule>
+
+
+
+
+
+
 	<rule context="fo:*/@axf:line-number-background-color">
 	  <let name="expression" value="ahf:parser-runner(.)"/>
 	  <assert test="local-name($expression) = ('EnumerationToken', 'Color', 'EMPTY', 'ERROR')"><value-of select="name(.)"/>="<value-of select="."/>" should be a Color, a color name, or 'transparent'.  '<value-of select="."/>' is a <value-of select="local-name($expression)"/>.</assert>

diff --git a/schema-ja/rng/axf.rng b/schema-ja/rng/axf.rng
@@ -692,6 +692,7 @@
   <define name="fo_inline.attlist" combine="interleave">
     <ref name="xml_id"/>
     <ref name="axf.annotation.attlist"/>
+    <ref name="axf_indent-here"/>
   </define>
   <define name="fo_inline-container.attlist" combine="interleave">
     <ref name="xml_id"/>
@@ -1801,6 +1802,18 @@
       </attribute>
     </optional>
   </define>
+  <!--
+    @axf:indent-here
+    
+    http://www.antennahouse.com/product/ahf64/ahf-ext.html#axf.indent-here
+  -->
+  <define name="axf_indent-here">
+    <optional>
+      <attribute name="axf:indent-here">
+        <a:documentation>Aligns the indent position to the region position when a line break occurs: none | &lt;length&gt;</a:documentation>
+      </attribute>
+    </optional>
+  </define>
   <!--
     @axf:number-type
     

diff --git a/schema-ja/xsd/axf.xsd b/schema-ja/xsd/axf.xsd
@@ -1480,6 +1480,18 @@
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
+  <!--
+    @axf:indent-here
+    
+    http://www.antennahouse.com/product/ahf64/ahf-ext.html#axf.indent-here
+  -->
+  <xs:attributeGroup name="axf_indent-here">
+    <xs:attribute name="indent-here" form="qualified">
+      <xs:annotation>
+        <xs:documentation>Aligns the indent position to the region position when a line break occurs: none | &lt;length&gt;</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
   <!--
     @axf:number-type
     

diff --git a/schema-ja/xsd/fo.xsd b/schema-ja/xsd/fo.xsd
@@ -6467,6 +6467,7 @@
     <xs:attributeGroup ref="axf:axf_word-wrap"/>
     <xs:attributeGroup ref="axf:xml_id"/>
     <xs:attributeGroup ref="axf:axf.annotation.attlist"/>
+    <xs:attributeGroup ref="axf:axf_indent-here"/>
   </xs:attributeGroup>
   <xs:element name="inline-container" substitutionGroup="fo:inline.fo.list">
     <xs:annotation>