metanorma-iso 1.0.8 → 1.0.9

data/docs/replacing-asciidoc.adoc

@@ -0,0 +1,15 @@
+= I can translate my specifications into IsoDoc XML myself (i.e. I don't like AsciiDoc, or I already have my own toolchain). Can I only use IsoDoc XML to produce pretty output?
+
+[TIP]
+====
+* Generate correct IsoDoc XML (make sure it validates!)
+* Create just the `IsoDoc::...::HtmlConvert` and/or `IsoDoc::...::WordConvert` classes to convert the IsoDoc XML into target formats.
+* Initialise the IsoDoc class passing the necessary information about fonts and scripts; the existing gems all illustrate this kind of initialisation.
+* Create the target format using the method `.convert(filename, xml)`.
+====
+
+The Asciidoctor-to-XML and XML-to-Output classes are separate, so you can invoke just the latter without the former. Of course, you will need to make sure that the IsoDoc XML you are passing to the generators is valid.
+
+The `IsoDoc::...::HtmlConvert` and/or `IsoDoc::...::WordConvert` are initialised in the existing gems with a hash giving the fonts to be used in the document (to be injected in the document SCSS stylesheets), the script of the document (to be used to pick the right font, in case of default font settings), and the `i18nyaml` YAML file for localisation. All existing gems have defaults set for these values on the Asciidoctor side invoking the class, so all parameters are optional.
+
+Once you have the classes set up, all you need to do is invoke the conversion of XML to the target format, with the method `.convert(filename, xml)`, where XML is the IsoDoc XML.

data/docs/styling-output-html.adoc

@@ -0,0 +1,37 @@
+= How can I style the resulting HTML output?
+
+[TIP]
+====
+* Clone the metanorma-sample gem: https://github.com/riboseinc/metanorma-sample.
+* Edit the `html_sample_titlepage.html` and `html_sample_intro.html` pages to match your organisation's branding.
+** Leave the Liquid Template instructions alone (`{{`, `{%`) unless you know what you're doing with them: they are how the pages are populated with metadata.
+* Edit the `default_fonts()` method in your `IsoDoc::...::HtmlConvert` class, to match your desired fonts.
+* Edit the `default_file_locations()` method in your `IsoDoc::...::HtmlConvert` class, to match your desired stylesheets and HTML templates.
+* Edit the `htmlstyle.scss` stylesheet to match your organisation's branding. The classes already in place there are used to style existing blocks of text; refer to the sample documents included in the gem (`spec/examples`) for their use.
+====
+
+Styling of output is intended to be configurable.
+HTML stylesheets are expressed in https://sass-lang.com/guide[SCSS], with their fonts populated through the `default_fonts()` method in the `IsoDoc::...::HtmlConvert` class.
+Frontispiece content is templated, populated from the metadata parsed in the `IsoDoc::...::Metadata` class, via https://shopify.github.io/liquid/[Liquid templates].
+The default stylesheets and HTML templates themselves are nominated in the `default_file_locations()` method in the `IsoDoc::...::HtmlConvert` class.
+That means you can change the styling of output documents readily, so long as you are aware of the functionality of the stylesheet.
+
+* Styling information is stored in the `.../lib/isodoc/html` folder of the gem, and applies to both Word and HTML content. For HTML content, the relevant files are `html_..._titlepage.html` (title page HTML template), `html_..._intro.html` (introductory HTML template, typically restricted to Table of Contents), `scripts.html` (Javascript scripts), and `htmlstyle.scss` (the HTML stylesheet).
+* The styling files to be loaded in are set in the `default_file_locations()` method of `IsoDoc::...::HtmlConvert`. The files can be overridden through document variables in the Asciidoc document.
+* Additional files (e.g. logos) can be loaded in the `initialize()` method of `IsoDoc::...::HtmlConvert`; for them to be access during document generation, they need to be copied to the working directory. (They can be removed subsequently by adding them to the `@files_to_delete` array. All image files are copied into an `_html` subdirectory.)
+* The HTML templates are populated through Liquid Templates: variables in `{{` correspond to the hash keys for metadata extracted in `IsoDoc::...::Metadata`, and its superclass `IsoDoc::Metadata` in the isodoc gem.
+* The SCSS stylesheets treat fonts as variables. Those variables are set in `default_fonts()`, which generates variable assignments for SCSS. Stylesheets normally recognise three fonts: `$bodyfont` for body text, `$headerfont` for headers and captions (which may be the same font as `$bodyfont`), and `$monospacefont` for monospace text. Note that `default_fonts()` takes the options passed to initialise `HtmlConvert` as a paremeter; the document language and script can be used to make different font choices for different document scripts. (The existing gems refer to `Latn`, Latin script, and `Hans`, Simplified Chinese script.)
+* Javascript scripts are populated in `scripts.html`; the scripts already in place in any gem you modify are in live use, and you should work out what they do before removing them. The AnchorJS script, for example, is used to generate navigable anchors in the document.
+* Additional scripts and fonts may be loaded in the document head through the `html_head()` method of  `IsoDoc::...::HtmlConvert`. The existing gems use the document head to load Jquery, the Table of Contents generation script, Google Fonts, and Font Awesome.
+* The classes in the SCSS stylesheet correspond to static HTML content in the HTML templates, and dynamic HTML content in the `IsoDoc::...::HtmlConvert` class, and its superclasses `IsoDoc::HtmlConvert` and `IsoDoc::Common` in the isodoc gem.
+
+An HTML document is populated as follows:
+
+* HTML Head wrapper (in `IsoDoc::HtmlConvert`)
+** `html_head()` content
+** `@htmlstylesheet` CSS stylesheet (expected to be in SCSS, generated from SCSS in the `generate_css()` method of `Isodoc::HtmlConvert`).
+* HTML Body
+** `@htmlcoverpage` HTML template (optional, corresponds to `html_..._titlepage.html`)
+** `@htmlintropage` HTML template (optional, corresponds to `html_..._intro.html`)
+** Document proper (converted from Standoc XML)
+** `@scripts` Javascript Scripts (optional, corresponds to `scripts.html`)

data/docs/styling-output-msword.adoc

@@ -0,0 +1,38 @@
+= How can I style the resulting Microsoft Word output?
+
+[TIP]
+====
+* There is no quick way of doing this.
+* Everything you can do in Word, you can do in Word HTML. Save Word documents as Word HTML to see how.
+* Clone the metanorma-sample gem: https://github.com/riboseinc/metanorma-sample.
+* Edit the `word_sample_titlepage.html` and `word_sample_intro.html` pages to match your organisation's branding. With lots of iterations of saving Word documents as HTML, for trial and error.
+** Leave the Liquid Template instructions alone (`{{`, `{%`) unless you know what you're doing with them: they are how the pages are populated with metadata.
+* Edit the `default_fonts()` method in your `IsoDoc::...::WordConvert` class, to match your desired fonts.
+* Edit the `default_file_locations()` method in your `IsoDoc::...::WordConvert` class, to match your desired stylesheets and file templates.
+* Edit the `wordstyle.scss` and `sample.scss` stylesheets to match your organisation's branding. With lots of iterations of saving Word documents as HTML, for trial and error.
+====
+
+Word output in the document toolset is generated through Word HTML, the variant of HTML that you get when you save a Word document as HTML. (That is why documents are saved in `.doc`, not `.docx`.) This has the advantage over https://en.wikipedia.org/wiki/Office_Open_XML[OOXML], the native markup of DOCX, of using a well-known markup language, with a low barrier to entry: if you want to work out how to do something in Word HTML, do it in Word, save the document as HTML, and open up the HTML in a text editor. (For more on the choice of using Word HTML, see https://github.com/riboseinc/html2doc/wiki/Why-not-docx%3F.)
+
+However Word HTML is not quite the HTML you are used to: it is a restricted, syntactically idiosyncratic variant of HTML 4, with a non-standard and weakened form of CSS. Doing any styling in Word HTML involves lots of trial and error, and paying close attention to how Word HTML does things in its CSS. We have documented a few of the clearer gotchas in https://github.com/riboseinc/html2doc/blob/master/README.adoc.
+
+It's still better than learning OOXML.
+
+The process for generating Word output is fairly similar to that for generating HTML, since both processes are generating a form of HTML; as we already noted, the two processes share a substantial amount of code. The main differences are in the handling of page-media features that CSS has lagged in (footnotes, pagination, headers and footers), and in the styling of lists, for which Word HTML uses custom (and undocumented) CSS classes prefixed with `@`, specifying inter alia the numbering for nine levels of nesting of the same list.
+
+* Styling information is stored in the `.../lib/isodoc/html` folder of the gem, and applies to both Word and HTML content. For Word content, the relevant files are `word_..._titlepage.html` (title page HTML template), `word_..._intro.html` (introductory HTML template, typically restricted to Table of Contents),  `wordstyle.scss` and `{name_of_standard}.scss` (the Word stylesheets), and `header.html` (document headers, footers, and endnote/footnote separators, referenced from the stylesheets).
+* The styling files to be loaded in are set in the `default_file_locations()` method of `IsoDoc::...::WordConvert`. 
+* As with HTML generation, additional files (e.g. logos) can be loaded in the `initialize()` method of `IsoDoc::...::WordConvert`. The `initialize()` method also sets the `@` styles in the stylesheet to be used for unordered and ordered lists; a single such style is intended to capture the behaviour of all levels of indentation. 
+* As with HTML output, the HTML templates are populated through Liquid Templates: variables in `{{` correspond to the hash keys for metadata extracted in `IsoDoc::...::Metadata`, and its superclass `IsoDoc::Metadata` in the isodoc gem.
+* As with HTML, the SCSS stylesheets treat fonts as variables, and are set in the `default_fonts()` method of `IsoDoc::...::WordConvert`.
+* Document headers and footers are set in the `header.html` file. This is also an HTML template, which is populated with metadata attributes through Liquid Template. The structure of `header.html` is determined by Word, and elements of `header.html` need to be crossreferenced from the Word stylesheet. To inspect Word `header.html` files, save a Word document as HTML, and look inside the `{document_name}.fld` folder generated alongside the HTML output.
+* The classes in the SCSS stylesheet correspond to static HTML content in the HTML templates, and dynamic HTML content in the `IsoDoc::...::WordConvert` class, and its superclasses `IsoDoc::WordConvert` and `IsoDoc::Common` in the isodoc gem.
+
+A Word HTML document is populated as follows:
+* HTML Head wrapper (in `IsoDoc::WordConvert`)
+** `@wordstylesheet` CSS stylesheet (generated from SCSS through the `generate_css()` method of `Isodoc::WordConvert`); corresponds to `wordstyle.scss`.
+** `@standstylesheet` CSS stylesheet (generated from SCSS through the `generate_css()` method of `Isodoc::WordConvert`); intended to override any generic CSS in `@wordstylesheet`. Optional, corresponds to `{name_of_standard}.scss`.
+* HTML Body
+** `@wordcoverpage` HTML template (optional, corresponds to `word_..._titlepage.html`). Included in `<div class=WordSection1>`.
+** `@htmlintropage` HTML template (optional, corresponds to `word_..._intro.html`). Included in `<div class=WordSection2>`. In the existing gems, WordSection2 is paginated with roman numerals. 
+** Document proper (converted from Standoc XML). Included in `<div class=WordSection2>` (prefatory material) and `<div class=WordSection3>` (main document). In the existing gems, WordSection3 is paginated with roman numerals.

data/lib/asciidoctor/iso/biblio.rng

@@ -476,6 +476,9 @@
     <zeroOrMore>
       <ref name="docidentifier"/>
     </zeroOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
     <zeroOrMore>
       <ref name="bdate"/>
     </zeroOrMore>
@@ -637,6 +640,8 @@
           <value>transmitted</value>
           <value>copied</value>
           <value>unchanged</value>
+          <value>circulated</value>
+          <text/>
         </choice>
       </attribute>
       <choice>
@@ -673,6 +678,11 @@
       <text/>
     </element>
   </define>
+  <define name="docnumber">
+    <element name="docnumber">
+      <text/>
+    </element>
+  </define>
   <define name="bclassification">
     <element name="classification">
       <optional>

data/lib/asciidoctor/iso/cleanup.rb

@@ -34,6 +34,30 @@ module Asciidoctor
           i, seen = other_footnote_renumber1(fn, i, seen)
         end
       end
+
+      def id_prefix(prefix, id)
+        prefix.join("/") + ( id.text.match(%{^/}) ? "" :  " " ) + id.text
+      end
+
+      def get_id_prefix(xmldoc)
+        prefix = []
+        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']"\
+                     "/organization").each do |x|
+          x1 = x.at("abbreviation")&.text || x.at("name")&.text
+          x1 == "ISO" and prefix.unshift("ISO") or prefix << x1
+        end
+        prefix
+      end
+
+      # ISO as a prefix goes first
+      def docidentifier_cleanup(xmldoc)
+        prefix = get_id_prefix(xmldoc)
+        id = xmldoc.at("//bibdata/docidentifier[@type = 'iso']") or return
+        id.content = id_prefix(prefix, id)
+        id = xmldoc.at("//bibdata/docidentifier[@type = 'iso-structured']/"\
+                       "project-number") or return
+        id.content = id_prefix(prefix, id)
+      end
     end
   end
 end

data/lib/asciidoctor/iso/front.rb

@@ -10,23 +10,50 @@ module Asciidoctor
   module ISO
     class Converter < Standoc::Converter
       def metadata_id(node, xml)
+        iso_id(node, xml)
+        node.attr("tc-docnumber") and
+          xml.docidentifier(node.attr("tc-docnumber"),
+                            **attr_code(type: "iso-tc"))
+        xml.docnumber node&.attr("docnumber")
+      end
+
+      def iso_id(node, xml)
+        return unless node.attr("docnumber")
         part, subpart = node&.attr("partnumber")&.split(/-/)
-        xml.docidentifier do |i|
+        dn = add_id_parts(node.attr("docnumber"), part, subpart)
+        dn = id_stage_prefix(dn, node)
+        xml.docidentifier dn, **attr_code(type: "iso")
+        xml.docidentifier **attr_code(type: "iso-structured") do |i|
           i.project_number node.attr("docnumber"),
             **attr_code(part: part, subpart: subpart)
-          if node.attr("tc-docnumber")
-            i.tc_document_number node.attr("tc-docnumber")
-          end
         end
       end
 
+      def add_id_parts(dn, part, subpart)
+        dn += "-#{part}" if part
+        dn += "-#{subpart}" if subpart
+        dn
+      end
+
+      def id_stage_prefix(dn, node)
+        if node.attr("docstage") && node.attr("docstage").to_i < 60
+          abbr = IsoDoc::Iso::Metadata.new("en", "Latn", {}).
+            stage_abbrev(node.attr("docstage"), node.attr("iteration"), 
+                         node.attr("draft"))
+          dn = "/#{abbr} #{dn}" # prefixes added in cleanup
+        else
+          dn += ":#{node.attr("copyright-year")}" if node.attr("copyright-year")
+        end
+        dn
+      end
+
       def organization(org, orgname)
         if ["ISO",
             "International Organization for Standardization"].include? orgname
           org.name "International Organization for Standardization"
           org.abbreviation "ISO"
         elsif ["IEC",
-                 "International Electrotechnical Commission"].include? orgname
+               "International Electrotechnical Commission"].include? orgname
           org.name "International Electrotechnical Commission"
           org.abbreviation "IEC"
         else

data/lib/asciidoctor/iso/isodoc.rng

@@ -1034,6 +1034,9 @@
     <zeroOrMore>
       <ref name="docidentifier"/>
     </zeroOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
     <zeroOrMore>
       <ref name="bdate"/>
     </zeroOrMore>

data/lib/asciidoctor/iso/isostandard.rng

@@ -84,6 +84,9 @@
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
+      <optional>
+        <ref name="docnumber"/>
+      </optional>
       <zeroOrMore>
         <ref name="bdate"/>
       </zeroOrMore>
@@ -163,6 +166,9 @@
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
+      <optional>
+        <ref name="docnumber"/>
+      </optional>
       <zeroOrMore>
         <ref name="bdate"/>
       </zeroOrMore>

data/lib/asciidoctor/iso/validate.rb

@@ -42,7 +42,8 @@ module Asciidoctor
       end
 
       def title_subpart_validate(root)
-        subpart = root.at("//bibdata/docidentifier/project-number[@subpart]")
+        docid = root.at("//bibdata/docidentifier[@type = 'iso']")
+        subpart = /-\d+-\d+/.match docid
         iec = root.at("//bibdata/contributor[role/@type = 'publisher']/"\
                       "organization[abbreviation = 'IEC' or "\
                       "name = 'International Electrotechnical Commission']")

data/lib/isodoc/iso/html/html_iso_titlepage.html

@@ -2,7 +2,7 @@
     {% if tc_docnumber %}
 <p class="coverpage_docnumber">{{ tc_docnumber }}</p>
     {% else %}
-<p class="coverpage_docnumber">{{ docnumber }}:{{ docyear }}(E) {{ draftinfo }}</p>
+<p class="coverpage_docnumber">{{ docnumber }}(E) {{ draftinfo }}</p>
     {% endif %}
 
 {% if revdate %}
@@ -10,7 +10,7 @@
 {% endif %}
 
 {% if tc_docnumber %}
-<p class="coverpage_docnumber">{{ docnumber }}:{{ docyear }}(E) {{ draftinfo }}</p>
+<p class="coverpage_docnumber">{{ docnumber }}(E) {{ draftinfo }}</p>
 {% endif %}
 
 <p class="coverpage_techcommittee">{{ agency }}/{{ editorialgroup | join: "/" }}</p>

data/lib/isodoc/iso/html/style-human.scss

@@ -416,7 +416,7 @@ ul li {
   }
 
 ul > li > p:first-child:before {
-  content: "—";
+  content: "\2014";
   display: inline-block;
   width: 1em;
   margin-left: -1.5em;

data/lib/isodoc/iso/html/style-iso.scss

@@ -252,7 +252,7 @@ h2 p {
   }
   
 ul > li > p:first-child:before {
-  content: "—";
+  content: "\2014";
   display: inline-block;
   width: 1em;
   margin-left: -1.5em;

data/lib/isodoc/iso/html/word_iso_titlepage.html

@@ -4,7 +4,7 @@ normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ tc_docnu
 style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'><o:p></o:p></span></b></p>
 {% else %}
 <p class="MsoNormal" align="right" style='text-align:right'><b style='mso-bidi-font-weight:
-normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumber }}:{{ docyear }}(E) {{ draftinfo }}</span></b><b
+normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumber }}(E) {{ draftinfo }}</span></b><b
 style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'><o:p></o:p></span></b></p>
 {% endif %}
 
@@ -13,7 +13,7 @@ style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'>
 {% endif %}
 
 {% if tc_docnumber %}
-<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB" style='mso-no-proof:yes'>{{ docnumber }}:{{ docyear }}(E) {{ draftinfo }}</span></p>
+<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB" style='mso-no-proof:yes'>{{ docnumber }}(E) {{ draftinfo }}</span></p>
 {% endif %}
 
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"

data/lib/isodoc/iso/metadata.rb

@@ -20,9 +20,10 @@ module IsoDoc
       }.freeze
 
       def stage_abbrev(stage, iter, draft)
+        return "" unless stage
         stage = STAGE_ABBRS[stage.to_sym] || "??"
-        stage += iter.text if iter
-        stage = "Pre" + stage if draft&.text =~ /^0\./
+        stage += iter if iter
+        stage = "Pre" + stage if draft =~ /^0\./
         stage
       end
 
@@ -31,8 +32,8 @@ module IsoDoc
         if docstatus
           set(:stage, docstatus.text)
           set(:stage_int, docstatus.text.to_i)
-          abbr = stage_abbrev(docstatus.text, isoxml.at(ns("//bibdata/status/iteration")),
-                              isoxml.at(ns("//version/draft")))
+          abbr = stage_abbrev(docstatus.text, isoxml&.at(ns("//bibdata/status/iteration"))&.text,
+                              isoxml&.at(ns("//version/draft"))&.text)
           set(:stageabbr, abbr)
         end
         revdate = isoxml.at(ns("//version/revision-date"))
@@ -40,15 +41,9 @@ module IsoDoc
       end
 
       def docid(isoxml, _out)
-        dn = docnumber(isoxml) # e.g. ISO 8601, ISO/IEC DIR 2
-        docstatus = get[:stage]
-        if docstatus
-          abbr = get[:stageabbr]
-          docstatus = get[:stage]
-          (docstatus.to_i < 60) && dn = dn.sub(/ /, "/#{abbr} ")
-        end
-        set(:docnumber, dn)
-        tcdn = isoxml.at(ns("//bibdata/docidentifier/tc-document-number"))
+        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso']"))
+        set(:docnumber, dn&.text)
+        tcdn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso-tc']"))
         set(:tc_docnumber, tcdn&.text)
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.0.8".freeze
+    VERSION = "1.0.9".freeze
   end
 end

data/spec/asciidoctor-iso/base_spec.rb

@@ -45,7 +45,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes default metadata" do
-    expect(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)).to be_equivalent_to <<~'OUTPUT'
+    expect(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)).to be_equivalent_to <<~"OUTPUT"
       = Document title
       Author
       :docfile: test.adoc
@@ -56,7 +56,7 @@ RSpec.describe Asciidoctor::ISO do
       :partnumber: 1
       :edition: 2
       :revdate: 2000-01-01
-      :draft: 3.4
+      :draft: 0.3.4
       :technical-committee: TC
       :technical-committee-number: 1
       :technical-committee-type: A
@@ -76,7 +76,6 @@ RSpec.describe Asciidoctor::ISO do
       :workgroup-number_2: 31
       :workgroup-type_2: C1
       :secretariat: SECRETARIAT
-      :copyright-year: 2001
       :docstage: 10
       :docsubstage: 20
       :iteration: 3
@@ -102,9 +101,11 @@ RSpec.describe Asciidoctor::ISO do
            <title-main language="fr" format="text/plain">Titre Principal</title-main>
            <title-part language="fr" format="text/plain">Part du Titre</title-part>
          </title>
-         <docidentifier>
-           <project-number part="1">ISO 1000</project-number>
-         </docidentifier>
+         <docidentifier type="iso">ISO/PreNWIP3 1000-1</docidentifier>
+<docidentifier type="iso-structured">
+  <project-number part="1">ISO 1000</project-number>
+</docidentifier>
+<docnumber>1000</docnumber>
          <contributor>
            <role type="author"/>
            <organization>
@@ -127,7 +128,7 @@ RSpec.describe Asciidoctor::ISO do
            <iteration>3</iteration>
          </status>
          <copyright>
-           <from>2001</from>
+           <from>#{Date.today.year}</from>
            <owner>
              <organization>
              <name>International Organization for Standardization</name>
@@ -156,7 +157,7 @@ RSpec.describe Asciidoctor::ISO do
        </bibdata><version>
          <edition>2</edition>
          <revision-date>2000-01-01</revision-date>
-         <draft>3.4</draft>
+         <draft>0.3.4</draft>
        </version>
        <sections/>
        </iso-standard>
@@ -178,6 +179,7 @@ RSpec.describe Asciidoctor::ISO do
       :language: el
       :script: Grek
       :publisher: IEC,IETF,ISO
+      :copyright-year: 2001
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -188,10 +190,12 @@ RSpec.describe Asciidoctor::ISO do
          <title>
 
          </title>
-         <docidentifier>
+         <docidentifier type="iso">ISO/IEC/IETF 1000-1-1:2001</docidentifier>
+         <docidentifier type="iso-structured">
            <project-number part="1" subpart="1">ISO/IEC/IETF 1000</project-number>
-           <tc-document-number>2000</tc-document-number>
          </docidentifier>
+         <docidentifier type="iso-tc">2000</docidentifier>
+         <docnumber>1000</docnumber>
          <contributor>
            <role type="author"/>
            <organization>
@@ -239,7 +243,7 @@ RSpec.describe Asciidoctor::ISO do
            <substage>60</substage>
          </status>
          <copyright>
-           <from>2018</from>
+           <from>2001</from>
            <owner>
              <organization>
                <name>International Electrotechnical Commission</name>
@@ -248,7 +252,7 @@ RSpec.describe Asciidoctor::ISO do
            </owner>
          </copyright>
          <copyright>
-           <from>2018</from>
+           <from>2001</from>
            <owner>
              <organization>
                <name>IETF</name>
@@ -256,7 +260,7 @@ RSpec.describe Asciidoctor::ISO do
            </owner>
          </copyright>
          <copyright>
-           <from>2018</from>
+           <from>2001</from>
            <owner>
              <organization>
                <name>International Organization for Standardization</name>