isodoc 3.0.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2fbbffe1ad377a78a633b5b7520737e4b623b3451b3475e9e4f9c7e9ecb2d5b
-  data.tar.gz: 6a8927c8585c3d35a2bfbeea8df4699b96b111a3a86c870588f524109e04938f
+  metadata.gz: 1afcea1c3a61c003f63ef54ee1fc3336a65755daceb584dcff2558731f419bd8
+  data.tar.gz: 6534a2e478ca74da49d70dbca4e88b611f045f6fa66051a62fe8d39775f61012
 SHA512:
-  metadata.gz: a6ab8147f4a8abfa5846772df470777d55a7f169d46d6fe6f5f83aaf0114812b5eac1f98dc69a41fb43bbfc0e7e4635b86394a30398b8262e71d7b82da7c65a2
-  data.tar.gz: 63be260dc909fdbac39e62d06cd28448e71fe968b237f542545057a6777b0b0f79bd01cc1faafb0467855c99d5d3b058371c62b76a592bd837140d546a9ccfa5
+  metadata.gz: 3b4ebffb29a7b2cee5f973244560c4ba3886a79712b3bc8ae0f0ed446ee4324f9b0e54cd40be669aa7aafcea84e493ea96bed8140bdc436765b67def8d9533f8
+  data.tar.gz: b95c345dc9079afd3b80b4d31eaabf0e89c87ec4b56433f860da6004f345390c437be0fb03c0eba3df3640c9cac242999259ec93746caaf3969d5b4c76edb2e0

data/lib/isodoc/base_style/all.scss

@@ -1,6 +1,7 @@
-@use 'base_style/reset';
-@use 'base_style/typography';
-@use 'base_style/nav';
-@use 'base_style/bands';
-@use 'base_style/blocks';
-@use 'base_style/coverpage';
+@use 'variables' as *;
+@forward 'base_style/reset';
+@forward 'base_style/typography';
+@forward 'base_style/nav';
+@forward 'base_style/bands';
+@forward 'base_style/blocks';
+@forward 'base_style/coverpage';

data/lib/isodoc/base_style/blocks.scss

@@ -1,3 +1,4 @@
+@use 'variables' as *;
 @use 'defaults';
 
 @mixin blockTitle() {

data/lib/isodoc/base_style/coverpage.scss

@@ -1,3 +1,5 @@
+@use 'variables' as *;
+
 @mixin coverpageStageBlock($fontFamily: $bodyfont, $fontSize: 1em) {
   font-family: $fontFamily;
   font-weight: 400;

data/lib/isodoc/base_style/nav.scss

@@ -1,3 +1,4 @@
+@use 'variables' as *;
 @use 'defaults';
 
 @mixin toc($colorLink, $colorLinkActiveBg, $colorLinkActiveFg) {

data/lib/isodoc/base_style/reset.scss

@@ -1,3 +1,5 @@
+@use 'variables' as *;
+
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,

data/lib/isodoc/css.rb

@@ -77,15 +77,28 @@ module IsoDoc
     def convert_scss(filename, stylesheet, stripwordcss)
       require "sassc-embedded"
       require "isodoc/sassc_importer"
-
       [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
+
+      Dir.mktmpdir do |dir|
+        variables_file_path = File.join(dir, "variables.scss")
+        File.write(variables_file_path,
+                   scss_fontheader(stripwordcss))
+
+        SassC.load_paths << dir
+
+        # Modify the stylesheet to use the tempfile with @use
+        modified_stylesheet = <<~SCSS
+          @use "variables" as *;
+          #{stylesheet}
+        SCSS
+        SassC::Engine.new(modified_stylesheet,
+                          syntax: :scss, importer: SasscImporter)
+          .render
+      end
     end
 
     # stripwordcss if HTML stylesheet, !stripwordcss if DOC stylesheet

data/lib/isodoc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Ribose Inc.
@@ -378,17 +378,13 @@ files:
 - lib/isodoc/base_style/all.scss
 - lib/isodoc/base_style/bands.css
 - lib/isodoc/base_style/bands.scss
-- lib/isodoc/base_style/blocks.css
 - lib/isodoc/base_style/blocks.scss
-- lib/isodoc/base_style/coverpage.css
 - 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.css
 - lib/isodoc/base_style/nav.scss
-- lib/isodoc/base_style/reset.css
 - lib/isodoc/base_style/reset.scss
 - lib/isodoc/base_style/rouge.css
 - lib/isodoc/base_style/scripts.html

data/lib/isodoc/base_style/reset.css

@@ -1,312 +0,0 @@
-@charset "UTF-8";
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-}
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  border: 0;
-  font-size: 100%;
-}
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, tt, var,
-b, u, i, center,
-dl, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  vertical-align: baseline;
-}
-
-html, body, div, span, applet, object, iframe,
-p, blockquote,
-a, abbr, acronym, address, big, cite,
-del, dfn, em, img, ins, q, s,
-small, strike, strong, sub, sup, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  font-family: {{bodyfont}};
-}
-
-code, pre, tt, kbd, samp {
-  font-family: {{monospacefont}};
-  font-variant-ligatures: none;
-}
-
-code *, pre *, tt *, kbd *, samp * {
-  font-family: {{monospacefont}} !important;
-  font-variant-ligatures: none;
-}
-
-p code, dt code, li code, label code, legend code, caption code, th code, td code,
-p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
-p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
-p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
-  font-size: {{monospacefontsize}};
-}
-
-sub, sup {
-  font-size: 0.75em;
-}
-
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-  display: block;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  font-family: {{headerfont}};
-}
-
-.h1, .h2, .h3, .h4, .h5, .h6 {
-  font-family: {{headerfont}};
-}
-
-blockquote, q {
-  quotes: none;
-}
-blockquote::before, blockquote::after, q::before, q::after {
-  content: "";
-  content: none;
-}
-
-.h2Annex {
-  font-family: {{headerfont}};
-}
-
-dl {
-  display: grid;
-  grid-template-columns: max-content auto;
-}
-dl dt p, dl dd p {
-  margin-top: 0;
-}
-dl dt {
-  grid-column-start: 1;
-}
-dl dd {
-  grid-column-start: 2;
-}
-
-b, strong {
-  font-weight: bold;
-}
-
-div.document-stage-band, div.document-type-band {
-  background-color: #333333;
-}
-
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef, span.TableFootnoteRef,
-a.FootnoteRef, span.FootnoteRef {
-  vertical-align: super;
-}
-
-.addition {
-  color: blue;
-}
-
-.deletion {
-  color: red;
-  text-decoration: line-through;
-}
-
-ruby {
-  ruby-position: over;
-  -webkit-ruby-position: before;
-}
-
-ruby ruby {
-  ruby-position: under;
-  -webkit-ruby-position: after;
-}
-
-/* code highlighting with line numbers */
-table.rouge-line-table td.rouge-gutter {
-  -moz-user-select: none;
-  -ms-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-  padding-right: 1em;
-}
-
-table.rouge-line-table td.rouge-code {
-  -moz-user-select: all;
-  -ms-user-select: all;
-  -webkit-user-select: all;
-  user-select: all;
-}
-
-table.rouge-line-table,
-table.rouge-line-table th,
-table.rouge-line-table td {
-  width: auto;
-  border: none;
-  margin: 0;
-  padding: 0;
-  font-size: 100%;
-}
-
-table.rouge-line-table pre {
-  margin: 0;
-  padding: 0;
-  overflow-x: visible;
-  font-size: 100%;
-}
-
-/* header § links */
-a.header {
-  color: inherit;
-  text-decoration: none;
-}
-
-a.header:hover {
-  color: #a53221 !important;
-  background: inherit;
-  box-shadow: none;
-}
-
-a.header:visited {
-  color: inherit;
-  text-decoration: none;
-}
-
-a.anchor {
-  position: absolute;
-  z-index: 1001;
-  width: 1.5ex;
-  margin-left: -1.5ex;
-  display: block;
-  text-decoration: none !important;
-  visibility: hidden;
-  text-align: center;
-  font-weight: 400;
-}
-
-a.anchor::before {
-  content: "§";
-  font-size: 0.85em;
-  display: block;
-  padding-top: 0.1em;
-}
-
-a.anchor:hover {
-  color: #a53221;
-  background: inherit;
-  box-shadow: none;
-}
-
-h1 > a.anchor:hover,
-h2 > a.anchor:hover,
-h3 > a.anchor:hover,
-h4 > a.anchor:hover,
-h5 > a.anchor:hover,
-h6 > a.anchor:hover,
-.inline-header > a.anchor:hover,
-h1:hover > a.anchor,
-h2:hover > a.anchor,
-h3:hover > a.anchor,
-h4:hover > a.anchor,
-h5:hover > a.anchor,
-h6:hover > a.anchor,
-.inline-header:hover > a.anchor {
-  visibility: visible;
-}
-
-/* collapsible snippets: collapsible before hidable */
-.hidable {
-  max-height: 0;
-  overflow: hidden;
-  transition: max-height 0.2s ease-out;
-}
-
-.collapsible {
-  background-color: #777;
-  color: white;
-  cursor: pointer;
-  padding: 3px 0;
-  margin: 0;
-  width: 100%;
-  border: none;
-  text-align: left;
-  outline: none;
-  font-size: 15px;
-}
-
-.active, .collapsible:hover {
-  background-color: #555;
-}
-
-.collapsible:after {
-  content: "▼";
-  color: white;
-  font-weight: bold;
-  float: right;
-  margin-left: 12px;
-  margin-right: 12px;
-}
-
-.active:after {
-  content: "▲";
-}
-
-/* collapsible: */
-.collapsible + .hidable {
-  margin-top: 0;
-}
-
-.collapsible:not(.active) + .hidable {
-  overflow: hidden;
-  padding: 0;
-}