metanorma-itu 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa11ca775d53301386b4213e8d168d31ffa66fdfc1e66ef1fa880bd45fc7d2d3
-  data.tar.gz: cffd94e8a380da22a7828480135ac09825ea90ba4f973cf518223dded868bae1
+  metadata.gz: 1716cf558f18bf55eec7bd90d86283304f0ff55fc7d8f384f0f85ce7808fdcc6
+  data.tar.gz: 3bb69ae66bfd7e2a1f8a791a7b1536f204830a40c16ae6ca972c5e7e86510190
 SHA512:
-  metadata.gz: c7ab3479fc531fb4860b2a58afb0e6cd968480a23297a8c783f848fbde8193605ef8aa2ac7d021791bae9128ad2509eb4caa9d1b410b54b4ed164077ff7e37be
-  data.tar.gz: 99d00b7dacc6e26078aac82809c3ac189f56ad4147c08af0f089e58d6e8306d532af346f6ba0c581b98d4cf78a1e3600e7345ffc3a68ab0705adb1c589b1ae1f
+  metadata.gz: 6e76f70372f778f9d487af3b6e2f7af48bee0fe0275b7facd4562d5106588f8e0141ea5a2af3113312674c946db7c39ac5b6a5a15065ffce3a493b6ec54947da
+  data.tar.gz: c3b7170b688848cd7dec19f96a504a5ae55a86645bae0bb11b48ea8ca9a84541c6d6033a526e8ae82cc80cba6a1e07f2b9d58b36fe244597ab3e4d6da1e30556

data/lib/asciidoctor/itu/cleanup.rb

@@ -43,8 +43,8 @@ module Asciidoctor
           x.at("./*/annex[last()] | ./*/sections").next =
           "<bibliography><sentinel/></bibliography>"
         ins = x.at("//bibliography").elements.first
-        unless x.at("//bibliography/references/title[text() = 'References']")
-          ins.previous = "<references><title>References</title><p>"\
+        unless x.at("//bibliography/references[@normative = 'true']")
+          ins.previous = "<references normative='true'><title>References</title><p>"\
             "#{@labels['clause_empty']}</p></references>"
         end
         x&.at("//sentinel")&.remove
@@ -160,6 +160,13 @@ module Asciidoctor
           biblio_reorder1(r)
         end
       end
+
+      def normref_cleanup(xmldoc)
+        super
+        r = xmldoc.at(NORM_REF) || return
+        title = r.at("./title") and
+          title.content = "References"
+      end
     end
   end
 end

data/lib/asciidoctor/itu/converter.rb

@@ -90,15 +90,6 @@ module Asciidoctor
         end
       end
 
-      def norm_ref_parse(attrs, xml, node)
-        @norm_ref = true
-        xml.references **attr_code(attrs) do |xml_section|
-          xml_section.title { |t| t << "References" }
-          xml_section << node.content
-        end
-        @norm_ref = false
-      end
-
       def term_def_title(toplevel, node)
         return node.title unless toplevel
         "Definitions"
@@ -131,8 +122,6 @@ module Asciidoctor
           div.next = "<p>#{@term_def_boilerplate}</p>"
       end
 
-      NORM_REF = "//bibliography/references[title = 'References']".freeze
-
       def load_yaml(lang, script)
         y = if @i18nyaml then YAML.load_file(@i18nyaml)
             elsif lang == "en"

data/lib/asciidoctor/itu/isodoc.rng

@@ -129,6 +129,9 @@
             </choice>
           </attribute>
         </optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
         <optional>
           <ref name="section-title"/>
         </optional>
@@ -303,11 +306,11 @@
         <ref name="paragraph"/>
       </element>
     </define>
-    <define name="TextElement" combine="choice">
-      <ref name="concept"/>
-    </define>
   </include>
   <!-- end overrides -->
+  <define name="TextElement" combine="choice">
+    <ref name="concept"/>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/isodoc/itu/html_convert.rb

@@ -17,9 +17,9 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Open Sans",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Open Sans",sans-serif'),
-          monospacefont: '"Space Mono",monospace'
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Times New Roman",serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Times New Roman",serif'),
+          monospacefont: '"Courier New",monospace'
         }
       end