isodoc 0.10.4 → 1.0.0

data/lib/isodoc/function/table.rb

@@ -3,16 +3,10 @@ module IsoDoc::Function
 
     def table_title_parse(node, out)
       name = node.at(ns("./name"))
-      out.p **{ class: "TableTitle", align: "center" } do |p|
+      out.p **{ class: "TableTitle", style: "text-align:center;" } do |p|
         lbl = anchor(node['id'], :label, false)
         lbl.nil? or p << l10n("#{@table_lbl} #{lbl}")
         name and !lbl.nil? and p << l10n("&nbsp;&mdash; ")
-=begin
-        get_anchors[node['id']][:label].nil? or
-          p << l10n("#{@table_lbl} #{get_anchors[node['id']][:label]}")
-        name and !get_anchors[node['id']][:label].nil? and
-          p << l10n("&nbsp;&mdash; ")
-=end
         name and name.children.each { |n| parse(n, p) }
       end
     end
@@ -52,9 +46,7 @@ module IsoDoc::Function
       attr_code(
         id: node["id"],
         class: "MsoISOTable",
-        border: 1,
-        cellspacing: 0,
-        cellpadding: 0,
+        style: "border-width:1px;border-spacing:0;",
         title: node["alt"]
       )
     end
@@ -81,20 +73,21 @@ module IsoDoc::Function
 
     def make_tr_attr(td, row, totalrows)
       style = td.name == "th" ? "font-weight:bold;" : ""
+      td["align"] and style += "text-align:#{td['align']};"
       rowmax = td["rowspan"] ? row + td["rowspan"].to_i - 1 : row
       style += <<~STYLE
         border-top:#{row.zero? ? "#{SW} 1.5pt;" : 'none;'}
         border-bottom:#{SW} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
+        padding:0;
       STYLE
       { rowspan: td["rowspan"], colspan: td["colspan"],
-        align: td["align"], style: style.gsub(/\n/, "") }
+        style: style.gsub(/\n/, "") }
     end
 
     def tr_parse(node, out, ord, totalrows, _header)
       out.tr do |r|
         node.elements.each do |td|
           attrs = make_tr_attr(td, ord, totalrows - 1)
-          # i, node.elements.size - 1, header)
           r.send td.name, **attr_code(attrs) do |entry|
             td.children.each { |n| parse(n, entry) }
           end

data/lib/isodoc/function/to_word_html.rb

@@ -42,7 +42,6 @@ module IsoDoc::Function
     # is inserted before this CSS.
     def define_head(html, filename, _dir)
       html.head do |head|
-        #head.title { |t| t << filename }
         if @standardstylesheet
           head.style do |style|
             stylesheet = File.read(@standardstylesheet, encoding: "utf-8").
@@ -53,8 +52,11 @@ module IsoDoc::Function
       end
     end
 
+    def body_attr
+      { lang: "#{@lang}" }
+    end
+
     def make_body(xml, docxml)
-      body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
       xml.body **body_attr do |body|
         make_body1(body, docxml)
         make_body2(body, docxml)

data/lib/isodoc/html_function/comments.rb

@@ -6,18 +6,22 @@ module IsoDoc::HtmlFunction
     end
 
     def comments(div)
+=begin
       return if @comments.empty?
       div.div **{ style: "mso-element:comment-list" } do |div1|
         @comments.each { |fn| div1.parent << fn }
       end
+=end
     end
 
     def review_note_parse(node, out)
+=begin
       fn = @comments.length + 1
       make_comment_link(out, fn, node)
       @in_comment = true
       @comments << make_comment_text(node, fn)
       @in_comment = false
+=end
     end
 
     def comment_link_attrs(fn, node)
@@ -51,9 +55,11 @@ module IsoDoc::HtmlFunction
     end
 
     def comment_cleanup(docxml)
+=begin
       move_comment_link_to_from(docxml)
       reorder_comments_by_comment_link(docxml)
       embed_comment_in_comment_list(docxml)
+=end
     end
 
     COMMENT_IN_COMMENT_LIST =

data/lib/isodoc/html_function/html.rb

@@ -44,12 +44,14 @@ module IsoDoc::HtmlFunction
     def toHTML(result, filename)
       result = (from_xhtml(html_cleanup(to_xhtml(result))))
       result = populate_template(result, :html)
-      #result = script_cdata(from_xhtml(move_images(to_xhtml(result))))
       result = from_xhtml(move_images(to_xhtml(result)))
-      result = script_cdata(inject_script(result))
-      File.open("#{filename}.html", "w:UTF-8") do |f|
-        f.write(result)
-      end
+      result = html5(script_cdata(inject_script(result)))
+      File.open("#{filename}.html", "w:UTF-8") { |f| f.write(result) }
+    end
+
+    def html5(doc)
+      doc.sub(%r{<!DOCTYPE html [^>]+>}, "<!DOCTYPE html>").
+        sub(%r{<\?xml[^>]+>}, "")
     end
 
     def html_cleanup(x)
@@ -63,9 +65,7 @@ module IsoDoc::HtmlFunction
     MATHJAX = <<~"MATHJAX".freeze
       <script type="text/x-mathjax-config">
         MathJax.Hub.Config({
-          asciimath2jax: {
-            delimiters: [['OPEN', 'CLOSE']]
-          }
+          asciimath2jax: { delimiters: [['OPEN', 'CLOSE']] }
        });
       </script>
       <script src="#{MATHJAX_ADDR}?config=AM_HTMLorMML" async="async"></script>
@@ -91,15 +91,6 @@ module IsoDoc::HtmlFunction
       HEAD
     end
 
-    def toclevel
-      <<~HEAD.freeze
-    function toclevel() { var i; var text = "";
-      for(i = 1; i <= #{@htmlToClevels}; i++) {
-        if (i > 1) { text += ","; } text += "h" + i + ":not(:empty):not(.TermNum)"; } 
-      return text;}
-      HEAD
-    end
-
     def html_head()
       <<~HEAD.freeze
     <title>{{ doctitle }}</title>
@@ -155,12 +146,10 @@ module IsoDoc::HtmlFunction
 
     def sourcecode_parse(node, out)
       name = node.at(ns("./name"))
-      out.pre **attr_code(id: node["id"], 
-                          class: "prettyprint #{sourcecodelang(node&.at(ns('./@lang'))&.value)}") do |div|
+      class1 = "prettyprint #{sourcecodelang(node&.at(ns('./@lang'))&.value)}"
+      out.pre **attr_code(id: node["id"], class: class1) do |div|
         @sourcecode = true
-        node.children.each do |n|
-          parse(n, div) unless n.name == "name"
-        end
+        node.children.each { |n| parse(n, div) unless n.name == "name" }
         @sourcecode = false
         sourcecode_name_parse(node, div, name) if name
       end
@@ -171,10 +160,6 @@ module IsoDoc::HtmlFunction
       html_intro(docxml) if @htmlintropage
       docxml.at("//body") << mathjax(@openmathdelim, @closemathdelim)
       docxml.at("//body") << sourcecode_highlighter
-      #if @scripts
-      #  scripts = File.read(@scripts, encoding: "UTF-8")
-      #  a = docxml.at("//body").add_child docxml.create_cdata(scripts)
-      #end
       html_main(docxml)
       docxml
     end
@@ -186,17 +171,15 @@ module IsoDoc::HtmlFunction
     end
 
     def html_cover(docxml)
-      cover = File.read(@htmlcoverpage, encoding: "UTF-8")
-      coverxml = to_xhtml_fragment(cover)
+      doc = to_xhtml_fragment(File.read(@htmlcoverpage, encoding: "UTF-8"))
       d = docxml.at('//div[@class="title-section"]')
-      d.children.first.add_previous_sibling coverxml.to_xml(encoding: "US-ASCII")
+      d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
     end
 
     def html_intro(docxml)
-      intro = File.read(@htmlintropage, encoding: "UTF-8")
-      introxml = to_xhtml_fragment(intro)
+      doc = to_xhtml_fragment(File.read(@htmlintropage, encoding: "UTF-8"))
       d = docxml.at('//div[@class="prefatory-section"]')
-      d.children.first.add_previous_sibling introxml.to_xml(encoding: "US-ASCII")
+      d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
     end
 
     def htmlstylesheet
@@ -210,11 +193,14 @@ module IsoDoc::HtmlFunction
       return docxml unless @htmlstylesheet
       title = docxml.at("//*[local-name() = 'head']/*[local-name() = 'title']")
       head = docxml.at("//*[local-name() = 'head']")
+=begin
       css = htmlstylesheet
       if title.nil? then head.children.first.add_previous_sibling css
       else
         title.add_next_sibling css
       end
+=end
+      head << htmlstylesheet
       docxml
     end
 
@@ -293,21 +279,33 @@ module IsoDoc::HtmlFunction
     end
 
     def html_toc_entry(level, header)
-      %(<li class="h#{level}"><a href="##{header['id']}">#{header_strip(header)}</a></li>)
+      %(<li class="#{level}"><a href="##{header['id']}">\
+      #{header_strip(header)}</a></li>)
     end
 
+    def toclevel_classes
+      (1..@htmlToClevels).inject([]) { |m, i| m << "h#{i}" }
+    end
+
+    def toclevel
+      ret = toclevel_classes.map { |l| "#{l}:not(:empty):not(.TermNum):not(.noTOC)" }
+      <<~HEAD.freeze
+    function toclevel() { return "#{ret.join(',')}";}
+      HEAD
+    end
+
+    # needs to be same output as toclevel
     def html_toc(docxml)
-=begin
       idx = docxml.at("//div[@id = 'toc']") or return docxml
       toc = "<ul>"
-      tocidx = 0
-      docxml.xpath("//main//h1 | //main//h2[not(@class = 'TermNum')]").each do |h|
+      path = toclevel_classes.map do |l|
+        "//main//#{l}[not(@class = 'TermNum')][not(@class = 'noTOC')][not(text())]"
+      end
+      docxml.xpath(path.join(" | ")).each_with_index do |h, tocidx|
         h["id"] ||= "toc#{tocidx}"
-        toc += html_toc_entry(h.name == "h1" ? 1 : 2, h)
-        tocidx += 1
+        toc += html_toc_entry(h.name, h)
       end
       idx.children = "#{toc}</ul>"
-=end
       docxml
     end
   end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.10.4".freeze
+  VERSION = "1.0.0".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -13,6 +13,10 @@ module IsoDoc::WordFunction
       end
     end
 
+    def body_attr
+      { lang: "EN-US", link: "blue", vlink: "#954F72" }
+    end
+
     def make_body1(body, _docxml)
       FileUtils.rm_rf tmpimagedir
       FileUtils.mkdir tmpimagedir
@@ -235,12 +239,12 @@ module IsoDoc::WordFunction
 
 
     def make_table_attr(node)
-      {
+      super.merge({
         style: "mso-table-lspace:15.0cm;margin-left:423.0pt;"\
         "mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;"\
         "mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;"\
-        "mso-table-overlap:never;"
-      }.merge(super)
+        "mso-table-overlap:never;border-spacing:0;border-width:1px;"
+      })
     end
 
     def table_parse(node, out)

data/lib/isodoc/word_function/postprocess.rb

@@ -60,6 +60,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       word_table_separator(docxml)
       word_admonition_images(docxml)
       word_list_continuations(docxml)
+      word_example_cleanup(docxml)
       docxml
     end
 
@@ -96,6 +97,12 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def word_annex_cleanup(docxml)
     end
 
+    def word_example_cleanup(docxml)
+      docxml.xpath("//div[@class = 'example']//p[not(@class)]").each do |p|
+        p["class"] = "example"
+      end
+    end
+
     def word_preface(docxml)
       word_cover(docxml) if @wordcoverpage
       word_intro(docxml, @wordToClevels) if @wordintropage

data/spec/isodoc/blocks_spec.rb

@@ -263,16 +263,16 @@ B</pre>
          <p id="_">The time <span class="stem">(#(t_90)#)</span> was estimated to be 18,2 min for this example.</p>
        </div></aside>
          <p><b>Key</b></p><dl><dt><p>A</p></dt><dd><p>B</p></dd></dl>
-       <p class="FigureTitle" align="center">Figure 1&#160;&#8212; Split-it-right <i>sample</i> divider</p></div>
+       <p class="FigureTitle" style="text-align:center;">Figure 1&#160;&#8212; Split-it-right <i>sample</i> divider</p></div>
                <div class="figure" id="figure-B">
 <pre>A &lt;
 B</pre>
-<p class="FigureTitle" align="center">Figure 2</p>
+<p class="FigureTitle" style="text-align:center;">Figure 2</p>
 </div>
                <div class="figure" id="figure-C">
 <pre>A &lt;
 B</pre>
-<p class="FigureTitle" align="center"/>
+<p class="FigureTitle" style="text-align:center;"/>
 </div>
                </div>
                <p class="zzSTDTitle1"/>
@@ -326,11 +326,11 @@ B</pre>
          <p id="_">The time <span class="stem">(#(t_90)#)</span> was estimated to be 18,2 min for this example.</p>
        </div></aside>
          <p><b>Key</b></p><table class="dl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;">A</p></td><td valign="top"><p>B</p></td></tr></table>
-       <p class="FigureTitle" align="center">Figure 1&#160;&#8212; Split-it-right sample divider</p></div>
+       <p class="FigureTitle" style="text-align:center;">Figure 1&#160;&#8212; Split-it-right sample divider</p></div>
                <div class="figure" id="figure-B">
 <pre>A &lt;
 B</pre>
-             <p class="FigureTitle" align="center">Figure 2</p>
+             <p class="FigureTitle" style="text-align:center;">Figure 2</p>
 </div>
              </div>
              <p>&#160;</p>
@@ -426,7 +426,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <pre id="samplecode" class="prettyprint lang-rb"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/><p class="SourceTitle" align="center">Ruby <i>code</i></p></pre>
+                 <pre id="samplecode" class="prettyprint lang-rb"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/><p class="SourceTitle" style="text-align:center;">Ruby <i>code</i></p></pre>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -461,7 +461,7 @@ B</pre>
              </p>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/><p class="SourceTitle" align="center">Ruby <i>code</i></p></p>
+                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/><p class="SourceTitle" style="text-align:center;">Ruby <i>code</i></p></p>
                </div>
                   <p>&#160;</p>
  </div>
@@ -491,7 +491,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <pre id="samplecode" class="prettyprint "><br/>&#160;&#160;&#160; <br/>&#160; &lt;xml&gt;<br/><p class="SourceTitle" align="center">XML code</p></pre>
+                 <pre id="samplecode" class="prettyprint "><br/>&#160;&#160;&#160; <br/>&#160; &lt;xml&gt;<br/><p class="SourceTitle" style="text-align:center;">XML code</p></pre>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -508,7 +508,7 @@ B</pre>
        %w{a b c}.each do |x|
          puts x <callout target="B">2</callout>
        end<annotation id="A">
-         <p id="_">This is one callout</p>
+         <p id="_">This is <em>one</em> callout</p>
        </annotation><annotation id="B">
          <p id="_">This is another callout</p>
        </annotation></sourcecode>
@@ -519,11 +519,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <pre id="_" class="prettyprint ">puts "Hello, world."  &lt;1&gt;<br/>&#160;&#160; %w{a b c}.each do |x|<br/>&#160;&#160;&#160;&#160; puts x  &lt;2&gt;<br/>&#160;&#160; end<span class="zzMoveToFollowing">&lt;1&gt; </span>
-            <p class="Sourcecode" id="_">This is one callout</p>
-          <span class="zzMoveToFollowing">&lt;2&gt; </span>
-            <p class="Sourcecode" id="_">This is another callout</p>
-          </pre>
+                 <pre id="_" class="prettyprint ">puts "Hello, world."  &lt;1&gt;<br/>&#160;&#160; %w{a b c}.each do |x|<br/>&#160;&#160;&#160;&#160; puts x  &lt;2&gt;<br/>&#160;&#160; end<br/><br/>&lt;1&gt; This is one callout<br/>&lt;2&gt; This is another callout</pre>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -546,7 +542,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div class="Admonition"><p class="AdmonitionTitle" align="center">CAUTION</p>
+                 <div class="Admonition"><p class="AdmonitionTitle" style="text-align:center;">CAUTION</p>
          <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
        </div>
                </div>
@@ -572,7 +568,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div class="Admonition"><p class="AdmonitionTitle" align="center">Title</p>
+                 <div class="Admonition"><p class="AdmonitionTitle" style="text-align:center;">Title</p>
          <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
        </div>
                </div>
@@ -645,11 +641,11 @@ World</p>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p id="_08bfe952-d57f-4150-9c95-5d52098cc2a8" align="left" style="text-align:left">Vache Equipment<br/>
+                 <p id="_08bfe952-d57f-4150-9c95-5d52098cc2a8" style="text-align:left;">Vache Equipment<br/>
        Fictitious<br/>
        World
            </p>
-           <p style="text-align:justify">Justify</p>
+           <p style="text-align:justify;">Justify</p>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -773,12 +769,12 @@ World</p>
     <table id="_">
       <tbody>
         <tr>
-          <td align="left">Object</td>
-          <td align="left">Value</td>
+          <td style="text-align:left;">Object</td>
+          <td style="text-align:left;">Value</td>
         </tr>
         <tr>
-          <td align="left">Mission</td>
-          <td align="left">Accomplished</td>
+          <td style="text-align:left;">Mission</td>
+          <td style="text-align:left;">Accomplished</td>
         </tr>
       </tbody>
     </table>
@@ -812,6 +808,7 @@ World</p>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
         <div class="permission"><p class="AdmonitionTitle">Permission 1:<br/>/ogc/recommendation/wfs/2</p>
+        <p><i>Subject: user<br/>Control-class: Technical<br/>Priority: P0<br/>Family: System and Communications Protection<br/>Family: System and Communications Protocols</i></p>
 
   <div class="requirement-inherit">/ss/584/2015/level/1</div>
   <div class="requirement-description">
@@ -858,12 +855,12 @@ World</p>
     <table id="_">
       <tbody>
         <tr>
-          <td align="left">Object</td>
-          <td align="left">Value</td>
+          <td style="text-align:left;">Object</td>
+          <td style="text-align:left;">Value</td>
         </tr>
         <tr>
-          <td align="left">Mission</td>
-          <td align="left">Accomplished</td>
+          <td style="text-align:left;">Mission</td>
+          <td style="text-align:left;">Accomplished</td>
         </tr>
       </tbody>
     </table>
@@ -896,7 +893,7 @@ World</p>
         <br/>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
-        <div class="require"><p class="AdmonitionTitle">Requirement:<br/>/ogc/recommendation/wfs/2. A New Requirement</p>
+        <div class="require"><p class="AdmonitionTitle">Requirement:<br/>/ogc/recommendation/wfs/2. A New Requirement</p><p><i>Subject: user</i></p>
 
   <div class="requirement-inherit">/ss/584/2015/level/1</div>
   <div class="requirement-description">
@@ -930,9 +927,11 @@ World</p>
     expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <recommendation id="_">
+    <recommendation id="_" obligation="shall,could">
   <label>/ogc/recommendation/wfs/2</label>
   <inherit>/ss/584/2015/level/1</inherit>
+  <classification><tag>type</tag><value>text</value></classification>
+  <classification><tag>language</tag><value>BASIC</value></classification>
   <subject>user</subject>
   <description>
     <p id="_">I recommend <em>this</em>.</p>
@@ -942,12 +941,12 @@ World</p>
     <table id="_">
       <tbody>
         <tr>
-          <td align="left">Object</td>
-          <td align="left">Value</td>
+          <td style="text-align:left;">Object</td>
+          <td style="text-align:left;">Value</td>
         </tr>
         <tr>
-          <td align="left">Mission</td>
-          <td align="left">Accomplished</td>
+          <td style="text-align:left;">Mission</td>
+          <td style="text-align:left;">Accomplished</td>
         </tr>
       </tbody>
     </table>
@@ -980,8 +979,7 @@ World</p>
        <br/>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
-        <div class="recommend"><p class="AdmonitionTitle">Recommendation 1:<br/>/ogc/recommendation/wfs/2</p>
-
+<div class="recommend"><p class="AdmonitionTitle">Recommendation 1:<br/>/ogc/recommendation/wfs/2</p><p><i>Obligation: shall,could<br/>Subject: user<br/>Type: text<br/>Language: BASIC</i></p>
   <div class="requirement-inherit">/ss/584/2015/level/1</div>
   <div class="requirement-description">
     <p id="_">I recommend <i>this</i>.</p>