metanorma-iso 2.7.0 → 2.7.1

data/lib/metanorma/iso/base.rb

@@ -79,6 +79,18 @@ module Metanorma
         name
       end
 
+      def document_scheme(node)
+        node.attr("document-scheme") || "2024"
+      end
+
+      def metadata_attrs(node)
+        ret = super
+        a = document_scheme(node) and
+          ret += "<presentation-metadata><name>document-scheme</name>" \
+            "<value>#{a}</value></presentation-metadata>"
+        ret
+      end
+
       def outputs(node, ret)
         File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
         presentation_xml_converter(node).convert("#{@filename}.xml")

data/lib/metanorma/iso/basicdoc.rng

@@ -244,6 +244,9 @@
         <data type="ID"/>
       </attribute>
       <attribute name="reviewer"/>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="date">
           <data type="dateTime"/>

data/lib/metanorma/iso/front.rb

@@ -25,9 +25,12 @@ module Metanorma
 
       def metadata_stage(node, xml)
         id = iso_id_default(iso_id_params(node))
-        id.stage and
-          xml.stagename metadata_stagename(id)&.strip,
-                        **attr_code(abbreviation: id.typed_stage_abbrev&.strip)
+        id.stage or return
+        if abbr = id.typed_stage_abbrev
+          abbr = abbr.to_s.upcase.strip
+        end
+        xml.stagename metadata_stagename(id)&.strip,
+                      **attr_code(abbreviation: abbr)
       rescue *STAGE_ERROR
       end
 
@@ -52,7 +55,7 @@ module Metanorma
       def metadata_status(node, xml)
         stage = get_stage(node)
         substage = get_substage(node)
-        abbrev = iso_id_default(iso_id_params(node)).stage&.abbr
+        abbrev = iso_id_default(iso_id_params(node)).stage&.abbr&.upcase
         xml.status do |s|
           s.stage stage, **attr_code(abbreviation: abbrev)
           s.substage substage

data/lib/metanorma/iso/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.12 -->
+<!-- VERSION v1.3.0 -->
 <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">
@@ -146,6 +146,9 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="style"/>
+        </optional>
         <oneOrMore>
           <ref name="PureTextElement"/>
         </oneOrMore>

data/lib/metanorma/iso/processor.rb

@@ -33,6 +33,7 @@ module Metanorma
           "Source Han Sans" => nil,
           "Source Han Sans Normal" => nil,
           "Courier New" => nil,
+          "Inter" => nil,
         }
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.7.0".freeze
+    VERSION = "2.7.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc