metanorma-iso 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04b55e3ca534c69d32ca0f9379574e2ea64af41abdcfcd723532917cce1dbb11
-  data.tar.gz: 9a4910e86d2792bf82e863ed1d57cd0bd492667acc2eef5eaf0d7443b99fd730
+  metadata.gz: e78f6a52feda554f9e3578e30ffd3af32afe6c771d16414f584ceadd38589b13
+  data.tar.gz: 2da68557d15c9436c6dc310203895e5611c64331b0f038e66590ad4611bdb5db
 SHA512:
-  metadata.gz: cee47fc2106cf2573bb9c5d1198c230c0b9c1e350a8c12b5c1764eb683e058579619cbcb26c33a8cd4f838ccaccc7282ba1e990777d672c5b0b1269f0f950ce7
-  data.tar.gz: 4515aa0402dddc620a72837044e3c47a8864a2503109a57846037f96041f7a88d9c4dca652c7392b9ce1ab45d158922316d565b32b8c35a6dc2695b108da46c7
+  metadata.gz: f1d80f1af14c5abfd4cc74a0e91dbcc0e4414fd46105ebbd80507871bba8ea788c1e8b09525b8672d85bd4f453d07b5a2b2621a96ebc63270999a2b9989ecbaa
+  data.tar.gz: '09b997180fa6f3c0a1ac2298efda92fc634f5ea1404115c1d65104da739ca278f6a134ee9114ba2b1d53fc4c9415ba6655a7612982479964b5b1bb2c5790a85a'

data/.gitignore

@@ -9,3 +9,5 @@ spec/examples/rice.doc
 spec/examples/rice.html
 spec/examples/rice.xml
 spec/examples/rice_files/
+
+.rubocop-https--*

data/.rubocop.yml

@@ -1,6 +1,14 @@
 # This project follows the Ribose OSS style guide.
 # https://github.com/riboseinc/oss-guides
 # All project-specific additions and overrides should be specified in this file.
-
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+
+# local repo-specific modifications
+
+AllCops:
+  DisplayCopNames: false
+  StyleGuideCopsOnly: false
+  TargetRubyVersion: 2.4
+Rails:
+  Enabled: true

data/lib/asciidoctor/iso/biblio.rng

@@ -124,7 +124,7 @@
           <value>application/tei+xml</value>
           <value>text/x-asciidoc</value>
           <value>text/markdown</value>
-          <value>application/x-isodoc+xml</value>
+          <value>application/x-metanorma+xml</value>
           <text/>
         </choice>
       </attribute>
@@ -452,6 +452,7 @@
       <attribute name="type">
         <choice>
           <value>isni</value>
+          <value>orcid</value>
           <value>uri</value>
         </choice>
       </attribute>
@@ -461,10 +462,7 @@
   <define name="org-identifier">
     <element name="identifier">
       <attribute name="type">
-        <choice>
-          <value>orcid</value>
-          <value>uri</value>
-        </choice>
+        <data type="string" datatypeLibrary=""/>
       </attribute>
       <text/>
     </element>
@@ -1106,7 +1104,7 @@
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>
-      <value>cited</value>
+      <value>cites</value>
       <value>isCitedIn</value>
     </choice>
   </define>

data/lib/asciidoctor/iso/front.rb

@@ -67,7 +67,7 @@ module Asciidoctor
         stage = get_stage(node)
         substage = get_substage(node)
         xml.status do |s|
-          s.stage stage, **attr_code(abbreviation: stage_abbr(stage, substage, doctype(node)))
+          s.stage stage, **attr_code(abbreviation: cover_stage_abbr(node))
           s.substage substage
           node.attr("iteration") && (s.iteration node.attr("iteration"))
         end

data/lib/asciidoctor/iso/front_id.rb

@@ -11,7 +11,7 @@ module Asciidoctor
     class Converter < Standoc::Converter
       STAGE_ABBRS = {
         "00": "PWI",
-        "10": "NWIP",
+        "10": "NP",
         "20": "WD",
         "30": "CD",
         "40": "DIS",
@@ -37,15 +37,11 @@ module Asciidoctor
         return nil if stage.to_i > 60
         ret = STAGE_ABBRS[stage.to_sym]
         ret = "PRF" if stage == "60" && substage == "00"
+        ret = "AWI" if stage == "10" && substage == "99"
         if %w(amendment technical-corrigendum technical-report 
           technical-specification).include?(doctype)
-          ret = "NP" if stage == "10"
-          ret = "AWI" if stage == "10" && substage == "99"
-          ret = "D" if stage == "40" and doctype == "amendment"
-          ret = "FD" if stage == "50" and
-            %w(amendment technical-corrigendum).include?(doctype)
-          ret = "D" if stage == "50" and
-            %w(technical-report technical-specification).include?(doctype)
+          ret = "D" if stage == "40" && doctype == "amendment"
+          ret = "FD" if stage == "50" && %w(amendment technical-corrigendum).include?(doctype)
         end
         ret
       end
@@ -54,8 +50,7 @@ module Asciidoctor
         return "Proof" if stage == "60" && substage == "00"
         ret = STAGE_NAMES[stage.to_sym]
         if iteration && %w(20 30).include?(stage)
-          prefix  = iteration.to_i.localize(@lang.to_sym).
-            to_rbnf_s("SpelloutRules", "spellout-ordinal")
+          prefix = iteration.to_i.localize(@lang.to_sym).to_rbnf_s("SpelloutRules", "spellout-ordinal")
           ret = "#{prefix.capitalize} #{ret.downcase}"
         end
         ret
@@ -70,16 +65,13 @@ module Asciidoctor
       end
 
       def iso_id(node, xml)
-        return unless !@amd && node.attr("docnumber") ||
-          @amd && node.attr("updates")
+        return unless !@amd && node.attr("docnumber") || @amd && node.attr("updates")
         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),
-          **attr_code(type: "iso-with-lang")
-        xml.docidentifier id_langsuffix(dn2, node),
-          **attr_code(type: "iso-reference")
+        xml.docidentifier id_langsuffix(dn1, node), **attr_code(type: "iso-with-lang")
+        xml.docidentifier id_langsuffix(dn2, node), **attr_code(type: "iso-reference")
       end
 
       def iso_id1(node)
@@ -132,18 +124,29 @@ module Asciidoctor
         dn
       end
 
-      def id_stage_abbr(stage, substage, node)
-        ret = IsoDoc::Iso::Metadata.new("en", "Latn", @i18n).
-          status_abbrev(stage_abbr(stage, substage, doctype(node)),
-                        substage, node.attr("iteration"),
-                        node.attr("draft"), doctype(node))
-        if %w(amendment technical-corrigendum amendment
-          technical-corrigendum).include?(doctype(node))
-          ret = ret + " " unless %w(40 50).include?(stage)
+      def id_stage_abbr(stage, substage, node, bare = false)
+        ret = bare ? 
+          IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
+          .status_abbrev(stage_abbr(stage, substage, doctype(node)),
+        substage, nil, nil, doctype(node)) :
+        IsoDoc::Iso::Metadata.new("en", "Latn", @i18n)
+          .status_abbrev(stage_abbr(stage, substage, doctype(node)),
+        substage, node.attr("iteration"),
+        node.attr("draft"), doctype(node))
+        if %w(amendment technical-corrigendum technical-report technical-specification).include?(doctype(node))
+          ret = ret + " " unless %w(D FD).include?(ret)
         end
         ret
       end
 
+      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 = "" if stage.to_i > 50 || stage.to_i == 60 && get_substage(node).to_i < 60
+        "#{abbr}#{typeabbr}".strip
+      end
+
       def id_stage_prefix(dn, node, force_year)
         stage = get_stage(node)
         typeabbr = get_typeabbr(node)
@@ -183,10 +186,12 @@ module Asciidoctor
         node.attr("docsubstage") || ( stage == "60" ? "60" : "00" )
       end
 
-      def get_typeabbr(node)
+      def get_typeabbr(node, amd = false)
         case doctype(node)
         when "technical-report" then "TR "
         when "technical-specification" then "TS "
+        when "amendment" then (amd ? "Amd " : "")
+        when "technical-corrigendum" then (amd ? "Cor " : "")
         else
           nil
         end

data/lib/asciidoctor/iso/validate_title.rb

@@ -3,9 +3,13 @@ require "metanorma-standoc"
 module Asciidoctor
   module ISO
     class Converter < Standoc::Converter
+      def title_lang_part(doc, part, lang)
+        doc.at("//bibdata/title[@type='title-#{part}' and @language='#{lang}']")
+      end
+
       def title_intro_validate(root)
-        title_intro_en = root.at("//title[@type='title-intro' and @language='en']")
-        title_intro_fr = root.at("//title[@type='title-intro' and @language='fr']")
+        title_intro_en = title_lang_part(root, "intro", "en")
+        title_intro_fr = title_lang_part(root, "intro", "fr")
         if title_intro_en.nil? && !title_intro_fr.nil?
           @log.add("Style", title_intro_fr, "No English Title Intro!")
         end
@@ -15,8 +19,8 @@ module Asciidoctor
       end
 
       def title_main_validate(root)
-        title_main_en = root.at("//title[@type='title-main' and @language='en']")
-        title_main_fr = root.at("//title[@type='title-main' and @language='fr']")
+        title_main_en = title_lang_part(root, "main", "en")
+        title_main_fr = title_lang_part(root, "main", "fr")
         if title_main_en.nil? && !title_main_fr.nil?
           @log.add("Style", title_main_fr, "No English Title!")
         end
@@ -26,8 +30,8 @@ module Asciidoctor
       end
 
       def title_part_validate(root)
-        title_part_en = root.at("//title[@type='title-part' and @language='en']")
-        title_part_fr = root.at("//title[@type='title-part' and @language='fr']")
+        title_part_en = title_lang_part(root, "part", "en")
+        title_part_fr = title_lang_part(root, "part", "fr")
         (title_part_en.nil? && !title_part_fr.nil?) &&
           @log.add("Style", title_part_fr, "No English Title Part!")
         (!title_part_en.nil? && title_part_fr.nil?) &&
@@ -41,20 +45,22 @@ module Asciidoctor
         iec = root.at("//bibdata/contributor[role/@type = 'publisher']/"\
                       "organization[abbreviation = 'IEC' or "\
                       "name = 'International Electrotechnical Commission']")
-        @log.add("Style", docid, "Subpart defined on non-IEC document!") if subpart && !iec
+        subpart && !iec and
+          @log.add("Style", docid, "Subpart defined on non-IEC document!")
       end
 
       # ISO/IEC DIR 2, 11.5.2
       def title_names_type_validate(root)
         doctypes = /International\sStandard | Technical\sSpecification |
         Publicly\sAvailable\sSpecification | Technical\sReport | Guide /xi
-        title_main_en = root.at("//title[@type='title-main' and @language='en']")
+        title_main_en = title_lang_part(root, "main", "en")
         if !title_main_en.nil? && doctypes.match(title_main_en.text)
           @log.add("Style", title_main_en, "Main Title may name document type")
         end
-        title_intro_en = root.at("//title[@type='title-intro' and @language='en']")
+        title_intro_en = title_lang_part(root, "intro", "en")
         if !title_intro_en.nil? && doctypes.match(title_intro_en.text)
-          @log.add("Style", title_intro_en, "Title Intro may name document type")
+          @log.add("Style", title_intro_en,
+                   "Title Intro may name document type")
         end
       end
 
@@ -64,8 +70,9 @@ module Asciidoctor
           title = s&.at("./title")&.text || s.name
           s.xpath("./clause | ./terms | ./references").each do |ss|
             subtitle = ss.at("./title")
-            !subtitle.nil? && !subtitle&.text&.empty? ||
-              @log.add("Style", ss, "#{title}: each first-level subclause must have a title")
+            !subtitle.nil? && !subtitle&.text&.empty? or
+              @log.add("Style", ss,
+                       "#{title}: each first-level subclause must have a title")
           end
         end
       end
@@ -82,7 +89,8 @@ module Asciidoctor
           withtitle = withtitle || (subtitle && !subtitle.text.empty?)
         end
         notitle && withtitle &&
-          @log.add("Style", nil, "#{label}: all subclauses must have a title, or none")
+          @log.add("Style", nil,
+                   "#{label}: all subclauses must have a title, or none")
       end
 
       def title_validate(root)

data/lib/isodoc/iso/index.rb

@@ -27,7 +27,8 @@ module IsoDoc
             c.add_child index_entries(words, index[k], w)
           end
         end
-        @xrefs.bookmark_anchor_names(docxml.xpath(ns(@xrefs.sections_xpath)))
+        docxml.xpath(ns("//indexsect//xref")).each { |x| x.children.remove }
+        @xrefs.bookmark_anchor_names(docxml)
       end
 
       def sortable(s)

data/lib/isodoc/iso/iso.amendment.xsl

@@ -5,6 +5,7 @@
 	<xsl:param name="svg_images"/>
 	<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
 	<xsl:variable name="images" select="document($svg_images)"/>
+	<xsl:param name="basepath"/>
 	
 	
 
@@ -343,8 +344,8 @@
 			<fo:declarations>
 				<xsl:call-template name="addPDFUAmeta"/>
 				<xsl:for-each select="//*[local-name() = 'eref'][generate-id(.)=generate-id(key('attachments',@bibitemid)[1])]">
-					<xsl:variable name="url" select="concat('url(', ., ')')"/>
-					<pdf:embedded-file src="{$url}"/>
+					<xsl:variable name="url" select="concat('url(file:',$basepath, @bibitemid, ')')"/>
+					<pdf:embedded-file src="{$url}" filename="{@bibitemid}"/>
 				</xsl:for-each>
 			</fo:declarations>
 
@@ -1650,6 +1651,12 @@
 			<xsl:if test="@id">
 				<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
 			</xsl:if>
+			<!-- bookmarks only in paragraph -->
+			<xsl:if test="count(iso:bookmark) != 0 and count(*) = count(iso:bookmark) and normalize-space() = ''">
+				<xsl:attribute name="font-size">0</xsl:attribute>
+				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+				<xsl:attribute name="line-height">0</xsl:attribute>
+			</xsl:if>
 			<xsl:apply-templates/>
 		</xsl:element>
 		<xsl:if test="$element-name = 'fo:inline' and not($inline = 'true') and not(local-name(..) = 'admonition')">
@@ -1956,6 +1963,7 @@
 	<!-- =================== -->
 	<!-- SVG images processing -->
 	<!-- =================== -->
+	<xsl:template match="*[local-name() = 'figure'][not(*[local-name() = 'image']) and *[local-name() = 'svg']]/*[local-name() = 'name']/*[local-name() = 'bookmark']" priority="2"/>
 	<xsl:template match="*[local-name() = 'figure'][not(*[local-name() = 'image'])]/*[local-name() = 'svg']" priority="2">
 		
 		<xsl:choose>
@@ -2005,6 +2013,13 @@
 								<fo:table-cell column-number="2">
 									<fo:block>
 										<fo:block-container width="{$width_scale}px" height="{$height_scale}px">
+											<xsl:if test="../*[local-name() = 'name']/*[local-name() = 'bookmark']">
+												<fo:block line-height="0" font-size="0">
+													<xsl:for-each select="../*[local-name() = 'name']/*[local-name() = 'bookmark']">
+														<xsl:call-template name="bookmark"/>
+													</xsl:for-each>
+												</fo:block>
+											</xsl:if>
 											<fo:block text-depth="0" line-height="0" font-size="0">
 												<fo:instream-foreign-object fox:alt-text="{../*[local-name() = 'name']}">
 													<xsl:attribute name="width">100%</xsl:attribute>
@@ -2158,7 +2173,7 @@
 	<!-- =================== -->
 	
 	<!-- For express listings PDF attachments -->
-	<xsl:template match="*[local-name() = 'eref'][contains(., '.exp')]" priority="2">
+	<xsl:template match="*[local-name() = 'eref'][contains(@bibitemid, '.exp')]" priority="2">
 		<fo:inline xsl:use-attribute-sets="eref-style">
 			<xsl:variable name="url" select="concat('url(embedded-file:', @bibitemid, ')')"/>
 			<fo:basic-link external-destination="{$url}" fox:alt-text="{@citeas}">
@@ -6111,8 +6126,8 @@
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'bookmark']">
-		<fo:inline id="{@id}"/>
+	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
+		<fo:inline id="{@id}" font-size="1pt"/>
 	</xsl:template><xsl:template match="*[local-name() = 'errata']">
 		<!-- <row>
 					<date>05-07-2013</date>

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -5,6 +5,7 @@
 	<xsl:param name="svg_images"/>
 	<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
 	<xsl:variable name="images" select="document($svg_images)"/>
+	<xsl:param name="basepath"/>
 	
 	
 
@@ -343,8 +344,8 @@
 			<fo:declarations>
 				<xsl:call-template name="addPDFUAmeta"/>
 				<xsl:for-each select="//*[local-name() = 'eref'][generate-id(.)=generate-id(key('attachments',@bibitemid)[1])]">
-					<xsl:variable name="url" select="concat('url(', ., ')')"/>
-					<pdf:embedded-file src="{$url}"/>
+					<xsl:variable name="url" select="concat('url(file:',$basepath, @bibitemid, ')')"/>
+					<pdf:embedded-file src="{$url}" filename="{@bibitemid}"/>
 				</xsl:for-each>
 			</fo:declarations>
 
@@ -1650,6 +1651,12 @@
 			<xsl:if test="@id">
 				<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
 			</xsl:if>
+			<!-- bookmarks only in paragraph -->
+			<xsl:if test="count(iso:bookmark) != 0 and count(*) = count(iso:bookmark) and normalize-space() = ''">
+				<xsl:attribute name="font-size">0</xsl:attribute>
+				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+				<xsl:attribute name="line-height">0</xsl:attribute>
+			</xsl:if>
 			<xsl:apply-templates/>
 		</xsl:element>
 		<xsl:if test="$element-name = 'fo:inline' and not($inline = 'true') and not(local-name(..) = 'admonition')">
@@ -1956,6 +1963,7 @@
 	<!-- =================== -->
 	<!-- SVG images processing -->
 	<!-- =================== -->
+	<xsl:template match="*[local-name() = 'figure'][not(*[local-name() = 'image']) and *[local-name() = 'svg']]/*[local-name() = 'name']/*[local-name() = 'bookmark']" priority="2"/>
 	<xsl:template match="*[local-name() = 'figure'][not(*[local-name() = 'image'])]/*[local-name() = 'svg']" priority="2">
 		
 		<xsl:choose>
@@ -2005,6 +2013,13 @@
 								<fo:table-cell column-number="2">
 									<fo:block>
 										<fo:block-container width="{$width_scale}px" height="{$height_scale}px">
+											<xsl:if test="../*[local-name() = 'name']/*[local-name() = 'bookmark']">
+												<fo:block line-height="0" font-size="0">
+													<xsl:for-each select="../*[local-name() = 'name']/*[local-name() = 'bookmark']">
+														<xsl:call-template name="bookmark"/>
+													</xsl:for-each>
+												</fo:block>
+											</xsl:if>
 											<fo:block text-depth="0" line-height="0" font-size="0">
 												<fo:instream-foreign-object fox:alt-text="{../*[local-name() = 'name']}">
 													<xsl:attribute name="width">100%</xsl:attribute>
@@ -2158,7 +2173,7 @@
 	<!-- =================== -->
 	
 	<!-- For express listings PDF attachments -->
-	<xsl:template match="*[local-name() = 'eref'][contains(., '.exp')]" priority="2">
+	<xsl:template match="*[local-name() = 'eref'][contains(@bibitemid, '.exp')]" priority="2">
 		<fo:inline xsl:use-attribute-sets="eref-style">
 			<xsl:variable name="url" select="concat('url(embedded-file:', @bibitemid, ')')"/>
 			<fo:basic-link external-destination="{$url}" fox:alt-text="{@citeas}">
@@ -6111,8 +6126,8 @@
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'bookmark']">
-		<fo:inline id="{@id}"/>
+	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
+		<fo:inline id="{@id}" font-size="1pt"/>
 	</xsl:template><xsl:template match="*[local-name() = 'errata']">
 		<!-- <row>
 					<date>05-07-2013</date>

data/lib/metanorma/iso/version.rb

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

data/metanorma-iso.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rake" , "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "= 0.54.0"
+  spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "iev", "~> 0.2.0"

data/spec/asciidoctor/amd_spec.rb

@@ -235,7 +235,7 @@ RSpec.describe Asciidoctor::ISO do
           <language>en</language>
           <script>Latn</script>
           <status>
-            <stage abbreviation="NP">10</stage>
+            <stage abbreviation="NP Amd">10</stage>
             <substage>20</substage>
             <iteration>3</iteration>
           </status>
@@ -320,7 +320,7 @@ RSpec.describe Asciidoctor::ISO do
           <language>en</language>
           <script>Latn</script>
           <status>
-            <stage abbreviation="CD">30</stage>
+            <stage abbreviation="CD Amd">30</stage>
             <substage>00</substage>
           </status>
           <copyright>
@@ -389,7 +389,7 @@ RSpec.describe Asciidoctor::ISO do
           <language>en</language>
           <script>Latn</script>
           <status>
-            <stage abbreviation="D">40</stage>
+            <stage abbreviation="DAmd">40</stage>
             <substage>00</substage>
           </status>
           <copyright>
@@ -527,7 +527,7 @@ RSpec.describe Asciidoctor::ISO do
           <language>en</language>
           <script>Latn</script>
           <status>
-            <stage abbreviation="CD">30</stage>
+            <stage abbreviation="CD Cor">30</stage>
             <substage>00</substage>
           </status>
           <copyright>
@@ -596,7 +596,7 @@ RSpec.describe Asciidoctor::ISO do
           <language>en</language>
           <script>Latn</script>
           <status>
-            <stage abbreviation='FD'>50</stage>
+            <stage abbreviation='FDCor'>50</stage>
             <substage>00</substage>
           </status>
           <copyright>

data/spec/asciidoctor/base_spec.rb

@@ -406,7 +406,7 @@ RSpec.describe Asciidoctor::ISO do
       OUTPUT
   end
 
-  it "defaults substage, defines iteration on stage 50, gives stage 50 on technical specification" do
+  it "defaults substage, defines iteration on stage 50" do
     output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
@@ -417,15 +417,15 @@ RSpec.describe Asciidoctor::ISO do
       :docnumber: 1000
       :docstage: 50
       :language: fr
-      :doctype: technical-specification
+      :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">
         <bibdata type="standard">
-          <docidentifier type="ISO">ISO/DTS 1000.2</docidentifier>
-          <docidentifier type="iso-with-lang">ISO/DTS 1000.2(F)</docidentifier>
-          <docidentifier type="iso-reference">ISO/DTS 1000.2(F)</docidentifier>
+        <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"/>
@@ -444,7 +444,7 @@ RSpec.describe Asciidoctor::ISO do
           <language>fr</language>
           <script>Latn</script>
           <status>
-            <stage abbreviation="D">50</stage>
+            <stage abbreviation="FDIS">50</stage>
             <substage>00</substage>
             <iteration>2</iteration>
           </status>
@@ -458,7 +458,7 @@ RSpec.describe Asciidoctor::ISO do
             </owner>
           </copyright>
           <ext>
-            <doctype>technical-specification</doctype>
+            <doctype>international-standard</doctype>
             <editorialgroup>
               <technical-committee/>
               <subcommittee/>

data/spec/asciidoctor/validate_spec.rb

@@ -4,6 +4,7 @@ require "fileutils"
 RSpec.describe Asciidoctor::ISO do
   context "when xref_error.adoc compilation" do
     it "generates error file" do
+      FileUtils.rm_f "xref_error.err"
       File.write("xref_error.adoc", <<~"CONTENT")
         = X
         A
@@ -1226,7 +1227,7 @@ RSpec.describe Asciidoctor::ISO do
     expect(File.read("test.err")).to include "No English Title Intro"
   end
 
-  it "Warning if English title and no French intro" do
+  it "Warning if English title and no French title" do
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
@@ -1237,6 +1238,7 @@ RSpec.describe Asciidoctor::ISO do
 
     INPUT
     expect(File.read("test.err")).to include "No French Title"
+    expect(File.read("test.err")).not_to include "No French Intro"
   end
 
   it "Warning if French title and no English title" do
@@ -1278,6 +1280,21 @@ RSpec.describe Asciidoctor::ISO do
     expect(File.read("test.err")).to include "No English Title Part"
   end
 
+    it "No warning if French main title and English main title" do
+    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :title-part-fr: Title
+      :title-part-en: Title
+      :no-isobib:
+
+    INPUT
+    expect(File.read("test.err")).not_to include "No French Title Intro"
+    expect(File.read("test.err")).not_to include "No French Title Part"
+  end
+
   it "Warning if non-IEC document with subpart" do
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title

data/spec/spec_helper.rb

@@ -24,6 +24,7 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
+=begin
   config.around do |example|
     Dir.mktmpdir("rspec-") do |dir|
       tmp_assets = File.join(dir, "spec/assets/")
@@ -32,6 +33,7 @@ RSpec.configure do |config|
       Dir.chdir(dir) { example.run }
     end
   end
+=end
 end
 
 def strip_guid(xml)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -196,16 +196,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement