isodoc 1.6.7 → 1.7.2

data/lib/isodoc/function/form.rb

@@ -1,48 +1,51 @@
-module IsoDoc::Function
-  module Form
-    def form_parse(node, out)
-      node.children.each do |n|
-        parse(n, out)
+module IsoDoc
+  module Function
+    module Form
+      def form_parse(node, out)
+        out.div **attr_code(class: node["class"],
+                            id: node["id"]) do |div|
+          node.children.each do |n|
+            parse(n, div)
+          end
+        end
       end
-    end
 
-    def input_parse(node, out)
-      case node["type"]
-      when "button" then out << "[#{node['value'] || 'BUTTON'}]"
-      when "checkbox" then out << "&#x2610; "
-      when "date" then text_input(out)
-      when "file" then text_input(out)
-      when "password" then text_input(out)
-      when "radio" then out << "&#x25CE; "
-      when "submit" # nop
-      when "text" then text_input(out, node["maxlength"])
+      def input_parse(node, out)
+        case node["type"]
+        when "button" then out << "[#{node['value'] || 'BUTTON'}]"
+        when "checkbox" then out << "&#x2610; "
+        when "date", "file", "password" then text_input(out)
+        when "radio" then out << "&#x25CE; "
+        when "submit" # nop
+        when "text" then text_input(out, node["maxlength"])
+        end
       end
-    end
 
-    def text_input(out, length = 10)
-      length ||= 10
-      length = length.to_i
-      length.zero? and length = 10
-      out << "_" * length
-      out << " "
-    end
+      def text_input(out, length = 10)
+        length ||= 10
+        length = length.to_i
+        length.zero? and length = 10
+        out << "_" * length
+        out << " "
+      end
 
-    def select_parse(node, out)
-      text_input(out, node["size"] || 10)
-    end
+      def select_parse(node, out)
+        text_input(out, node["size"] || 10)
+      end
 
-    def label_parse(node, out)
-      node.children.each do |n|
-        parse(n, out)
+      def label_parse(node, out)
+        node.children.each do |n|
+          parse(n, out)
+        end
       end
-    end
 
-    def option_parse(node, out); end
+      def option_parse(node, out); end
 
-    def textarea_parse(_node, out)
-      out.table **{ border: 1, width: "50%" } do |t|
-        t.tr do |tr|
-          tr.td do |td|
+      def textarea_parse(_node, out)
+        out.table **{ border: 1, width: "50%" } do |t|
+          t.tr do |tr|
+            tr.td do |td|
+            end
           end
         end
       end

data/lib/isodoc/function/inline.rb

@@ -71,7 +71,11 @@ module IsoDoc::Function
     end
 
     def termrefelem_parse(node, out)
-      out << "Termbase #{node['base']}, term ID #{node['target']}"
+      if node.text.strip.empty?
+        out << "Termbase #{node['base']}, term ID #{node['target']}"
+      else
+        node.children.each { |n| parse(n, out) }
+      end
     end
 
     def stem_parse(node, out)

data/lib/isodoc/function/references.rb

@@ -58,7 +58,7 @@ module IsoDoc::Function
                     "@type = 'ISBN']"))
       return [id, id1, id2] if id || id1 || id2
 
-      id = Nokogiri::XML::Node.new("docidentifier", b.document)
+      id = Nokogiri::XML::Node.new("docidentifier", bib.document)
       id << "(NO ID)"
       [nil, id, nil]
     end

data/lib/isodoc/function/to_word_html.rb

@@ -1,237 +1,239 @@
 require "fileutils"
 require "pathname"
 
-module IsoDoc::Function
-  module ToWordHtml
-
-    def set_termdomain(termdomain)
-      @termdomain = termdomain
-    end
+module IsoDoc
+  module Function
+    module ToWordHtml
+      def set_termdomain(termdomain)
+        @termdomain = termdomain
+      end
 
-    def in_sourcecode
-      @sourcecode
-    end
+      def in_sourcecode
+        @sourcecode
+      end
 
-    def note?
-      @note
-    end
+      def note?
+        @note
+      end
 
-    def init_file(filename, debug)
-      filepath = Pathname.new(filename)
-      filename = filepath.sub_ext("").sub(/\.presentation$/, "").to_s
-      dir = init_dir(filename, debug)
-      @filename = filename
-      @localdir = "#{filepath.parent}/"
-      @sourcedir = @localdir
-      @sourcefilename and
-        @sourcedir = "#{Pathname.new(@sourcefilename).parent}/"
-      [filename, dir]
-    end
+      def init_file(filename, debug)
+        filepath = Pathname.new(filename)
+        filename = filepath.sub_ext("").sub(/\.presentation$/, "").to_s
+        dir = init_dir(filename, debug)
+        @filename = filename
+        @localdir = "#{filepath.parent}/"
+        @sourcedir = @localdir
+        @sourcefilename and
+          @sourcedir = "#{Pathname.new(@sourcefilename).parent}/"
+        [filename, dir]
+      end
 
-    def init_dir(filename, debug)
-      dir = "#{filename}_files"
-      unless debug
-        Dir.mkdir(dir, 0o777) unless File.exists?(dir)
-        FileUtils.rm_rf "#{dir}/*"
+      def init_dir(filename, debug)
+        dir = "#{filename}_files"
+        unless debug
+          Dir.mkdir(dir, 0o777) unless File.exists?(dir)
+          FileUtils.rm_rf "#{dir}/*"
+        end
+        dir
       end
-      dir
-    end
 
-    # tmp image dir is same directory as @filename
-    def tmpimagedir
-      @filename + tmpimagedir_suffix
-    end
+      # tmp image dir is same directory as @filename
+      def tmpimagedir
+        @filename + tmpimagedir_suffix
+      end
 
-    def rel_tmpimagedir
-      Pathname.new(@filename).basename.to_s + tmpimagedir_suffix
-    end
+      def rel_tmpimagedir
+        Pathname.new(@filename).basename.to_s + tmpimagedir_suffix
+      end
 
-    # isodoc.css overrides any CSS injected by Html2Doc, which
-    # is inserted before this CSS.
-    def define_head(head, _filename, _dir)
-      if @standardstylesheet
-        head.style do |style|
-          @standardstylesheet.open
-          stylesheet = @standardstylesheet.read
-          style.comment "\n#{stylesheet}\n"
+      # isodoc.css overrides any CSS injected by Html2Doc, which
+      # is inserted before this CSS.
+      def define_head(head, _filename, _dir)
+        if @standardstylesheet
+          head.style do |style|
+            @standardstylesheet.open
+            stylesheet = @standardstylesheet.read
+            style.comment "\n#{stylesheet}\n"
+          end
         end
       end
-    end
 
-    def body_attr
-      { lang: @lang.to_s }
-    end
-
-    def make_body(xml, docxml)
-      xml.body **body_attr do |body|
-        make_body1(body, docxml)
-        make_body2(body, docxml)
-        make_body3(body, docxml)
+      def body_attr
+        { lang: @lang.to_s }
       end
-    end
 
-    def make_body1(body, _docxml)
-      body.div **{ class: "title-section" } do |div1|
-        div1.p { |p| p << "&nbsp;" } # placeholder
+      def make_body(xml, docxml)
+        xml.body **body_attr do |body|
+          make_body1(body, docxml)
+          make_body2(body, docxml)
+          make_body3(body, docxml)
+        end
       end
-      section_break(body)
-    end
 
-    def make_body2(body, _docxml)
-      body.div **{ class: "prefatory-section" } do |div2|
-        div2.p { |p| p << "&nbsp;" } # placeholder
+      def make_body1(body, _docxml)
+        body.div **{ class: "title-section" } do |div1|
+          div1.p { |p| p << "&nbsp;" } # placeholder
+        end
+        section_break(body)
       end
-      section_break(body)
-    end
 
-    def make_body3(body, docxml)
-      body.div **{ class: "main-section" } do |div3|
-        boilerplate docxml, div3
-        preface_block docxml, div3
-        abstract docxml, div3
-        foreword docxml, div3
-        introduction docxml, div3
-        acknowledgements docxml, div3
-        middle docxml, div3
-        footnotes div3
-        comments div3
+      def make_body2(body, _docxml)
+        body.div **{ class: "prefatory-section" } do |div2|
+          div2.p { |p| p << "&nbsp;" } # placeholder
+        end
+        section_break(body)
       end
-    end
 
-    def info(isoxml, out)
-      @meta.title isoxml, out
-      @meta.subtitle isoxml, out
-      @meta.docstatus isoxml, out
-      @meta.docid isoxml, out
-      @meta.otherid isoxml, out
-      @meta.docnumeric isoxml, out
-      @meta.doctype isoxml, out
-      @meta.author isoxml, out
-      @meta.bibdate isoxml, out
-      @meta.relations isoxml, out
-      @meta.version isoxml, out
-      @meta.url isoxml, out
-      @meta.keywords isoxml, out
-      @meta.note isoxml, out
-      @meta.get
-    end
+      def make_body3(body, docxml)
+        body.div **{ class: "main-section" } do |div3|
+          boilerplate docxml, div3
+          preface_block docxml, div3
+          abstract docxml, div3
+          foreword docxml, div3
+          introduction docxml, div3
+          acknowledgements docxml, div3
+          middle docxml, div3
+          footnotes div3
+          comments div3
+        end
+      end
 
-    def middle(isoxml, out)
-      middle_title(isoxml, out)
-      middle_admonitions(isoxml, out)
-      i = scope isoxml, out, 0
-      i = norm_ref isoxml, out, i
-      i = terms_defs isoxml, out, i
-      symbols_abbrevs isoxml, out, i
-      clause isoxml, out
-      annex isoxml, out
-      bibliography isoxml, out
-    end
+      def info(isoxml, out)
+        @meta.title isoxml, out
+        @meta.subtitle isoxml, out
+        @meta.docstatus isoxml, out
+        @meta.docid isoxml, out
+        @meta.otherid isoxml, out
+        @meta.docnumeric isoxml, out
+        @meta.doctype isoxml, out
+        @meta.author isoxml, out
+        @meta.bibdate isoxml, out
+        @meta.relations isoxml, out
+        @meta.version isoxml, out
+        @meta.url isoxml, out
+        @meta.keywords isoxml, out
+        @meta.note isoxml, out
+        @meta.get
+      end
 
-    def boilerplate(node, out)
-      return if @bare
+      def middle(isoxml, out)
+        middle_title(isoxml, out)
+        middle_admonitions(isoxml, out)
+        i = scope isoxml, out, 0
+        i = norm_ref isoxml, out, i
+        i = terms_defs isoxml, out, i
+        symbols_abbrevs isoxml, out, i
+        clause isoxml, out
+        annex isoxml, out
+        bibliography isoxml, out
+      end
 
-      boilerplate = node.at(ns("//boilerplate")) or return
-      out.div **{ class: "authority" } do |s|
-        boilerplate.children.each do |n|
-          if n.name == "title"
-            s.h1 do |h|
-              n.children.each { |nn| parse(nn, h) }
+      def boilerplate(node, out)
+        return if @bare
+
+        boilerplate = node.at(ns("//boilerplate")) or return
+        out.div **{ class: "authority" } do |s|
+          boilerplate.children.each do |n|
+            if n.name == "title"
+              s.h1 do |h|
+                n.children.each { |nn| parse(nn, h) }
+              end
+            else parse(n, s)
             end
-          else parse(n, s)
           end
         end
       end
-    end
 
-    def parse(node, out)
-      if node.text? then text_parse(node, out)
-      else
-        case node.name
-        when "em" then em_parse(node, out)
-        when "strong" then strong_parse(node, out)
-        when "sup" then sup_parse(node, out)
-        when "sub" then sub_parse(node, out)
-        when "tt" then tt_parse(node, out)
-        when "strike" then strike_parse(node, out)
-        when "underline" then underline_parse(node, out)
-        when "keyword" then keyword_parse(node, out)
-        when "smallcap" then smallcap_parse(node, out)
-        when "br" then br_parse(node, out)
-        when "hr" then hr_parse(node, out)
-        when "bookmark" then bookmark_parse(node, out)
-        when "pagebreak" then pagebreak_parse(node, out)
-        when "callout" then callout_parse(node, out)
-        when "stem" then stem_parse(node, out)
-        when "clause" then clause_parse(node, out)
-        when "xref" then xref_parse(node, out)
-        when "eref" then eref_parse(node, out)
-        when "origin" then origin_parse(node, out)
-        when "link" then link_parse(node, out)
-        when "ul" then ul_parse(node, out)
-        when "ol" then ol_parse(node, out)
-        when "li" then li_parse(node, out)
-        when "dl" then dl_parse(node, out)
-        when "fn" then footnote_parse(node, out)
-        when "p" then para_parse(node, out)
-        when "quote" then quote_parse(node, out)
-        when "tr" then tr_parse(node, out)
-        when "note" then note_parse(node, out)
-        when "review" then review_note_parse(node, out)
-        when "admonition" then admonition_parse(node, out)
-        when "formula" then formula_parse(node, out)
-        when "table" then table_parse(node, out)
-        when "figure" then figure_parse(node, out)
-        when "example" then example_parse(node, out)
-        when "image" then image_parse(node, out, nil)
-        when "sourcecode" then sourcecode_parse(node, out)
-        when "pre" then pre_parse(node, out)
-        when "annotation" then annotation_parse(node, out)
-        when "term" then termdef_parse(node, out)
-        when "preferred" then term_parse(node, out)
-        when "admitted" then admitted_term_parse(node, out)
-        when "deprecates" then deprecated_term_parse(node, out)
-        when "domain" then set_termdomain(node.text)
-        when "definition" then definition_parse(node, out)
-        when "termsource" then termref_parse(node, out)
-        when "modification" then modification_parse(node, out)
-        when "termnote" then termnote_parse(node, out)
-        when "termexample" then example_parse(node, out)
-        when "terms" then terms_parse(node, out)
-        when "definitions" then symbols_parse(node, out)
-        when "references" then bibliography_parse(node, out)
-        when "termdocsource" then termdocsource_parse(node, out)
-        when "requirement" then requirement_parse(node, out)
-        when "recommendation" then recommendation_parse(node, out)
-        when "permission" then permission_parse(node, out)
-        when "subject" then requirement_skip_parse(node, out)
-        when "classification" then requirement_skip_parse(node, out)
-        when "inherit" then requirement_component_parse(node, out)
-        when "description" then requirement_component_parse(node, out)
-        when "specification" then requirement_component_parse(node, out)
-        when "measurement-target" then requirement_component_parse(node, out)
-        when "verification" then requirement_component_parse(node, out)
-        when "import" then requirement_component_parse(node, out)
-        when "index" then index_parse(node, out)
-        when "index-xref" then index_xref_parse(node, out)
-        when "termref" then termrefelem_parse(node, out)
-        when "copyright-statement" then copyright_parse(node, out)
-        when "license-statement" then license_parse(node, out)
-        when "legal-statement" then legal_parse(node, out)
-        when "feedback-statement" then feedback_parse(node, out)
-        when "passthrough" then passthrough_parse(node, out)
-        when "amend" then amend_parse(node, out)
-        when "tab" then clausedelimspace(out) # in Presentation XML only
-        when "svg" then svg_parse(node, out) # in Presentation XML only
-        when "add" then add_parse(node, out)
-        when "del" then del_parse(node, out)
-        when "form" then form_parse(node, out)
-        when "input" then input_parse(node, out)
-        when "select" then select_parse(node, out)
-        when "label" then label_parse(node, out)
-        when "option" then option_parse(node, out)
-        when "textarea" then textarea_parse(node, out)
-        else error_parse(node, out)
+      def parse(node, out)
+        if node.text? then text_parse(node, out)
+        else
+          case node.name
+          when "em" then em_parse(node, out)
+          when "strong" then strong_parse(node, out)
+          when "sup" then sup_parse(node, out)
+          when "sub" then sub_parse(node, out)
+          when "tt" then tt_parse(node, out)
+          when "strike" then strike_parse(node, out)
+          when "underline" then underline_parse(node, out)
+          when "keyword" then keyword_parse(node, out)
+          when "smallcap" then smallcap_parse(node, out)
+          when "br" then br_parse(node, out)
+          when "hr" then hr_parse(node, out)
+          when "bookmark" then bookmark_parse(node, out)
+          when "pagebreak" then pagebreak_parse(node, out)
+          when "callout" then callout_parse(node, out)
+          when "stem" then stem_parse(node, out)
+          when "clause" then clause_parse(node, out)
+          when "xref" then xref_parse(node, out)
+          when "eref" then eref_parse(node, out)
+          when "origin" then origin_parse(node, out)
+          when "link" then link_parse(node, out)
+          when "ul" then ul_parse(node, out)
+          when "ol" then ol_parse(node, out)
+          when "li" then li_parse(node, out)
+          when "dl" then dl_parse(node, out)
+          when "fn" then footnote_parse(node, out)
+          when "p" then para_parse(node, out)
+          when "quote" then quote_parse(node, out)
+          when "tr" then tr_parse(node, out)
+          when "note" then note_parse(node, out)
+          when "review" then review_note_parse(node, out)
+          when "admonition" then admonition_parse(node, out)
+          when "formula" then formula_parse(node, out)
+          when "table" then table_parse(node, out)
+          when "figure" then figure_parse(node, out)
+          when "example" then example_parse(node, out)
+          when "image" then image_parse(node, out, nil)
+          when "sourcecode" then sourcecode_parse(node, out)
+          when "pre" then pre_parse(node, out)
+          when "annotation" then annotation_parse(node, out)
+          when "term" then termdef_parse(node, out)
+          when "preferred" then term_parse(node, out)
+          when "admitted" then admitted_term_parse(node, out)
+          when "deprecates" then deprecated_term_parse(node, out)
+          when "domain" then set_termdomain(node.text)
+          when "definition" then definition_parse(node, out)
+          when "termsource" then termref_parse(node, out)
+          when "modification" then modification_parse(node, out)
+          when "termnote" then termnote_parse(node, out)
+          when "termexample" then example_parse(node, out)
+          when "terms" then terms_parse(node, out)
+          when "definitions" then symbols_parse(node, out)
+          when "references" then bibliography_parse(node, out)
+          when "termdocsource" then termdocsource_parse(node, out)
+          when "requirement" then requirement_parse(node, out)
+          when "recommendation" then recommendation_parse(node, out)
+          when "permission" then permission_parse(node, out)
+          when "subject" then requirement_skip_parse(node, out)
+          when "classification" then requirement_skip_parse(node, out)
+          when "inherit" then requirement_component_parse(node, out)
+          when "description" then requirement_component_parse(node, out)
+          when "specification" then requirement_component_parse(node, out)
+          when "measurement-target" then requirement_component_parse(node, out)
+          when "verification" then requirement_component_parse(node, out)
+          when "import" then requirement_component_parse(node, out)
+          when "index" then index_parse(node, out)
+          when "index-xref" then index_xref_parse(node, out)
+          when "termref" then termrefelem_parse(node, out)
+          when "copyright-statement" then copyright_parse(node, out)
+          when "license-statement" then license_parse(node, out)
+          when "legal-statement" then legal_parse(node, out)
+          when "feedback-statement" then feedback_parse(node, out)
+          when "passthrough" then passthrough_parse(node, out)
+          when "amend" then amend_parse(node, out)
+          when "tab" then clausedelimspace(out) # in Presentation XML only
+          when "svg" then svg_parse(node, out) # in Presentation XML only
+          when "add" then add_parse(node, out)
+          when "del" then del_parse(node, out)
+          when "form" then form_parse(node, out)
+          when "input" then input_parse(node, out)
+          when "select" then select_parse(node, out)
+          when "label" then label_parse(node, out)
+          when "option" then option_parse(node, out)
+          when "textarea" then textarea_parse(node, out)
+          when "toc" then toc_parse(node, out)
+          else error_parse(node, out)
+          end
         end
       end
     end