metanorma-ogc 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a75c31de8888444e5fd9973771e9a9c24ac1541eae103f8a55f02605d4837f91
-  data.tar.gz: abf157ea956927268720b5582cfa0fb6d8986b45c1041bafc783dcf28d9c6b84
+  metadata.gz: a7eaaf9d1a9326779ac34d82205a3ad742b138811c423fea47f1223249f0f72a
+  data.tar.gz: 40d1cc897c5ad040c88cf54e86b1baa386694b0d91a166eb9837d529254f7da9
 SHA512:
-  metadata.gz: 539fc9469c898441e23cf956da90c9f5c443ed6db504b3250e2ee9b5341addf00b2ba884aaacecd621852b4b66ddfd02598f4b7ce40f7111a85c77d0da054c9a
-  data.tar.gz: 3bb45e8622ff63c69fd3f1024b8d4c75411750bd7f25eac53d777c21caaea10852d9776861d6387dbe76442b093b503d503ff9c76e90c7c8d36cfb46a3425254
+  metadata.gz: aa95f8fd413e7b9c2bdbb5520c084411ab851c5dce773b9a381596f13aad2db8d8cb1c12e0b9d9185f18d1b33c1967c18923d550d81d2548a758d899810617a6
+  data.tar.gz: efea6443d650bc71dd58cf49b416ae3efb727a985334485b8365aac864a689ae26104e66c7988580ef72118669020581048e81078862aab689bf2752145f9bf7

data/lib/asciidoctor/ogc/converter.rb

@@ -46,6 +46,7 @@ module Asciidoctor
         when "preface" then "foreword"
         when "foreword" then "donotrecognise-foreword"
         when "introduction" then "donotrecognise-foreword"
+        when "references" then "normative references"
         else
           super
         end
@@ -99,14 +100,6 @@ module Asciidoctor
         end
       end
 
-      def bibliography_parse(attrs, xml, node)
-        clausetype = node&.attr("heading")&.downcase || node.title.downcase
-        if clausetype == "references" then norm_ref_parse(attrs, xml, node) 
-        else
-          super
-        end
-      end
-
       def submitters_parse(attrs, xml, node)
         xml.submitters **attr_code(attrs) do |xml_section|
           xml_section << node.content

data/lib/asciidoctor/ogc/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/ogc/html_convert.rb

@@ -17,9 +17,9 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",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