Merge pull request #943 from metanorma/feature/presxml-autonum

Presentation XML captions refactor: https://github.com/metanorma/isod…
metanorma · Dec 8, 2024 · c64fc0d · c64fc0d
2 parents 6c8f2d9 + 909e177
commit c64fc0d
Show file tree

Hide file tree

Showing 26 changed files with 921 additions and 877 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,3 +7,4 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 gemspec
 
 eval_gemfile("Gemfile.devel") rescue nil
+
diff --git a/Gemfile.devel b/Gemfile.devel
@@ -0,0 +1 @@
+gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "feature/presxml-autonum"
diff --git a/lib/metanorma/standoc/biblio.rng b/lib/metanorma/standoc/biblio.rng
@@ -1783,9 +1783,21 @@ that the `number` given for the series applies to the second iteration of number
 May be used to differentiate rendering of notes in bibliographies</a:documentation>
         </attribute>
       </optional>
-      <ref name="LocalizedMarkedUpString">
+      <ref name="LocalizedStringAttributes">
         <a:documentation>The content of the note</a:documentation>
       </ref>
+      <choice>
+        <oneOrMore>
+          <ref name="BasicBlockNoId">
+            <a:documentation>Multiple blocks of content</a:documentation>
+          </ref>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="TextElement">
+            <a:documentation>Single block of content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
   <define name="bibabstract">

diff --git a/lib/metanorma/standoc/isodoc.rng b/lib/metanorma/standoc/isodoc.rng
@@ -326,7 +326,7 @@ normative or informative references, some split references into sections organiz
       <a:documentation>Content of note</a:documentation>
       <oneOrMore>
         <choice>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -412,7 +412,7 @@ normative or informative references, some split references into sections organiz
       <element name="note">
         <ref name="OptionalId"/>
         <oneOrMore>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
         </oneOrMore>
       </element>
     </define>
@@ -1977,7 +1977,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
@@ -2015,7 +2015,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -2037,7 +2037,7 @@ used in document amendments</a:documentation>
           <ref name="dl"/>
           <ref name="quote"/>
           <ref name="sourcecode"/>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="figure"/>
         </choice>
       </oneOrMore>

diff --git a/spec/metanorma/processor_spec.rb b/spec/metanorma/processor_spec.rb
@@ -40,7 +40,7 @@
     processor.output(<<~INPUT, "test.xml", "test.html", :html)
               <iso-standard xmlns="http://riboseinc.com/isoxml">
       <sections>
-      <terms id="H" obligation="normative" displayorder="1"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
+      <terms id="H" obligation="normative" displayorder="1"><fmt-title>Terms, Definitions, Symbols and Abbreviated Terms</fmt-title>
         <term id="J">
         <preferred>Term2</preferred>
       </term>
@@ -64,7 +64,7 @@
     processor.output(<<~INPUT, "test.xml", "test.doc", :doc)
               <iso-standard xmlns="http://riboseinc.com/isoxml">
       <sections>
-      <terms id="H" obligation="normative" displayorder="1"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
+      <terms id="H" obligation="normative" displayorder="1"><fmt-title>Terms, Definitions, Symbols and Abbreviated Terms</fmt-title>
         <term id="J">
         <preferred>Term2</preferred>
       </term>

diff --git a/spec/vcr_cassettes/bipm.yml b/spec/vcr_cassettes/bipm.yml
diff --git a/spec/vcr_cassettes/bsi16341.yml b/spec/vcr_cassettes/bsi16341.yml
diff --git a/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml b/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml
diff --git a/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec1.yml b/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec1.yml
diff --git a/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec2.yml b/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec2.yml
diff --git a/spec/vcr_cassettes/doi.yml b/spec/vcr_cassettes/doi.yml
diff --git a/spec/vcr_cassettes/doi2.yml b/spec/vcr_cassettes/doi2.yml
diff --git a/spec/vcr_cassettes/dual_refs.yml b/spec/vcr_cassettes/dual_refs.yml
diff --git a/spec/vcr_cassettes/hide_refs.yml b/spec/vcr_cassettes/hide_refs.yml
diff --git a/spec/vcr_cassettes/iev_03-01-02.yml b/spec/vcr_cassettes/iev_03-01-02.yml
diff --git a/spec/vcr_cassettes/iev_103-01-02.yml b/spec/vcr_cassettes/iev_103-01-02.yml
diff --git a/spec/vcr_cassettes/isobib_get_123.yml b/spec/vcr_cassettes/isobib_get_123.yml
diff --git a/spec/vcr_cassettes/isobib_get_123_1.yml b/spec/vcr_cassettes/isobib_get_123_1.yml
diff --git a/spec/vcr_cassettes/isobib_get_123_1_fr.yml b/spec/vcr_cassettes/isobib_get_123_1_fr.yml
diff --git a/spec/vcr_cassettes/isobib_get_123_2001_and_iev.yml b/spec/vcr_cassettes/isobib_get_123_2001_and_iev.yml
diff --git a/spec/vcr_cassettes/isobib_get_123_2001a.yml b/spec/vcr_cassettes/isobib_get_123_2001a.yml
diff --git a/spec/vcr_cassettes/isobib_get_124.yml b/spec/vcr_cassettes/isobib_get_124.yml
diff --git a/spec/vcr_cassettes/merge_refs.yml b/spec/vcr_cassettes/merge_refs.yml
diff --git a/spec/vcr_cassettes/rfcbib_get_rfc8341.yml b/spec/vcr_cassettes/rfcbib_get_rfc8341.yml
diff --git a/spec/vcr_cassettes/separates_iev_citations_by_top_level_clause.yml b/spec/vcr_cassettes/separates_iev_citations_by_top_level_clause.yml
diff --git a/spec/vcr_cassettes/std-link.yml b/spec/vcr_cassettes/std-link.yml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@ git_source(:github) { \|repo\| "https://github.com/#{repo}" }
		gemspec

		eval_gemfile("Gemfile.devel") rescue nil
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "feature/presxml-autonum"