isodoc 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1afcea1c3a61c003f63ef54ee1fc3336a65755daceb584dcff2558731f419bd8
-  data.tar.gz: 6534a2e478ca74da49d70dbca4e88b611f045f6fa66051a62fe8d39775f61012
+  metadata.gz: 489435b8dddc8dba521d81e00c4aedff413367caae737b0bc406069d23d9181b
+  data.tar.gz: 0531fab9b4faf2f409eee7e6d22be86106c642221deec38af06328adf637912b
 SHA512:
-  metadata.gz: 3b4ebffb29a7b2cee5f973244560c4ba3886a79712b3bc8ae0f0ed446ee4324f9b0e54cd40be669aa7aafcea84e493ea96bed8140bdc436765b67def8d9533f8
-  data.tar.gz: b95c345dc9079afd3b80b4d31eaabf0e89c87ec4b56433f860da6004f345390c437be0fb03c0eba3df3640c9cac242999259ec93746caaf3969d5b4c76edb2e0
+  metadata.gz: 7b00856fcce581e10566072193968591c255da75aa290f9c22aa636d24a38470055c67f26291f037375e1b02f3dd5959de58086530e0e5f46dc6467c94fa6c4d
+  data.tar.gz: 36ea446dfa881db1666bd12c884e0f966a2bdeaa55ceee3f4ae66e9b5b8fe27b0f431ad0a68319fdc77b831c4b61924b017f2badcd2d35efd0d778d336bc87c2

data/isodoc.gemspec

@@ -37,13 +37,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mn2pdf", ">= 2.13"
   spec.add_dependency "mn-requirements", "~> 0.5.0"
 
+  spec.add_dependency "nokogiri", "<= 1.16.8"
   spec.add_dependency "relaton-render", "~> 0.9.0"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "rouge", "~> 4.0"
   spec.add_dependency "thread_safe"
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
   spec.add_dependency "uuidtools"
-  spec.add_dependency "nokogiri", "<= 1.16.8"
 
   spec.add_development_dependency "bigdecimal"
   spec.add_development_dependency "debug"
@@ -53,8 +53,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1.5.2"
-  #spec.add_development_dependency "sassc", "~> 2.4.0"
-  spec.add_development_dependency "sassc-embedded", "~> 1"
+  # spec.add_development_dependency "sassc", "~> 2.4.0"
+  if RUBY_VERSION.start_with?("3.1")
+    spec.add_development_dependency "sassc-embedded", "1.54.0"
+  else
+    spec.add_development_dependency "sassc-embedded", "~> 1"
+  end
+  #spec.add_development_dependency "sassc-embedded", "~> 1"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "xml-c14n"

data/lib/isodoc/gem_tasks.rb

@@ -3,6 +3,7 @@
 require "sassc-embedded"
 require "isodoc/sassc_importer"
 require "rake/clean"
+require "tmpdir"
 
 module IsoDoc
   module GemTasks
@@ -110,7 +111,8 @@ module IsoDoc
     end
 
     def compile_scss(filename)
-      require "sassc"
+      require "sassc-embedded"
+      require "isodoc/sassc_importer"
 
       isodoc_path = if Gem.loaded_specs["isodoc"]
                       File.join(Gem.loaded_specs["isodoc"].full_gem_path,
@@ -122,12 +124,18 @@ module IsoDoc
        File.dirname(filename)].each do |name|
         SassC.load_paths << name
       end
+      Dir.mktmpdir do |dir|
+        variables_file_path = File.join(dir, "variables.scss")
+        File.write(variables_file_path, fonts_placeholder)
+        SassC.load_paths << dir
+
       sheet_content = File.read(filename, encoding: "UTF-8")
-      SassC::Engine.new(fonts_placeholder + sheet_content,
+      SassC::Engine.new(%<@use "variables" as *;\n#{sheet_content}>,
                         syntax: :scss,
                         importer: SasscImporter)
         .render
     end
+    end
 
     def compile_scss_task(current_task)
       filename = current_task.source

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.0.3".freeze
+  VERSION = "3.0.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Ribose Inc.
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.16.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.16.8
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.16.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.16.8
 - !ruby/object:Gem::Dependency
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
@@ -294,16 +294,16 @@ dependencies:
   name: sassc-embedded
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.54.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -376,19 +376,15 @@ files:
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
 - lib/isodoc.rb
 - lib/isodoc/base_style/all.scss
-- lib/isodoc/base_style/bands.css
 - lib/isodoc/base_style/bands.scss
 - lib/isodoc/base_style/blocks.scss
 - lib/isodoc/base_style/coverpage.scss
-- lib/isodoc/base_style/defaults.css
 - lib/isodoc/base_style/defaults.scss
-- lib/isodoc/base_style/metanorma_word.css
 - lib/isodoc/base_style/metanorma_word.scss
 - lib/isodoc/base_style/nav.scss
 - lib/isodoc/base_style/reset.scss
 - lib/isodoc/base_style/rouge.css
 - lib/isodoc/base_style/scripts.html
-- lib/isodoc/base_style/typography.css
 - lib/isodoc/base_style/typography.scss
 - lib/isodoc/class_utils.rb
 - lib/isodoc/common.rb

data/lib/isodoc/base_style/bands.css

@@ -1,135 +0,0 @@
-#standard-band {
-  background-color: #0AC442;
-}
-
-#standard {
-  border-bottom: solid 3px #0AC442;
-}
-
-#directive-band {
-  background-color: #540D6E;
-}
-
-#directive {
-  border-bottom: solid 3px #540D6E;
-}
-
-#guide-band {
-  background-color: #D183C9;
-}
-
-#guide {
-  border-bottom: solid 3px #D183C9;
-}
-
-#specification-band {
-  background-color: #65AFFF;
-}
-
-#specification {
-  border-bottom: solid 3px #65AFFF;
-}
-
-#report-band {
-  background-color: #3A405A;
-}
-
-#report {
-  border-bottom: solid 3px #3A405A;
-}
-
-#amendment-band {
-  background-color: #F26430;
-}
-
-#amendment {
-  border-bottom: solid 3px #F26430;
-}
-
-#corrigendum-band {
-  background-color: #C84630;
-}
-
-#corrigendum {
-  border-bottom: solid 3px #C84630;
-}
-
-#administrative-band {
-  background-color: #BFAE48;
-}
-
-#administrative {
-  border-bottom: solid 3px #BFAE48;
-}
-
-#advisory-band {
-  background-color: #BD9391;
-}
-
-#advisory {
-  border-bottom: solid 3px #BD9391;
-}
-
-#proposal-band {
-  background-color: #39A0ED;
-}
-
-#proposal {
-  border-bottom: solid 3px #39A0ED;
-}
-
-#working-draft-band {
-  background-color: #2D7393;
-}
-
-#working-draft {
-  border-bottom: solid 3px #2D7393;
-}
-
-#committee-draft-band {
-  background-color: #2A6B7C;
-}
-
-#committee-draft {
-  border-bottom: solid 3px #2A6B7C;
-}
-
-#draft-standard-band {
-  background-color: #1C7F7A;
-}
-
-#draft-standard {
-  border-bottom: solid 3px #1C7F7A;
-}
-
-#final-draft-band {
-  background-color: #53C170;
-}
-
-#final-draft {
-  border-bottom: solid 3px #53C170;
-}
-
-#published-band {
-  background-color: #069E2D;
-}
-
-#published {
-  border-bottom: solid 3px #069E2D;
-}
-
-#withdrawn-band {
-  background-color: #004E64;
-}
-
-#withdrawn {
-  border-bottom: solid 3px #004E64;
-}
-
-#cancelled-band {
-  background-color: #2E382E;
-}
-
-#cancelled {
-  border-bottom: solid 3px #2E382E;
-}

data/lib/isodoc/base_style/metanorma_word.css

@@ -1,72 +0,0 @@
-ol {
-  margin-bottom: 0cm;
-}
-
-ul {
-  margin-bottom: 0cm;
-}
-
-table.MsoISOTable tr {
-  page-break-inside: avoid;
-}
-
-td {
-  page-break-inside: avoid;
-}
-
-tr {
-  page-break-after: avoid;
-}
-
-table.MsoISOTableBig tr {
-  page-break-inside: auto;
-}
-
-table.MsoISOTableBig td {
-  page-break-inside: auto;
-}
-
-span.stem {
-  font-family: "Cambria Math", serif;
-  mso-ascii-font-family: "Cambria Math";
-  font-style: italic;
-}
-
-dt {
-  page-break-inside: avoid;
-  page-break-after: avoid;
-}
-
-br.section {
-  page-break-before: always;
-  mso-break-type: section-break;
-}
-
-br.pagebreak {
-  page-break-before: always;
-  mso-special-character: line-break;
-}
-
-span.addition {
-  color: blue;
-}
-
-span.deletion {
-  color: red;
-  text-decoration: line-through;
-}
-
-table.rouge-line-table {
-  border: none;
-  mso-border-alt: none;
-  mso-border-insideh: none;
-  mso-border-insidev: none;
-}
-
-td.rouge-code p.Sourcecode {
-  margin: 0px;
-}
-
-div.table_container {
-  margin-bottom: 14pt;
-}