html2doc 1.0.5 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6616c37575b4bd09b8b7bf7a89beffece7388f3e2a4039610825a030ffb72318
-  data.tar.gz: f29a3348e0b9260c4178af9a7f939e8ec39c2401cdc321346e5a6321e862cbad
+  metadata.gz: b92a72c9d0ee6005e38ab8de1f0cbc48455819955d34eb349fef1244504a9971
+  data.tar.gz: 52b07e9c1720bc2bf7a7196e0f650c62b81bf534535795bb2a136f2e79829416
 SHA512:
-  metadata.gz: 4dee0b6541178293833caf2d55e1ec382ea16692b4efe4455ff0fd627e89ef5e67be747248cefd6c56ff151d8f9ea46f54633241d90996055e3574604eed175e
-  data.tar.gz: da5201fa1568f34e0638947d6dcfb5df1b7cf4303de1f74323122fcf92f6060cc7d5ddcc483cbfbfcb70798d12afc95c89b48d0274a34114fd8b18d7c1d58692
+  metadata.gz: af4b84183859fd83ac500c6c1ac28e76d49ec7fb48c8a4cf49bc3543909b913e78c8293918b34e21e9e68f2dc78a500824337677ae1aea54bcf7cbecebd9363d
+  data.tar.gz: 9e0bd48390458ec57dcc9650643a9332a549148a1297b37962e37399453d95132e39c69cb94ea13fcc70f9d6bc273fccf742da61e6f4a3025710182df1d65144

data/.github/workflows/rake.yml

@@ -0,0 +1,42 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: rake
+
+on:
+  push:
+    branches: [ master, main ]
+    tags: [ v* ]
+  pull_request:
+
+jobs:
+  rake:
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        experimental: [ false ]
+        include:
+          - ruby: '3.0'
+            os: 'ubuntu-latest'
+            experimental: true
+          - ruby: '3.0'
+            os: 'windows-latest'
+            experimental: true
+          - ruby: '3.0'
+            os: 'macos-latest'
+            experimental: true
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: bundle exec rake

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+.rubocop-https--*

data/.rubocop.yml

@@ -1,10 +1,12 @@
 # This project follows the Ribose OSS style guide.
 # https://github.com/riboseinc/oss-guides
 # All project-specific additions and overrides should be specified in this file.
-
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+
+# local repo-specific modifications
+
 AllCops:
-  TargetRubyVersion: 2.3
-Rails:
-  Enabled: true
+  DisplayCopNames: false
+  StyleGuideCopsOnly: false
+  TargetRubyVersion: 2.4

data/Gemfile

@@ -10,6 +10,6 @@ end
 
 gemspec
 
-if File.exist? 'Gemfile.devel'
-  eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
+if File.exist? "Gemfile.devel"
+  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end

data/README.adoc

@@ -3,9 +3,7 @@
 https://github.com/metanorma/html2doc/workflows/main/badge.svg
 
 image:https://img.shields.io/gem/v/html2doc.svg["Gem Version", link="https://rubygems.org/gems/html2doc"]
-image:https://github.com/metanorma/html2doc/workflows/ubuntu/badge.svg["Ubuntu Build Status", link="https://github.com/metanorma/html2doc/actions?query=workflow%3Aubuntu"]
-image:https://github.com/metanorma/html2doc/workflows/macos/badge.svg["OSX Build Status", link="https://github.com/metanorma/html2doc/actions?query=workflow%3Amacos"]
-image:https://github.com/metanorma/html2doc/workflows/windows/badge.svg["Windows Build Status", link="https://github.com/metanorma/html2doc/actions?query=workflow%3Awindows"]
+image:https://github.com/metanorma/html2doc/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/html2doc/actions?workflow=rake"]
 image:https://codeclimate.com/github/metanorma/html2doc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/html2doc"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/html2doc.svg["Pull Requests", link="https://github.com/metanorma/html2doc/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/html2doc/latest.svg["Commits since latest",link="https://github.com/metanorma/html2doc/releases"]

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/html2doc

@@ -21,9 +21,8 @@ if ARGV.length < 1
 end
 
 Html2Doc.process(
-  File.read(ARGV[0], encoding: "utf-8"), 
+  File.read(ARGV[0], encoding: "utf-8"),
   filename: ARGV[0].gsub(/\.html?$/, ""),
   stylesheet: options[:stylesheet],
-  header: options[:header],
+  header: options[:header]
 )
-                 

data/html2doc.gemspec

@@ -28,10 +28,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "image_size"
   spec.add_dependency "mime-types"
-  spec.add_dependency "nokogiri", ">= 1.10.4"
+  spec.add_dependency "nokogiri", "~> 1.10.4"
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
-  spec.add_dependency "asciimath", "~> 2.0.0"
+  spec.add_dependency "asciimath", "~> 2.0.2"
+  spec.add_dependency "plane1converter", "~> 0.0.1"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
@@ -39,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "= 0.54.0"
+  spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "rspec-match_fuzzy", "~> 0.1.3"

data/lib/html2doc/base.rb

@@ -2,8 +2,6 @@ require "uuidtools"
 require "asciimath"
 require "htmlentities"
 require "nokogiri"
-#require "xml/xslt"
-require "pp"
 require "fileutils"
 
 module Html2Doc
@@ -19,16 +17,26 @@ module Html2Doc
 
   def self.process_header(headerfile, hash)
     return if headerfile.nil?
+
     doc = File.read(headerfile, encoding: "utf-8")
-    doc = header_image_cleanup(doc, hash[:dir1], hash[:filename], File.dirname(hash[:filename]))
+    doc = header_image_cleanup(doc, hash[:dir1], hash[:filename],
+                               File.dirname(hash[:filename]))
     File.open("#{hash[:dir1]}/header.html", "w:UTF-8") { |f| f.write(doc) }
   end
 
+  def self.clear_dir(dir)
+    Dir.foreach(dir) do |f|
+      fn = File.join(dir, f)
+      File.delete(fn) if f != "." && f != ".."
+    end
+    dir
+  end
+
   def self.create_dir(filename, dir)
-    return dir if dir
+    dir and return clear_dir(dir)
     dir = "#{filename}_files"
     Dir.mkdir(dir) unless File.exists?(dir)
-    dir
+    clear_dir(dir)
   end
 
   def self.process_html(result, hash)
@@ -64,7 +72,7 @@ module Html2Doc
 
   def self.to_xhtml(xml)
     xml.gsub!(/<\?xml[^>]*>/, "")
-    unless /<!DOCTYPE /.match xml
+    unless /<!DOCTYPE /.match? xml
       xml = '<!DOCTYPE html SYSTEM
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' + xml
     end
@@ -76,34 +84,34 @@ module Html2Doc
   DOCTYPE
 
   def self.from_xhtml(xml)
-    xml.to_xml.sub(%{ xmlns="http://www.w3.org/1999/xhtml"}, "").
-      sub(DOCTYPE, "").
-      gsub(%{ />}, "/>")
+    xml.to_xml.sub(%{ xmlns="http://www.w3.org/1999/xhtml"}, "")
+      .sub(DOCTYPE, "")
+      .gsub(%{ />}, "/>")
   end
 
-  def self.msword_fix(r)
+  def self.msword_fix(doc)
     # brain damage in MSWord parser
-    r.gsub!(%r{<span style="mso-special-character:footnote"/>},
-            '<span style="mso-special-character:footnote"></span>')
-    r.gsub!(%r{<div style="mso-element:footnote-list"></div>},
-            '<div style="mso-element:footnote-list"/>')
-    r.gsub!(%r{(<a style="mso-comment-reference:[^>/]+)/>}, "\\1></a>")
-    r.gsub!(%r{<link rel="File-List"}, "<link rel=File-List")
-    r.gsub!(%r{<meta http-equiv="Content-Type"},
-            "<meta http-equiv=Content-Type")
-    r.gsub!(%r{></m:jc>}, "/>")
-    r.gsub!(%r{></v:stroke>}, "/>")
-    r.gsub!(%r{></v:f>}, "/>")
-    r.gsub!(%r{></v:path>}, "/>")
-    r.gsub!(%r{></o:lock>}, "/>")
-    r.gsub!(%r{></v:imagedata>}, "/>")
-    r.gsub!(%r{></w:wrap>}, "/>")
-    r.gsub!(%r{&tab;|&amp;tab;}, '<span style="mso-tab-count:1">&#xA0; </span>')
-    r = r.split(%r{(<m:oMath>|</m:oMath>)}).each_slice(4).map do |a|
+    doc.gsub!(%r{<span style="mso-special-character:footnote"/>},
+              '<span style="mso-special-character:footnote"></span>')
+    doc.gsub!(%r{<div style="mso-element:footnote-list"></div>},
+              '<div style="mso-element:footnote-list"/>')
+    doc.gsub!(%r{(<a style="mso-comment-reference:[^>/]+)/>}, "\\1></a>")
+    doc.gsub!(%r{<link rel="File-List"}, "<link rel=File-List")
+    doc.gsub!(%r{<meta http-equiv="Content-Type"},
+              "<meta http-equiv=Content-Type")
+    doc.gsub!(%r{></m:jc>}, "/>")
+    doc.gsub!(%r{></v:stroke>}, "/>")
+    doc.gsub!(%r{></v:f>}, "/>")
+    doc.gsub!(%r{></v:path>}, "/>")
+    doc.gsub!(%r{></o:lock>}, "/>")
+    doc.gsub!(%r{></v:imagedata>}, "/>")
+    doc.gsub!(%r{></w:wrap>}, "/>")
+    doc.gsub!(%r{&tab;|&amp;tab;},
+              '<span style="mso-tab-count:1">&#xA0; </span>')
+    doc.split(%r{(<m:oMath>|</m:oMath>)}).each_slice(4).map do |a|
       a.size > 2 and a[2] = a[2].gsub(/>\s+</, "><")
       a
     end.join
-    r
   end
 
   PRINT_VIEW = <<~XML.freeze
@@ -122,26 +130,27 @@ module Html2Doc
   def self.define_head1(docxml, dir)
     docxml.xpath("//*[local-name() = 'head']").each do |h|
       h.children.first.add_previous_sibling <<~XML
-      #{PRINT_VIEW}
-        <link rel="File-List" href="#{File.basename(dir)}/filelist.xml"/>
+        #{PRINT_VIEW}
+          <link rel="File-List" href="cid:filelist.xml"/>
       XML
     end
   end
 
-  def self.filename_substitute(stylesheet, header_filename, filename)
-    if header_filename.nil?
-      stylesheet.gsub!(/\n[^\n]*FILENAME[^\n]*i\n/, "\n")
-    else
-      stylesheet.gsub!(/FILENAME/, File.basename(filename))
+  def self.filename_substitute(head, header_filename)
+    return if header_filename.nil?
+
+    head.xpath(".//*[local-name() = 'style']").each do |s|
+      s1 = s.to_xml.gsub(/url\("[^"]+"\)/) do |m|
+        /FILENAME/.match?(m) ? "url(cid:header.html)" : m
+      end
+      s.replace(s1)
     end
-    stylesheet
   end
 
   def self.stylesheet(filename, header_filename, fn)
-    (fn.nil? || fn.empty?) &&
+    (fn.nil? || fn.empty?) and
       fn = File.join(File.dirname(__FILE__), "wordstyle.css")
     stylesheet = File.read(fn, encoding: "UTF-8")
-    stylesheet = filename_substitute(stylesheet, header_filename, filename)
     xml = Nokogiri::XML("<style/>")
     xml.children.first << Nokogiri::XML::Comment.new(xml, "\n#{stylesheet}\n")
     xml.root.to_s
@@ -152,6 +161,7 @@ module Html2Doc
     head = docxml.at("//*[local-name() = 'head']")
     css = stylesheet(hash[:filename], hash[:header_file], hash[:stylesheet])
     add_stylesheet(head, title, css)
+    filename_substitute(head, hash[:header_file])
     define_head1(docxml, hash[:dir1])
     rootnamespace(docxml.root)
   end
@@ -180,13 +190,13 @@ module Html2Doc
   end
 
   def self.bookmarks(docxml)
-    docxml.xpath("//*[@id][not(@name)][not(@style = 'mso-element:footnote')]").each do |x|
-      next if x["id"].empty?
-      next if %w(shapetype v:shapetype shape v:shape).include? x.name
-      if x.children.empty?
-        x.add_child("<a name='#{x["id"]}'></a>")
-      else
-        x.children.first.previous = "<a name='#{x["id"]}'></a>"
+    docxml.xpath("//*[@id][not(@name)][not(@style = 'mso-element:footnote')]")
+      .each do |x|
+      next if x["id"].empty? ||
+        %w(shapetype v:shapetype shape v:shape).include?(x.name)
+
+      if x.children.empty? then x.add_child("<a name='#{x['id']}'></a>")
+      else x.children.first.previous = "<a name='#{x['id']}'></a>"
       end
       x.delete("id")
     end

data/lib/html2doc/lists.rb

@@ -7,6 +7,7 @@ require "uuidtools"
 module Html2Doc
   def self.style_list(li, level, liststyle, listnumber)
     return unless liststyle
+
     if li["style"]
       li["style"] += ";"
     else
@@ -16,37 +17,39 @@ module Html2Doc
   end
 
   def self.list_add1(li, liststyles, listtype, level)
-    if [:ul, :ol].include? listtype
-          list_add(li.xpath(".//ul") - li.xpath(".//ul//ul | .//ol//ul"),
-                   liststyles, :ul, level + 1)
-          list_add(li.xpath(".//ol") - li.xpath(".//ul//ol | .//ol//ol"),
-                   liststyles, :ol, level + 1)
-        else
-          list_add(li.xpath(".//ul") - li.xpath(".//ul//ul | .//ol//ul"),
-                   liststyles, listtype, level + 1)
-          list_add(li.xpath(".//ol") - li.xpath(".//ul//ol | .//ol//ol"),
-                   liststyles, listtype, level + 1)
-        end
+    if %i[ul ol].include? listtype
+      list_add(li.xpath(".//ul") - li.xpath(".//ul//ul | .//ol//ul"),
+               liststyles, :ul, level + 1)
+      list_add(li.xpath(".//ol") - li.xpath(".//ul//ol | .//ol//ol"),
+               liststyles, :ol, level + 1)
+    else
+      list_add(li.xpath(".//ul") - li.xpath(".//ul//ul | .//ol//ul"),
+               liststyles, listtype, level + 1)
+      list_add(li.xpath(".//ol") - li.xpath(".//ul//ol | .//ol//ol"),
+               liststyles, listtype, level + 1)
+    end
   end
 
   def self.list_add(xpath, liststyles, listtype, level)
-    xpath.each_with_index do |list, i|
+    xpath.each_with_index do |l, _i|
       @listnumber += 1 if level == 1
-      list["seen"] = true if level == 1
-      list["id"] ||= UUIDTools::UUID.random_create
-      (list.xpath(".//li") - list.xpath(".//ol//li | .//ul//li")).each do |li|
+      l["seen"] = true if level == 1
+      l["id"] ||= UUIDTools::UUID.random_create
+      (l.xpath(".//li") - l.xpath(".//ol//li | .//ul//li")).each do |li|
         style_list(li, level, liststyles[listtype], @listnumber)
         list_add1(li, liststyles, listtype, level)
       end
-      list.xpath(".//ul[not(ancestor::li/ancestor::*/@id = '#{list['id']}')] | "\
-                 ".//ol[not(ancestor::li/ancestor::*/@id = '#{list['id']}')]").each do |li|
-        list_add1(li.parent, liststyles, listtype, level-1)
+      l.xpath(".//ul[not(ancestor::li/ancestor::*/@id = '#{l['id']}')] | "\
+              ".//ol[not(ancestor::li/ancestor::*/@id = '#{l['id']}')]")
+        .each do |li|
+        list_add1(li.parent, liststyles, listtype, level - 1)
       end
     end
   end
 
   def self.list2para(u)
     return if u.xpath("./li").empty?
+
     u.xpath("./li").first["class"] ||= "MsoListParagraphCxSpFirst"
     u.xpath("./li").last["class"] ||= "MsoListParagraphCxSpLast"
     u.xpath("./li/p").each { |p| p["class"] ||= "MsoListParagraphCxSpMiddle" }
@@ -64,21 +67,25 @@ module Html2Doc
   def self.lists1(docxml, liststyles, k)
     case k
     when :ul then list_add(docxml.xpath("//ul[not(@class)]#{TOPLIST}"),
-                            liststyles, :ul, 1)
+                           liststyles, :ul, 1)
     when :ol then list_add(docxml.xpath("//ol[not(@class)]#{TOPLIST}"),
                            liststyles, :ol, 1)
     else
-      list_add(docxml.xpath("//ol[@class = '#{k.to_s}']#{TOPLIST} | "\
-                            "//ul[@class = '#{k.to_s}']#{TOPLIST}"),
+      list_add(docxml.xpath("//ol[@class = '#{k}']#{TOPLIST} | "\
+                            "//ul[@class = '#{k}']#{TOPLIST}"),
       liststyles, k, 1)
     end
   end
 
   def self.lists_unstyled(docxml, liststyles)
-    list_add(docxml.xpath("//ul#{TOPLIST}[not(@seen)]"),
-             liststyles, :ul, 1) if liststyles.has_key?(:ul)
-    list_add(docxml.xpath("//ol#{TOPLIST}[not(@seen)]"),
-             liststyles, :ul, 1) if liststyles.has_key?(:ol)
+    if liststyles.has_key?(:ul)
+      list_add(docxml.xpath("//ul#{TOPLIST}[not(@seen)]"),
+               liststyles, :ul, 1)
+    end
+    if liststyles.has_key?(:ol)
+      list_add(docxml.xpath("//ol#{TOPLIST}[not(@seen)]"),
+               liststyles, :ul, 1)
+    end
     docxml.xpath("//ul[@seen] | //ol[@seen]").each do |l|
       l.delete("seen")
     end
@@ -86,6 +93,7 @@ module Html2Doc
 
   def self.lists(docxml, liststyles)
     return if liststyles.nil?
+
     @listnumber = 0
     liststyles.each_key { |k| lists1(docxml, liststyles, k) }
     lists_unstyled(docxml, liststyles)

data/lib/html2doc/math.rb

@@ -2,20 +2,27 @@ require "uuidtools"
 require "asciimath"
 require "htmlentities"
 require "nokogiri"
+require "plane1converter"
 
 module Html2Doc
   @xsltemplate =
     Nokogiri::XSLT(File.read(File.join(File.dirname(__FILE__), "mml2omml.xsl"),
                              encoding: "utf-8"))
 
-  def self.asciimath_to_mathml1(x)
-    AsciiMath::MathMLBuilder.new(:msword => true).append_expression(
-      AsciiMath.parse(HTMLEntities.new.decode(x)).ast).to_s.
-        gsub(/<math>/, "<math xmlns='http://www.w3.org/1998/Math/MathML'>")
+  def self.asciimath_to_mathml1(expr)
+    AsciiMath::MathMLBuilder.new(msword: true).append_expression(
+      AsciiMath.parse(HTMLEntities.new.decode(expr)).ast,
+    ).to_s
+      .gsub(/<math>/, "<math xmlns='http://www.w3.org/1998/Math/MathML'>")
+  rescue StandardError => e
+    puts "parsing: #{expr}"
+    puts e.message
+    raise e
   end
 
   def self.asciimath_to_mathml(doc, delims)
     return doc if delims.nil? || delims.size < 2
+
     m = doc.split(/(#{Regexp.escape(delims[0])}|#{Regexp.escape(delims[1])})/)
     m.each_slice(4).map.with_index do |(*a), i|
       i % 500 == 0 && m.size > 1000 && i > 0 and
@@ -25,43 +32,96 @@ module Html2Doc
     end.join
   end
 
+  def self.unwrap_accents(doc)
+    doc.xpath("//*[@accent = 'true']").each do |x|
+      x.elements.length > 1 or next
+      x.elements[1].name == "mrow" and
+        x.elements[1].replace(x.elements[1].children)
+    end
+    doc
+  end
+
   # random fixes to MathML input that OOXML needs to render properly
-  def self.ooxml_cleanup(m, docnamespaces)
-    m = mathml_preserve_space(mathml_insert_rows(m, docnamespaces), docnamespaces)
-    m.add_namespace(nil, "http://www.w3.org/1998/Math/MathML")
-    m
+  def self.ooxml_cleanup(math, docnamespaces)
+    math = unwrap_accents(
+      mathml_preserve_space(
+        mathml_insert_rows(math, docnamespaces), docnamespaces
+      ),
+    )
+    math.add_namespace(nil, "http://www.w3.org/1998/Math/MathML")
+    math
   end
 
-  def self.mathml_insert_rows(m, docnamespaces)
-    m.xpath(%w(msup msub msubsup munder mover munderover).
-            map { |m| ".//xmlns:#{m}" }.join(" | "), docnamespaces).each do |x|
+  def self.mathml_insert_rows(math, docnamespaces)
+    math.xpath(%w(msup msub msubsup munder mover munderover)
+            .map { |m| ".//xmlns:#{m}" }.join(" | "), docnamespaces).each do |x|
       next unless x.next_element && x.next_element != "mrow"
+
       x.next_element.wrap("<mrow/>")
     end
-    m
+    math
   end
 
-  def self.mathml_preserve_space(m, docnamespaces)
-    m.xpath(".//xmlns:mtext", docnamespaces).each do |x|
+  def self.mathml_preserve_space(math, docnamespaces)
+    math.xpath(".//xmlns:mtext", docnamespaces).each do |x|
       x.children = x.children.to_xml.gsub(/^\s/, "&#xA0;").gsub(/\s$/, "&#xA0;")
     end
-    m
+    math
   end
 
-  def self.unitalic(m)
-    m.xpath(".//xmlns:r[xmlns:rPr/xmlns:sty[@m:val = 'p']]").each do |x|
+  def self.unitalic(math)
+    math.xpath(".//xmlns:r[xmlns:rPr[not(xmlns:scr)]/xmlns:sty[@m:val = 'p']]").each do |x|
       x.wrap("<span style='font-style:normal;'></span>")
     end
-    m.xpath(".//xmlns:r[xmlns:rPr/xmlns:sty[@m:val = 'bi']]").each do |x|
-      x.wrap("<span style='font-style:italic;font-weight:bold;'></span>")
+    math.xpath(".//xmlns:r[xmlns:rPr[not(xmlns:scr)]/xmlns:sty[@m:val = 'bi']]").each do |x|
+      x.wrap("<span class='nostem' style='font-weight:bold;'><em></em></span>")
     end
-    m.xpath(".//xmlns:r[xmlns:rPr/xmlns:sty[@m:val = 'i']]").each do |x|
+    math.xpath(".//xmlns:r[xmlns:rPr[not(xmlns:scr)]/xmlns:sty[@m:val = 'i']]").each do |x|
       x.wrap("<span class='nostem'><em></em></span>")
     end
-    m.xpath(".//xmlns:r[xmlns:rPr/xmlns:sty[@m:val = 'b']]").each do |x|
+    math.xpath(".//xmlns:r[xmlns:rPr[not(xmlns:scr)]/xmlns:sty[@m:val = 'b']]").each do |x|
       x.wrap("<span style='font-style:normal;font-weight:bold;'></span>")
     end
-    m
+    math.xpath(".//xmlns:r[xmlns:rPr/xmlns:scr[@m:val = 'monospace']]").each do |x|
+      to_plane1(x, :monospace)
+    end
+    math.xpath(".//xmlns:r[xmlns:rPr/xmlns:scr[@m:val = 'double-struck']]").each do |x|
+      to_plane1(x, :doublestruck)
+    end
+    math.xpath(".//xmlns:r[xmlns:rPr[not(xmlns:sty) or xmlns:sty/@m:val = 'p']/xmlns:scr[@m:val = 'script']]").each do |x|
+      to_plane1(x, :script)
+    end
+    math.xpath(".//xmlns:r[xmlns:rPr[xmlns:sty/@m:val = 'b']/xmlns:scr[@m:val = 'script']]").each do |x|
+      to_plane1(x, :scriptbold)
+    end
+    math.xpath(".//xmlns:r[xmlns:rPr[not(xmlns:sty) or xmlns:sty/@m:val = 'p']/xmlns:scr[@m:val = 'fraktur']]").each do |x|
+      to_plane1(x, :fraktur)
+    end
+    math.xpath(".//xmlns:r[xmlns:rPr[xmlns:sty/@m:val = 'b']/xmlns:scr[@m:val = 'fraktur']]").each do |x|
+      to_plane1(x, :frakturbold)
+    end
+    math.xpath(".//xmlns:r[xmlns:rPr[not(xmlns:sty) or xmlns:sty/@m:val = 'p']/xmlns:scr[@m:val = 'sans-serif']]").each do |x|
+      to_plane1(x, :sans)
+    end
+    math.xpath(".//xmlns:r[xmlns:rPr[xmlns:sty/@m:val = 'b']/xmlns:scr[@m:val = 'sans-serif']]").each do |x|
+      to_plane1(x, :sansbold)
+    end
+    math.xpath(".//xmlns:r[xmlns:rPr[xmlns:sty/@m:val = 'i']/xmlns:scr[@m:val = 'sans-serif']]").each do |x|
+      to_plane1(x, :sansitalic)
+    end
+    math.xpath(".//xmlns:r[xmlns:rPr[xmlns:sty/@m:val = 'bi']/xmlns:scr[@m:val = 'sans-serif']]").each do |x|
+      to_plane1(x, :sansbolditalic)
+    end
+    math
+  end
+
+  def self.to_plane1(xml, font)
+    xml.traverse do |n|
+      next unless n.text?
+
+      n.replace(Plane1Converter.conv(HTMLEntities.new.decode(n.text), font))
+    end
+    xml
   end
 
   def self.mathml_to_ooml(docxml)
@@ -71,22 +131,23 @@ module Html2Doc
       i % 100 == 0 && m.size > 500 && i > 0 and
         warn "Math OOXML #{i} of #{m.size}"
       element = ooxml_cleanup(x, docnamespaces)
-      doc = Nokogiri::XML::Document::new()
+      doc = Nokogiri::XML::Document::new
       doc.root = element
-      ooxml = (unitalic(esc_space(@xsltemplate.transform(doc)))).to_s.
-        gsub(/<\?[^>]+>\s*/, "").
-        gsub(/ xmlns(:[^=]+)?="[^"]+"/, "").
-        gsub(%r{<(/)?(?!span)(?!em)([a-z])}, "<\\1m:\\2")
+      ooxml = unitalic(esc_space(@xsltemplate.transform(doc))).to_s
+        .gsub(/<\?[^>]+>\s*/, "")
+        .gsub(/ xmlns(:[^=]+)?="[^"]+"/, "")
+        .gsub(%r{<(/)?(?!span)(?!em)([a-z])}, "<\\1m:\\2")
       ooxml = uncenter(x, ooxml)
       x.swap(ooxml)
     end
   end
 
-  # escape space as &#x32;; we are removing any spaces generated by 
+  # escape space as &#x32;; we are removing any spaces generated by
   # XML indentation
   def self.esc_space(xml)
     xml.traverse do |n|
       next unless n.text?
+
       n = n.text.gsub(/ /, "&#x32;")
     end
     xml
@@ -94,17 +155,15 @@ module Html2Doc
 
   # if oomml has no siblings, by default it is centered; override this with
   # left/right if parent is so tagged
-  def self.uncenter(m, ooxml)
-    if m.next == nil && m.previous == nil
-      alignnode = m.at(".//ancestor::*[@style][local-name() = 'p' or "\
-                       "local-name() = 'div' or local-name() = 'td']/@style")
-      return ooxml unless alignnode
-      if alignnode.text.include? ("text-align:left")
-        ooxml = "<m:oMathPara><m:oMathParaPr><m:jc "\
-          "m:val='left'/></m:oMathParaPr>#{ooxml}</m:oMathPara>"
-      elsif alignnode.text.include? ("text-align:right")
+  def self.uncenter(math, ooxml)
+    alignnode = math.at(".//ancestor::*[@style][local-name() = 'p' or "\
+                     "local-name() = 'div' or local-name() = 'td']/@style")
+    return ooxml unless alignnode && (math.next == nil && math.previous == nil)
+
+    %w(left right).each do |dir|
+      if alignnode.text.include? ("text-align:#{dir}")
         ooxml = "<m:oMathPara><m:oMathParaPr><m:jc "\
-          "m:val='right'/></m:oMathParaPr>#{ooxml}</m:oMathPara>"
+          "m:val='#{dir}'/></m:oMathParaPr>#{ooxml}</m:oMathPara>"
       end
     end
     ooxml