metanorma-iso 1.7.4 → 1.8.4

data/lib/isodoc/iso/metadata.rb

@@ -16,6 +16,7 @@ module IsoDoc
 
       def status_abbrev(stage, substage, iter, draft, doctype)
         return "" unless stage
+
         if %w(technical-report technical-specification).include?(doctype)
           stage = "DTS" if stage == "DIS"
           stage = "FDTS" if stage == "FDIS"

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -5,10 +5,6 @@ require_relative "index"
 module IsoDoc
   module Iso
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
-      def initialize(options)
-        super
-      end
-
       def convert1(docxml, filename, dir)
         if amd(docxml)
           @oldsuppressheadingnumbers = @suppressheadingnumbers
@@ -30,43 +26,57 @@ module IsoDoc
         @xrefs = Xref.new(lang, script, klass, labels, options)
       end
 
-      def figure1(f)
-        return if labelled_ancestor(f) && f.ancestors("figure").empty?
-        lbl = @xrefs.anchor(f['id'], :label, false) or return
-        figname = f.parent.name == "figure" ? "" : "#{@i18n.figure} "
-        connective = f.parent.name == "figure" ? "&nbsp; " : "&nbsp;&mdash; "
-        prefix_name(f, connective, l10n("#{figname}#{lbl}"), "name")
+      def figure1(node)
+        return if labelled_ancestor(node) && node.ancestors("figure").empty?
+
+        lbl = @xrefs.anchor(node["id"], :label, false) or return
+        figname = node.parent.name == "figure" ? "" : "#{@i18n.figure} "
+        connective = node.parent.name == "figure" ? "&nbsp; " : "&nbsp;&mdash; "
+        prefix_name(node, connective, l10n("#{figname}#{lbl}"), "name")
       end
 
-      def example1(f)
-        n = @xrefs.get[f["id"]]
-        lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @i18n.example :
-          l10n("#{@i18n.example} #{n[:label]}")
-        prefix_name(f, "&nbsp;&mdash; ", lbl, "name")
+      def example1(node)
+        n = @xrefs.get[node["id"]]
+        lbl = if n.nil? || n[:label].nil? || n[:label].empty?
+                @i18n.example
+              else
+                l10n("#{@i18n.example} #{n[:label]}")
+              end
+        prefix_name(node, "&nbsp;&mdash; ", lbl, "name")
       end
 
-      def eref_localities1_zh(target, type, from, to, delim)
+      def eref_localities1_zh(target, type, from, to, n, delim)
         subsection = from&.text&.match(/\./)
-        ret = (delim == ";") ? ";" : (type == "list") ? "" : delim
+        ret = if delim == ";"
+                ";"
+              else
+                type == "list" ? "" : delim
+              end
         ret += " 第#{from.text}" if from
         ret += "&ndash;#{to.text}" if to
-        loc = (@i18n.locality[type] || type.sub(/^locality:/, "").capitalize )
+        loc = (@i18n.locality[type] || type.sub(/^locality:/, "").capitalize)
         ret += " #{loc}" unless subsection && type == "clause" ||
-          type == "list" || target.match(/^IEV$|^IEC 60050-/)
+          type == "list" || target.match(/^IEV$|^IEC 60050-/) ||
+          n["droploc"] == "true"
         ret += ")" if type == "list"
         ret
       end
 
-      def eref_localities1(target, type, from, to, delim, lang = "en")
+      def eref_localities1(target, type, from, to, delim, n, lang = "en")
         return "" if type == "anchor"
+
         subsection = from&.text&.match(/\./)
         type = type.downcase
         lang == "zh" and
-          return l10n(eref_localities1_zh(target, type, from, to, delim))
-        ret = (delim == ";") ? ";" : (type == "list") ? "" : delim
-        loc = @i18n.locality[type] || type.sub(/^locality:/, "").capitalize
-        ret += " #{loc}" unless subsection && type == "clause" ||
-          type == "list" || target.match(/^IEV$|^IEC 60050-/)
+          return l10n(eref_localities1_zh(target, type, from, to, n, delim))
+        ret = if delim == ";"
+                ";"
+              else
+                type == "list" ? "" : delim
+              end
+        ret += eref_locality_populate(type, n) unless subsection &&
+          type == "clause" || type == "list" ||
+          target.match(/^IEV$|^IEC 60050-/)
         ret += " #{from.text}" if from
         ret += "&ndash;#{to.text}" if to
         ret += ")" if type == "list"
@@ -78,17 +88,18 @@ module IsoDoc
         l10n(@xrefs.anchor(container, :xref) + delim + linkend)
       end
 
-      def example_span_label(node, div, name)
+      def example_span_label(_node, div, name)
         return if name.nil?
-        div.span **{ class: "example_label" } do |p|
+
+        div.span **{ class: "example_label" } do |_p|
           name.children.each { |n| parse(n, div) }
         end
       end
 
-      def clause1(f)
-        if !f.at(ns("./title")) &&
-            !%w(sections preface bibliography).include?(f.parent.name)
-          f["inline-header"] = "true"
+      def clause1(node)
+        if !node.at(ns("./title")) &&
+            !%w(sections preface bibliography).include?(node.parent.name)
+          node["inline-header"] = "true"
         end
         super
       end
@@ -96,8 +107,8 @@ module IsoDoc
       def clause(docxml)
         docxml.xpath(ns("//clause[not(ancestor::annex)] | "\
                         "//terms | //definitions | //references | "\
-                        "//preface/introduction[clause]")).
-        each do |f|
+                        "//preface/introduction[clause]"))
+          .each do |f|
           clause1(f)
         end
       end

data/lib/isodoc/iso/sts_convert.rb

@@ -4,28 +4,25 @@ require "mn2sts"
 module IsoDoc
   module Iso
 
-    # A {Converter} implementation that generates HTML output, and a document
-    # schema encapsulation of the document for validation
-    #
     class StsConvert < IsoDoc::XslfoPdfConvert
-      def initialize(options)
+      def initialize(_options) # rubocop:disable Lint/MissingSuper
         @libdir = File.dirname(__FILE__)
         @format = :sts
         @suffix = "sts.xml"
       end
 
-      def convert(input_filename, file = nil, debug = false, output_filename = nil)
-        file = File.read(input_filename, encoding: "utf-8") if file.nil?
-        docxml, filename, dir = convert_init(file, input_filename, debug)
-        /\.xml$/.match(input_filename) or
-          input_filename = Tempfile.open([filename, ".xml"], encoding: "utf-8") do |f|
-          f.write file
-          f.path
+      def convert(in_fname, file = nil, debug = false, out_fname = nil)
+        file = File.read(in_fname, encoding: "utf-8") if file.nil?
+        _docxml, filename, dir = convert_init(file, in_fname, debug)
+        unless /\.xml$/.match?(in_fname)
+          in_fname = Tempfile.open([filename, ".xml"], encoding: "utf-8") do |f|
+            f.write file
+            f.path
+          end
         end
         FileUtils.rm_rf dir
-        Mn2sts.convert(input_filename, output_filename || "#{filename}.#{@suffix}")
+        Mn2sts.convert(in_fname, out_fname || "#{filename}.#{@suffix}")
       end
     end
   end
 end
-

data/lib/isodoc/iso/word_convert.rb

@@ -34,7 +34,6 @@ module IsoDoc
                            html_doc_path("style-iso.scss")),
         htmlcoverpage: html_doc_path("html_iso_titlepage.html"),
         htmlintropage: html_doc_path("html_iso_intro.html"),
-        scripts: html_doc_path("scripts.html"),
         wordstylesheet: html_doc_path("wordstyle.scss"),
         standardstylesheet: html_doc_path("isodoc.scss"),
         header: html_doc_path("header.html"),

data/lib/isodoc/iso/xref.rb

@@ -4,25 +4,35 @@ module IsoDoc
     end
 
     class Xref < IsoDoc::Xref
-      def initial_anchor_names(d)
-        if @klass.amd(d)
-          d.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
-          sequential_asset_names(d.xpath(ns("//preface/*")))
-          d.xpath(ns("//sections/clause")).each { |c| c.element? and preface_names(c) }
-          middle_section_asset_names(d)
-          termnote_anchor_names(d)
-          termexample_anchor_names(d)
+      def initial_anchor_names(doc)
+        if @klass.amd(doc)
+          initial_anchor_names_amd(doc)
         else
           super
         end
-        introduction_names(d.at(ns("//introduction")))
+        introduction_names(doc.at(ns("//introduction")))
+      end
+
+      def initial_anchor_names_amd(doc)
+        doc.xpath(ns("//preface/*")).each do |c|
+          c.element? and preface_names(c)
+        end
+        sequential_asset_names(doc.xpath(ns("//preface/*")))
+        doc.xpath(ns("//sections/clause")).each do |c|
+          c.element? and preface_names(c)
+        end
+        middle_section_asset_names(doc)
+        termnote_anchor_names(doc)
+        termexample_anchor_names(doc)
       end
 
       # we can reference 0-number clauses in introduction
       def introduction_names(clause)
         return if clause.nil?
-        clause.at(ns("./clause")) and @anchors[clause["id"]] = 
-          { label: "0", level: 1, xref: clause.at(ns("./title"))&.text, type: "clause" }
+
+        clause.at(ns("./clause")) and
+          @anchors[clause["id"]] = { label: "0", level: 1, type: "clause",
+                                     xref: clause.at(ns("./title"))&.text }
         i = Counter.new
         clause.xpath(ns("./clause")).each do |c|
           i.increment(c)
@@ -35,17 +45,19 @@ module IsoDoc
         super
       end
 
-      def appendix_names(clause, num)
+      def appendix_names(clause, _num)
         i = Counter.new
         clause.xpath(ns("./appendix")).each do |c|
           i.increment(c)
-          @anchors[c["id"]] = anchor_struct(i.print, nil, @labels["appendix"], "clause")
+          @anchors[c["id"]] = anchor_struct(i.print, nil, @labels["appendix"],
+                                            "clause")
           @anchors[c["id"]][:level] = 2
           @anchors[c["id"]][:container] = clause["id"]
           j = Counter.new
           c.xpath(ns("./clause | ./references")).each do |c1|
             j.increment(c1)
-            appendix_names1(c1, l10n("#{@labels["appendix"]} #{i.print}.#{j.print}"), 3, clause["id"])
+            lbl = "#{@labels['appendix']} #{i.print}.#{j.print}"
+            appendix_names1(c1, l10n(lbl), 3, clause["id"])
           end
         end
       end
@@ -56,8 +68,8 @@ module IsoDoc
         # subclauses are not prefixed with "Clause"
         i = Counter.new
         clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
-                        "./references")).
-                       each do |c|
+                        "./references"))
+          .each do |c|
           i.increment(c)
           section_names1(c, "#{num}.#{i.print}", level + 1)
         end
@@ -73,7 +85,8 @@ module IsoDoc
       end
 
       def appendix_names1(clause, num, level, container)
-        @anchors[clause["id"]] = { label: num, xref: num, level: level, container: container }
+        @anchors[clause["id"]] = { label: num, xref: num, level: level,
+                                   container: container }
         i = Counter.new
         clause.xpath(ns("./clause | ./references")).each do |c|
           i.increment(c)
@@ -85,29 +98,33 @@ module IsoDoc
         c = IsoDoc::XrefGen::Counter.new
         clause.xpath(ns(".//formula")).each do |t|
           next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] =
-            anchor_struct("#{num}#{hiersep}#{c.increment(t).print}", t,
-                          t["inequality"] ? @labels["inequality"] : @labels["formula"],
-                          "formula", t["unnumbered"])
+
+          @anchors[t["id"]] = anchor_struct(
+            "#{num}#{hiersep}#{c.increment(t).print}", t,
+            t["inequality"] ? @labels["inequality"] : @labels["formula"],
+            "formula", t["unnumbered"]
+          )
         end
       end
 
-      def figure_anchor(t, sublabel, label)
-        @anchors[t["id"]] = anchor_struct(
+      def figure_anchor(elem, sublabel, label)
+        @anchors[elem["id"]] = anchor_struct(
           (sublabel ? "#{label} #{sublabel}" : label),
-          nil, @labels["figure"], "figure", t["unnumbered"])
-        sublabel && t["unnumbered"] != "true" and
-          @anchors[t["id"]][:label] = sublabel
+          nil, @labels["figure"], "figure", elem["unnumbered"]
+        )
+        sublabel && elem["unnumbered"] != "true" and
+          @anchors[elem["id"]][:label] = sublabel
       end
 
       def sequential_figure_names(clause)
         c = IsoDoc::XrefGen::Counter.new
         j = 0
-        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).
-          each do |t|
+        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
+          .each do |t|
           j = subfigure_increment(j, c, t)
-          sublabel = j.zero? ? nil : "#{(j+96).chr})"
+          sublabel = j.zero? ? nil : "#{(j + 96).chr})"
           next if t["id"].nil? || t["id"].empty?
+
           figure_anchor(t, sublabel, c.print)
         end
       end
@@ -115,20 +132,21 @@ module IsoDoc
       def hierarchical_figure_names(clause, num)
         c = IsoDoc::XrefGen::Counter.new
         j = 0
-        clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]")).
-          each do |t|
+        clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]"))
+          .each do |t|
           j = subfigure_increment(j, c, t)
           label = "#{num}#{hiersep}#{c.print}"
-          sublabel = j.zero? ? nil : "#{(j+96).chr})"
+          sublabel = j.zero? ? nil : "#{(j + 96).chr})"
           next if t["id"].nil? || t["id"].empty?
+
           figure_anchor(t, sublabel, label)
         end
       end
 
       def reference_names(ref)
         super
-        @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref].
-                                sub(/ \(All Parts\)/i, "") }
+        @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref]
+          .sub(/ \(All Parts\)/i, "") }
       end
 
       def back_anchor_names(docxml)

data/lib/metanorma/iso/processor.rb

@@ -38,6 +38,7 @@ module Metanorma
 
       def use_presentation_xml(ext)
         return true if ext == :html_alt
+
         super
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.7.4".freeze
+    VERSION = "1.8.4".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "metanorma/iso/version"
 
@@ -29,22 +29,22 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
+  spec.add_dependency "isodoc", "~> 1.6.2"
+  spec.add_dependency "metanorma-standoc", "~> 1.9.0"
+  spec.add_dependency "mn2sts", "~> 1.8.0"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 1.5.0"
-  spec.add_dependency "metanorma-standoc", "~> 1.8.0"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"
-  spec.add_dependency "mn2sts", "~> 1.5.0"
 
   spec.add_development_dependency "byebug"
-  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "rake" , "~> 13.0"
+  spec.add_development_dependency "iev", "~> 0.2.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1.5.2"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "iev", "~> 0.2.0"
 end

data/spec/asciidoctor/base_spec.rb

@@ -6,27 +6,33 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes a blank document" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", *OPTIONS))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(Asciidoctor.convert(input, *OPTIONS)))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "converts a blank document" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", *OPTIONS))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       = Document title
       Author
       :docfile: test.adoc
       :novalid:
       :no-isobib:
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(Asciidoctor.convert(input, *OPTIONS)))
+      .to be_equivalent_to xmlpp(output)
     expect(File.exist?("test_alt.html")).to be true
     expect(File.exist?("test.html")).to be true
     expect(File.exist?("test.doc")).to be true
@@ -35,7 +41,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "converts a blank document in French" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", *OPTIONS))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       = Document title
       Author
       :docfile: test.adoc
@@ -44,10 +50,13 @@ RSpec.describe Asciidoctor::ISO do
       :no-pdf:
       :language: fr
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR_FR}
         <sections/>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(Asciidoctor.convert(input, *OPTIONS)))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes default metadata" do
@@ -96,87 +105,88 @@ RSpec.describe Asciidoctor::ISO do
       :copyright-year: 2000
       :horizontal: true
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <?xml version="1.0" encoding="UTF-8"?>
-      <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
-        <bibdata type="standard">
-          <title format="text/plain" language="en" type="main">Introduction — Main Title — Title — Title Part</title>
-          <title format="text/plain" language="en" type="title-intro">Introduction</title>
-          <title format="text/plain" language="en" type="title-main">Main Title — Title</title>
-          <title format="text/plain" language="en" type="title-part">Title Part</title>
-          <title format="text/plain" language="fr" type="main">Introduction Française — Titre Principal — Part du Titre</title>
-          <title format="text/plain" language="fr" type="title-intro">Introduction Française</title>
-          <title format="text/plain" language="fr" type="title-main">Titre Principal</title>
-          <title format="text/plain" language="fr" type="title-part">Part du Titre</title>
-          <docidentifier type="ISO">ISO/PreWD3 1000-1</docidentifier>
-          <docidentifier type="iso-with-lang">ISO/PreWD3 1000-1(E)</docidentifier>
-          <docidentifier type="iso-reference">ISO/PreWD3 1000-1:2000(E)</docidentifier>
-          <docnumber>1000</docnumber>
-          <contributor>
-            <role type="author"/>
-            <organization>
-              <name>International Organization for Standardization</name>
-              <abbreviation>ISO</abbreviation>
-            </organization>
-          </contributor>
-          <contributor>
-            <role type="publisher"/>
-            <organization>
-              <name>International Organization for Standardization</name>
-              <abbreviation>ISO</abbreviation>
-            </organization>
-          </contributor>
-          <edition>2</edition>
-          <version>
-            <revision-date>2000-01-01</revision-date>
-            <draft>0.3.4</draft>
-          </version>
-          <language>en</language>
-          <script>Latn</script>
-          <status>
-            <stage abbreviation="WD">20</stage>
-            <substage>20</substage>
-            <iteration>3</iteration>
-          </status>
-          <copyright>
-            <from>2000</from>
-            <owner>
+    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(<<~"OUTPUT")
+        <?xml version="1.0" encoding="UTF-8"?>
+        <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
+          <bibdata type="standard">
+            <title format="text/plain" language="en" type="main">Introduction — Main Title — Title — Title Part</title>
+            <title format="text/plain" language="en" type="title-intro">Introduction</title>
+            <title format="text/plain" language="en" type="title-main">Main Title — Title</title>
+            <title format="text/plain" language="en" type="title-part">Title Part</title>
+            <title format="text/plain" language="fr" type="main">Introduction Française — Titre Principal — Part du Titre</title>
+            <title format="text/plain" language="fr" type="title-intro">Introduction Française</title>
+            <title format="text/plain" language="fr" type="title-main">Titre Principal</title>
+            <title format="text/plain" language="fr" type="title-part">Part du Titre</title>
+            <docidentifier type="ISO">ISO/PreWD3 1000-1</docidentifier>
+            <docidentifier type="iso-with-lang">ISO/PreWD3 1000-1(E)</docidentifier>
+            <docidentifier type="iso-reference">ISO/PreWD3 1000-1:2000(E)</docidentifier>
+            <docnumber>1000</docnumber>
+            <contributor>
+              <role type="author"/>
               <organization>
                 <name>International Organization for Standardization</name>
                 <abbreviation>ISO</abbreviation>
               </organization>
-            </owner>
-          </copyright>
-          <ext>
-            <doctype>article</doctype>
-            <horizontal>true</horizontal>
-            <editorialgroup>
-              <technical-committee number="1" type="A">TC</technical-committee>
-              <technical-committee number="11" type="A1">TC1</technical-committee>
-              <subcommittee number="2" type="B">SC</subcommittee>
-              <subcommittee number="21" type="B1">SC1</subcommittee>
-              <workgroup number="3" type="C">WG</workgroup>
-              <workgroup number="31" type="C1">WG1</workgroup>
-              <secretariat>SECRETARIAT</secretariat>
-            </editorialgroup>
-            <ics>
-              <code>1</code>
-            </ics>
-            <ics>
-              <code>2</code>
-            </ics>
-            <ics>
-              <code>3</code>
-            </ics>
-            <structuredidentifier>
-              <project-number part="1">ISO 1000</project-number>
-            </structuredidentifier>
-            <stagename>Third working draft</stagename>
-          </ext>
-        </bibdata>
-        <sections/>
-      </iso-standard>
-    OUTPUT
+            </contributor>
+            <contributor>
+              <role type="publisher"/>
+              <organization>
+                <name>International Organization for Standardization</name>
+                <abbreviation>ISO</abbreviation>
+              </organization>
+            </contributor>
+            <edition>2</edition>
+            <version>
+              <revision-date>2000-01-01</revision-date>
+              <draft>0.3.4</draft>
+            </version>
+            <language>en</language>
+            <script>Latn</script>
+            <status>
+              <stage abbreviation="WD">20</stage>
+              <substage>20</substage>
+              <iteration>3</iteration>
+            </status>
+            <copyright>
+              <from>2000</from>
+              <owner>
+                <organization>
+                  <name>International Organization for Standardization</name>
+                  <abbreviation>ISO</abbreviation>
+                </organization>
+              </owner>
+            </copyright>
+            <ext>
+              <doctype>article</doctype>
+              <horizontal>true</horizontal>
+              <editorialgroup>
+                <technical-committee number="1" type="A">TC</technical-committee>
+                <technical-committee number="11" type="A1">TC1</technical-committee>
+                <subcommittee number="2" type="B">SC</subcommittee>
+                <subcommittee number="21" type="B1">SC1</subcommittee>
+                <workgroup number="3" type="C">WG</workgroup>
+                <workgroup number="31" type="C1">WG1</workgroup>
+                <secretariat>SECRETARIAT</secretariat>
+              </editorialgroup>
+              <ics>
+                <code>1</code>
+              </ics>
+              <ics>
+                <code>2</code>
+              </ics>
+              <ics>
+                <code>3</code>
+              </ics>
+              <structuredidentifier>
+                <project-number part="1">ISO 1000</project-number>
+              </structuredidentifier>
+              <stagename>Third working draft</stagename>
+            </ext>
+          </bibdata>
+          <sections/>
+        </iso-standard>
+      OUTPUT
   end
 
   it "processes complex metadata" do
@@ -203,95 +213,132 @@ RSpec.describe Asciidoctor::ISO do
       :pub-email: x@example.com
       :pub-uri: http://www.example.com
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <?xml version="1.0" encoding="UTF-8"?>
-      <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
-        <bibdata type="standard">
-          <docidentifier type="ISO">ISO/IEC/IETF/TR 1000-1-1:2001</docidentifier>
-          <docidentifier type="iso-with-lang">ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
-          <docidentifier type="iso-reference">ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
-          <docidentifier type="iso-tc">2000</docidentifier>
-          <docidentifier type="iso-tc">2003</docidentifier>
-          <docnumber>1000</docnumber>
-          <contributor>
-            <role type="author"/>
-            <organization>
-              <name>International Electrotechnical Commission</name>
-              <abbreviation>IEC</abbreviation>
-            </organization>
-          </contributor>
-          <contributor>
-            <role type="author"/>
-            <organization>
-              <name>IETF</name>
-            </organization>
-          </contributor>
-          <contributor>
-            <role type="author"/>
-            <organization>
-              <name>International Organization for Standardization</name>
-              <abbreviation>ISO</abbreviation>
-            </organization>
-          </contributor>
-          <contributor>
-            <role type="publisher"/>
-            <organization>
-              <name>International Electrotechnical Commission</name>
-              <abbreviation>IEC</abbreviation>
-            </organization>
-          </contributor>
-          <contributor>
-            <role type="publisher"/>
-            <organization>
-              <name>IETF</name>
-            </organization>
-          </contributor>
-          <contributor>
-            <role type="publisher"/>
-            <organization>
-              <name>International Organization for Standardization</name>
-              <abbreviation>ISO</abbreviation>
-            </organization>
-          </contributor>
-          <language>el</language>
-          <script>Grek</script>
-          <status>
-            <stage abbreviation="IS">60</stage>
-            <substage>60</substage>
-          </status>
-          <copyright>
-            <from>2001</from>
-            <owner>
-              <organization>
-                <name>International Organization for Standardization</name>
-                <abbreviation>ISO</abbreviation>
-              </organization>
-            </owner>
-          </copyright>
-          <copyright>
-            <from>2001</from>
-            <owner>
-              <organization>
-                <name>IETF</name>
-              </organization>
-            </owner>
-          </copyright>
-          <ext>
-            <doctype>technical-report</doctype>
-            <editorialgroup>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
-            </editorialgroup>
-            <structuredidentifier>
-              <project-number part="1" subpart="1">ISO/IEC/IETF 1000</project-number>
-            </structuredidentifier>
-            <stagename>International standard</stagename>
-          </ext>
-        </bibdata>
-        <sections/>
-      </iso-standard>
-    OUTPUT
+    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(<<~"OUTPUT")
+                      <?xml version="1.0" encoding="UTF-8"?>
+                      <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
+                        <bibdata type="standard">
+                          <docidentifier type="ISO">ISO/IEC/IETF/TR 1000-1-1:2001</docidentifier>
+                          <docidentifier type="iso-with-lang">ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
+                          <docidentifier type="iso-reference">ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
+                          <docidentifier type="iso-tc">2000</docidentifier>
+                          <docidentifier type="iso-tc">2003</docidentifier>
+                          <docnumber>1000</docnumber>
+                          <contributor>
+                            <role type="author"/>
+                            <organization>
+                              <name>International Electrotechnical Commission</name>
+                              <abbreviation>IEC</abbreviation>
+                            </organization>
+                          </contributor>
+                          <contributor>
+                            <role type="author"/>
+                            <organization>
+                              <name>IETF</name>
+                            </organization>
+                          </contributor>
+                          <contributor>
+                            <role type="author"/>
+                            <organization>
+                              <name>International Organization for Standardization</name>
+                              <abbreviation>ISO</abbreviation>
+                            </organization>
+                          </contributor>
+                          <contributor>
+                            <role type="publisher"/>
+                            <organization>
+                              <name>International Electrotechnical Commission</name>
+                              <abbreviation>IEC</abbreviation>
+                              <address>
+                  <formattedAddress>1 Infinity Loop + California</formattedAddress>
+                </address>
+                <phone>3333333</phone>
+                <phone type='fax'>4444444</phone>
+                <email>x@example.com</email>
+                <uri>http://www.example.com</uri>
+                            </organization>
+                          </contributor>
+                          <contributor>
+                            <role type="publisher"/>
+                            <organization>
+                              <name>IETF</name>
+                              <address>
+                  <formattedAddress>1 Infinity Loop + California</formattedAddress>
+                </address>
+                <phone>3333333</phone>
+                <phone type='fax'>4444444</phone>
+                <email>x@example.com</email>
+                <uri>http://www.example.com</uri>
+                            </organization>
+                          </contributor>
+                          <contributor>
+                            <role type="publisher"/>
+                            <organization>
+                              <name>International Organization for Standardization</name>
+                              <abbreviation>ISO</abbreviation>
+                              <address>
+                  <formattedAddress>1 Infinity Loop + California</formattedAddress>
+                </address>
+                <phone>3333333</phone>
+                <phone type='fax'>4444444</phone>
+                <email>x@example.com</email>
+                <uri>http://www.example.com</uri>
+                            </organization>
+                          </contributor>
+                          <language>el</language>
+                          <script>Grek</script>
+                          <status>
+                            <stage abbreviation="IS">60</stage>
+                            <substage>60</substage>
+                          </status>
+                          <copyright>
+                            <from>2001</from>
+                            <owner>
+                              <organization>
+                                <name>International Organization for Standardization</name>
+                                <abbreviation>ISO</abbreviation>
+                                <address>
+                  <formattedAddress>1 Infinity Loop + California</formattedAddress>
+                </address>
+                <phone>3333333</phone>
+                <phone type='fax'>4444444</phone>
+                <email>x@example.com</email>
+                <uri>http://www.example.com</uri>
+        #{'        '}
+                              </organization>
+                            </owner>
+                          </copyright>
+                          <copyright>
+                            <from>2001</from>
+                            <owner>
+                              <organization>
+                                <name>IETF</name>
+                                <address>
+                  <formattedAddress>1 Infinity Loop + California</formattedAddress>
+                </address>
+                <phone>3333333</phone>
+                <phone type='fax'>4444444</phone>
+                <email>x@example.com</email>
+                <uri>http://www.example.com</uri>
+                              </organization>
+                            </owner>
+                          </copyright>
+                          <ext>
+                            <doctype>technical-report</doctype>
+                            <editorialgroup>
+                              <technical-committee/>
+                              <subcommittee/>
+                              <workgroup/>
+                            </editorialgroup>
+                            <structuredidentifier>
+                              <project-number part="1" subpart="1">ISO/IEC/IETF 1000</project-number>
+                            </structuredidentifier>
+                            <stagename>International standard</stagename>
+                          </ext>
+                        </bibdata>
+                        <sections/>
+                      </iso-standard>
+      OUTPUT
   end
 
   it "processes subdivisions" do
@@ -318,7 +365,8 @@ RSpec.describe Asciidoctor::ISO do
       :pub-email: x@example.com
       :pub-uri: http://www.example.com
     INPUT
-    expect(xmlpp(strip_guid(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))))
+    expect(xmlpp(strip_guid(output
+      .sub(%r{<boilerplate>.*</boilerplate>}m, ""))))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
         <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
           <bibdata type='standard'>
@@ -336,13 +384,6 @@ RSpec.describe Asciidoctor::ISO do
                 <name>International Organization for Standardization</name>
                 <subdivision>Subdivision</subdivision>
                 <abbreviation>SD</abbreviation>
-                <address>
-                  <formattedAddress>1 Infinity Loop <br/>California</formattedAddress>
-                </address>
-                <phone>3333333</phone>
-                <phone type='fax'>4444444</phone>
-                <email>x@example.com</email>
-                <uri>http://www.example.com</uri>
               </organization>
             </contributor>
             <contributor>
@@ -420,12 +461,81 @@ RSpec.describe Asciidoctor::ISO do
       :doctype: international-standard
       :iteration: 2
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
+    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(<<~"OUTPUT")
+              <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
+                <bibdata type="standard">
+                <docidentifier type='ISO'>ISO/FDIS 1000.2</docidentifier>
+        <docidentifier type='iso-with-lang'>ISO/FDIS 1000.2(F)</docidentifier>
+        <docidentifier type='iso-reference'>ISO/FDIS 1000.2(F)</docidentifier>
+                  <docnumber>1000</docnumber>
+                  <contributor>
+                    <role type="author"/>
+                    <organization>
+                      <name>International Organization for Standardization</name>
+                      <abbreviation>ISO</abbreviation>
+                    </organization>
+                  </contributor>
+                  <contributor>
+                    <role type="publisher"/>
+                    <organization>
+                      <name>International Organization for Standardization</name>
+                      <abbreviation>ISO</abbreviation>
+                    </organization>
+                  </contributor>
+                  <language>fr</language>
+                  <script>Latn</script>
+                  <status>
+                    <stage abbreviation="FDIS">50</stage>
+                    <substage>00</substage>
+                    <iteration>2</iteration>
+                  </status>
+                  <copyright>
+                    <from>#{Date.today.year}</from>
+                    <owner>
+                      <organization>
+                        <name>International Organization for Standardization</name>
+                        <abbreviation>ISO</abbreviation>
+                      </organization>
+                    </owner>
+                  </copyright>
+                  <ext>
+                    <doctype>international-standard</doctype>
+                    <editorialgroup>
+                      <technical-committee/>
+                      <subcommittee/>
+                      <workgroup/>
+                    </editorialgroup>
+                    <structuredidentifier>
+                      <project-number>ISO 1000</project-number>
+                    </structuredidentifier>
+                    <stagename>Final draft</stagename>
+                  </ext>
+                </bibdata>
+                <sections/>
+              </iso-standard>
+      OUTPUT
+  end
+
+  it "defaults substage for stage 60" do
+    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :docnumber: 1000
+      :docstage: 60
+    INPUT
+
+    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(<<~"OUTPUT")
+        <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
         <bibdata type="standard">
-        <docidentifier type='ISO'>ISO/FDIS 1000.2</docidentifier>
-<docidentifier type='iso-with-lang'>ISO/FDIS 1000.2(F)</docidentifier>
-<docidentifier type='iso-reference'>ISO/FDIS 1000.2(F)</docidentifier>
+          <docidentifier type="ISO">ISO 1000</docidentifier>
+          <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
+          <docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
           <docnumber>1000</docnumber>
           <contributor>
             <role type="author"/>
@@ -441,12 +551,12 @@ RSpec.describe Asciidoctor::ISO do
               <abbreviation>ISO</abbreviation>
             </organization>
           </contributor>
-          <language>fr</language>
+
+          <language>en</language>
           <script>Latn</script>
           <status>
-            <stage abbreviation="FDIS">50</stage>
-            <substage>00</substage>
-            <iteration>2</iteration>
+            <stage abbreviation="IS">60</stage>
+            <substage>60</substage>
           </status>
           <copyright>
             <from>#{Date.today.year}</from>
@@ -458,7 +568,7 @@ RSpec.describe Asciidoctor::ISO do
             </owner>
           </copyright>
           <ext>
-            <doctype>international-standard</doctype>
+            <doctype>article</doctype>
             <editorialgroup>
               <technical-committee/>
               <subcommittee/>
@@ -467,15 +577,15 @@ RSpec.describe Asciidoctor::ISO do
             <structuredidentifier>
               <project-number>ISO 1000</project-number>
             </structuredidentifier>
-            <stagename>Final draft</stagename>
+            <stagename>International standard</stagename>
           </ext>
         </bibdata>
         <sections/>
-      </iso-standard>
-    OUTPUT
+        </iso-standard>
+      OUTPUT
   end
 
-  it "defaults substage for stage 60" do
+  it "populates metadata for PRF" do
     output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
@@ -485,64 +595,65 @@ RSpec.describe Asciidoctor::ISO do
       :no-isobib:
       :docnumber: 1000
       :docstage: 60
+      :docsubstage: 00
     INPUT
+    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(<<~"OUTPUT")
+        <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
+          <bibdata type="standard">
+            <docidentifier type="ISO">ISO 1000</docidentifier>
+            <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
+            <docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
+            <docnumber>1000</docnumber>
+            <contributor>
+              <role type="author"/>
+              <organization>
+                <name>International Organization for Standardization</name>
+                <abbreviation>ISO</abbreviation>
+              </organization>
+            </contributor>
+            <contributor>
+              <role type="publisher"/>
+              <organization>
+                <name>International Organization for Standardization</name>
+                <abbreviation>ISO</abbreviation>
+              </organization>
+            </contributor>
 
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
-      <bibdata type="standard">
-        <docidentifier type="ISO">ISO 1000</docidentifier>
-        <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
-        <docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
-        <docnumber>1000</docnumber>
-        <contributor>
-          <role type="author"/>
-          <organization>
-            <name>International Organization for Standardization</name>
-            <abbreviation>ISO</abbreviation>
-          </organization>
-        </contributor>
-        <contributor>
-          <role type="publisher"/>
-          <organization>
-            <name>International Organization for Standardization</name>
-            <abbreviation>ISO</abbreviation>
-          </organization>
-        </contributor>
-
-        <language>en</language>
-        <script>Latn</script>
-        <status>
-          <stage abbreviation="IS">60</stage>
-          <substage>60</substage>
-        </status>
-        <copyright>
-          <from>#{Date.today.year}</from>
-          <owner>
-            <organization>
-              <name>International Organization for Standardization</name>
-              <abbreviation>ISO</abbreviation>
-            </organization>
-          </owner>
-        </copyright>
-        <ext>
-          <doctype>article</doctype>
-          <editorialgroup>
-            <technical-committee/>
-            <subcommittee/>
-            <workgroup/>
-          </editorialgroup>
-          <structuredidentifier>
-            <project-number>ISO 1000</project-number>
-          </structuredidentifier>
-          <stagename>International standard</stagename>
-        </ext>
-      </bibdata>
-      <sections/>
-      </iso-standard>
-    OUTPUT
+            <language>en</language>
+            <script>Latn</script>
+            <status>
+              <stage abbreviation="PRF">60</stage>
+              <substage>00</substage>
+            </status>
+            <copyright>
+              <from>#{Date.today.year}</from>
+              <owner>
+                <organization>
+                  <name>International Organization for Standardization</name>
+                  <abbreviation>ISO</abbreviation>
+                </organization>
+              </owner>
+            </copyright>
+            <ext>
+              <doctype>article</doctype>
+              <editorialgroup>
+                <technical-committee/>
+                <subcommittee/>
+                <workgroup/>
+              </editorialgroup>
+              <structuredidentifier>
+                <project-number>ISO 1000</project-number>
+              </structuredidentifier>
+              <stagename>Proof</stagename>
+            </ext>
+          </bibdata>
+          <sections/>
+        </iso-standard>
+      OUTPUT
   end
 
-  it "populates metadata for PRF" do
+  it "defaults metadata for DIR" do
     output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
@@ -551,62 +662,62 @@ RSpec.describe Asciidoctor::ISO do
       :novalid:
       :no-isobib:
       :docnumber: 1000
-      :docstage: 60
-      :docsubstage: 00
+      :doctype: directive
     INPUT
-    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
-        <bibdata type="standard">
-          <docidentifier type="ISO">ISO 1000</docidentifier>
-          <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
-          <docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
-          <docnumber>1000</docnumber>
-          <contributor>
-            <role type="author"/>
-            <organization>
-              <name>International Organization for Standardization</name>
-              <abbreviation>ISO</abbreviation>
-            </organization>
-          </contributor>
-          <contributor>
-            <role type="publisher"/>
-            <organization>
-              <name>International Organization for Standardization</name>
-              <abbreviation>ISO</abbreviation>
-            </organization>
-          </contributor>
 
-          <language>en</language>
-          <script>Latn</script>
-          <status>
-            <stage abbreviation="PRF">60</stage>
-            <substage>00</substage>
-          </status>
-          <copyright>
-            <from>#{Date.today.year}</from>
-            <owner>
+    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
+      .to be_equivalent_to xmlpp(<<~"OUTPUT")
+        <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
+          <bibdata type='standard'>
+            <docidentifier type='ISO'>ISO DIR 1000</docidentifier>
+            <docidentifier type='iso-with-lang'>ISO DIR 1000(E)</docidentifier>
+            <docidentifier type='iso-reference'>ISO DIR 1000(E)</docidentifier>
+            <docnumber>1000</docnumber>
+            <contributor>
+              <role type='author'/>
               <organization>
                 <name>International Organization for Standardization</name>
                 <abbreviation>ISO</abbreviation>
               </organization>
-            </owner>
-          </copyright>
-          <ext>
-            <doctype>article</doctype>
-            <editorialgroup>
-              <technical-committee/>
-              <subcommittee/>
-              <workgroup/>
-            </editorialgroup>
-            <structuredidentifier>
-              <project-number>ISO 1000</project-number>
-            </structuredidentifier>
-            <stagename>Proof</stagename>
-          </ext>
-        </bibdata>
-        <sections/>
-      </iso-standard>
-    OUTPUT
+            </contributor>
+            <contributor>
+              <role type='publisher'/>
+              <organization>
+                <name>International Organization for Standardization</name>
+                <abbreviation>ISO</abbreviation>
+              </organization>
+            </contributor>
+            <language>en</language>
+            <script>Latn</script>
+            <status>
+              <stage abbreviation='IS'>60</stage>
+              <substage>60</substage>
+            </status>
+            <copyright>
+              <from>2021</from>
+              <owner>
+                <organization>
+                  <name>International Organization for Standardization</name>
+                  <abbreviation>ISO</abbreviation>
+                </organization>
+              </owner>
+            </copyright>
+            <ext>
+              <doctype>directive</doctype>
+              <editorialgroup>
+                <technical-committee/>
+                <subcommittee/>
+                <workgroup/>
+              </editorialgroup>
+              <structuredidentifier>
+                <project-number>ISO 1000</project-number>
+              </structuredidentifier>
+              <stagename>International standard</stagename>
+            </ext>
+          </bibdata>
+          <sections> </sections>
+        </iso-standard>
+      OUTPUT
   end
 
   it "reads scripts into blank HTML document" do
@@ -632,9 +743,12 @@ RSpec.describe Asciidoctor::ISO do
       :no-pdf:
     INPUT
     html = File.read("test.html", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Cambria", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+    expect(html)
+      .to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
+    expect(html)
+      .to match(%r[blockquote[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+    expect(html)
+      .to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
   end
 
   it "uses default fonts for alt doc" do
@@ -647,9 +761,12 @@ RSpec.describe Asciidoctor::ISO do
       :no-pdf:
     INPUT
     html = File.read("test_alt.html", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Space Mono", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
+    expect(html)
+      .to match(%r[\bpre[^{]+\{[^{]+font-family: "Space Mono", monospace;]m)
+    expect(html)
+      .to match(%r[blockquote[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
+    expect(html)
+      .to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
   end
 
   it "uses Chinese fonts" do
@@ -663,9 +780,12 @@ RSpec.describe Asciidoctor::ISO do
       :no-pdf:
     INPUT
     html = File.read("test.html", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
+    expect(html)
+      .to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
+    expect(html)
+      .to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
+    expect(html)
+      .to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
   end
 
   it "uses specified fonts" do
@@ -683,7 +803,8 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: Andale Mono;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: Zapf Chancery;]m)
+    expect(html)
+      .to match(%r[blockquote[^{]+\{[^{]+font-family: Zapf Chancery;]m)
     expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: Comic Sans;]m)
   end