metanorma-standoc 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a89b3efcfc722056b86af6abde4f88da3486f37bcecea96629cd1de11790d46
-  data.tar.gz: 64f22bed9aa0cae70f4d84fa50e13e09aec847c3d40d5af8e5d95199760f47ef
+  metadata.gz: 79db51fbd661a4c2ed28f283a6a14c7360c533ea6e27acde67e46d6f08fc6c82
+  data.tar.gz: 801c1134d49a110307984e6fa13377d0120514f2e62e1a9a37597037a722ddf9
 SHA512:
-  metadata.gz: 142d1fa79dbb37d8387e3dc083f1f0780cbd275f125bf8b53a117deba8f1d74b4d5025caa5b96fd17076837f26e381dcb71621133364c494e21497e9cf0442f8
-  data.tar.gz: 8b7720d05df8bf23f404310f733e0788d27f9672d6005743a558d2a9837b0e07f12ef035c606966cc451379cf159bac88cdd9cbbae4de5147a9f56c719f1b6fe
+  metadata.gz: 1358896f65017f63484f11f07747f13df81265143f52da50046d3cc0477f18b488db49457c903773824a68b650ff021571ff98c86fba95373236de88da687a9e
+  data.tar.gz: befa8dd7f5c9cafb8bb573b4f25c92dde9a6f0e9a8107b3e29c5d15d8aa88e427f159a3f9460fe2065d4f25d2df015dce12b402ff1e858062938ccedbf39118c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.3.4)
+    metanorma-standoc (1.3.5)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       html2doc (~> 0.8.11)
@@ -23,7 +23,7 @@ GEM
     asciimath (1.0.8)
     ast (2.4.0)
     byebug (11.0.1)
-    cnccs (0.1.4)
+    cnccs (0.1.5)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     crack (0.4.3)
@@ -52,7 +52,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (1.0.0)
-    html2doc (0.8.13)
+    html2doc (0.8.14)
       asciimath (~> 1.0.7)
       htmlentities (~> 4.3.4)
       image_size
@@ -64,7 +64,7 @@ GEM
     iev (0.2.3)
       nokogiri (>= 1.10.4)
     image_size (2.0.2)
-    isodoc (1.0.4)
+    isodoc (1.0.5)
       asciimath
       html2doc (~> 0.8.11)
       htmlentities (~> 4.3.4)
@@ -73,7 +73,7 @@ GEM
       nokogiri (>= 1.10.4)
       rake (~> 12.0)
       roman-numerals
-      sassc (~> 2)
+      sassc (~> 2.2.1)
       thread_safe
       uuidtools
     isoics (0.1.8)
@@ -113,7 +113,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    relaton (0.5.5)
+    relaton (0.5.6)
       relaton-gb (~> 0.6.0)
       relaton-iec (~> 0.4.0)
       relaton-ietf (~> 0.6.0)
@@ -121,33 +121,33 @@ GEM
       relaton-itu (~> 0.3.0)
       relaton-nist (~> 0.3.0)
       relaton-ogc (~> 0.1.0)
-    relaton-bib (0.3.8)
+    relaton-bib (0.3.9)
       addressable
       nokogiri
-    relaton-gb (0.6.4)
+    relaton-gb (0.6.5)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       relaton-iso-bib (~> 0.3.0)
-    relaton-iec (0.4.6)
+    relaton-iec (0.4.8)
       addressable
       relaton-iso-bib (~> 0.3.0)
-    relaton-ietf (0.6.5)
+    relaton-ietf (0.6.6)
       relaton-bib (~> 0.3.0)
     relaton-iev (0.1.1)
       relaton (~> 0.5.0)
-    relaton-iso (0.6.6)
+    relaton-iso (0.6.7)
       relaton-iec (~> 0.4.0)
       relaton-iso-bib (~> 0.3.0)
-    relaton-iso-bib (0.3.7)
+    relaton-iso-bib (0.3.9)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)
-    relaton-itu (0.3.4)
+    relaton-itu (0.3.5)
       relaton-iso-bib (~> 0.3.0)
-    relaton-nist (0.3.5)
+    relaton-nist (0.3.6)
       relaton-bib (~> 0.3.0)
       rubyzip
-    relaton-ogc (0.1.1)
+    relaton-ogc (0.1.2)
       faraday
       relaton-iso-bib (~> 0.3.0)
     roman-numerals (0.3.0)

data/docs/quickstart.adoc

@@ -88,7 +88,7 @@ Syntax includes the following; the links are to the Asciidoctor User Manual. All
 
 Attributes of the document, which typically appear in the coverpage (if at all), rather than in the document proper. The permitted attributes for Asciidoctor-ISO, and their expected values, are documented in the https://github.com/metanorma/metanorma-iso#document-attributes[Asciidoctor-ISO Readme]. Note that the author line expected in Asciidoctor is not used; the title line is likewise ignored, in favour of attributes describing the three-part bilingual title.
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 = Rice model
 :docnumber: 17301
@@ -101,7 +101,7 @@ Attributes of the document, which typically appear in the coverpage (if at all),
 
 * https://asciidoctor.org/docs/user-manual/#text-formatting[Formatting marks]: bold, italic, monospace, subscript, superscript
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 This document specifies minimum requirements and test methods for rice (_Oryza sativa L._).
 --
@@ -109,7 +109,7 @@ This document specifies minimum requirements and test methods for rice (_Oryza s
 * https://asciidoctor.org/docs/user-manual/#anchordef[Anchors] (for internal cross-references): these can be defined for any section or subsection, and any block (e.g. images, lists, examples, formulas, and so forth). The numbering of all blocks and clauses is automated, and does not need to be provided in the text.
 * https://asciidoctor.org/docs/user-manual/#internal-cross-references[Internal Cross-references] reference anchors within the document. By default, the text for these is also automated, to follow ISO/IEC DIR 2, including naming the container of a block where required (e.g. `B.6, Formula (B.1)` for a formula in an annex). However, cross-references can supply their own text as an override, following a comma (e.g. `<``<AnnexB,the following annex>``>`).
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 The International Organization for Standardization (ISO) draws attention to the fact that it is claimed that compliance with this document may involve the use of a patent concerning sample dividers given in <<AnnexA>> and shown in <<figureA-1>>.
 
@@ -121,14 +121,14 @@ image::images/rice_image1.png[]
 
 * https://asciidoctor.org/docs/user-manual/#url[URLs]
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 http://www.iso.org/obp[OBP]
 --
 
 * https://asciidoctor.org/docs/user-manual/#activating-stem-support[STEM support] (mathematical expressions), as both inline and block formatting. (ISO Formulae are expressed as stem blocks.) Asciidoctor natively uses http://asciimath.org[AsciiMath] for its mathematical expressions; the `:stem:` document attribute must be present for AsciiMath to be recognised. The gem will ensure that any AsciiMath is rendered in the HTML output, and converted to Microsoft Office's OOXML (via MathML) in the Word output. Asciidoctor also supports LaTeX, but the gem does not cater for converting LaTeX to a Word-compatible output.
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 [[formulaA-1,A.1]]
 [stem]
@@ -143,7 +143,7 @@ stem:[w]:: is the mass fraction of grains with a particular defect in the test s
 
 * https://asciidoctor.org/docs/user-manual/#user-footnotes[Footnotes]. Note that footnotes are treated as inline formatting, so they cannot straightforwardly span more than a single paragraph in Asciidoctor. Footnotes within figures and tables are rendered within their blocks, as required by ISO/IEC DIR 2.
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 containing a mass fraction of 4,1 % iodine and 6,3 % potassium iodide in deionized water such as Lugols.footnote:[Lugols is an example of a suitable product available commercially. This information is given for the convenience of users of this document and does not constitute an endorsement by ISO of this product.]
 --
@@ -154,7 +154,7 @@ Blocks are groupings of paragraphs and text into larger units, commonly https://
 
 * https://asciidoctor.org/docs/user-manual/#unordered-lists[Unordered lists]
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 The main changes compared to the previous edition are:
 
@@ -164,7 +164,7 @@ The main changes compared to the previous edition are:
 
 * https://asciidoctor.org/docs/user-manual/#ordered-lists[Ordered lists]. Note that ISO/IEC presupposes that the first level of an ordered list is indexed with a lowercase letter. The gem automatically creates labels for the nested levels of ordered lists, and ignores any https://asciidoctor.org/docs/user-manual/#numbering-styles[numbering styles] indicated by the user.
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 . the sampling method used;
 . the test method used;
@@ -173,7 +173,7 @@ The main changes compared to the previous edition are:
 
 * https://asciidoctor.org/docs/user-manual/#labeled-list[Definition lists]. These are used for all keys of figures and formulae, and as the content of Symbols and Abbreviations clauses and subclauses:
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 stem:[w]:: is the mass fraction of grains with a particular defect in the test sample;
 stem:[m_D]:: is the mass, in grams, of grains with that defect;
@@ -184,7 +184,7 @@ Note that the key to a figure must be preceded by the paragraph `*Key*`, and the
 
 * https://asciidoctor.org/docs/user-manual/#tables[Tables]. Asciidoctor supports a rich range of table formatting (which the Asciidoctor-ISO gem extends further).
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 [[tableD-1]]
 [cols="<,^,^,^,^",headerrows=2]
@@ -200,7 +200,7 @@ Note that the key to a figure must be preceded by the paragraph `*Key*`, and the
 
 * https://asciidoctor.org/docs/user-manual/#images[Images], which are mapped to ISO figures, with accompanying titles:
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 [[figureC-1]]
 .Typical gelatinization curve
@@ -210,14 +210,14 @@ footnote:[The time stem:[t_90] was estimated to be 18,2 min for this example.]
 
 * https://asciidoctor.org/docs/user-manual/#admonition[Admonitions], which express Notes, Warnings, Cautions, etc.
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 CAUTION: Only use paddy or parboiled rice for the determination of husked rice yield.
 --
 
 * https://asciidoctor.org/docs/user-manual/#prose-excerpts-quotes-and-verses[Block quotes]
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 [quote, ISO, "ISO7301,clause 1"]
 _____
@@ -229,7 +229,7 @@ _____
 * https://asciidoctor.org/docs/user-manual/#example[Examples]
 * https://asciidoctor.org/docs/user-manual/#listing-blocks[Listing blocks] (source code), including https://asciidoctor.org/docs/user-manual/#callouts[source code callouts]
 
-[source,asciidoctor]
+[source,asciidoc]
 ----
 .Sample Code
 ====
@@ -256,7 +256,7 @@ end
 
 * The Asciidoctor https://asciidoctor.org/docs/user-manual/#doc-preamble[Document preamble] is treated as the document Foreword: it is the text appearing between the document header and the first section header. (Note that the foreword is here given a https://asciidoctor.org/docs/user-manual/#title[block title], but that will be provided automatically anyway.)
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 [[foreword]]
 .Foreword
@@ -265,7 +265,7 @@ ISO (the International Organization for Standardization)
 
 * The Asciidoctor https://asciidoctor.org/docs/user-manual/#sections[Sections] correspond to ISO clauses, starting with the Introduction (if present). Each section and subsection is delimited with a header; the number of equal signs before the header indicate the level of nesting of the section, starting with two equal signs. No numbering should be given for any header: numbering is done automatically by the gem.
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 == Sampling
 Sampling shall be carried out in accordance with <<ISO24333,clause 5>>
@@ -286,7 +286,7 @@ Full details of Asciidoctor-ISO–specific markup and conventions is given in th
 
 https://asciidoctor.org/docs/user-manual/#section-styles[Section styles] are used to indicate specific types of section: `[bibliography]` for Normative References and Bibliography, `[appendix]` for Annexes, and `[%appendix]` for Appendixes (annexes of annexes). These styles must be provided for the sections to be processed correctly: bibliographic references will not be recognised as such, for example, without the `[bibliography]` style applied:
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 [bibliography]
 == Bibliography
@@ -300,7 +300,7 @@ The sections that have a fixed position according to ISO/IEC DIR 2 (Introduction
 
 Terms and Definitions sections follow a strict grammar in their Asciidoctor-ISO markup, as ISO/IEC DIR 2 prescribes their structure so strictly. The following illustrates the complete structure of a term entry; the Rice document splits up these features among several terms.
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 [[paddy]]
 === paddy
@@ -329,7 +329,7 @@ All bibliographic entries must be given as unordered lists. Normative references
 
 For ISO and related standards, the reference is given as a bibliographic anchor (in triple brackets), consisting of an internal identifier followed by the ISO identifier. The internal identifier can be used in cross-references (citations). The date may be added to the ISO identifier, as required by ISO/IEC DIR 2; standards under preparation have their date given as `--`, and should be accompanied by a footnote detailing the status of the standard.
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 Grade 3 quality as specified in <<ISO3696>>.
 
@@ -342,7 +342,7 @@ Grade 3 quality as specified in <<ISO3696>>.
 
 Non-ISO references under normative references are still cited by document identifier. Under informative references, non-ISO documents are both displayed and cited with reference numbers in brackets. In Asciidoctor-ISO, the cross-reference is a normal anchor identifier; the bracket numbering for informative references is automatic.
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 For details concerning the use of the Dumas method, see References <<ref10>> and <<ref16>>.
 
@@ -355,7 +355,7 @@ For details concerning the use of the Dumas method, see References <<ref10>> and
 
 In cross-references, bibliographic localities (e.g. page numbers, clause numbers) can be added directly after the comma, as part of the cross-reference text. Bibliographic localities are expressed as a sequence of lowercase locality type, then an equal sign, then by the locality number or range:
 
-[source,asciidoctor]
+[source,asciidoc]
 --
 <<ISO7301,clause=3.1>>
 

data/lib/asciidoctor/standoc/basicdoc.rng

@@ -336,7 +336,9 @@
   </define>
   <define name="tname">
     <element name="name">
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="tclass">
@@ -812,6 +814,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>
@@ -850,6 +855,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>
@@ -875,6 +883,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>

data/lib/asciidoctor/standoc/biblio.rng

@@ -919,6 +919,7 @@
     <choice>
       <value>main</value>
       <value>alt</value>
+      <text/>
     </choice>
   </define>
   <define name="seriesorganization">

data/lib/asciidoctor/standoc/blocks.rb

@@ -185,6 +185,7 @@ module Asciidoctor
           height: node.attr("height") || "auto",
           width: node.attr("width") || "auto" ,
           filename: node.attr("filename"),
+          title: node.attr("titleattr"),
           alt: node.alt == node.attr("default-alt") ? nil : node.alt }
       end
 

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -138,7 +138,7 @@ module Asciidoctor
 
       def omit_docid_prefix(prefix)
         return true if prefix.nil? || prefix.empty?
-        ["ISO", "IEC", "IEV"].include? prefix
+        %(ISO IEC IEV ITU).include? prefix
       end
 
       def format_ref(ref, type, isopub)

data/lib/asciidoctor/standoc/i18n.rb

@@ -32,6 +32,7 @@ module Asciidoctor
           @external_terms_boilerplate = y["external_terms_boilerplate"] || ""
           @internal_external_terms_boilerplate =
             y["internal_external_terms_boilerplate"] || ""
+          @labels = y
         end
       end
     end

data/lib/asciidoctor/standoc/isodoc.rng

@@ -252,7 +252,11 @@
         </zeroOrMore>
       </group>
       <oneOrMore>
-        <ref name="clause-subsection"/>
+        <choice>
+          <ref name="clause-subsection"/>
+          <ref name="terms"/>
+          <ref name="definitions"/>
+        </choice>
       </oneOrMore>
     </choice>
   </define>

data/lib/asciidoctor/standoc/utils.rb

@@ -159,14 +159,14 @@ module Asciidoctor
 
       # block for processing XML document fragments as XHTML,
       # to allow for HTMLentities
+      # Unescape special chars used in Asciidoctor substitution processing
       def noko(&block)
         doc = ::Nokogiri::XML.parse(NOKOHEAD)
         fragment = doc.fragment("")
         ::Nokogiri::XML::Builder.with fragment, &block
         fragment.to_xml(encoding: "US-ASCII").lines.map do |l|
-          #l.gsub(/(?<!\s)\n/, " ")
-          #l.sub(/\n$/, " ")
-          l.sub(/\s*\n$/, " ")
+          l.gsub(/\s*\n$/m, " ").gsub("&#150;", "\u0096").
+            gsub("&#151;", "\u0097")
         end
       end
 

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.3.4".freeze
+    VERSION = "1.3.5".freeze
   end
 end

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -750,14 +750,15 @@ RSpec.describe Asciidoctor::Standoc do
     it "accepts attributes on images" do
       expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
-      [height=4,width=3,alt="IMAGE",filename="riceimg1.png"]
+      [height=4,width=3,alt="IMAGE",filename="riceimg1.png",titleattr="TITLE"]
+      .Caption
       image::spec/examples/rice_images/rice_image1.png[]
 
       INPUT
       #{BLANK_HDR}
               <sections>
-         <figure id="_">
-         <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="4" width="3" alt="IMAGE" filename="riceimg1.png"/>
+         <figure id="_"><name>Caption</name>
+         <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="4" width="3" title="TITLE" alt="IMAGE" filename="riceimg1.png"/>
        </figure>
        </sections>
        </standard-document>

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -987,6 +987,7 @@ RSpec.describe Asciidoctor::Standoc do
           <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
           <bibitem type="standard" id="IEC60050-102">
+          <fetched>#{Date.today}</fetched>
           <title type="title-main" format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary (IEV)</title>
           <title type="title-part" format="text/plain" language="en" script="Latn">Part 102: Mathematics – General concepts and linear algebra</title>
           <title type="main" format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary (IEV) – Part 102: Mathematics – General concepts and linear algebra</title>
@@ -1023,6 +1024,7 @@ RSpec.describe Asciidoctor::Standoc do
             </owner>
           </copyright>
         </bibitem><bibitem type="standard" id="IEC60050-103">
+          <fetched>#{Date.today}</fetched>
           <title type="title-main" format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary (IEV)</title>
           <title type="title-part" format="text/plain" language="en" script="Latn">Part 103: Mathematics – Functions</title>
           <title type="main" format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary (IEV) – Part 103: Mathematics – Functions</title>
@@ -1359,7 +1361,7 @@ it "inserts boilerplate before empty Normative References in French" do
     def mock_iecbib_get_iec60050_103_01
       expect(Iecbib::IecBibliography).to receive(:get).with("IEC 60050-103", nil, {keep_year: true}) do
       IsoBibItem::XMLParser.from_xml(<<~"OUTPUT")
-      <bibitem type="international-standard" id="IEC60050-103">
+      <bibitem type="standard" id="IEC60050-103">
          <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
          <docidentifier>IEC 60050-103:2009</docidentifier>
          <date type="published">
@@ -1397,7 +1399,7 @@ end
     def mock_iecbib_get_iec60050_102_01
       expect(Iecbib::IecBibliography).to receive(:get).with("IEC 60050-102", nil, {keep_year: true}) do
       IsoBibItem::XMLParser.from_xml(<<~"OUTPUT")
-      <bibitem type="international-standard" id="IEC60050-102">
+      <bibitem type="standard" id="IEC60050-102">
          <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
          <docidentifier>IEC 60050-102:2007</docidentifier>
          <date type="published">
@@ -1435,7 +1437,7 @@ end
     def mock_iev
       expect(Iecbib::IecBibliography).to receive(:get).with("IEV", nil, {}) do
       IsoBibItem::XMLParser.from_xml(<<~"OUTPUT")
-      <bibitem type="international-standard" id="IEC60050:2001">
+      <bibitem type="standard" id="IEC60050:2001">
          <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
          <docidentifier>IEC 60050:2011</docidentifier>
          <date type="published">