isodoc 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acde5067685a87b3ab6d60d0db7d0d0bb41258ee9569248487fea64ad9bdc6bb
-  data.tar.gz: 8afea86b4d65ed1dc140d598e3e9bf84fe1f6025edfd6287e266e5f725d58044
+  metadata.gz: 1842bc01d32d12e9bdc0fd5d468c4e0d92f92bd17323b42dd9a40a9179fa1462
+  data.tar.gz: 95194b1e93992bd7aa9bc345cf10508eea01ccd3402bd17654574446898b512d
 SHA512:
-  metadata.gz: c989302746ce89015f7dc719b5df66b2b3a8c27e498aa20471bf7e9631a1a80cc0914226b7e6d0778b4b792e9d91d0ea29eb84f07ec14fd646e6800999f5e1a3
-  data.tar.gz: ae33822c3445e57c08b2b0f8bc575e635c88cd7e071af6c93f04b039a1c5375de1deb7373984b9d7877c39a37542f9ef4a3e3f33dcbddf7316c71eb5bb55daaf
+  metadata.gz: 920c818ea215000355ee34aeb7714f5b3de2eb6681413d1ceff2f0734baf0bd5a0d114a9c1681687027a2ef4e86c44f733e00e45b0e0c4150b950b091ea1a8fa
+  data.tar.gz: 9104bd8e1d4bb7479fab74cb4ff302b7b684bd0949bb5a49da7638ca7d7c04958680a29ad1aaaadea8dc2b1f2098dfae693d106cfc75df6c4ec848219182802a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (1.0.10)
+    isodoc (1.0.11)
       asciimath
       html2doc (~> 0.9.0)
       htmlentities (~> 4.3.4)
@@ -114,7 +114,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
     timecop (0.9.1)
     unicode-display_width (1.6.0)

data/lib/isodoc/function/blocks.rb

@@ -40,8 +40,10 @@ module IsoDoc::Function
 
     def figure_name_parse(node, div, name)
       return if name.nil? && node.at(ns("./figure"))
+      lbl = anchor(node['id'], :label, false)
+      lbl = nil if labelled_ancestor(node) && node.ancestors("figure").empty?
+      return if lbl.nil? && name.nil?
       div.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
-        lbl = anchor(node['id'], :label, false)
         lbl.nil? or p << l10n("#{@figure_lbl} #{lbl}")
         name and !lbl.nil? and p << "&nbsp;&mdash; "
         name and name.children.each { |n| parse(n, div) }
@@ -69,14 +71,14 @@ module IsoDoc::Function
     end
 
     def pseudocode_parse(node, out)
-        @in_figure = true
-        name = node.at(ns("./name"))
-        out.div **attr_code(id: node["id"], class: "pseudocode") do |div|
-          node.children.each { |n| parse(n, div) unless n.name == "name" }
-          sourcecode_name_parse(node, div, name) if name
-        end
-        @in_figure = false
+      @in_figure = true
+      name = node.at(ns("./name"))
+      out.div **attr_code(id: node["id"], class: "pseudocode") do |div|
+        node.children.each { |n| parse(n, div) unless n.name == "name" }
+        sourcecode_name_parse(node, div, name)
       end
+      @in_figure = false
+    end
 
     def example_label(node, div, name)
       n = get_anchors[node["id"]]
@@ -129,9 +131,11 @@ module IsoDoc::Function
     end
 
     def sourcecode_name_parse(node, div, name)
+      lbl = anchor(node['id'], :label, false)
+      lbl = nil if labelled_ancestor(node)
+      return if lbl.nil? && name.nil?
       div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
         if node.ancestors("example").empty?
-          lbl = anchor(node['id'], :label, false)
           lbl.nil? or p << l10n("#{@figure_lbl} #{lbl}")
           name and !lbl.nil? and p << "&nbsp;&mdash; "
         end
@@ -152,8 +156,7 @@ module IsoDoc::Function
         node.children.each { |n| parse(n, div) unless n.name == "name" }
         @sourcecode = false
       end
-      sourcecode_name_parse(node, out, name) if name ||
-        node.ancestors("example").empty? && anchor(node['id'], :label, false)
+      sourcecode_name_parse(node, out, name)
     end
 
     def pre_parse(node, out)

data/lib/isodoc/function/reqt.rb

@@ -7,10 +7,7 @@ module IsoDoc::Function
 
     def recommendation_name(node, out, type)
       label, title, lbl = recommendation_labels(node)
-      #label = node.at(ns("./label"))
-      #title = node.at(ns("./title"))
       out.p **{ class: "AdmonitionTitle" }  do |b|
-        #lbl = anchor(node['id'], :label, false)
         b << (lbl.nil? ? l10n("#{type}:") : l10n("#{type} #{lbl}:"))
         if label || title
           b.br

data/lib/isodoc/function/table.rb

@@ -3,8 +3,10 @@ module IsoDoc::Function
 
     def table_title_parse(node, out)
       name = node.at(ns("./name"))
+      lbl = anchor(node['id'], :label, false)
+      lbl = nil if labelled_ancestor(node)
+      return if name.nil? && lbl.nil?
       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; ")
         name and name.children.each { |n| parse(n, p) }

data/lib/isodoc/function/utils.rb

@@ -176,5 +176,10 @@ module IsoDoc::Function
         File.join(@localdir, i["src"])
       end
     end
+
+    def labelled_ancestor(node)
+      return !node.ancestors("example, requirement, recommendation, permission, "\
+                             "table, figure, sourcecode").empty?
+    end
   end
 end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.10".freeze
+  VERSION = "1.0.11".freeze
 end

data/spec/isodoc/blocks_spec.rb

@@ -272,7 +272,6 @@ B</pre>
                <div class="figure" id="figure-C">
 <pre>A &lt;
 B</pre>
-<p class="FigureTitle" style="text-align:center;"/>
 </div>
                </div>
                <p class="zzSTDTitle1"/>
@@ -430,6 +429,9 @@ B</pre>
     <sourcecode lang="ruby" id="samplecode">
     <name>Ruby <em>code</em></name>
   puts x
+</sourcecode>
+<sourcecode unnumbered="true">
+Que?
 </sourcecode>
     </foreword></preface>
     </iso-standard>
@@ -439,6 +441,11 @@ B</pre>
                <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" style="text-align:center;">Figure 1&#160;&#8212; Ruby <i>code</i></p></pre>
+                 <pre class='prettyprint '>
+  <br/>
+  Que?
+  <br/>
+</pre>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -454,6 +461,9 @@ B</pre>
     <sourcecode lang="ruby" id="samplecode">
     <name>Ruby <em>code</em></name>
   puts x
+</sourcecode>
+<sourcecode unnumbered="true">
+Que?
 </sourcecode>
     </foreword></preface>
     </iso-standard>
@@ -474,6 +484,11 @@ B</pre>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/></p><p class="SourceTitle" style="text-align:center;">Figure 1&#160;&#8212; Ruby <i>code</i></p>
+                 <p class='Sourcecode'>
+  <br/>
+  Que?
+  <br/>
+</p>
                </div>
                   <p>&#160;</p>
  </div>
@@ -1066,6 +1081,53 @@ INPUT
 OUTPUT
   end
 
+  it "does not label embedded figures, sourcecode" do
+  expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+<itu-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata>
+    <language>en</language>
+    </bibdata>
+        <preface><foreword>
+        <example>
+        <sourcecode id="B"><name>Label</name>A B C</sourcecode>
+  <figure id="A" class="pseudocode"><name>Label</name><p id="_">  <strong>A</strong></p></figure>
+        <sourcecode id="B1">A B C</sourcecode>
+  <figure id="A1" class="pseudocode"><p id="_">  <strong>A</strong></p></figure>
+</example>
+</preface></itu-standard>
+INPUT
+    #{HTML_HDR}
+      <br/>
+      <div>
+      <h1 class='ForewordTitle'>Foreword</h1>
+               <div class='example'>
+                 <p class='example-title'>EXAMPLE</p>
+                 <pre id='B' class='prettyprint '>
+                   A B C
+                   <p class='SourceTitle' style='text-align:center;'>Label</p>
+                 </pre>
+                 <div id='A' class='pseudocode'>
+                   <p id='_'>
+                     &#160;&#160;
+                     <b>A</b>
+                   </p>
+                   <p class='SourceTitle' style='text-align:center;'>Label</p>
+                 </div>
+                 <pre id='B1' class='prettyprint '>A B C</pre>
+                 <div id='A1' class='pseudocode'>
+                   <p id='_'>
+                     &#160;&#160;
+                     <b>A</b>
+                   </p>
+                 </div>
+               </div>
+             </div>
+             <p class='zzSTDTitle1'/>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+       end
 
 
 end

data/spec/isodoc/postproc_spec.rb

@@ -1054,7 +1054,6 @@ word = File.read("test.doc").sub(/^.*<div class="WordSection2">/m, '<div class="
              </p>
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
-               <p class="TableTitle" style="text-align:center;font-size:0pt;">&#xA0;</p>
                <div align="center" class="table_container">
                  <table class="MsoISOTable" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;"><a name="_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7" id="_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7"></a>
                    <thead>
@@ -1109,7 +1108,6 @@ word = File.read("test.doc").sub(/^.*<div class="WordSection2">/m, '<div class="
          </p>
          <div>
            <h1 class='ForewordTitle'>Foreword</h1>
-           <p class='TableTitle' style='text-align:center;font-size:0pt;'>&#xA0;</p>
            <div align='center' class="table_container">
              <table class='MsoISOTable' style='mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
                <a name='_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7' id='_fe12b8f8-6858-4cd6-af7d-d4b6f3ebd1a7'/>

data/spec/isodoc/table_spec.rb

@@ -121,7 +121,6 @@ RSpec.describe IsoDoc do
                    <p><span class="note_label">NOTE</span>&#160; This is a table about rice</p>
                  </div>
                </table>
-               <p class="TableTitle" style="text-align:center;"/>
                <table id="tableD-2" class="MsoISOTable" style="border-width:1px;border-spacing:0;">
                  <tbody>
                    <tr>

data/spec/isodoc/xref_spec.rb

@@ -337,6 +337,7 @@ RSpec.describe IsoDoc do
          <p class="FigureTitle" style="text-align:center;">Figure 3&#160;&#8212; Split-it-right sample divider</p></div>
          <div id="note3" class="pseudocode">
 <p>pseudocode</p>
+<p class='SourceTitle' style='text-align:center;'>Figure 4</p>
 </div>
 <pre id='note4' class='prettyprint '>
   <br/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2019-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath