metanorma-iso 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da005628ba019121c2c72d9e74dcfe32dcd01fc555d7cc14d2a9936766375d51
-  data.tar.gz: 1e415f917d4d2737ecfad1b15bdcb6f4071d2c35df4b8a91e94926d7434c081d
+  metadata.gz: d3629dd32172e9b6df3f58715579377d8cf71e989c27b54200f1f562a9892b3d
+  data.tar.gz: 5645a46a5e59c5a55543469064124582250ef5b676ced7627d839c120b5f6da2
 SHA512:
-  metadata.gz: a7d82b3fe97c1e2ed1a078c335d97b32f16f23f0d0640e97d978ec8fb7b99243f023cc8ef9946f0c5f2a425daa0bb657cf14c61691c1f943b6790645901b08e1
-  data.tar.gz: faf3e8a9eff4650f60b7a4db80d429e1c7c9b68b9de1e9b708cf0d49030d62b1b62bc2114a581ac09db40c8eae7f97ee81e6f17a8036e3cc0ff62e5067e15dd1
+  metadata.gz: b6cdedb8c9ebfd573277b5a757a9599687f3818c3be99cd50e835866b2306846c8d93c4df0fde2a0f29575832f56af3a17f4fb31fc98734df918626a21d9a035
+  data.tar.gz: bf939763b17cd5db3c55cfc3f870be2de3892727849073d33785439a113561300fe81941ee4d8ffe02a2cb5712b11b172a7347f5b9209d956f8755dbc4a694ef

data/lib/isodoc/iso/html/isodoc-dis.css

@@ -76,7 +76,7 @@ p.NormRef, li.NormRef, div.NormRef {
   mso-ansi-language: EN-GB; }
 
 p.FigureTitle, li.FigureTitle, div.FigureTitle {
-  mso-style-name: figuretitle;
+  mso-style-name: "Figure Title";
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "";
@@ -1691,12 +1691,6 @@ div.Example, td.Example {
   margin: 0in;
   margin-bottom: 6.0pt; }
 
-td.Example p.MsoListParagraph {
-  font-size: {{smallerfontsize}}; }
-
-div.Example p.MsoListParagraph {
-  font-size: {{smallerfontsize}}; }
-
 p.Example, li.Example, div.Example {
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -4483,9 +4477,6 @@ span.SpellE {
   mso-style-name: "";
   mso-spl-e: yes; }
 
-div.Note p.MsoListParagraph {
-  font-size: {{smallerfontsize}}; }
-
 div.Note span.stem {
   font-size: {{smallerfontsize}}; }
 

data/lib/isodoc/iso/html/isodoc-dis.scss

@@ -71,7 +71,7 @@ p.NormRef, li.NormRef, div.NormRef
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
 p.FigureTitle, li.FigureTitle, div.FigureTitle
-	{mso-style-name:figuretitle;
+	{mso-style-name:"Figure Title";
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"";
@@ -1626,14 +1626,6 @@ div.Example, td.Example {
    margin-bottom:6.0pt;
 }
 
-td.Example p.MsoListParagraph {
-  font-size: $smallerfontsize;
-}
-
-div.Example p.MsoListParagraph {
-  font-size: $smallerfontsize;
-}
-
 p.Example, li.Example, div.Example
 	{
 	mso-style-unhide:no;
@@ -4308,10 +4300,6 @@ span.SpellE
 	mso-spl-e:yes;}
 
 
-div.Note p.MsoListParagraph {
-  font-size: $smallerfontsize;
-}
-
 div.Note span.stem {
   font-size: $smallerfontsize; }
 

data/lib/isodoc/iso/html/isodoc.css

@@ -376,6 +376,7 @@ p.SourceTitle {
   mso-ansi-language: EN-GB; }
 
 p.Tabletitle, li.Tabletitle, div.Tabletitle, p.ListTitle {
+  mso-style-name: "Table title";
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "";
@@ -510,6 +511,7 @@ span.AnnexFigureTitleChar {
 
 p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
   mso-style-unhide: no;
+  mso-style-name: "Note";
   mso-style-qformat: yes;
   mso-style-parent: "";
   margin-top: 0cm;
@@ -1277,7 +1279,7 @@ aside {
   font-size: {{footnotefontsize}}; }
 
 /*
-div.example {
+div.Example {
 	border:solid black .25pt;
 	mso-border-alt:solid black .25pt;
 	padding:10pt;
@@ -1287,7 +1289,7 @@ div.example {
 }
 */
 /*
-div.example {
+div.Example {
   margin-left:70.9pt;
   text-indent:-70.9pt;
 }
@@ -1305,12 +1307,6 @@ div.Example, td.Example {
   margin: 0in;
   margin-bottom: 6.0pt; }
 
-td.Example p.MsoListParagraph {
-  font-size: {{smallerfontsize}}; }
-
-div.Example p.MsoListParagraph {
-  font-size: {{smallerfontsize}}; }
-
 p.Example, li.Example, div.Example {
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -1334,9 +1330,6 @@ span.ExampleChar {
   mso-style-link: Example;
   mso-ansi-language: EN-GB; }
 
-div.Note p.MsoListParagraph {
-  font-size: {{smallerfontsize}}; }
-
 div.Note span.stem {
   font-size: {{smallerfontsize}}; }
 

data/lib/isodoc/iso/html/isodoc.scss

@@ -358,7 +358,8 @@ p.SourceTitle
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
 p.Tabletitle, li.Tabletitle, div.Tabletitle, p.ListTitle
-	{mso-style-unhide:no;
+	{mso-style-name:"Table title";
+        mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"";
 	margin-top:0cm;
@@ -485,6 +486,7 @@ span.AnnexFigureTitleChar
 	font-weight:bold;}
 p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
 	{mso-style-unhide:no;
+        mso-style-name:"Note";
 	mso-style-qformat:yes;
 	mso-style-parent:"";
 	margin-top:0cm;
@@ -1234,7 +1236,7 @@ aside {
 }
 
 /*
-div.example {
+div.Example {
 	border:solid black .25pt;
 	mso-border-alt:solid black .25pt;
 	padding:10pt;
@@ -1246,7 +1248,7 @@ div.example {
 
 
 /*
-div.example {
+div.Example {
   margin-left:70.9pt;
   text-indent:-70.9pt;
 }
@@ -1267,14 +1269,6 @@ div.Example, td.Example {
    margin-bottom:6.0pt;
 }
 
-td.Example p.MsoListParagraph {
-  font-size: $smallerfontsize;
-}
-
-div.Example p.MsoListParagraph {
-  font-size: $smallerfontsize;
-}
-
 p.Example, li.Example, div.Example
 	{
 	mso-style-unhide:no;
@@ -1300,10 +1294,6 @@ span.ExampleChar
 
 
 
-div.Note p.MsoListParagraph {
-  font-size: $smallerfontsize;
-}
-
 div.Note span.stem {
   font-size: $smallerfontsize; }
 

data/lib/isodoc/iso/i18n-en.yaml

@@ -1,5 +1,5 @@
 term_def_boilerplate: |
-      <p>ISO and IEC maintain terminological databases for use in
+      <p>ISO and IEC maintain terminology databases for use in
       standardization at the following addresses:</p>
 
       <ul>

data/lib/isodoc/iso/iso.amendment.xsl

@@ -3445,10 +3445,12 @@
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 		<xsl:attribute name="font-size">65%</xsl:attribute>
@@ -4086,6 +4088,14 @@
 				
 				
 				
+				<xsl:if test="*[local-name()='bookmark']"> <!-- special case: table/bookmark -->
+					<fo:block keep-with-previous="always" line-height="0.1">
+						<xsl:for-each select="*[local-name()='bookmark']">
+							<xsl:call-template name="bookmark"/>
+						</xsl:for-each>
+					</fo:block>
+				</xsl:if>
+				
 			</fo:block-container>
 		</xsl:variable>
 		
@@ -7976,7 +7986,7 @@
 						
 						
 						<!-- <xsl:if test="$namespace = 'ieee'">							
-							<xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
+							<xsl:if test="$current_template = 'standard'">8</xsl:if>
 						</xsl:if> -->
 						
 								
@@ -9305,7 +9315,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
 		<!-- to split by '_' and other chars -->
 		<xsl:call-template name="add-zero-spaces-java"/>
-	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
+	</xsl:template><xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
 		<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
 		<fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline>
 		<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -3445,10 +3445,12 @@
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 		<xsl:attribute name="font-size">65%</xsl:attribute>
@@ -4086,6 +4088,14 @@
 				
 				
 				
+				<xsl:if test="*[local-name()='bookmark']"> <!-- special case: table/bookmark -->
+					<fo:block keep-with-previous="always" line-height="0.1">
+						<xsl:for-each select="*[local-name()='bookmark']">
+							<xsl:call-template name="bookmark"/>
+						</xsl:for-each>
+					</fo:block>
+				</xsl:if>
+				
 			</fo:block-container>
 		</xsl:variable>
 		
@@ -7976,7 +7986,7 @@
 						
 						
 						<!-- <xsl:if test="$namespace = 'ieee'">							
-							<xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
+							<xsl:if test="$current_template = 'standard'">8</xsl:if>
 						</xsl:if> -->
 						
 								
@@ -9305,7 +9315,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
 		<!-- to split by '_' and other chars -->
 		<xsl:call-template name="add-zero-spaces-java"/>
-	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
+	</xsl:template><xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
 		<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
 		<fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline>
 		<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -196,6 +196,10 @@ module IsoDoc
         type
       end
 
+      def related1(node)
+        node.remove
+      end
+
       include Init
     end
   end

data/lib/isodoc/iso/word_cleanup.rb

@@ -11,11 +11,10 @@ module IsoDoc
         end
       end
 
-      # force Annex h2 down to be p.h2Annex, so it is not picked up by ToC
       def word_annex_cleanup1(docxml, lvl)
         docxml.xpath("//h#{lvl}[ancestor::*[@class = 'Section3']]").each do |h2|
           h2.name = "p"
-          h2["class"] = "h#{lvl}Annex"
+          h2["class"] = "a#{lvl}"
         end
       end
 
@@ -37,16 +36,51 @@ module IsoDoc
 
       def style_cleanup(docxml)
         word_annex_cleanup_h1(docxml)
-        style_cleanup1(docxml)
+        figure_style(docxml)
+        new_styles(docxml)
       end
 
-      def style_cleanup1(docxml)
-        docxml.xpath("//*[@class = 'example']").each do |p|
-          p["class"] = "Example"
+      def figure_style(docxml)
+        docxml.xpath("//div[@class = 'figure']").each do |f|
+          f["style"] ||= ""
+          f["style"] += "text-align:center;"
         end
+      end
+
+      def quote_style(docxml)
+        docxml.xpath("//div[@class = 'Quote' or @class = 'Note' or "\
+                     "@class = 'Example' or @class = 'Admonition']").each do |d|
+                       quote_style1(d)
+                     end
+      end
+
+      def quote_style1(div)
+        div.xpath(".//li").each do |p|
+          p["style"] ||= ""
+          p["style"] += "font-size:#{default_fonts({})[:smallerfontsize]};"
+        end
+      end
+
+      STYLESMAP = {
+        example: "Example",
+        note: "Note",
+        Sourcecode: "Code",
+        tabletitle: "Tabletitle",
+        Biblio: "MsoNormal",
+        figure: "MsoNormal",
+        SourceTitle: "FigureTitle",
+      }.freeze
+
+      def new_styles(docxml)
+        STYLESMAP.each do |k, v|
+          docxml.xpath("//*[@class = '#{k}']").each { |s| s["class"] = v }
+        end
+        docxml.xpath("//div[@class = 'Section3']//p[@class = 'Tabletitle']")
+          .each { |t| t["class"] = "AnnexTableTitle" }
         docxml.xpath("//*[@class = 'zzHelp']/p[not(@class)]").each do |p|
           p["class"] = "zzHelp"
         end
+        quote_style(docxml)
       end
 
       def authority_hdr_cleanup(docxml)

data/lib/isodoc/iso/word_dis_cleanup.rb

@@ -1,11 +1,6 @@
 module IsoDoc
   module Iso
     class WordDISConvert < WordConvert
-      def style_cleanup(docxml)
-        super
-        dis_styles(docxml)
-      end
-
       STYLESMAP = {
         AltTerms: "AdmittedTerm",
         TableFootnote: "Tablefootnote",
@@ -30,7 +25,7 @@ module IsoDoc
         zzCopyright1: "zzCopyright",
       }.freeze
 
-      def dis_styles(docxml)
+      def new_styles(docxml)
         STYLESMAP.each do |k, v|
           docxml.xpath("//*[@class = '#{k}']").each { |s| s["class"] = v }
         end
@@ -46,8 +41,8 @@ module IsoDoc
         figure_style(docxml)
         note_style(docxml)
         example_style(docxml)
-        quote_style(docxml)
         dis_style_interactions(docxml)
+        quote_style(docxml)
       end
 
       def dis_style_interactions(docxml)
@@ -68,13 +63,6 @@ module IsoDoc
         end
       end
 
-      def quote_style(docxml)
-        docxml.xpath("//div[@class = 'Quote' or @class = 'Note' or "\
-                     "@class = 'Example' or @class = 'Admonition']").each do |d|
-                       quote_style1(d)
-                     end
-      end
-
       def para_style_change(div, class1, class2)
         s = class1 ? "@class = '#{class1}'" : "not(@class)"
         div.xpath(".//p[#{s}]").each do |p|

data/lib/metanorma/iso/isodoc.rng

@@ -2504,6 +2504,16 @@
           <text/>
         </element>
       </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
       <optional>
         <element name="language">
           <text/>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.1.4".freeze
+    VERSION = "2.1.5".freeze
   end
 end

data/spec/isodoc/postproc_spec.rb

@@ -126,66 +126,6 @@ RSpec.describe IsoDoc do
     expect(File.exist?("spec/assets/iso.pdf")).to be true
   end
 
-  it "converts annex subheadings to h2Annex class for Word" do
-    IsoDoc::Iso::WordConvert
-      .new(WORD_HTML_CSS.dup)
-      .convert("test", <<~"INPUT", false)
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <annex id="P" inline-header="false" obligation="normative">
-            <title>Annex</title>
-            <clause id="Q" inline-header="false" obligation="normative">
-              <title>A.1
-                <tab/>
-                Annex A.1</title>
-            </clause>
-            <appendix id="Q2" inline-header="false" obligation="normative">
-              <title>Appendix 1
-                <tab/>
-                An Appendix</title>
-            </appendix>
-          </annex>
-          <bibliography>
-            <references id="R" normative="false"><title>Bibliography</title></references>
-          </bibliography>
-        </iso-standard>
-      INPUT
-
-    word = File.read("test.doc", encoding: "UTF-8")
-      .sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">')
-      .sub(%r{<br[^>]*>\s*<div class="colophon".*$}m, "")
-
-    expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <div class="WordSection3">
-        <p class="zzSTDTitle1"/>
-        <p class="MsoNormal">
-          <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
-        </p>
-        <div class="Section3">
-          <a id="P" name="P"/>
-          <p class="ANNEX">Annex</p>
-          <div>
-            <a id="Q" name="Q"/>
-            <p class="h2Annex">A.1
-              <span style="mso-tab-count:1">  </span>
-              Annex A.1</p>
-          </div>
-          <div>
-            <a id="Q2" name="Q2"/>
-            <p class="h2Annex">Appendix 1
-              <span style="mso-tab-count:1">  </span>
-              An Appendix</p>
-          </div>
-        </div>
-        <p class='MsoNormal'>
-          <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
-        </p>
-        <div>
-          <p class='BiblioTitle'>Bibliography</p>
-        </div>
-      </div>
-    OUTPUT
-  end
-
   it "populates Word template with terms reference labels" do
     IsoDoc::Iso::WordConvert
       .new(WORD_HTML_CSS.dup)
@@ -817,7 +757,7 @@ RSpec.describe IsoDoc do
         </p>
         <div class="Section3">
           <a id="P" name="P"/>
-          <div class="figure">
+          <div class="MsoNormal" style='text-align:center;'>
             <a id="samplecode" name="samplecode"/>
             <p class="MsoNormal">Hello</p>
             <p class="MsoNormal">Key</p>
@@ -864,7 +804,7 @@ RSpec.describe IsoDoc do
       .sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">')
       .sub(%r{<br[^>]*>\s*<div class="colophon".*$}m, "")
     expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-           <div class='WordSection3'>
+      <div class='WordSection3'>
          <p class='zzSTDTitle1'/>
          <p class='MsoNormal'>
            <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>

data/spec/isodoc/terms_spec.rb

@@ -249,4 +249,66 @@ RSpec.describe IsoDoc do
       .sub(%r{</div>\s*<br.*$}m, "")))
       .to be_equivalent_to xmlpp(word)
   end
+
+  it "processes related terms" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <sections>
+      <terms id='A' obligation='normative'>
+            <title>Terms and definitions</title>
+            <term id='second'>
+        <preferred>
+          <expression>
+            <name>Second Term</name>
+          </expression>
+        <field-of-application>Field</field-of-application>
+        <usage-info>Usage Info 1</usage-info>
+        </preferred>
+        <definition><verbal-definition>Definition 1</verbal-definition></definition>
+      </term>
+      <term id="C">
+      <preferred language='fr' script='Latn' type='prefix'>
+                <expression>
+                  <name>First Designation</name>
+                  </expression></preferred>
+        <related type='contrast'>
+          <preferred>
+            <expression>
+              <name>Fifth Designation</name>
+              <grammar>
+                <gender>neuter</gender>
+              </grammar>
+            </expression>
+          </preferred>
+          <xref target='second'/>
+        </related>
+        <definition><verbal-definition>Definition 2</verbal-definition></definition>
+      </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+       <?xml version='1.0'?>
+          <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <sections>
+          <terms id='A' obligation='normative' displayorder='1'>
+            <title depth='1'>1<tab/>Terms and definitions</title>
+            <term id='second'>
+              <name>1.1</name>
+              <preferred><strong>Second Term</strong>, &#x3c;Field, Usage Info 1&#x3e;</preferred>
+              <definition>Definition 1</definition>
+            </term>
+            <term id='C'>
+              <name>1.2</name>
+              <preferred language='fr' script='Latn' type='prefix'><strong>First Designation</strong></preferred>
+              <definition>Definition 2</definition>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+  end
 end