version bump

metanorma · Nov 20, 2023 · 973a111 · 973a111
1 parent 8525b29
commit 973a111
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 39 deletions.
diff --git a/lib/metanorma/cc/basicdoc.rng b/lib/metanorma/cc/basicdoc.rng
@@ -914,44 +914,47 @@
   -->
   <define name="image">
     <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
+      <ref name="Image"/>
+    </element>
+  </define>
+  <define name="Image">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <attribute name="src">
+      <data type="anyURI"/>
+    </attribute>
+    <attribute name="mimetype"/>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
       </attribute>
-      <attribute name="src">
+    </optional>
+    <optional>
+      <attribute name="height">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <attribute name="longdesc">
         <data type="anyURI"/>
       </attribute>
-      <attribute name="mimetype"/>
-      <optional>
-        <attribute name="filename"/>
-      </optional>
-      <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
-        <attribute name="longdesc">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-    </element>
+    </optional>
   </define>
   <define name="video">
     <element name="video">

diff --git a/lib/metanorma/cc/biblio.rng b/lib/metanorma/cc/biblio.rng
@@ -348,6 +348,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
+      <optional>
+        <ref name="logo"/>
+      </optional>
     </element>
   </define>
   <define name="orgname">
@@ -366,6 +369,11 @@
       </choice>
     </element>
   </define>
+  <define name="logo">
+    <element name="logo">
+      <ref name="image"/>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -942,6 +950,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>

diff --git a/lib/metanorma/cc/converter.rb b/lib/metanorma/cc/converter.rb
@@ -60,7 +60,9 @@ def doc_converter(node)
       end
 
       def presentation_xml_converter(node)
-        IsoDoc::CC::PresentationXMLConvert.new(doc_extract_attributes(node))
+        IsoDoc::CC::PresentationXMLConvert
+          .new(doc_extract_attributes(node)
+          .merge(output_formats: ::Metanorma::CC::Processor.new.output_formats))
       end
     end
   end

diff --git a/lib/metanorma/cc/isodoc.rng b/lib/metanorma/cc/isodoc.rng
@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.5 -->
+<!-- VERSION v1.2.8 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -1013,6 +1013,14 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="BasicBlock" combine="choice">
+    <ref name="columnbreak"/>
+  </define>
+  <define name="columnbreak">
+    <element name="columnbreak">
+      <empty/>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -1046,6 +1054,17 @@
       <ref name="date_inline"/>
     </choice>
   </define>
+  <define name="PureTextElement" combine="choice">
+    <ref name="passthrough_inline"/>
+  </define>
+  <define name="passthrough_inline">
+    <element name="passthrough">
+      <optional>
+        <attribute name="formats"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
   <define name="add">
     <element name="add">
       <choice>
@@ -1084,6 +1103,9 @@
       <optional>
         <attribute name="style"/>
       </optional>
+      <optional>
+        <attribute name="custom-charset"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1386,6 +1408,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1609,6 +1634,9 @@
     <optional>
       <attribute name="number"/>
     </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1660,6 +1688,9 @@
     <optional>
       <attribute name="number"/>
     </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1757,6 +1788,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>

diff --git a/lib/metanorma/cc/processor.rb b/lib/metanorma/cc/processor.rb
@@ -33,6 +33,7 @@ def version
       end
 
       def output(isodoc_node, inname, outname, format, options={})
+        options_preprocess(options)
         case format
         when :html
           IsoDoc::CC::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)

diff --git a/lib/metanorma/cc/version.rb b/lib/metanorma/cc/version.rb
@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "2.3.2".freeze
+    VERSION = "2.3.3".freeze
   end
 end
diff --git a/metanorma-cc.gemspec b/metanorma-cc.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.5.2"
+  spec.add_dependency "metanorma-generic", "~> 2.5.3"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

diff --git a/spec/isodoc/base_spec.rb b/spec/isodoc/base_spec.rb
@@ -79,6 +79,7 @@
         :circulateddate=>"XXX",
         :confirmeddate=>"XXX",
         :copieddate=>"XXX",
+        :correcteddate=>"XXX",
         :createddate=>"XXX",
         :docnumber=>"CC/WD 1000:2001",
         :docnumeric=>"1000",