metanorma-iec 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 763286864b1673ad7efbe9530c3e76365f16613c84c859c57cbb3ac5467e733e
-  data.tar.gz: 8070859546537d9e321c7cb9d70bed07b5ed9a815bc8e4ba4079e36c7b53b615
+  metadata.gz: 92b20defce24dab5f7107aad66e8e034a9be80529279c6dbe842300e39974af3
+  data.tar.gz: 206961dc8da8348e27b4e9a7c86efb0999f6ff6cdcac80e51881224db3a3ea63
 SHA512:
-  metadata.gz: cc1681c77b64959b79c00520ca145155d6344d76e7dab18e4810d33f6982cc27efdf913853956f2028a3031a8019bbf49382cdc037682a0132fb2e869be6a7d9
-  data.tar.gz: 149447762adb6eee1b36ada1db22e244702d5b176fb0a8ab58353b27dffeaba278050d02098de97098553fecfb56db5c3c57a5a8894ca0203098d21538d6417d
+  metadata.gz: 7b67680e01cf794537cc9d9d37c5765b061cef56ed49b22d2b9ba7e45220300de160396a382f5551ac5437f821c85f77ac629ee76df4a4d85a5a6fd571aea8a3
+  data.tar.gz: 14cf2ca4493fb7575358ba738c185011bb7b444d6cbd37d3bb94a7a8f25ed6d31a5a202c6b78ae11f69d4bb5de3a0fe151afc50e2a2f7a301ff6c3c32f754c21

data/lib/asciidoctor/iec/converter.rb

@@ -4,9 +4,21 @@ require "metanorma-iso"
 module Asciidoctor
   module Iec
     class Converter < ISO::Converter
+      XML_ROOT_TAG = "iec-standard".freeze
+      XML_NAMESPACE = "https://www.metanorma.org/ns/iec".freeze
 
       register_for "iec"
 
+      def makexml(node)
+        @draft = node.attributes.has_key?("draft")
+        #super
+        result = makexml1(node)
+        ret1 = cleanup(Nokogiri::XML(result))
+        ret1.root.add_namespace(nil, self.class::XML_NAMESPACE)
+        validate(ret1) unless @novalid
+        ret1
+      end
+
       def metadata_author(node, xml)
         publishers = node.attr("publisher") || "IEC"
         publishers.split(/,[ ]?/).each do |p|
@@ -47,13 +59,6 @@ module Asciidoctor
         xml.docidentifier dn, **attr_code(type: "iso")
       end
 
-=begin
-      def make_preface(x, s)
-        s.previous = boilerplate(x)
-        super
-      end
-=end
-
       def boilerplate_file(x_orig)
         lang = case x_orig&.at("//bibdata/language")&.text
                when "fr" then "fr"
@@ -176,14 +181,6 @@ module Asciidoctor
         super.merge(y)
       end
 
-      def makexml1(node)
-        result = ["<?xml version='1.0' encoding='UTF-8'?>\n<iec-standard>"]
-        result << noko { |ixml| front node, ixml }
-        result << noko { |ixml| middle node, ixml }
-        result << "</iec-standard>"
-        textcleanup(result)
-      end
-
       def html_converter(node)
         node.nil? ? IsoDoc::Iec::HtmlConvert.new({}) :
           IsoDoc::Iec::HtmlConvert.new(html_extract_attributes(node))

data/lib/asciidoctor/iec/iec.rng

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="http://riboseinc.com/isoxml" xmlns="http://relaxng.org/ns/structure/1.0">
+<grammar  ns="https://www.metanorma.com/ns/iec" xmlns="http://relaxng.org/ns/structure/1.0">
+  <!-- default namespace = "https://www.metanorma.com/ns/iec" -->
   <include href="isostandard.rng">
     <start>
       <ref name="iec-standard"/>

data/lib/asciidoctor/iec/isostandard.rng

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
   <include href="isodoc.rng">
     <start>
       <ref name="iso-standard"/>

data/lib/isodoc/iec/html/header.html

@@ -97,7 +97,6 @@ lang=EN-GB> –<span style='mso-tab-count:1'>
 </div>
 
 <div style='mso-element:header' id=eh2>
-
 <p class=MsoHeader><span lang=EN-GB><span style='mso-tab-count:1'>                                                                        </span>–
 </span><!--[if supportFields]><span class=MsoPageNumber><span lang=EN-GB><span
 style='mso-element:field-begin'></span><span
@@ -106,11 +105,20 @@ class=MsoPageNumber><span lang=EN-GB><span style='mso-no-proof:yes'>2</span></sp
 class=MsoPageNumber><span lang=EN-GB><span style='mso-element:field-end'></span></span></span><![endif]--><span
 lang=EN-GB> –<span style='mso-tab-count:1'>     </span> {{ docnumber }} </span> © <span
 lang=EN-GB> {{ agency }}:{{docyear}}</span></p>
+</div>
 
+<div style='mso-element:header' id=eh2l>
+<p class=MsoHeaderLandscape><span lang=EN-GB><span style='mso-tab-count:1'>                                                                        </span>–
+</span><!--[if supportFields]><span class=MsoPageNumber><span lang=EN-GB><span
+style='mso-element:field-begin'></span><span
+style='mso-spacerun:yes'> </span>PAGE <span style='mso-element:field-separator'></span></span></span><![endif]--><span
+class=MsoPageNumber><span lang=EN-GB><span style='mso-no-proof:yes'>2</span></span></span><!--[if supportFields]><span
+class=MsoPageNumber><span lang=EN-GB><span style='mso-element:field-end'></span></span></span><![endif]--><span
+lang=EN-GB> –<span style='mso-tab-count:1'>     </span> {{ docnumber }} </span> © <span
+lang=EN-GB> {{ agency }}:{{docyear}}</span></p>
 </div>
 
 <div style='mso-element:header' id=h2>
-
 <p class=MsoHeader><span lang=EN-GB>{{ docnumber }}
 </span> © <span
 lang=EN-GB> {{ agency }}:{{docyear}}<span style='mso-tab-count:
@@ -120,31 +128,50 @@ style='mso-spacerun:yes'> </span>PAGE <span style='mso-element:field-separator'
 class=MsoPageNumber><span lang=EN-GB><span style='mso-no-proof:yes'>1</span></span></span><!--[if supportFields]><span
 class=MsoPageNumber><span lang=EN-GB><span style='mso-element:field-end'></span></span></span><![endif]--><span
 lang=EN-GB> –<span style='mso-tab-count:1'>                                                                        </span></span></p>
+</div>
 
+<div style='mso-element:header' id=h2l>
+<p class=MsoHeaderLandscape><span lang=EN-GB>{{ docnumber }}
+</span> © <span
+lang=EN-GB> {{ agency }}:{{docyear}}<span style='mso-tab-count:
+1'>      </span>– </span><!--[if supportFields]><span class=MsoPageNumber><span
+lang=EN-GB><span style='mso-element:field-begin'></span><span
+style='mso-spacerun:yes'> </span>PAGE <span style='mso-element:field-separator'></span></span></span><![endif]--><span
+class=MsoPageNumber><span lang=EN-GB><span style='mso-no-proof:yes'>1</span></span></span><!--[if supportFields]><span
+class=MsoPageNumber><span lang=EN-GB><span style='mso-element:field-end'></span></span></span><![endif]--><span
+lang=EN-GB> –<span style='mso-tab-count:1'>                                                                        </span></span></p>
 </div>
 
 <div style='mso-element:footer' id=ef2>
-
 <p class=MsoFooter><span lang=EN-GB><o:p>&nbsp;</o:p></span></p>
+</div>
 
+<div style='mso-element:footer' id=ef2l>
+<p class=MsoFooterLandscape><span lang=EN-GB><o:p>&nbsp;</o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f2>
-
 <p class=MsoFooter><span lang=EN-GB><o:p>&nbsp;</o:p></span></p>
+</div>
 
+<div style='mso-element:footer' id=f2l>
+<p class=MsoFooterLandscape><span lang=EN-GB><o:p>&nbsp;</o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=ef3>
-
 <p class=MsoFooter><span lang=EN-GB><o:p>&nbsp;</o:p></span></p>
+</div>
 
+<div style='mso-element:footer' id=ef3l>
+<p class=MsoFooterLandscape><span lang=EN-GB><o:p>&nbsp;</o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f3>
-
 <p class=MsoFooter><span lang=EN-GB><o:p>&nbsp;</o:p></span></p>
+</div>
 
+<div style='mso-element:footer' id=f3l>
+<p class=MsoFooterLandscape><span lang=EN-GB><o:p>&nbsp;</o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f4>

data/lib/isodoc/iec/html/wordstyle.scss

@@ -643,6 +643,20 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
 	letter-spacing:.4pt;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:ZH-CN;}
+p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
+        {mso-style-unhide:no;
+        margin:0cm;
+        margin-bottom:.0001pt;
+        text-align:justify;
+        mso-pagination:widow-orphan;
+        tab-stops:center 331.0pt right 662.0pt;
+        layout-grid-mode:char;
+        font-size:10.0pt;
+        font-family:"Arial",sans-serif;
+        mso-fareast-font-family:"Times New Roman";
+        letter-spacing:.4pt;
+        mso-ansi-language:EN-GB;
+        mso-fareast-language:ZH-CN;}
 p.MsoFooter, li.MsoFooter, div.MsoFooter
 	{mso-style-noshow:yes;
 	mso-style-priority:29;
@@ -660,6 +674,23 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
 	letter-spacing:.4pt;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:ZH-CN;}
+p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
+        {mso-style-noshow:yes;
+        mso-style-priority:29;
+        mso-style-unhide:no;
+        mso-style-parent:Header;
+        margin:0cm;
+        margin-bottom:.0001pt;
+        text-align:justify;
+        mso-pagination:widow-orphan;
+        tab-stops:center 331.0pt right 662.0pt;
+        layout-grid-mode:char;
+        font-size:10.0pt;
+        font-family:"Arial",sans-serif;
+        mso-fareast-font-family:"Times New Roman";
+        letter-spacing:.4pt;
+        mso-ansi-language:EN-GB;
+        mso-fareast-language:ZH-CN;}
 span.MsoFootnoteReference
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
@@ -1305,12 +1336,12 @@ div.WordSection1
         margin:3.0cm 2.5cm 1.5cm 2.5cm;
         mso-header-margin:35.45pt;
         mso-footer-margin:14.2pt;
-        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
-        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
-        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
-        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
-        mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2;
-        mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff2;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2l;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2l;
+        mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2l;
+        mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff2l;
         mso-paper-source:0;}
 @page WordSection2P
        {size:595.3pt 841.9pt;

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end
 

data/spec/asciidoctor-iec/base_spec.rb

@@ -89,7 +89,7 @@ RSpec.describe Asciidoctor::Iec do
       :library-ics: 1,2,3
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
-       <iec-standard xmlns="http://riboseinc.com/isoxml">
+       <iec-standard xmlns="https://www.metanorma.org/ns/iec">
        <bibdata type="standard">
    <title language="en" format="text/plain" type="main">Introduction — Main Title — Title — Title Part</title>
    <title language="en" format="text/plain" type="title-intro">Introduction</title>
@@ -186,7 +186,7 @@ RSpec.describe Asciidoctor::Iec do
       :docstage: A2CD
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
-       <iec-standard xmlns="http://riboseinc.com/isoxml">
+       <iec-standard xmlns="https://www.metanorma.org/ns/iec">
        <bibdata type="standard">
          <docidentifier type="iso">ISO/IEC/IETF/2CD 1000-1-1</docidentifier>
          <docidentifier type="iso-tc">2000</docidentifier>
@@ -333,7 +333,7 @@ RSpec.describe Asciidoctor::Iec do
       :docnumber: 1000
       :docstage: 50
     INPUT
-    <iec-standard xmlns="http://riboseinc.com/isoxml">
+    <iec-standard xmlns="https://www.metanorma.org/ns/iec">
 <bibdata type="standard">
   <docidentifier type="iso">IEC/FDIS 1000</docidentifier>
   <docnumber>1000</docnumber>
@@ -396,7 +396,7 @@ OUTPUT
       :docnumber: 1000
       :docstage: 60
     INPUT
-<iec-standard xmlns="http://riboseinc.com/isoxml">
+<iec-standard xmlns="https://www.metanorma.org/ns/iec">
 <bibdata type="standard">
   <docidentifier type="iso">IEC 1000</docidentifier>
   <docnumber>1000</docnumber>
@@ -460,7 +460,7 @@ OUTPUT
       :docstage: 60
       :docsubstage: 00
     INPUT
-<iec-standard xmlns="http://riboseinc.com/isoxml">
+<iec-standard xmlns="https://www.metanorma.org/ns/iec">
 <bibdata type="standard">
   <docidentifier type="iso">IEC 1000</docidentifier>
   <docnumber>1000</docnumber>

data/spec/spec_helper.rb

@@ -140,7 +140,7 @@ UNPUBLISHED_BOILERPLATE = BOILERPLATE.sub(/<\/boilerplate>/, "#{BOILERPLATE_LICE
 
 BLANK_HDR = <<~"HDR"
 <?xml version="1.0" encoding="UTF-8"?>
-<iec-standard xmlns="http://riboseinc.com/isoxml">
+<iec-standard xmlns="https://www.metanorma.org/ns/iec">
 <bibdata type="standard">
   <contributor>
     <role type="author"/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing