isodoc 1.0.28 → 1.0.29

data/lib/isodoc/function/table.rb

@@ -44,12 +44,12 @@ module IsoDoc::Function
       end
     end
 
-    def make_table_attr(node)
+    def table_attrs(node)
       width = node["width"] ? "width:#{node['width']};" : nil
       attr_code(
         id: node["id"],
         class: "MsoISOTable",
-        style: "border-width:1px;border-spacing:0;#{width}",
+        style: "border-width:1px;border-spacing:0;#{width}#{keep_style(node)}",
         title: node["alt"]
       )
     end
@@ -66,7 +66,7 @@ module IsoDoc::Function
     def table_parse(node, out)
       @in_table = true
       table_title_parse(node, out)
-      out.table **make_table_attr(node) do |t|
+      out.table **table_attrs(node) do |t|
         tcaption(node, t)
         thead_parse(node, t)
         tbody_parse(node, t)

data/lib/isodoc/function/terms.rb

@@ -40,7 +40,7 @@ module IsoDoc::Function
     end
 
     def termnote_parse(node, out)
-      out.div **{ class: "Note" } do |div|
+      out.div **note_attrs(node) do |div|
         first = node.first_element_child
         div.p do |p|
           p << "#{anchor(node['id'], :label) || '???'}: "

data/lib/isodoc/function/utils.rb

@@ -147,7 +147,7 @@ module IsoDoc::Function
     end
 
     def populate_template(docxml, _format = nil)
-      meta = @meta.get.merge(@labels || {})
+      meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {})
       template = liquid(docxml)
       template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h).
         gsub('<', '<').gsub('>', '>').gsub('&', '&')
@@ -155,6 +155,7 @@ module IsoDoc::Function
 
     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|
         f.binmode

data/lib/isodoc/function/xref_counter.rb

@@ -15,26 +15,60 @@ module IsoDoc::Function
         @num = 0
         @letter = ""
         @subseq = ""
+        @letter_override = nil
+        @number_override = nil
+      end
+
+      def new_subseq_increment(node)
+        @subseq = node["subsequence"]
+        @num += 1
+        @letter = node["subsequence"] ? "a" : ""
+        if node["number"]
+          /^(?<n>\d*)(?<a>[a-z]*)$/ =~ node["number"]
+          if n || a
+            @letter_override = @letter = a if a
+            @number_override = @num = n.to_i if n
+          else
+            @letter_override = node["number"]
+            @letter = @letter_override if /^[a-z]$/.match(@letter_override)
+          end
+        end
+      end
+
+      def sequence_increment(node)
+        if node["number"]
+          @number_override = node["number"]
+          @num = @number_override.to_i if /^\d+$/.match(@number_override)
+        else
+          @num += 1
+        end
+      end
+
+      def subsequence_increment(node)
+        if node["number"]
+          @letter_override = node["number"]
+          @letter = @letter_override if /^[a-z]$/.match(@letter_override)
+        else
+          @letter = (@letter.ord + 1).chr.to_s
+        end
       end
 
       def increment(node)
         return self if node["unnumbered"]
+        @letter_override = nil
+        @number_override = nil
         if node["subsequence"] != @subseq
-          @subseq = node["subsequence"]
-          @num += 1
-          @letter = node["subsequence"] ? "a" : ""
+          new_subseq_increment(node)
+        elsif @letter.empty?
+          sequence_increment(node)
         else
-          if @letter.empty?
-            @num += 1
-          else
-            @letter = (@letter.ord + 1).chr.to_s
-          end
+          subsequence_increment(node)
         end
         self
       end
 
       def print
-        "#{@num}#{@letter}"
+        "#{@number_override || @num}#{@letter_override || @letter}"
       end
 
       def listlabel(depth)

data/lib/isodoc/function/xref_gen_seq.rb

@@ -1,15 +1,20 @@
 module IsoDoc::Function
   module XrefGen
+    def subfigure_increment(j, c, t)
+      if t.parent.name == "figure" then j += 1
+        else
+          j = 0
+          c.increment(t)
+        end
+      j
+    end
+
     def sequential_figure_names(clause)
       c = Counter.new
       j = 0
       clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).
         each do |t|
-        if t.parent.name == "figure" then j += 1
-        else
-          j = 0
-          c.increment(t)
-        end
+        j = subfigure_increment(j, c, t)
         label = c.print + (j.zero? ? "" : "-#{j}")
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] =
@@ -80,11 +85,7 @@ module IsoDoc::Function
       j = 0
       clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]")).
         each do |t|
-        if t.parent.name == "figure" then j += 1
-        else
-          j = 0
-          c.increment(t)
-        end
+        j = subfigure_increment(j, c, t)
         label = "#{num}#{hiersep}#{c.print}" +
           (j.zero? ? "" : "#{hierfigsep}#{j}")
         next if t["id"].nil? || t["id"].empty?

data/lib/isodoc/html_function/html.rb

@@ -102,7 +102,7 @@ module IsoDoc::HtmlFunction
     def sourcecode_parse(node, out)
       name = node.at(ns("./name"))
       class1 = "prettyprint #{sourcecodelang(node&.at(ns('./@lang'))&.value)}"
-      out.pre **attr_code(id: node["id"], class: class1) do |div|
+      out.pre **sourcecode_attrs(node).merge(class: class1) do |div|
         @sourcecode = true
         node.children.each { |n| parse(n, div) unless n.name == "name" }
         @sourcecode = false

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.28".freeze
+  VERSION = "1.0.29".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -1,4 +1,5 @@
 require_relative "./table.rb"
+require_relative "./inline.rb"
 
 module IsoDoc::WordFunction
   module Body
@@ -69,28 +70,6 @@ module IsoDoc::WordFunction
       node.xpath(ns("./note")).each { |n| parse(n, out) }
     end
 
-    def section_break(body)
-      body.p do |p|
-        p.br **{ clear: "all", class: "section" }
-      end
-    end
-
-    def page_break(out)
-      out.p do |p|
-        p.br **{ clear: "all",
-                 style: "mso-special-character:line-break;"\
-                 "page-break-before:always" }
-      end
-    end
-
-    def pagebreak_parse(node, out)
-      return page_break(out) if node["orientation"].nil?
-      out.p do |p|
-        p.br **{clear: "all", class: "section", 
-                orientation: node["orientation"] }
-      end
-    end
-
     WORD_DT_ATTRS = {class: @note ? "Note" : nil, align: "left",
                      style: "margin-left:0pt;text-align:left;"}.freeze
 
@@ -174,7 +153,7 @@ module IsoDoc::WordFunction
     end
 
     def termnote_parse(node, out)
-      out.div **{ class: "Note" } do |div|
+      out.div **note_attrs(node) do |div|
         first = node.first_element_child
         div.p **{ class: "Note" } do |p|
           anchor = get_anchors[node['id']]
@@ -185,41 +164,23 @@ module IsoDoc::WordFunction
     end
 
     def para_attrs(node)
-      attrs = { class: para_class(node), id: node["id"] }
+      attrs = { class: para_class(node), id: node["id"], style: "" }
       unless node["align"].nil?
         attrs[:align] = node["align"] unless node["align"] == "justify"
-        attrs[:style] = "text-align:#{node['align']}"
+        attrs[:style] += "text-align:#{node['align']};"
       end
+      attrs[:style] += "#{keep_style(node)}"
+      attrs[:style] = nil if attrs[:style].empty?
       attrs
     end
 
-    def imgsrc(uri)
-      return uri unless %r{^data:image/}.match uri
-      save_dataimage(uri)
-    end
-
-    def image_parse(node, out, caption)
-      attrs = { src: imgsrc(node["src"]),
-                height: node["height"],
-                alt: node["alt"],
-                title: node["title"],
-                width: node["width"] }
-      out.img **attr_code(attrs)
-      image_title_parse(out, caption)
-    end
-
-    def xref_parse(node, out)
-      target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".doc#") :
-        "##{node["target"]}"
-        out.a(**{ "href": target }) { |l| l << get_linkend(node) }
-    end
-
     def example_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-anchor-horizontal:column;"\
-        "mso-table-overlap:never;border-collapse:collapse;"
+        "mso-table-overlap:never;border-collapse:collapse;"\
+        "#{keep_style(node)}"
       })
     end
 
@@ -240,5 +201,10 @@ module IsoDoc::WordFunction
         node.children.each { |n| parse(n, li) }
       end
     end
+
+    def suffix_url(url)
+      return url if %r{^http[s]?://}.match(url)
+      url.sub(/#{File.extname(url)}$/, ".doc")
+    end
   end
 end

data/lib/isodoc/word_function/inline.rb

@@ -0,0 +1,75 @@
+module IsoDoc::WordFunction
+  module Body
+    def section_break(body)
+      body.p do |p|
+        p.br **{ clear: "all", class: "section" }
+      end
+    end
+
+    def page_break(out)
+      out.p do |p|
+        p.br **{ clear: "all",
+                 style: "mso-special-character:line-break;"\
+                 "page-break-before:always" }
+      end
+    end
+
+    def pagebreak_parse(node, out)
+      return page_break(out) if node["orientation"].nil?
+      out.p do |p|
+        p.br **{clear: "all", class: "section",
+                orientation: node["orientation"] }
+      end
+    end
+
+    def imgsrc(node)
+      ret = svg_to_emf(node) and return ret
+      return node["src"] unless %r{^data:image/}.match node["src"]
+      save_dataimage(node["src"])
+    end
+
+    def image_parse(node, out, caption)
+      attrs = { src: imgsrc(node),
+                height: node["height"],
+                alt: node["alt"],
+                title: node["title"],
+                width: node["width"] }
+      out.img **attr_code(attrs)
+      image_title_parse(out, caption)
+    end
+
+    def svg_to_emf_filename(uri)
+      File.join(File.dirname(uri), File.basename(uri, ".*")) + ".emf"
+    end
+
+    def svg_to_emf(node)
+      return unless node["mimetype"] == "image/svg+xml"
+      uri = node["src"]
+      %r{^data:image/}.match(uri) and uri = save_dataimage(uri)
+      ret = svg_to_emf_filename(uri)
+      File.exists?(ret) and return ret
+      exe = inkscape_installed? or return nil
+      system %(#{exe} --export-type="emf" #{uri}) and
+        return ret
+      nil
+    end
+
+    def inkscape_installed?
+      cmd = "inkscape"
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each do |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return exe if File.executable?(exe) && !File.directory?(exe)
+        end
+      end
+      nil
+    end
+
+    def xref_parse(node, out)
+      target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".doc#") :
+        "##{node["target"]}"
+        out.a(**{ "href": target }) { |l| l << get_linkend(node) }
+    end
+  end
+end

data/lib/isodoc/word_function/table.rb

@@ -33,12 +33,12 @@ module IsoDoc::WordFunction
         align: td["align"], style: style.gsub(/\n/, "") }
     end
 
-    def make_table_attr(node)
+    def table_attrs(node)
       super.merge(attr_code({
         summary: node["summary"],
         width: node["width"],
         style: "mso-table-anchor-horizontal:column;"\
-        "mso-table-overlap:never;border-spacing:0;border-width:1px;"
+        "mso-table-overlap:never;border-spacing:0;border-width:1px;#{keep_style(node)}"
       }))
     end
 
@@ -46,7 +46,7 @@ module IsoDoc::WordFunction
       @in_table = true
       table_title_parse(node, out)
       out.div **{ align: "center", class: "table_container" } do |div|
-        div.table **make_table_attr(node) do |t|
+        div.table **table_attrs(node) do |t|
           thead_parse(node, t)
           tbody_parse(node, t)
           tfoot_parse(node, t)

data/spec/assets/odf.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <circle fill="#009" r="45" cx="50" cy="50"/>
+  <path d="M33,26H78A37,37,0,0,1,33,83V57H59V43H33Z" fill="#FFF"/>
+</svg>

data/spec/assets/odf1.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <circle fill="#009" r="45" cx="50" cy="50"/>
+  <path d="M33,26H78A37,37,0,0,1,33,83V57H59V43H33Z" fill="#FFF"/>
+</svg>

data/spec/isodoc/blocks_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <note>
+    <note id="A" keep-with-next="true" keep-lines-together="true">
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
 </note>
     </foreword></preface>
@@ -15,7 +15,7 @@ RSpec.describe IsoDoc do
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="" class="Note">
+                 <div id="A" class="Note" style="page-break-after: avoid;page-break-inside: avoid;">
                    <p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                </div>
@@ -30,7 +30,7 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <note>
+    <note id="A">
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
 </note>
     </foreword></preface>
@@ -47,7 +47,7 @@ RSpec.describe IsoDoc do
              <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
-               <div id="" class="Note">
+               <div id="A" class="Note">
                  <p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span>These results are based on a study carried out on three different types of kernel.</p>
                </div>
              </div>
@@ -134,7 +134,7 @@ INPUT
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="" class="Note">
+                 <div class="Note">
                    <p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
                    <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
                  </div>
@@ -150,7 +150,7 @@ INPUT
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <note>
+    <note id="A">
     <dl>
     <dt>A</dt>
     <dd><p>B</p></dd>
@@ -165,7 +165,7 @@ INPUT
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="" class="Note"><p><span class="note_label">NOTE</span>&#160; </p>
+                 <div id="A" class="Note"><p><span class="note_label">NOTE</span>&#160; </p>
            <dl><dt><p>A</p></dt><dd><p>B</p></dd></dl>
            <ul>
            <li>C</li></ul>
@@ -183,7 +183,7 @@ INPUT
     expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <note>
+    <note id="A">
     <dl>
     <dt>A</dt>
     <dd><p>B</p></dd>
@@ -205,7 +205,7 @@ INPUT
              <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
-               <div id="" class="Note"><p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span></p>
+               <div id="A" class="Note"><p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span></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 class="Note">B</p></td></tr></table>
            <ul>
            <li>C</li></ul>
@@ -317,7 +317,7 @@ OUTPUT
     expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <figure id="figureA-1">
+    <figure id="figureA-1" keep-with-next="true" keep-lines-together="true">
   <name>Split-it-right <em>sample</em> divider<fn reference="1"><p>X</p></fn></name>
   <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png" alt="alttext" title="titletxt"/>
   <image src="rice_images/rice_image1.png" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f1" mimetype="image/png"/>
@@ -345,7 +345,7 @@ B
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="figureA-1" class="figure">
+                 <div id="figureA-1" class="figure" style='page-break-after: avoid;page-break-inside: avoid;'>
 
          <img src="rice_images/rice_image1.png" height="20" width="30" alt="alttext" title="titletxt"/>
          <img src="rice_images/rice_image1.png" height="20" width="auto"/>
@@ -380,6 +380,7 @@ B
   end
 
   it "processes figures (Word)" do
+    FileUtils.rm_rf "spec/assets/odf1.emf"
     expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(/['"][^'".]+\.gif['"]/, "'_.gif'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
@@ -452,11 +453,122 @@ B
     OUTPUT
   end
 
+   it "converts SVG (Word)" do
+    FileUtils.rm_rf "spec/assets/odf1.emf"
+    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true).gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.emf['"]/, "'_.emf'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <figure id="figureA-1">
+  <image src="spec/assets/odf.svg" mimetype="image/svg+xml"/>
+  <image src="spec/assets/odf1.svg" mimetype="image/svg+xml"/>
+  <image src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj4KICA8Y2lyY2xlIGZpbGw9IiMwMDkiIHI9IjQ1IiBjeD0iNTAiIGN5PSI1MCIvPgogIDxwYXRoIGQ9Ik0zMywyNkg3OEEzNywzNywwLDAsMSwzMyw4M1Y1N0g1OVY0M0gzM1oiIGZpbGw9IiNGRkYiLz4KPC9zdmc+Cg==" id="_d3731866-1a07-435a-a6c2-1acd41023a4e" mimetype="image/svg+xml" height="auto" width="auto"/>
+</figure>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+<head>
+<style>
+        </style>
+  </head>
+  <body lang='EN-US' link='blue' vlink='#954F72'>
+    <div class='WordSection1'>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection2'>
+      <p>
+        <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+      </p>
+      <div>
+        <h1 class='ForewordTitle'>Foreword</h1>
+        <div id='figureA-1' class='figure'>
+          <img src='spec/assets/odf.emf'/>
+          <img src='spec/assets/odf1.emf'/>
+          <img src='_.emf' height='auto' width='auto'/>
+          <p class='FigureTitle' style='text-align:center;'>Figure 1</p>
+        </div>
+      </div>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection3'>
+      <p class='zzSTDTitle1'/>
+    </div>
+  </body>
+</html>
+
+OUTPUT
+    end
+
+context "disable inkscape" do
+
+   it "converts SVG (Word) with inkscape disabled" do
+    FileUtils.rm_rf "spec/assets/odf1.emf"
+    allow(IsoDoc::WordFunction::Body).to receive(:inkscape_installed?).and_return(nil)
+    allow_any_instance_of(IsoDoc::WordFunction::Body).to receive(:inkscape_installed?)
+
+    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true).gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.svg['"]/, "'_.svg'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <figure id="figureA-1">
+  <image src="spec/assets/odf.svg" mimetype="image/svg+xml"/>
+  <image src="spec/assets/odf1.svg" mimetype="image/svg+xml"/>
+  <image src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj4KICA8Y2lyY2xlIGZpbGw9IiMwMDkiIHI9IjQ1IiBjeD0iNTAiIGN5PSI1MCIvPgogIDxwYXRoIGQ9Ik0zMywyNkg3OEEzNywzNywwLDAsMSwzMyw4M1Y1N0g1OVY0M0gzM1oiIGZpbGw9IiNGRkYiLz4KPC9zdmc+Cg==" id="_d3731866-1a07-435a-a6c2-1acd41023a4e" mimetype="image/svg+xml" height="auto" width="auto"/>
+</figure>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+ <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+<head>
+<style>
+        </style>
+  </head>
+  <body lang='EN-US' link='blue' vlink='#954F72'>
+    <div class='WordSection1'>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection2'>
+      <p>
+        <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+      </p>
+      <div>
+        <h1 class='ForewordTitle'>Foreword</h1>
+        <div id='figureA-1' class='figure'>
+          <img src='spec/assets/odf.emf'/>
+          <img src='spec/assets/odf1.svg'/>
+          <img src='_.svg' height='auto' width='auto'/>
+          <p class='FigureTitle' style='text-align:center;'>Figure 1</p>
+        </div>
+      </div>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection3'>
+      <p class='zzSTDTitle1'/>
+    </div>
+  </body>
+</html>
+
+OUTPUT
+    end
+   end
+
+
   it "processes examples" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <example id="samplecode">
+    <example id="samplecode" keep-with-next="true" keep-lines-together="true">
     <name>Title</name>
   <p>Hello</p>
   <sourcecode id="X">
@@ -470,7 +582,7 @@ B
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="samplecode" class="example">
+                 <div id="samplecode" class="example" style="page-break-after: avoid;page-break-inside: avoid;">
                  <p class="example-title">EXAMPLE&#160;&#8212; Title</p>
          <p>Hello</p>
          <pre id='X' class='prettyprint '>
@@ -489,6 +601,60 @@ B
     OUTPUT
   end
 
+   it "processes examples (Word)" do
+    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <example id="samplecode" keep-with-next="true" keep-lines-together="true">
+    <name>Title</name>
+  <p>Hello</p>
+  <sourcecode id="X">
+  <name>Sample</name>
+  </sourcecode>
+</example>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    <html  xmlns:epub='http://www.idpf.org/2007/ops' lang='en'><head><style>
+        </style>
+  </head>
+  <body lang='EN-US' link='blue' vlink='#954F72'>
+    <div class='WordSection1'>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection2'>
+      <p>
+        <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+      </p>
+      <div>
+        <h1 class='ForewordTitle'>Foreword</h1>
+        <div id='samplecode' class='example' style='page-break-after: avoid;page-break-inside: avoid;'>
+          <p class='example-title'>EXAMPLE&#160;&#8212; Title</p>
+          <p>Hello</p>
+          <p id='X' class='Sourcecode'>
+            <br/>
+            &#160;
+            <br/>
+            &#160;
+          </p>
+          <p class='SourceTitle' style='text-align:center;'>Sample</p>
+        </div>
+      </div>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection3'>
+      <p class='zzSTDTitle1'/>
+    </div>
+  </body>
+</html>
+OUTPUT
+   end
 
   it "processes sequences of examples" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
@@ -671,7 +837,7 @@ Que?
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution">
+    <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution" keep-with-next="true" keep-lines-together="true">
   <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
 </admonition>
     </foreword></preface>
@@ -681,7 +847,7 @@ Que?
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div class="Admonition" id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a'><p class="AdmonitionTitle" style="text-align:center;">CAUTION</p>
+                 <div class="Admonition" id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' style='page-break-after: avoid;page-break-inside: avoid;'><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>
@@ -723,7 +889,7 @@ Que?
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true">
+    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true"  keep-with-next="true" keep-lines-together="true">
   <stem type="AsciiMath">r = 1 %</stem>
 <dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
   <dt>
@@ -747,16 +913,16 @@ Que?
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181934" class="formula"><p><span class="stem">(#(r = 1 %)#)</span></p></div><p style='page-break-after:avoid;'>where</p><dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d" class="formula_dl"><dt>
+                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181934" style='page-break-after: avoid;page-break-inside: avoid;'><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span></p></div><p style='page-break-after:avoid;'>where</p><dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d" class="formula_dl"><dt>
            <span class="stem">(#(r)#)</span>
          </dt><dd>
            <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
          </dd></dl>
 
 
-           <div id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0" class="Note"><p><span class="note_label">NOTE</span>&#160; [durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p></div>
+           <div id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0" class="Note"><p><span class="note_label">NOTE</span>&#160; [durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p></div></div>
 
-                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181935" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</p></div>
+                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181935"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</p></div></div>
                  </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -769,7 +935,7 @@ Que?
     expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true">
+    <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true"   keep-with-next="true" keep-lines-together="true">
   <stem type="AsciiMath">r = 1 %</stem>
 <dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
   <dt>
@@ -807,7 +973,7 @@ Que?
              </p>
              <div>
                <h1 class='ForewordTitle'>Foreword</h1>
-               <div id='_be9158af-7e93-4ee2-90c5-26d31c181934' class='formula'>
+               <div id='_be9158af-7e93-4ee2-90c5-26d31c181934' style='page-break-after: avoid;page-break-inside: avoid;'><div class='formula'>
                  <p>
                    <span class='stem'>(#(r = 1 %)#)</span>
                  </p>
@@ -834,12 +1000,14 @@ Que?
                    always expressed.
                  </p>
                </div>
-               <div id='_be9158af-7e93-4ee2-90c5-26d31c181935' class='formula'>
+               </div>
+               <div id='_be9158af-7e93-4ee2-90c5-26d31c181935'><div class='formula'>
                  <p>
                    <span class='stem'>(#(r = 1 %)#)</span>
                    <span style='mso-tab-count:1'>&#160; </span>
                    (1)
                  </p>
+                 </div>
                </div>
              </div>
              <p>&#160;</p>
@@ -855,14 +1023,14 @@ Que?
     OUTPUT
   end
 
-  it "processes paragraph alignments" do
+  it "processes paragraph attributes" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p align="left" id="_08bfe952-d57f-4150-9c95-5d52098cc2a8">Vache Equipment<br/>
 Fictitious<br/>
 World</p>
-    <p align="justify">Justify</p>
+    <p align="justify" keep-with-next="true" keep-lines-together="true">Justify</p>
     </foreword></preface>
     </iso-standard>
     INPUT
@@ -874,7 +1042,7 @@ World
        Fictitious<br/>
        World
            </p>
-           <p style="text-align:justify;">Justify</p>
+           <p style="text-align:justify;page-break-after: avoid;page-break-inside: avoid;">Justify</p>
                </div>
                <p class="zzSTDTitle1"/>
              </div>
@@ -883,14 +1051,14 @@ World
     OUTPUT
   end
 
-  it "processes paragraph alignments (Word)" do
+  it "processes paragraph attributes (Word)" do
     expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p align="left" id="_08bfe952-d57f-4150-9c95-5d52098cc2a8">Vache Equipment<br/>
 Fictitious<br/>
 World</p>
-    <p align="justify">Justify</p>
+    <p align="justify" keep-with-next="true" keep-lines-together="true">Justify</p>
     </foreword></preface>
     </iso-standard>
     INPUT
@@ -905,11 +1073,11 @@ World
                <p><br  clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <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" align="left" style="text-align:left;">Vache Equipment<br/>
        Fictitious<br/>
        World
            </p>
-           <p style="text-align:justify">Justify</p>
+           <p style="text-align:justify;page-break-after: avoid;page-break-inside: avoid;">Justify</p>
                </div>
                <p>&#160;</p>
              </div>
@@ -984,7 +1152,7 @@ World
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <permission id="_">
+    <permission id="_"   keep-with-next="true" keep-lines-together="true">
   <label>/ogc/recommendation/wfs/2</label>
   <inherit>/ss/584/2015/level/1</inherit>
   <inherit><eref type="inline" bibitemid="rfc2616" citeas="RFC 2616">RFC 2616 (HTTP/1.1)</eref></inherit>
@@ -1042,7 +1210,8 @@ World
        <br/>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
-        <div class="permission"><p class="RecommendationTitle">Permission 1:<br/>/ogc/recommendation/wfs/2</p>
+        <div class="permission" id='_' style='page-break-after: avoid;page-break-inside: avoid;'>
+        <p class="RecommendationTitle">Permission 1:<br/>/ogc/recommendation/wfs/2</p>
         <p><i>Subject: user<br/>
 Inherits: /ss/584/2015/level/1
 <br/>
@@ -1058,7 +1227,7 @@ Inherits: RFC 2616 (HTTP/1.1)
   </div>
   <div class="requirement-measurement-target">
     <p id="_">The measurement target shall be measured as:</p>
-    <div id="_" class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div>
+    <div id="_"><div class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div></div>
 
 
   </div>
@@ -1088,7 +1257,7 @@ Inherits: RFC 2616 (HTTP/1.1)
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <requirement id="A" unnumbered="true">
+    <requirement id="A" unnumbered="true"  keep-with-next="true" keep-lines-together="true">
   <title>A New Requirement</title>
   <label>/ogc/recommendation/wfs/2</label>
   <inherit>/ss/584/2015/level/1</inherit>
@@ -1114,7 +1283,7 @@ Inherits: RFC 2616 (HTTP/1.1)
   <description>
     <p id="_">As for the measurement targets,</p>
   </description>
-  <measurement-target exclude="false">
+  <measurement-target exclude="false"  keep-with-next="true" keep-lines-together="true">
     <p id="_">The measurement target shall be measured as:</p>
     <formula id="B">
       <stem type="AsciiMath">r/1 = 0</stem>
@@ -1139,7 +1308,8 @@ Inherits: RFC 2616 (HTTP/1.1)
         <br/>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
-        <div class="require"><p class="RecommendationTitle">Requirement:<br/>/ogc/recommendation/wfs/2. A New Requirement</p><p><i>Subject: user<br/>Inherits: /ss/584/2015/level/1</i></p>
+        <div class="require" id='A' style='page-break-after: avoid;page-break-inside: avoid;'>
+<p class="RecommendationTitle">Requirement:<br/>/ogc/recommendation/wfs/2. A New Requirement</p><p><i>Subject: user<br/>Inherits: /ss/584/2015/level/1</i></p>
 
   <div class="requirement-description">
     <p id="_">I recommend <i>this</i>.</p>
@@ -1148,9 +1318,9 @@ Inherits: RFC 2616 (HTTP/1.1)
   <div class="requirement-description">
     <p id="_">As for the measurement targets,</p>
   </div>
-  <div class="requirement-measurement-target">
+  <div class="requirement-measurement-target"  style='page-break-after: avoid;page-break-inside: avoid;'>
     <p id="_">The measurement target shall be measured as:</p>
-    <div id="B" class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div>
+    <div id="B"><div class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div></div>
 
 
   </div>
@@ -1227,7 +1397,7 @@ Inherits: RFC 2616 (HTTP/1.1)
              <br/>
              <div>
                <h1 class='ForewordTitle'>Avant-propos</h1>
-               <div class='require'>
+               <div class='require' id="A">
                  <p class='RecommendationTitle'>
                    Exigence:
                    <br/>
@@ -1252,11 +1422,12 @@ Inherits: RFC 2616 (HTTP/1.1)
                  </div>
                  <div class='requirement-measurement-target'>
                    <p id='_'>The measurement target shall be measured as:</p>
-                   <div id='B' class='formula'>
+                   <div id='B'><div class='formula'>
                      <p>
                        <span class='stem'>(#(r/1 = 0)#)</span>
                        &#160; (1)
                      </p>
+                     </div>
                    </div>
                  </div>
                  <div class='requirement-verification'>
@@ -1287,7 +1458,7 @@ end
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
-    <recommendation id="_" obligation="shall,could">
+    <recommendation id="_" obligation="shall,could"   keep-with-next="true" keep-lines-together="true">
   <label>/ogc/recommendation/wfs/2</label>
   <inherit>/ss/584/2015/level/1</inherit>
   <classification><tag>type</tag><value>text</value></classification>
@@ -1339,7 +1510,8 @@ end
        <br/>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
-<div class="recommend"><p class="RecommendationTitle">Recommendation 1:<br/>/ogc/recommendation/wfs/2</p><p><i>Obligation: shall,could<br/>Subject: user<br/>Inherits: /ss/584/2015/level/1<br/>Type: text<br/>Language: BASIC</i></p>
+<div class="recommend"  id='_' style='page-break-after: avoid;page-break-inside: avoid;'>
+<p class="RecommendationTitle">Recommendation 1:<br/>/ogc/recommendation/wfs/2</p><p><i>Obligation: shall,could<br/>Subject: user<br/>Inherits: /ss/584/2015/level/1<br/>Type: text<br/>Language: BASIC</i></p>
   <div class="requirement-description">
     <p id="_">I recommend <i>this</i>.</p>
   </div>
@@ -1349,7 +1521,7 @@ end
   </div>
   <div class="requirement-measurement-target">
     <p id="_">The measurement target shall be measured as:</p>
-    <div id="_" class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div>
+    <div id="_"><div class="formula"><p><span class="stem">(#(r/1 = 0)#)</span>&#160; (1)</p></div></div>
 
 
   </div>
@@ -1374,7 +1546,7 @@ end
     <language>en</language>
     </bibdata>
         <preface><foreword>
-  <figure id="_" class="pseudocode"><name>Label</name><p id="_">  <strong>A</strong><br/>
+  <figure id="_" class="pseudocode" keep-with-next="true" keep-lines-together="true"><name>Label</name><p id="_">  <strong>A</strong><br/>
         <smallcap>B</smallcap></p>
 <p id="_">  <em>C</em></p></figure>
 </preface></itu-standard>
@@ -1383,7 +1555,7 @@ INPUT
              <br/>
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
-               <div id="_" class="pseudocode"><p id="_">&#160;&#160;<b>A</b><br/>
+               <div id="_" class="pseudocode" style='page-break-after: avoid;page-break-inside: avoid;'><p id="_">&#160;&#160;<b>A</b><br/>
        &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;<span style="font-variant:small-caps;">B</span></p>
        <p id="_">&#160;&#160;<i>C</i></p><p class="SourceTitle" style="text-align:center;">Figure 1&#xA0;&#x2014; Label</p></div>
              </div>