isodoc 0.8.4 → 0.8.5

data/spec/isodoc/terms_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe IsoDoc do
 </termexample>
 
 <termsource status="modified">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301: 2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
     <modification>
     <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
   </modification>
@@ -46,7 +46,7 @@ RSpec.describe IsoDoc do
   <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
 </termnote>
 <termsource status="identical">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301: 2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
 </termsource></term>
 </terms>
 </sections>
@@ -81,7 +81,7 @@ RSpec.describe IsoDoc do
        </td></tr></table>
 
        <p>[TERMREF]
-         <a href="#ISO7301">ISO 7301: 2011, 3.1</a>
+         <a href="#ISO7301">ISO 7301:2011, 3.1</a>
            [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
        [/TERMREF]</p><p class="TermNum" id="paddy">1.2</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
        <p class="AltTerms" style="text-align:left;">rough rice</p>
@@ -95,7 +95,7 @@ RSpec.describe IsoDoc do
        <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
        <div class="Note"><p>Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
        <p>[TERMREF]
-         <a href="#ISO7301">ISO 7301: 2011, 3.1</a>
+         <a href="#ISO7301">ISO 7301:2011, 3.1</a>
        [/TERMREF]</p></div>
              </div>
            </body>
@@ -126,7 +126,7 @@ OUTPUT
 </termexample>
 
 <termsource status="modified">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301: 2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
     <modification>
     <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
   </modification>
@@ -149,7 +149,7 @@ OUTPUT
   <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
 </termnote>
 <termsource status="identical">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301: 2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
 </termsource></term>
 </terms>
 </sections>
@@ -184,7 +184,7 @@ OUTPUT
        </td></tr></table>
 
        <p>[TERMREF]
-         <a href="#ISO7301">ISO 7301: 2011, 3.1</a>
+         <a href="#ISO7301">ISO 7301:2011, 3.1</a>
            [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
        [/TERMREF]</p><p class="TermNum" id="paddy">1.2</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
        <p class="AltTerms" style="text-align:left;">rough rice</p>
@@ -198,7 +198,7 @@ OUTPUT
        <div class="Note"><p class="Note">Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
        <div class="Note"><p class="Note">Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
        <p>[TERMREF]
-         <a href="#ISO7301">ISO 7301: 2011, 3.1</a>
+         <a href="#ISO7301">ISO 7301:2011, 3.1</a>
        [/TERMREF]</p></div>
            </div>
          </body>

data/spec/isodoc/xref_spec.rb

@@ -848,6 +848,7 @@ RSpec.describe IsoDoc do
          <title>Foreword</title>
          <p id="A">This is a preamble
          <xref target="C"/>
+         <xref target="C1"/>
          <xref target="D"/>
          <xref target="H"/>
          <xref target="I"/>
@@ -860,16 +861,13 @@ RSpec.describe IsoDoc do
          <xref target="P"/>
          <xref target="Q"/>
          <xref target="Q1"/>
-         <xref target="Q2"/>
          <xref target="R"/>
          </p>
        </foreword>
         <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
        </clause>
-       <patent-notice>
-       <p>This is patent boilerplate</p>
-       </patent-notice>
+       <clause id="C1" inline-header="false" obligation="informative">Text</clause>
        </introduction></preface><sections>
        <clause id="D" obligation="normative">
          <title>Scope</title>
@@ -910,9 +908,6 @@ RSpec.describe IsoDoc do
          <title>Annex A.1a</title>
          </clause>
        </clause>
-              <appendix id="Q2" inline-header="false" obligation="normative">
-         <title>An Appendix</title>
-       </appendix>
        </annex><bibliography><references id="R" obligation="informative">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
@@ -929,7 +924,8 @@ RSpec.describe IsoDoc do
     <div>
     <h1 class="ForewordTitle">Foreword</h1>
     <p id="A">This is a preamble
-    <a href="#C">0.1</a>
+    <a href="#C">Introduction Subsection</a>
+    <a href="#C1">Introduction, 2</a>
     <a href="#D">Clause 1</a>
     <a href="#H">Clause 3</a>
     <a href="#I">3.1</a>
@@ -942,18 +938,17 @@ RSpec.describe IsoDoc do
     <a href="#P">Annex A</a>
     <a href="#Q">A.1</a>
     <a href="#Q1">A.1.1</a>
-    <a href="#Q2">Annex A, Appendix 1</a>
     <a href="#R">Clause 2</a>
     </p>
     </div>
     <br/>
-    <div class="Section3" id="B">
-    <h1 class="IntroTitle">0.&#160; Introduction</h1>
-      <div id="C">
-    <h2>0.1. Introduction Subsection</h2>
-    </div>
-    <p>This is patent boilerplate</p>
-    </div>
+                 <div class="Section3" id="B">
+               <h1 class="IntroTitle">Introduction</h1>
+               <div id="C">
+          <h2>Introduction Subsection</h2>
+        </div>
+               <div id="C1">Text</div>
+             </div>
     <p class="zzSTDTitle1"/>
     <div id="D">
     <h1>1.&#160; Scope</h1>
@@ -1008,9 +1003,6 @@ RSpec.describe IsoDoc do
           <div id="Q1">
           <h3>A.1.1. Annex A.1a</h3>
           </div>
-        </div>
-       <div id="Q2">
-        <h2>Appendix 1. An Appendix</h2>
         </div>
                </div>
                <br/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-14 00:00:00.000000000 Z
+date: 2018-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: metanorma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -336,24 +350,12 @@ files:
 - lib/isodoc/function/utils.rb
 - lib/isodoc/function/xref_gen.rb
 - lib/isodoc/function/xref_sect_gen.rb
+- lib/isodoc/headlesshtml_convert.rb
 - lib/isodoc/html_convert.rb
 - lib/isodoc/html_function.rb
 - lib/isodoc/html_function/comments.rb
 - lib/isodoc/html_function/footnotes.rb
 - lib/isodoc/html_function/html.rb
-- lib/isodoc/iso/html/header.html
-- lib/isodoc/iso/html/html_iso_intro.html
-- lib/isodoc/iso/html/html_iso_titlepage.html
-- lib/isodoc/iso/html/htmlstyle.scss
-- lib/isodoc/iso/html/isodoc.scss
-- lib/isodoc/iso/html/scripts.html
-- lib/isodoc/iso/html/style-human.scss
-- lib/isodoc/iso/html/style-iso.scss
-- lib/isodoc/iso/html/word_iso_intro.html
-- lib/isodoc/iso/html/word_iso_titlepage.html
-- lib/isodoc/iso/html/wordstyle.scss
-- lib/isodoc/iso/html_convert.rb
-- lib/isodoc/iso/word_convert.rb
 - lib/isodoc/metadata.rb
 - lib/isodoc/pdf_convert.rb
 - lib/isodoc/version.rb
@@ -380,7 +382,6 @@ files:
 - spec/isodoc/footnotes_spec.rb
 - spec/isodoc/i18n_spec.rb
 - spec/isodoc/inline_spec.rb
-- spec/isodoc/iso_spec.rb
 - spec/isodoc/lists_spec.rb
 - spec/isodoc/metadata_spec.rb
 - spec/isodoc/postproc_spec.rb

data/lib/isodoc/iso/html/header.html

@@ -1,206 +0,0 @@
-<html xmlns:v="urn:schemas-microsoft-com:vml"
-xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
-xmlns:mv="http://macVmlSchemaUri" xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta name=Title content="">
-<meta name=Keywords content="">
-<meta http-equiv=Content-Type content="text/html; charset=utf-8">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 15">
-<meta name=Originator content="Microsoft Word 15">
-<link id=Main-File rel=Main-File href="../{{ filename }}.html">
-<!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="2049"/>
-</xml><![endif]-->
-</head>
-
-<body lang=EN link=blue vlink="#954F72">
-
-<div style='mso-element:footnote-separator' id=fs>
-
-<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-normal'><span lang=EN-GB><span style='mso-special-character:footnote-separator'><![if !supportFootnotes]>
-
-<hr align=left size=1 width="33%">
-
-<![endif]></span></span></p>
-
-</div>
-
-<div style='mso-element:footnote-continuation-separator' id=fcs>
-
-<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuation-separator'><![if !supportFootnotes]>
-
-<hr align=left size=1>
-
-<![endif]></span></span></p>
-
-</div>
-
-<div style='mso-element:endnote-separator' id=es>
-
-<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-normal'><span lang=EN-GB><span style='mso-special-character:footnote-separator'><![if !supportFootnotes]>
-
-<hr align=left size=1 width="33%">
-
-<![endif]></span></span></p>
-
-</div>
-
-<div style='mso-element:endnote-continuation-separator' id=ecs>
-
-<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
-normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuation-separator'><![if !supportFootnotes]>
-
-<hr align=left size=1>
-
-<![endif]></span></span></p>
-
-</div>
-
-<div style='mso-element:header' id=eha>
-
-<p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
-
-</div>
-
-<div style='mso-element:header' id=ha>
-
-<p class=MsoHeader style='margin-bottom:18.0pt'><span lang=EN-GB
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt;font-weight:normal'>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved</span><span lang=EN-GB
-style='font-weight:normal'><o:p></o:p></span></p>
-
-</div>
-
-<div style='mso-element:footer' id=efa>
-
-<p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
-exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
-lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
-style='mso-element:field-begin'></span><span
-style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
-</span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
-style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
-mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>2</span></span></b><!--[if supportFields]><b
-style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
-mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
-lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
-style='mso-tab-count:1'>                                                                                                                                                                           </span>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
-
-</div>
-
-<div style='mso-element:header' id=eh2>
-
-<p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
-
-</div>
-
-<div style='mso-element:header' id=h2>
-
-<p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
-
-</div>
-
-<div style='mso-element:footer' id=ef2>
-
-<p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:exactly'><!--[if supportFields]><span
-lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
-style='mso-element:field-begin'></span><span
-style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
-</span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
-lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
-style='mso-no-proof:yes'>ii</span></span><!--[if supportFields]><span
-lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
-style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
-1'>                                                                                                                                                                           </span>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
-
-</div>
-
-<div style='mso-element:footer' id=f2>
-
-<p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– All
-rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
-lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
-style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
-</span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
-lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
-style='mso-no-proof:yes'>iii</span></span><!--[if supportFields]><span
-lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
-style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
-
-</div>
-
-<div style='mso-element:footer' id=ef3>
-
-<p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
-exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
-lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
-style='mso-element:field-begin'></span><span
-style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
-</span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
-style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
-mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>2</span></span></b><!--[if supportFields]><b
-style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
-mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
-lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
-style='mso-tab-count:1'>                                                                                                                                                                           </span>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
-
-</div>
-
-<div style='mso-element:footer' id=f3>
-
-<p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– All
-rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
-style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
-mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
-PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
-style='mso-element:field-separator'></span></span></b><![endif]--><b
-style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
-mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>3</span></span></b><!--[if supportFields]><b
-style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
-mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
-lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
-
-</div>
-
-<div style='mso-element:footer' id=f4>
-
-<p class=MsoFooter><b style='mso-bidi-font-weight:normal'><span>ICS {{ ics }}<o:p></o:p></span></b></p>
-
-<p class=MsoFooter style='margin-top:0cm'><span lang=EN-AU style='font-size:
-10.0pt;mso-ansi-language:EN-AU'>Price based on </span><!--[if supportFields]><span
-lang=EN-AU style='font-size:10.0pt;mso-ansi-language:EN-AU'><span
-style='mso-element:field-begin'></span><span style='mso-spacerun:yes'> </span>NUMPAGES<span
-style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
-lang=EN-AU style='font-size:10.0pt;mso-ansi-language:EN-AU'><span
-style='mso-no-proof:yes'>26</span></span><!--[if supportFields]><span
-lang=EN-AU style='font-size:10.0pt;mso-ansi-language:EN-AU'><span
-style='mso-element:field-end'></span></span><![endif]--><span lang=EN-AU
-style='font-size:10.0pt;mso-ansi-language:EN-AU'> pages<o:p></o:p></span></p>
-
-<p class=MsoFooter><span lang=EN-AU style='font-size:10.0pt;'>©
-{{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
-
-</div>
-
-
-
-</body>
-
-</html>

data/lib/isodoc/iso/html/html_iso_intro.html

@@ -1,34 +0,0 @@
-<div class="copyright">
-  <p class="year">
-    &copy; {{ agency }} {{ docyear }}, Published in Switzerland
-  </p>
-
-  <p class="message">
-    All rights
-reserved. Unless otherwise specified, no part of this publication may be
-reproduced or utilized otherwise in any form or by any means, electronic or
-mechanical, including photocopying, or posting on the internet or an intranet,
-without prior written permission. Permission can be requested from either ISO
-at the address below or ISO’s member body in the country of the requester.
-  </p>
-
-  <p class="name">ISO copyright office</p>
-  <p class="address">
-    Ch. de Blandonnet 8 &#x2022; CP 401<br/>
-    CH-1214 Vernier, Geneva, Switzerland<br/>
-    Tel.&nbsp;&nbsp;+ 41 22 749 01 11<br/>
-    Fax&nbsp;&nbsp;+ 41 22 749 09 47<br/>
-    copyright@iso.org<br/>
-    www.iso.org
-  </p>
-</div>
-
-
-</div>
-
-<nav>
-
-  <h1 id="content">Contents</h1>
-  <div id="toc"></div>
-
-</nav>