lib/asciidoctor/iso/validate_title.rb in metanorma-iso-1.7.3 vs lib/asciidoctor/iso/validate_title.rb in metanorma-iso-1.7.4

@@ -1,35 +1,39 @@
 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
         if !title_intro_en.nil? && title_intro_fr.nil?
           @log.add("Style", title_intro_en, "No French Title Intro!")
         end
       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
         if !title_main_en.nil? && title_main_fr.nil?
           @log.add("Style", title_main_en, "No French Title!")
         end
       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?) &&
           @log.add("Style", title_part_en, "No French Title Part!")
       end
@@ -39,35 +43,38 @@
         docid = root.at("//bibdata/docidentifier[@type = 'ISO']")
         subpart = /-\d+-\d+/.match docid
         iec = root.at("//bibdata/contributor[role/@type = 'publisher']/"\
                       "organization[abbreviation = 'IEC' or "\
                       "name = 'International Electrotechnical Commission']")
-        @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
 
       # ISO/IEC DIR 2, 22.2
       def title_first_level_validate(root)
         root.xpath(SECTIONS_XPATH).each do |s|
           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
 
       # ISO/IEC DIR 2, 22.2
@@ -80,10 +87,11 @@
           subtitle = s.at("./title")
           notitle = notitle || (!subtitle || subtitle.text.empty?)
           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)
         title_intro_validate(root)
         title_main_validate(root)