metanorma-iso 2.0.7 → 2.1.0

data/lib/isodoc/iso/word_convert.rb

@@ -2,6 +2,7 @@ require_relative "base_convert"
 require "isodoc"
 require_relative "init"
 require_relative "word_cleanup"
+require_relative "word_dis_convert"
 
 module IsoDoc
   module Iso
@@ -13,6 +14,11 @@ module IsoDoc
         @wordToClevels = 3 if @wordToClevels.zero?
         @htmlToClevels = options[:htmltoclevels].to_i
         @htmlToClevels = 3 if @htmlToClevels.zero?
+        init_dis
+      end
+
+      def init_dis
+        @dis = ::IsoDoc::Iso::WordDISConvert.new(options)
       end
 
       def font_choice(options)
@@ -45,16 +51,16 @@ module IsoDoc
           olstyle: "l2" }
       end
 
-      def convert1(docxml, filename, dir)
-        @dis = /^[45].$/.match?(docxml&.at(ns("//bibdata/status/stage"))&.text)
-        if @dis
-          @wordstylesheet_name = html_doc_path("wordstyle-dis.scss")
-          @standardstylesheet_name = html_doc_path("isodoc-dis.scss")
-          @wordcoverpage = html_doc_path("word_iso_titlepage-dis.html")
-          @wordintropage = html_doc_path("word_iso_intro-dis.html")
-          @header = html_doc_path("header-dis.html")
+      def convert(input_filename, file = nil, debug = false,
+                output_filename = nil)
+        file = File.read(input_filename, encoding: "utf-8") if file.nil?
+        docxml = Nokogiri::XML(file) { |config| config.huge }
+        if @dis &&
+            /^[45].$/.match?(docxml&.at(ns("//bibdata/status/stage"))&.text)
+          @dis.convert(input_filename, file, debug, output_filename)
+        else
+          super
         end
-        super
       end
 
       def make_body(xml, docxml)
@@ -171,11 +177,22 @@ module IsoDoc
 
         name&.at(ns("./strong"))&.remove # supplied by CSS list numbering
         div.h1 **{ class: "Annex" } do |t|
-          name.children.each { |c2| parse(c2, t) }
+          annex_name1(name, t)
           clause_parse_subtitle(name, t)
         end
       end
 
+      def annex_name1(name, out)
+        name.children.each do |c2|
+          if c2.name == "span" && c2["class"] == "obligation"
+            out.span **{ style: "font-weight:normal;" } do |s|
+              c2.children.each { |c3| parse(c3, s) }
+            end
+          else parse(c2, out)
+          end
+        end
+      end
+
       include BaseConvert
       include Init
     end

data/lib/isodoc/iso/word_dis_convert.rb

@@ -0,0 +1,174 @@
+module IsoDoc
+  module Iso
+    class WordDISConvert < WordConvert
+      def default_file_locations(_options)
+        {
+          wordstylesheet: html_doc_path("wordstyle-dis.scss"),
+          standardstylesheet: html_doc_path("isodoc-dis.scss"),
+          header: html_doc_path("header-dis.html"),
+          wordcoverpage: html_doc_path("word_iso_titlepage-dis.html"),
+          wordintropage: html_doc_path("word_iso_intro-dis.html"),
+          ulstyle: "l3",
+          olstyle: "l2",
+        }
+      end
+
+      def initialize(options)
+        @libdir ||= File.dirname(__FILE__) # rubocop:disable Lint/DisjunctiveAssignmentInConstructor
+        options.merge!(default_file_locations(options))
+        super
+      end
+
+      def init_dis; end
+
+      def style_cleanup(docxml)
+        super
+        dis_styles(docxml)
+      end
+
+      STYLESMAP = {
+        AltTerms: "AdmittedTerm",
+        TableFootnote: "Tablefootnote",
+        formula: "Formula",
+        note: "Note",
+        NormRef: "RefNorm",
+        biblio: "BiblioEntry",
+        MsoNormal: "MsoBodyText",
+        FigureTitle: "Figuretitle",
+      }.freeze
+
+      def dis_styles(docxml)
+        STYLESMAP.each do |k, v|
+          docxml.xpath("//*[@class = '#{k}']").each { |s| s["class"] = v }
+        end
+        docxml.xpath("//h1[@class = 'ForewordTitle' or @class = 'IntroTitle']")
+          .each { |h| h.name = "p" }
+        dis_styles1(docxml)
+        docxml.xpath("//p[not(@class)]").each { |p| p["class"] = "MsoBodyText" }
+      end
+
+      def dis_styles1(docxml)
+        code_style(docxml)
+        figure_style(docxml)
+        example_style(docxml)
+      end
+
+      def example_style(docxml)
+        docxml.xpath("//div[@class = 'Example']").each do |d|
+          d.xpath("./p").each_with_index do |p, i|
+            next if p["class"] && p["class"] != "Example"
+
+            p["class"] = (i.zero? ? "Example" : "Examplecontinued")
+          end
+        end
+      end
+
+      def figure_name_attrs(_node)
+        { class: "FigureTitle", style: "text-align:center;" }
+      end
+
+      def table_title_attrs(_node)
+        { class: "Tabletitle", style: "text-align:center;" }
+      end
+
+      def word_annex_cleanup1(docxml, lvl)
+        docxml.xpath("//h#{lvl}[ancestor::*[@class = 'Section3']]").each do |h2|
+          h2.name = "p"
+          h2["class"] = "a#{lvl}"
+        end
+      end
+
+      def span_parse(node, out)
+        out.span **{ class: node["class"] } do |x|
+          node.children.each { |n| parse(n, x) }
+        end
+      end
+
+      def word_toc_preface(level)
+        <<~TOC.freeze
+          <span lang="EN-GB"><span
+          style='mso-element:field-begin'></span><span
+          style='mso-spacerun:yes'>&#xA0;</span>TOC \\o &quot;2-#{level}&quot; \\h \\z \\t
+          &quot;Heading 1;1;ANNEX;1;Biblio Title;1;Foreword Title;1;Intro Title;1;ANNEXN;1;ANNEXZ;1;na2;1;na3;1;na4;1;na5;1;na6;1;Title;1;Base_Heading;1;Box-title;1;Front Head;1;Index Head;1;AMEND Terms Heading;1;AMEND Heading 1 Unnumbered;1&quot;
+           <span style='mso-element:field-separator'></span></span>
+        TOC
+      end
+
+      def render_identifier(ident)
+        ret = super
+        ret[:sdo] = std_docid_semantic(ret[:sdo])
+        ret
+      end
+
+      FIGURE_NESTED_STYLES =
+        { Note: "Figurenote", example: "Figureexample" }.freeze
+
+      def figure_style(docxml)
+        docxml.xpath("//div[@class = 'figure']").each do |f|
+          FIGURE_NESTED_STYLES.each do |k, v|
+            f.xpath(".//*[@class = '#{k}']").each { |n| n["class"] = v }
+          end
+          f.xpath("./img").each do |i|
+            i.replace("<p class='FigureGraphic'>#{i.to_xml}</p>")
+          end
+        end
+      end
+
+      def code_style(doc)
+        span_style((doc.xpath("//tt//b") - doc.xpath("//tt//i//b")),
+                   "ISOCodebold")
+        span_style((doc.xpath("//tt//i") - doc.xpath("//tt//b//i")),
+                   "ISOCodeitalic")
+        span_style((doc.xpath("//b//tt") - doc.xpath("//b//i//tt")),
+                   "ISOCodebold")
+        span_style((doc.xpath("//i//tt") - doc.xpath("//i//b//tt")),
+                   "ISOCodeitalic")
+        span_style(doc.xpath("//tt"), "ISOCode")
+      end
+
+      def span_style(xpath, style)
+        xpath.each do |elem|
+          elem.name = "span"
+          elem["class"] = style
+        end
+      end
+
+      def make_tr_attr(cell, row, totalrows, header)
+        super.merge(header: header)
+      end
+
+      def word_cleanup(docxml)
+        word_table_cell_para(docxml)
+        super
+      end
+
+      def word_table_cell_para(docxml)
+        docxml.xpath("//td | //th").each do |t|
+          s = t["header"] == "true" ? "Tableheader" : "Tablebody"
+          t.delete("header")
+          if t.at("./p |./div")
+            t.xpath("./p | ./div").each { |p| p["class"] = s }
+          else
+            t.children = "<div class='#{s}'>#{t.children.to_xml}</div>"
+          end
+        end
+      end
+
+      def toWord(result, filename, dir, header)
+        result = from_xhtml(word_cleanup(to_xhtml(result)))
+          .gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
+        @wordstylesheet = wordstylesheet_update
+        ::Html2Doc::IsoDIS.new(
+          filename: filename,
+          imagedir: @localdir,
+          stylesheet: @wordstylesheet&.path,
+          header_file: header&.path, dir: dir,
+          asciimathdelims: [@openmathdelim, @closemathdelim],
+          liststyles: { ul: @ulstyle, ol: @olstyle }
+        ).process(result)
+        header&.unlink
+        @wordstylesheet.unlink if @wordstylesheet.is_a?(Tempfile)
+      end
+    end
+  end
+end

data/lib/isodoc/iso/xref.rb

@@ -10,36 +10,48 @@ module IsoDoc
         else
           initial_anchor_names1(doc)
         end
-        introduction_names(doc.at(ns("//introduction")))
+        if @parse_settings.empty? || @parse_settings[:clauses]
+          introduction_names(doc.at(ns("//introduction")))
+        end
       end
 
       def initial_anchor_names_amd(doc)
-        doc.xpath(ns("//preface/*")).each do |c|
-          c.element? and preface_names(c)
+        if @parse_settings.empty? || @parse_settings[:clauses]
+          doc.xpath(ns("//preface/*")).each do |c|
+            c.element? and preface_names(c)
+          end
+          doc.xpath(ns("//sections/clause")).each do |c|
+            c.element? and preface_names(c)
+          end
         end
-        sequential_asset_names(doc.xpath(ns("//preface/*")))
-        doc.xpath(ns("//sections/clause")).each do |c|
-          c.element? and preface_names(c)
+        if @parse_settings.empty?
+          sequential_asset_names(doc.xpath(ns("//preface/*")))
+          middle_section_asset_names(doc)
+          termnote_anchor_names(doc)
+          termexample_anchor_names(doc)
         end
-        middle_section_asset_names(doc)
-        termnote_anchor_names(doc)
-        termexample_anchor_names(doc)
       end
 
       def initial_anchor_names1(doc)
-        doc.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
-        # potentially overridden in middle_section_asset_names()
-        sequential_asset_names(doc.xpath(ns("//preface/*")))
-        n = Counter.new
-        n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
-        n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
-        doc.xpath(ns("//sections/clause[not(@type = 'scope')] | "\
-                     "//sections/terms | //sections/definitions")).each do |c|
-          n = section_names(c, n, 1)
+        if @parse_settings.empty? || @parse_settings[:clauses]
+          doc.xpath(ns("//preface/*")).each do |c|
+            c.element? and preface_names(c)
+          end
+          # potentially overridden in middle_section_asset_names()
+          sequential_asset_names(doc.xpath(ns("//preface/*")))
+          n = Counter.new
+          n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
+          n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
+          doc.xpath(ns("//sections/clause[not(@type = 'scope')] | "\
+                       "//sections/terms | //sections/definitions")).each do |c|
+            n = section_names(c, n, 1)
+          end
+        end
+        if @parse_settings.empty?
+          middle_section_asset_names(doc)
+          termnote_anchor_names(doc)
+          termexample_anchor_names(doc)
         end
-        middle_section_asset_names(doc)
-        termnote_anchor_names(doc)
-        termexample_anchor_names(doc)
       end
 
       # we can reference 0-number clauses in introduction
@@ -68,6 +80,7 @@ module IsoDoc
           @anchors[c["id"]] = anchor_struct(i.print, nil, @labels["appendix"],
                                             "clause")
           @anchors[c["id"]][:level] = 2
+          @anchors[c["id"]][:subtype] = "annex"
           @anchors[c["id"]][:container] = clause["id"]
           j = Counter.new
           c.xpath(ns("./clause | ./references")).each do |c1|
@@ -78,10 +91,11 @@ module IsoDoc
         end
       end
 
+      # subclauses are not prefixed with "Clause"
+      # retaining sybtupe for the semantics
       def section_names1(clause, num, level)
         @anchors[clause["id"]] =
-          { label: num, level: level, xref: num }
-        # subclauses are not prefixed with "Clause"
+          { label: num, level: level, xref: num, subtype: "clause" }
         i = Counter.new
         clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
                         "./references"))
@@ -92,7 +106,8 @@ module IsoDoc
       end
 
       def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = { label: num, xref: num, level: level }
+        @anchors[clause["id"]] = { label: num, xref: num, level: level,
+                                   subtype: "annex" }
         i = Counter.new
         clause.xpath(ns("./clause | ./references")).each do |c|
           i.increment(c)
@@ -113,7 +128,7 @@ module IsoDoc
       def hierarchical_formula_names(clause, num)
         c = IsoDoc::XrefGen::Counter.new
         clause.xpath(ns(".//formula")).each do |t|
-          next if t["id"].nil? || t["id"].empty?
+          next if blank?(t["id"])
 
           @anchors[t["id"]] = anchor_struct(
             "#{num}#{hiersep}#{c.increment(t).print}", t,
@@ -133,13 +148,12 @@ module IsoDoc
       end
 
       def sequential_figure_names(clause)
-        c = IsoDoc::XrefGen::Counter.new
         j = 0
         clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
-          .each do |t|
+          .each_with_object(IsoDoc::XrefGen::Counter.new) do |t, c|
           j = subfigure_increment(j, c, t)
           sublabel = j.zero? ? nil : "#{(j + 96).chr})"
-          next if t["id"].nil? || t["id"].empty?
+          next if blank?(t["id"])
 
           figure_anchor(t, sublabel, c.print)
         end
@@ -153,7 +167,7 @@ module IsoDoc
           j = subfigure_increment(j, c, t)
           label = "#{num}#{hiersep}#{c.print}"
           sublabel = j.zero? ? nil : "#{(j + 96).chr})"
-          next if t["id"].nil? || t["id"].empty?
+          next if blank?(t["id"])
 
           figure_anchor(t, sublabel, label)
         end
@@ -167,7 +181,13 @@ module IsoDoc
 
       def back_anchor_names(docxml)
         super
-        docxml.xpath(ns("//indexsect")).each { |b| preface_names(b) }
+        if @parse_settings.empty? || @parse_settings[:clauses]
+          docxml.xpath(ns("//indexsect")).each { |b| preface_names(b) }
+        end
+      end
+
+      def annex_name_lbl(clause, num)
+        super.sub(%r{<br/>(.*)$}, "<br/><span class='obligation'>\\1</span>")
       end
     end
   end

data/lib/metanorma/iso/biblio.rng

@@ -527,7 +527,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -677,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -848,17 +851,46 @@
   </define>
   <define name="bplace">
     <element name="place">
-      <optional>
-        <attribute name="uri">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="region"/>
-      </optional>
+      <choice>
+        <text/>
+        <group>
+          <ref name="bibliocity"/>
+          <zeroOrMore>
+            <ref name="biblioregion"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="bibliocountry"/>
+          </zeroOrMore>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="bibliocity">
+    <element name="city">
       <text/>
     </element>
   </define>
+  <define name="biblioregion">
+    <element name="region">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="bibliocountry">
+    <element name="country">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="RegionType">
+    <optional>
+      <attribute name="iso"/>
+    </optional>
+    <optional>
+      <attribute name="recommended">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <text/>
+  </define>
   <define name="bprice">
     <element name="price">
       <attribute name="currency"/>
@@ -922,9 +954,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/lib/metanorma/iso/boilerplate-fr.xml

@@ -1,7 +1,7 @@
 <boilerplate>
   <copyright-statement>
     <clause>
-    <p id="boilerplate-year">&#xa9; {{ agency }} {{ docyear }}</p>
+      <p id="boilerplate-year">&#xa9; <span class="std_publisher">{{ agency }}</span> <span class="std_docNumber">{{ docyear }}</span></p>
 
   <p id="boilerplate-message">
     Droits de reproduction réservés. Sauf indication contraire, ou requise dans le cadre de sa mise en œuvre,

data/lib/metanorma/iso/boilerplate-ru.xml

@@ -1,9 +1,7 @@
 <boilerplate>
   <copyright-statement>
     <clause>
-    <p id="boilerplate-year">
-    &#xa9; {{ agency }} {{ docyear }}
-  </p>
+      <p id="boilerplate-year">&#xa9; <span class="std_publisher">{{ agency }}</span> <span class="std_docNumber">{{ docyear }}</span></p>
 
   <p id="boilerplate-message">
     Все права защищены. Если иначе не определено или не требуется в контексте его реализации, никакая часть этой публикации не может быть воспроизведена или использована иначе в любой форме или каким-либо образом, электронным или механическим, включая фотокопирование, или публикацию в Интернете или интранете, без предварительного письменного разрешения. Разрешение может быть запрошено ISO по адресу, указанному ниже, или у органа — члена ISO страны запрашивающего.

data/lib/metanorma/iso/boilerplate.xml

@@ -1,9 +1,7 @@
 <boilerplate>
   <copyright-statement>
     <clause>
-    <p id="boilerplate-year">
-    &#xa9; {{ agency }} {{ docyear }}
-  </p>
+      <p id="boilerplate-year">&#xa9; <span class="std_publisher">{{ agency }}</span> <span class="std_docNumber">{{ docyear }}</span></p>
 
   <p id="boilerplate-message">
     All rights

data/lib/metanorma/iso/cleanup.rb

@@ -40,7 +40,8 @@ module Metanorma
         xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']"\
                      "/organization").each_with_object([]) do |x, prefix|
           x1 = x.at("abbreviation")&.text || x.at("name")&.text
-          (x1 == "ISO" and prefix.unshift("ISO")) or prefix << x1
+          #(x1 == "ISO" and prefix.unshift("ISO")) or prefix << x1
+          prefix << x1
         end
       end
 
@@ -51,10 +52,10 @@ module Metanorma
         id.content = id_prefix(prefix, id)
         id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") and
           id.content = id_prefix(prefix, id)
-        id = xmldoc.at("//bibdata/docidentifier[@type = 'iso-with-lang']") and
-          id.content = id_prefix(prefix, id)
-        id = xmldoc.at("//bibdata/docidentifier[@type = 'iso-reference']") and
-          id.content = id_prefix(prefix, id)
+        %w(iso-with-lang iso-reference iso-undated).each do |t|
+          id = xmldoc.at("//bibdata/docidentifier[@type = '#{t}']") and
+            id.content = id_prefix(prefix, id)
+        end
       end
 
       def format_ref(ref, type)
@@ -140,7 +141,7 @@ module Metanorma
         xmldoc.xpath("//bibitem/note[@type = 'Unpublished-Status']").each do |n|
           e = xmldoc.at("//eref[@bibitemid = '#{n.parent['id']}']") or next
           fn = n.children.to_xml
-          n&.elements&.first&.name == "p" or fn = "<p>#{fn}</p>"
+          n.elements&.first&.name == "p" or fn = "<p>#{fn}</p>"
           e.next = "<fn>#{fn}</fn>"
         end
       end

data/lib/metanorma/iso/front_id.rb

@@ -73,13 +73,19 @@ module Metanorma
         (!@amd && node.attr("docnumber")) || (@amd && node.attr("updates")) or
           return
 
-        dn = iso_id1(node)
-        dn1 = id_stage_prefix(dn, node, false)
-        dn2 = id_stage_prefix(dn, node, true)
-        xml.docidentifier dn1, **attr_code(type: "ISO")
-        xml.docidentifier(id_langsuffix(dn1, node),
+        dn = id_stage_prefix(iso_id1(node), node)
+        dns = [id_year(dn, node, mode: :default),
+               id_year(dn, node, mode: :force),
+               id_year(dn, node, mode: :strip)]
+        iso_id_out(node, xml, dns)
+      end
+
+      def iso_id_out(node, xml, dns)
+        xml.docidentifier dns[0], **attr_code(type: "ISO")
+        xml.docidentifier dns[2], **attr_code(type: "iso-undated")
+        xml.docidentifier(id_langsuffix(dns[0], node),
                           **attr_code(type: "iso-with-lang"))
-        xml.docidentifier(id_langsuffix(dn2, node),
+        xml.docidentifier(id_langsuffix(dns[1], node),
                           **attr_code(type: "iso-reference"))
       end
 
@@ -160,14 +166,14 @@ module Metanorma
       def cover_stage_abbr(node)
         stage = get_stage(node)
         abbr = id_stage_abbr(get_stage(node), get_substage(node), node, true)
-        typeabbr = get_typeabbr(node, true)
+        typeabbr = get_typeabbr(node, amd: true)
         if stage.to_i > 50 || (stage.to_i == 60 && get_substage(node).to_i < 60)
           typeabbr = ""
         end
         "#{abbr}#{typeabbr}".strip
       end
 
-      def id_stage_prefix(docnum, node, force_year)
+      def id_stage_prefix(docnum, node)
         stage = get_stage(node)
         typeabbr = get_typeabbr(node)
         if stage && (stage.to_i < 60)
@@ -175,11 +181,22 @@ module Metanorma
         elsif typeabbr == "DIR " then docnum = "#{typeabbr}#{docnum}"
         elsif typeabbr && !@amd then docnum = "/#{typeabbr}#{docnum}"
         end
-        (force_year || !(stage && (stage.to_i < 60))) and
-          docnum = id_add_year(docnum, node)
         docnum
       end
 
+      def id_year(docnum, node, mode: :default)
+        case mode
+        when :strip then docnum.sub(/:(19|20)\d\d(?!\d)/, "")
+        when :force then id_add_year(docnum, node)
+        else
+          stage = get_stage(node)
+          if stage && (stage.to_i < 60)
+            docnum
+          else id_add_year(docnum, node)
+          end
+        end
+      end
+
       def unpub_stage_prefix(docnum, stage, typeabbr, node)
         abbr = id_stage_abbr(stage, get_substage(node), node)
         %w(40 50).include?(stage) && i = node.attr("iteration") and
@@ -213,7 +230,7 @@ module Metanorma
         ret
       end
 
-      def get_typeabbr(node, amd = false)
+      def get_typeabbr(node, amd: false)
         case doctype(node)
         when "directive" then "DIR "
         when "technical-report" then "TR "