RubyGems - isodoc - Versions diffs - 1.1.1 → 1.1.3 - Mend

isodoc 1.1.1 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

checksums.yaml +4 -4
data/Rakefile +3 -1
data/isodoc.gemspec +2 -2
data/lib/isodoc/base_style/all.css +207 -0
data/lib/isodoc/base_style/blocks.css +0 -0
data/lib/isodoc/base_style/coverpage.css +0 -0
data/lib/isodoc/base_style/defaults.css +0 -0
data/lib/isodoc/base_style/metanorma_word.css +34 -0
data/lib/isodoc/base_style/metanorma_word.scss +0 -1
data/lib/isodoc/base_style/nav.css +0 -0
data/lib/isodoc/base_style/reset.css +105 -0
data/lib/isodoc/base_style/reset.scss +3 -3
data/lib/isodoc/base_style/typography.css +0 -0
data/lib/isodoc/convert.rb +111 -54
data/lib/isodoc/function/utils.rb +57 -51
data/lib/isodoc/gem_tasks.rb +133 -0
data/lib/isodoc/metadata.rb +69 -63
data/lib/isodoc/sassc_importer.rb +11 -0
data/lib/isodoc/version.rb +1 -1
data/spec/assets/{html.css → html.scss} +0 -0
data/spec/isodoc/footnotes_spec.rb +2 -2
data/spec/isodoc/postproc_spec.rb +1319 -1345
metadata +27 -17

data/lib/isodoc/function/utils.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module IsoDoc::Function
   module Utils
     def date_range(date)
@@ -9,50 +11,50 @@ module IsoDoc::Function
     end
     def insert_tab(out, n)
-      [1..n].each { out << "&nbsp; " }
+      [1..n].each { out << '&nbsp; ' }
     end
     # add namespaces for Word fragments
-    NOKOHEAD = <<~HERE.freeze
-    <!DOCTYPE html SYSTEM
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-    <html xmlns="http://www.w3.org/1999/xhtml">
-    <head> <title></title> <meta charset="UTF-8" /> </head>
-    <body> </body> </html>
+    NOKOHEAD = <<~HERE
+      <!DOCTYPE html SYSTEM
+      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+      <html xmlns="http://www.w3.org/1999/xhtml">
+      <head> <title></title> <meta charset="UTF-8" /> </head>
+      <body> </body> </html>
     HERE
     # block for processing XML document fragments as XHTML,
     # to allow for HTMLentities
     def noko(&block)
       doc = ::Nokogiri::XML.parse(NOKOHEAD)
-      fragment = doc.fragment("")
+      fragment = doc.fragment('')
       ::Nokogiri::XML::Builder.with fragment, &block
-      fragment.to_xml(encoding: "US-ASCII").lines.map do |l|
-        l.gsub(/\s*\n/, "")
+      fragment.to_xml(encoding: 'US-ASCII').lines.map do |l|
+        l.gsub(/\s*\n/, '')
       end
     end
     def attr_code(attributes)
       attributes = attributes.reject { |_, val| val.nil? }.map
       attributes.map do |k, v|
-        [k, (v.is_a? String) ? HTMLEntities.new.decode(v) : v]
+        [k, v.is_a?(String) ? HTMLEntities.new.decode(v) : v]
       end.to_h
     end
     DOCTYPE_HDR = '<!DOCTYPE html SYSTEM '\
-      '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.freeze
+      '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
     def to_xhtml(xml)
-      xml.gsub!(/<\?xml[^>]*>/, "")
-      /<!DOCTYPE /.match xml or xml = DOCTYPE_HDR + xml
+      xml.gsub!(/<\?xml[^>]*>/, '')
+      /<!DOCTYPE /.match(xml) || (xml = DOCTYPE_HDR + xml)
       xml = xml.split(/(\&[^ \r\n\t#;]+;)/).map do |t|
-        /^(\&[^ \t\r\n#;]+;)/.match(t) ?
+        /^(\&[^ \t\r\n#;]+;)/.match?(t) ?
           HTMLEntities.new.encode(HTMLEntities.new.decode(t), :hexadecimal) : t
-      end.join("")
+      end.join('')
       begin
-        Nokogiri::XML.parse(xml) { |config| config.strict }
+        Nokogiri::XML.parse(xml, &:strict)
       rescue Nokogiri::XML::SyntaxError => e
-        File.open("#{@filename}.#{@format}.err", "w:UTF-8") { |f| f.write xml }
+        File.open("#{@filename}.#{@format}.err", 'w:UTF-8') { |f| f.write xml }
         abort "Malformed Output XML for #{@format}: #{e} (see #{@filename}.#{@format}.err)"
       end
     end
@@ -64,7 +66,7 @@ module IsoDoc::Function
     end
     def from_xhtml(xml)
-      xml.to_xml.sub(%r{ xmlns="http://www.w3.org/1999/xhtml"}, "")
+      xml.to_xml.sub(%r{ xmlns="http://www.w3.org/1999/xhtml"}, '')
     end
     CLAUSE_ANCESTOR =
@@ -72,7 +74,7 @@ module IsoDoc::Function
       "local-name() = 'acknowledgements' or local-name() = 'term' or "\
       "local-name() = 'appendix' or local-name() = 'foreword' or "\
       "local-name() = 'introduction' or local-name() = 'terms' or "\
-      "local-name() = 'clause' or local-name() = 'references']/@id".freeze
+      "local-name() = 'clause' or local-name() = 'references']/@id"
     def get_clause_id(node)
       clause = node.xpath(CLAUSE_ANCESTOR)
@@ -86,7 +88,7 @@ module IsoDoc::Function
       "local-name() = 'acknowledgements' or local-name() = 'term' or "\
       "local-name() = 'clause' or local-name() = 'references' or "\
       "local-name() = 'figure' or local-name() = 'formula' or "\
-      "local-name() = 'table' or local-name() = 'example']/@id".freeze
+      "local-name() = 'table' or local-name() = 'example']/@id"
     def get_note_container_id(node)
       container = node.xpath(NOTE_CONTAINER_ANCESTOR)
@@ -94,7 +96,7 @@ module IsoDoc::Function
     end
     def sentence_join(array)
-      return "" if array.nil? || array.empty?
+      return '' if array.nil? || array.empty?
       if array.length == 1 then array[0]
       else
         IsoDoc::Function::I18n::l10n("#{array[0..-2].join(', ')} "\
@@ -105,25 +107,25 @@ module IsoDoc::Function
     # avoid `; avoid {{ (Liquid Templates); avoid [[ (Javascript)
     def extract_delims(text)
-      @openmathdelim = "(#("
-      @closemathdelim = ")#)"
+      @openmathdelim = '(#('
+      @closemathdelim = ')#)'
       while text.include?(@openmathdelim) || text.include?(@closemathdelim)
-        @openmathdelim += "("
-        @closemathdelim += ")"
+        @openmathdelim += '('
+        @closemathdelim += ')'
       end
       [@openmathdelim, @closemathdelim]
     end
     def header_strip(h)
-      h = h.to_s.gsub(%r{<br\s*/>}, " ").gsub(/<\/?h[123456][^>]*>/, "").
-        gsub(/<\/?b[^>]*>/, "")
+      h = h.to_s.gsub(%r{<br\s*/>}, ' ').gsub(/<\/?h[123456][^>]*>/, '')
+           .gsub(/<\/?b[^>]*>/, '')
       h1 = to_xhtml_fragment(h.dup)
       h1.traverse do |x|
-        x.replace(" ") if x.name == "span" && /mso-tab-count/.match(x["style"])
-        x.remove if x.name == "span" && x["class"] == "MsoCommentReference"
-        x.remove if x.name == "a" && x["class"] == "FootnoteRef"
-        x.remove if x.name == "span" && /mso-bookmark/.match(x["style"])
-        x.replace(x.children) if x.name == "a"
+        x.replace(' ') if x.name == 'span' && /mso-tab-count/.match(x['style'])
+        x.remove if x.name == 'span' && x['class'] == 'MsoCommentReference'
+        x.remove if x.name == 'a' && x['class'] == 'FootnoteRef'
+        x.remove if x.name == 'span' && /mso-bookmark/.match(x['style'])
+        x.replace(x.children) if x.name == 'a'
       end
       from_xhtml(h1)
     end
@@ -135,9 +137,9 @@ module IsoDoc::Function
     def liquid(doc)
       # unescape HTML escapes in doc
       doc = doc.split(%r<(\{%|%\})>).each_slice(4).map do |a|
-        a[2] = a[2].gsub(/\&lt;/, "<").gsub(/\&gt;/, ">") if a.size > 2
-        a.join("")
-      end.join("")
+        a[2] = a[2].gsub(/\&lt;/, '<').gsub(/\&gt;/, '>') if a.size > 2
+        a.join('')
+      end.join('')
       Liquid::Template.parse(doc)
     end
@@ -147,37 +149,41 @@ module IsoDoc::Function
     end
     def populate_template(docxml, _format = nil)
-      meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {})
+      meta = @meta
+             .get
+             .merge(@labels || {})
+             .merge(@meta.labels || {})
+             .merge(@meta.fonts_options || {})
       template = liquid(docxml)
-      template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h).
-        gsub('&lt;', '&#x3c;').gsub('&gt;', '&#x3e;').gsub('&amp;', '&#x26;')
+      template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h)
+              .gsub('&lt;', '&#x3c;').gsub('&gt;', '&#x3e;').gsub('&amp;', '&#x26;')
     end
-    def save_dataimage(uri, relative_dir = true)
+    def save_dataimage(uri, _relative_dir = true)
       %r{^data:image/(?<imgtype>[^;]+);base64,(?<imgdata>.+)$} =~ uri
-      imgtype.sub!(/\+[a-z0-9]+$/, "") # svg+xml
-      imgtype = "png" unless /^[a-z0-9]+$/.match imgtype
-      Tempfile.open(["image", ".#{imgtype}"]) do |f|
+      imgtype.sub!(/\+[a-z0-9]+$/, '') # svg+xml
+      imgtype = 'png' unless /^[a-z0-9]+$/.match imgtype
+      Tempfile.open(['image', ".#{imgtype}"]) do |f|
         f.binmode
         f.write(Base64.strict_decode64(imgdata))
-        @tempfile_cache << f #persist to the end
+        @tempfile_cache << f # persist to the end
         f.path
       end
     end
     def image_localfile(i)
-      if /^data:image/.match i["src"]
-        save_dataimage(i["src"], false)
-      elsif %r{^([A-Z]:)?/}.match i["src"]
-        i["src"]
+      if /^data:image/.match? i['src']
+        save_dataimage(i['src'], false)
+      elsif %r{^([A-Z]:)?/}.match? i['src']
+        i['src']
       else
-        File.join(@localdir, i["src"])
+        File.join(@localdir, i['src'])
       end
     end
     def labelled_ancestor(node)
-      return !node.ancestors("example, requirement, recommendation, permission, "\
-                             "table, figure, sourcecode").empty?
+      !node.ancestors('example, requirement, recommendation, permission, '\
+                             'table, figure, sourcecode').empty?
     end
   end
 end

data/lib/isodoc/gem_tasks.rb ADDED

@@ -0,0 +1,133 @@
+# frozen_string_literal: true
+require 'sassc'
+require 'isodoc/sassc_importer'
+require 'rake/clean'
+module IsoDoc
+  module GemTasks
+    extend Rake::DSL if defined? Rake::DSL
+    module_function
+    def install
+      rule '.css' => [proc { |tn| tn.sub(/\.css$/, '.scss') }] do |current_task|
+        begin
+          puts(current_task)
+          compile_scss_task(current_task)
+        rescue StandardError => e
+          notify_borken_compilation(e, current_task)
+        end
+      end
+      scss_files = Rake::FileList['lib/**/*.scss']
+      source_files = scss_files.ext('.css')
+      task :comment_out_liquid do
+        process_css_files(scss_files) do |file_name|
+          comment_out_liquid(File.read(file_name, encoding: 'UTF-8'))
+        end
+      end
+      task build_scss: [:comment_out_liquid].push(*source_files) do
+        process_css_files(scss_files) do |file_name|
+          uncomment_out_liquid(File.read(file_name, encoding: 'UTF-8'))
+        end
+        git_cache_compiled_files && puts('Built scss!')
+      end
+      Rake::Task['build'].enhance [:build_scss] do
+        git_rm_compiled_files
+        Rake::Task[:clean].invoke
+      end
+    end
+    def notify_borken_compilation(error, current_task)
+      puts("Cannot compile #{current_task} because of #{error.message}")
+      puts('continue anyway[y|n]?')
+      answer = STDIN.gets.strip
+      if %w[y yes].include?(answer.strip.downcase)
+        puts("Cannot compile #{current_task} because of #{error.message}")
+      else
+        exit(0)
+      end
+    end
+    def git_cache_compiled_files
+      CLEAN.each do |css_file|
+        sh "git add #{css_file}"
+      end
+    end
+    def git_rm_compiled_files
+      CLEAN.each do |css_file|
+        sh "git rm --cached #{css_file}"
+      end
+    end
+    def process_css_files(scss_files)
+      scss_files.each do |file_name|
+        result = yield(file_name)
+        File.open(file_name, 'w', encoding: 'UTF-8') do |file|
+          file.puts(result)
+        end
+      end
+    end
+    def comment_out_liquid(text)
+      text.split("\n").map do |line|
+        if line.match?(/{({|%).+(}|%)}/)
+          "/* LIQUID_COMMENT#{line}LIQUID_COMMENT */"
+        else
+          line
+        end
+      end
+          .join("\n")
+    end
+    def uncomment_out_liquid(text)
+      text
+        .gsub('/* LIQUID_COMMENT', '')
+        .gsub('LIQUID_COMMENT */', '')
+        .gsub('"{{', '{{').gsub('}}"', '}}')
+    end
+    def fonts_placeholder
+      <<~TEXT
+        $bodyfont: '{{bodyfont}}';
+        $headerfont: '{{headerfont}}';
+        $monospacefont: '{{monospacefont}}';
+      TEXT
+    end
+    def compile_scss(filename)
+      require 'sassc'
+      isodoc_path = if Gem.loaded_specs['isodoc']
+                      File.join(Gem.loaded_specs['isodoc'].full_gem_path, 'lib', 'isodoc')
+                    else
+                      File.join('lib', 'isodoc')
+                    end
+      [isodoc_path,
+       File.dirname(filename)].each do |name|
+        SassC.load_paths << name
+      end
+      sheet_content = File.read(filename, encoding: 'UTF-8')
+      SassC::Engine.new(fonts_placeholder + sheet_content,
+                        syntax: :scss,
+                        importer: SasscImporter)
+                   .render
+    end
+    def compile_scss_task(current_task)
+      filename = current_task.source
+      basename = File.basename(filename, '.*')
+      compiled_path = File.join(File.dirname(filename), "#{basename}.css")
+      content = uncomment_out_liquid(compile_scss(filename))
+      File.open(compiled_path, 'w:UTF-8') do |f|
+        f.write(content)
+      end
+      CLEAN << compiled_path
+    end
+  end
+end

data/lib/isodoc/metadata.rb CHANGED

@@ -1,10 +1,15 @@
-require_relative "./metadata_date"
+# frozen_string_literal: true
+require_relative './metadata_date'
 module IsoDoc
   class Metadata
     DATETYPES = %w{published accessed created implemented obsoleted confirmed
-    updated issued received transmitted copied unchanged circulated vote-started
-    vote-ended}.freeze
+                   updated issued received transmitted copied unchanged
+                   circulated vote-started
+                   vote-ended}.freeze
+    attr_accessor :fonts_options
     def ns(xpath)
       Common::ns(xpath)
@@ -14,13 +19,14 @@ module IsoDoc
       IsoDoc::Function::I18n::l10n(a, b, c)
     end
-    def initialize(lang, script, labels)
+    def initialize(lang, script, labels, fonts_options = {})
       @metadata = {}
-      DATETYPES.each { |w| @metadata["#{w.gsub(/-/, "_")}date".to_sym] = "XXX" }
+      DATETYPES.each { |w| @metadata["#{w.gsub(/-/, '_')}date".to_sym] = 'XXX' }
       @lang = lang
       @script = script
       @c = HTMLEntities.new
       @labels = labels
+      @fonts_options = fonts_options
     end
     def get
@@ -36,26 +42,26 @@ module IsoDoc
     end
     def extract_person_names(authors)
-      authors.inject([]) do |ret, a|
-        if a.at(ns("./name/completename"))
-          ret << a.at(ns("./name/completename")).text
+      authors.reduce([]) do |ret, a|
+        if a.at(ns('./name/completename'))
+          ret << a.at(ns('./name/completename')).text
         else
           fn = []
-          forenames = a.xpath(ns("./name/forename"))
+          forenames = a.xpath(ns('./name/forename'))
           forenames.each { |f| fn << f.text }
-          surname = a&.at(ns("./name/surname"))&.text
-          ret << fn.join(" ") + " " + surname
+          surname = a&.at(ns('./name/surname'))&.text
+          ret << fn.join(' ') + ' ' + surname
         end
       end
     end
     def extract_person_affiliations(authors)
-      authors.inject([]) do |m, a|
-        name = a&.at(ns("./affiliation/organization/name"))&.text
-        location = a&.at(ns("./affiliation/organization/address/"\
-                            "formattedAddress"))&.text
-        m << ((!name.nil? && !location.nil?) ? "#{name}, #{location}" :
-          (name || location || ""))
+      authors.reduce([]) do |m, a|
+        name = a&.at(ns('./affiliation/organization/name'))&.text
+        location = a&.at(ns('./affiliation/organization/address/'\
+                            'formattedAddress'))&.text
+        m << (!name.nil? && !location.nil? ? "#{name}, #{location}" :
+          (name || location || ''))
         m
       end
     end
@@ -84,99 +90,99 @@ module IsoDoc
     end
     def bibdate(isoxml, _out)
-      isoxml.xpath(ns("//bibdata/date")).each do |d|
-        set("#{d['type'].gsub(/-/, "_")}date".to_sym, Common::date_range(d))
+      isoxml.xpath(ns('//bibdata/date')).each do |d|
+        set("#{d['type'].gsub(/-/, '_')}date".to_sym, Common::date_range(d))
       end
     end
     def doctype(isoxml, _out)
-      b = isoxml&.at(ns("//bibdata/ext/doctype"))&.text || return
-      t = b.split(/[- ]/).map{ |w| w.capitalize }.join(" ")
+      b = isoxml&.at(ns('//bibdata/ext/doctype'))&.text || return
+      t = b.split(/[- ]/).map(&:capitalize).join(' ')
       set(:doctype, t)
     end
     def iso?(org)
-      name = org&.at(ns("./name"))&.text
-      abbrev = org&.at(ns("./abbreviation"))&.text
-      (abbrev == "ISO" ||
-       name == "International Organization for Standardization" )
+      name = org&.at(ns('./name'))&.text
+      abbrev = org&.at(ns('./abbreviation'))&.text
+      (abbrev == 'ISO' ||
+       name == 'International Organization for Standardization')
     end
     def agency(xml)
-      agency = ""
+      agency = ''
       publisher = []
       xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/"\
-                   "organization")).each do |org|
-        name = org&.at(ns("./name"))&.text
-        agency1 = org&.at(ns("./abbreviation"))&.text || name
+                   'organization')).each do |org|
+        name = org&.at(ns('./name'))&.text
+        agency1 = org&.at(ns('./abbreviation'))&.text || name
         publisher << name if name
-        agency = iso?(org) ?  "ISO/#{agency}" : "#{agency}#{agency1}/"
+        agency = iso?(org) ? "ISO/#{agency}" : "#{agency}#{agency1}/"
       end
-      set(:agency, agency.sub(%r{/$}, ""))
-      set(:publisher, multiple_and(publisher, @labels["and"]))
+      set(:agency, agency.sub(%r{/$}, ''))
+      set(:publisher, multiple_and(publisher, @labels['and']))
     end
     def multiple_and(names, andword)
-      return "" if names.length == 0
+      return '' if names.empty?
       return names[0] if names.length == 1
-      names.length == 2 and
-        return l10n("#{names[0]} #{andword} #{names[1]}", @lang, @script)
-      l10n(names[0..-2].join(", ") + " #{andword} #{names[-1]}", @lang, @script)
+      (names.length == 2) &&
+        (return l10n("#{names[0]} #{andword} #{names[1]}", @lang, @script))
+      l10n(names[0..-2].join(', ') + " #{andword} #{names[-1]}", @lang, @script)
     end
     def docstatus(isoxml, _out)
-      docstatus = isoxml.at(ns("//bibdata/status/stage"))
+      docstatus = isoxml.at(ns('//bibdata/status/stage'))
       set(:unpublished, true)
       if docstatus
         set(:stage, status_print(docstatus.text))
-        i = isoxml&.at(ns("//bibdata/status/substage"))&.text and
+        (i = isoxml&.at(ns('//bibdata/status/substage'))&.text) &&
           set(:substage, i)
-        i = isoxml&.at(ns("//bibdata/status/iteration"))&.text and
+        (i = isoxml&.at(ns('//bibdata/status/iteration'))&.text) &&
           set(:iteration, i)
         set(:unpublished, unpublished(docstatus.text))
-        unpublished(docstatus.text) and
+        unpublished(docstatus.text) &&
           set(:stageabbr, stage_abbr(docstatus.text))
       end
     end
     def stage_abbr(docstatus)
-      status_print(docstatus).split(/ /).
-        map { |s| s[0].upcase }.join("")
+      status_print(docstatus).split(/ /)
+                             .map { |s| s[0].upcase }.join('')
     end
     def unpublished(status)
-      !(status.downcase == "published")
+      !status.casecmp('published').zero?
     end
     def status_print(status)
-      status.split(/-/).map{ |w| w.capitalize }.join(" ")
+      status.split(/-/).map(&:capitalize).join(' ')
     end
     def docid(isoxml, _out)
-      dn = isoxml.at(ns("//bibdata/docidentifier"))
+      dn = isoxml.at(ns('//bibdata/docidentifier'))
       set(:docnumber, dn&.text)
     end
     def docnumeric(isoxml, _out)
-      dn = isoxml.at(ns("//bibdata/docnumber"))
+      dn = isoxml.at(ns('//bibdata/docnumber'))
       set(:docnumeric, dn&.text)
     end
     def draftinfo(draft, revdate)
-      draftinfo = ""
+      draftinfo = ''
       if draft
-        draftinfo = " (#{@labels["draft_label"]} #{draft}"
+        draftinfo = " (#{@labels['draft_label']} #{draft}"
         draftinfo += ", #{revdate}" if revdate
-        draftinfo += ")"
+        draftinfo += ')'
       end
       l10n(draftinfo, @lang, @script)
     end
     def version(isoxml, _out)
-      set(:edition, isoxml&.at(ns("//bibdata/edition"))&.text)
-      set(:docyear, isoxml&.at(ns("//bibdata/copyright/from"))&.text)
-      set(:draft, isoxml&.at(ns("//version/draft"))&.text)
-      revdate = isoxml&.at(ns("//version/revision-date"))&.text
+      set(:edition, isoxml&.at(ns('//bibdata/edition'))&.text)
+      set(:docyear, isoxml&.at(ns('//bibdata/copyright/from'))&.text)
+      set(:draft, isoxml&.at(ns('//version/draft'))&.text)
+      revdate = isoxml&.at(ns('//version/revision-date'))&.text
       set(:revdate, revdate)
       set(:revdate_monthyear, monthyr(revdate))
       set(:draftinfo,
@@ -188,7 +194,7 @@ module IsoDoc
       set(:doctitle, main)
     end
-    def subtitle(isoxml, _out)
+    def subtitle(_isoxml, _out)
       nil
     end
@@ -199,29 +205,29 @@ module IsoDoc
     def relations_partof(isoxml)
       std = isoxml.at(ns("//bibdata/relation[@type = 'partOf']")) || return
-      id = std.at(ns(".//docidentifier"))
+      id = std.at(ns('.//docidentifier'))
       set(:partof, id.text) if id
     end
     def relations_obsoletes(isoxml)
       std = isoxml.at(ns("//bibdata/relation[@type = 'obsoletes']")) || return
-      locality = std.at(ns(".//locality"))
-      id = std.at(ns(".//docidentifier"))
+      locality = std.at(ns('.//locality'))
+      id = std.at(ns('.//docidentifier'))
       set(:obsoletes, id.text) if id
       set(:obsoletes_part, locality.text) if locality
     end
     def url(xml, _out)
-      a = xml.at(ns("//bibdata/uri[not(@type)]")) and set(:url, a.text)
-      a = xml.at(ns("//bibdata/uri[@type = 'html']")) and set(:html, a.text)
-      a = xml.at(ns("//bibdata/uri[@type = 'xml']")) and set(:xml, a.text)
-      a = xml.at(ns("//bibdata/uri[@type = 'pdf']")) and set(:pdf, a.text)
-      a = xml.at(ns("//bibdata/uri[@type = 'doc']")) and set(:doc, a.text)
+      (a = xml.at(ns('//bibdata/uri[not(@type)]'))) && set(:url, a.text)
+      (a = xml.at(ns("//bibdata/uri[@type = 'html']"))) && set(:html, a.text)
+      (a = xml.at(ns("//bibdata/uri[@type = 'xml']"))) && set(:xml, a.text)
+      (a = xml.at(ns("//bibdata/uri[@type = 'pdf']"))) && set(:pdf, a.text)
+      (a = xml.at(ns("//bibdata/uri[@type = 'doc']"))) && set(:doc, a.text)
     end
     def keywords(isoxml, _out)
       ret = []
-      isoxml.xpath(ns("//bibdata/keyword")).each { |kw| ret << kw.text }
+      isoxml.xpath(ns('//bibdata/keyword')).each { |kw| ret << kw.text }
       set(:keywords, ret)
     end
   end