isodoc 2.0.8.1 → 2.0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a736ad455159e993e2c100d8ac3cd67a09c07705dad2fab7f30c8995636a55d8
-  data.tar.gz: b600c452fe5bac0622c27ab05ca4156c46caaea6f56d0cebc2d76b9377c3ae2a
+  metadata.gz: 391849b43509b58e8e08eb2ab4e2922cdb3c6ac21ac287110518078b73601465
+  data.tar.gz: 8b15f3e7f8c608c0521c3347616a6ea2df7d09092d3830c2bd71f58ea23a95fc
 SHA512:
-  metadata.gz: 6e534774023bcb0212a72808f5167633ecce14af71aaa506388385c5e458fd41a87bb927d87546a3b3a709021d41d1592c99cd008caab5f652023543820137ad
-  data.tar.gz: 9b8dfa80516811e6aa87d0cfc80ac3ad79c26eaf61edf6366b12a89c30b429d0b96e15fc7970c0ada89ce8d94ebbc08a330af41dcb5185baa7245a05f1f1a8d7
+  metadata.gz: 7f7b97e099260821ec96ec660c2bfa180dff43f2c3b186a2fa42ddebeb5052fe19904afbd62b28215caedeab4f5184c3fbee89171b3fd3a9759e91329bbbfc16
+  data.tar.gz: 53584cc076ed6b5537c592e4c750f069ba5ef69159c8ecabfe787968b5af4024b61868e1e98b7fbf1d03975980087b89557e2fe252e3a74cb42844bcd684ab6c

data/lib/isodoc/css.rb

@@ -29,10 +29,10 @@ module IsoDoc
       @wordstylesheet = generate_css(localpath(@wordstylesheet_name), false)
       @standardstylesheet =
         generate_css(localpath(@standardstylesheet_name), false)
-      @htmlstylesheet_override_name and @htmlstylesheet_override =
-        File.open(localpath(@htmlstylesheet_override_name))
-      @wordstylesheet_override_name and @wordstylesheet_override =
-        File.open(localpath(@wordstylesheet_override_name))
+      @htmlstylesheet_override_name and
+        @htmlstylesheet_override = File.open(localpath(@htmlstylesheet_override_name))
+      @wordstylesheet_override_name and
+        @wordstylesheet_override = File.open(localpath(@wordstylesheet_override_name))
     end
 
     def default_fonts(_options)
@@ -80,12 +80,12 @@ module IsoDoc
 
       [File.join(Gem.loaded_specs["isodoc"].full_gem_path,
                  "lib", "isodoc"),
-                 File.dirname(filename)].each do |name|
-                   SassC.load_paths << name
-                 end
-                 SassC::Engine.new(scss_fontheader(stripwordcss) + stylesheet,
-                                   syntax: :scss, importer: SasscImporter)
-                   .render
+       File.dirname(filename)].each do |name|
+        SassC.load_paths << name
+      end
+      SassC::Engine.new(scss_fontheader(stripwordcss) + stylesheet,
+                        syntax: :scss, importer: SasscImporter)
+        .render
     end
 
     # stripwordcss if HTML stylesheet, !stripwordcss if DOC stylesheet
@@ -96,6 +96,7 @@ module IsoDoc
       stylesheet = File.read(filename, encoding: "UTF-8")
       stylesheet = populate_template(stylesheet, :word)
       stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, "\\1") if stripwordcss
+      stylesheet.gsub!(/--/, "-DOUBLE_HYPHEN_ESCAPE-") unless stripwordcss
       if File.extname(filename) == ".scss"
         stylesheet = convert_scss(filename, stylesheet, stripwordcss)
       end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.0.8.1".freeze
+  VERSION = "2.0.8.2".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -39,6 +39,7 @@ module IsoDoc
 
       def toWord(result, filename, dir, header)
         result = from_xhtml(word_cleanup(to_xhtml(result)))
+          .gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
         @wordstylesheet = wordstylesheet_update
         Html2Doc.process(
           result,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.0.8.1
+  version: 2.0.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath