isodoc 1.0.3 → 1.0.4

data/lib/isodoc/base_style/nav.scss

@@ -0,0 +1,180 @@
+@import 'defaults';
+
+@mixin toc($colorLink, $colorLinkActiveBg, $colorLinkActiveFg) {
+  ul {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+
+    li a {
+      padding: 5px 10px;
+    }
+
+    a {
+      color: $colorLink;
+      text-decoration: none;
+      display: block;
+
+      &:hover {
+        box-shadow: none;
+        color: $colorLinkActiveFg;
+      }
+    }
+  }
+
+  .h2 {
+    padding-left: 30px;
+  }
+
+  .h3 {
+    padding-left: 50px;
+  }
+
+  .toc-active, li:hover {
+    background: $colorLinkActiveBg;
+    box-shadow: inset -5px 0px 10px -5px $colorLinkActiveBg !important;
+
+    a {
+      color: $colorLinkActiveFg;
+    }
+  }
+
+  @media print {
+    .toc-active, li:hover {
+      background: white;
+      box-shadow: none !important;
+    }
+
+    .toc-active a {
+      color: $colorLink;
+    }
+
+    li:hover a {
+      color: black;
+    }
+  }
+}
+
+@mixin sidebarNavContainer($offset) {
+  // Expected to be applied to body.
+
+  @media screen and (min-width: $bigscreenBreakpoint) {
+    padding-left: $offset;
+  }
+
+  @media print {
+    padding-left: 0;
+  }
+}
+
+@mixin sidebarToc($font: $bodyfont, $fontWeight: 400) {
+  font-family: $font;
+  font-weight: $fontWeight;
+
+  @media screen and (max-width: $bigscreenBreakpoint) {
+    padding: 0 1.5em;
+    overflow: visible;
+  }
+}
+
+@mixin sidebarNav(
+    $colorBg,
+    $width,
+    $offsetLeft,
+    $lineHeight: null) {
+
+  @media screen and (min-width: $bigscreenBreakpoint) {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    width: $width;
+    font-size: 0.9em;
+    overflow: auto;
+    padding: 0 0 0 $offsetLeft;
+    background-color: $colorBg;
+
+    @if $lineHeight != null {
+      line-height: $lineHeight;
+    }
+  }
+
+  @media print {
+    position: relative;
+    width: auto;
+    font-size: 0.9em;
+    overflow: auto;
+    padding: 0;
+    margin-right: 0;
+    background-color: white;
+  }
+}
+
+@mixin sidebarNavToggle($colorFg: white, $colorBg: black) {
+  @media screen and (min-width: $bigscreenBreakpoint) {
+    position: fixed;
+    height: 100%;
+    width: 30px;
+    background-color: $colorBg;
+    color: $colorFg !important;
+    cursor: pointer;
+    z-index: 100;
+
+    span {
+      text-align: center;
+      width: 100%;
+      position: absolute;
+      top: 50%;
+      transform: translate(0, -50%);
+    }
+  }
+
+  @media screen and (max-width: $bigscreenBreakpoint) {
+    display: none;
+  }
+
+  @media print {
+    display: none;
+  }
+}
+
+@mixin tocSeparator {
+  @media screen and (min-width: $bigscreenBreakpoint) {
+    display: none;
+  }
+}
+
+@mixin toTopBtn($color, $colorBg) {
+  font-family: $monospacefont;
+  font-variant-ligatures: none;
+  display: none;
+  position: fixed;
+  bottom: 20px;
+  right: 30px;
+  z-index: 99;
+  font-size: 12px;
+  border: none;
+  outline: none;
+  background-color: $colorBg;
+  opacity: 0.15;
+  color: $color;
+  cursor: pointer;
+  padding: 10px 15px 10px 15px;
+  border-radius: 4px;
+
+  &:hover {
+    opacity: 1;
+  }
+
+  @media print {
+    display: none;
+  }
+}
+
+@mixin anchorLink($color) {
+  &:hover {
+    background: none;
+    color: $color;
+    box-shadow: none;
+  }
+}

data/lib/isodoc/base_style/reset.scss

@@ -0,0 +1,98 @@
+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, nav, 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;
+}
+
+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;
+}
+
+blockquote, q {
+  quotes: none;
+
+  &:before, &:after {
+    content: '';
+    content: none;
+  }
+}

data/lib/isodoc/base_style/typography.scss

@@ -0,0 +1,89 @@
+.h2Annex {
+  font-family: $headerfont;
+}
+
+dl {
+  display: grid;
+  grid-template-columns: max-content auto;
+
+  dt, dd {
+    p {
+      margin-top: 0;
+    }
+  }
+
+  dt {
+    grid-column-start: 1;
+  }
+
+  dd {
+    grid-column-start: 2;
+  }
+}
+
+@mixin bodyStyle1($fontSize, $lineHeight, $colorText, $colorBackground, $fontWeight: 400) {
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 100%;
+  font-size: $fontSize;
+  font-weight: $fontWeight;
+  line-height: $lineHeight;
+  color: $colorText;
+  background-color: $colorBackground;
+
+  main {
+    margin: 0 3em 0 6em;
+  }
+}
+
+@mixin elementStyles($color, $colorHighlightBg, $colorHighlightFg) {
+  a, a:visited {
+    text-decoration: none;
+    color: $color;
+  }
+  a:hover {
+    color: $colorHighlightFg;
+    background: $colorHighlightBg;
+    box-shadow: 3px 0 0 $colorHighlightBg, -3px 0 0 $colorHighlightBg;
+  }
+  ::selection,
+  ::-moz-selection {
+    background: $colorHighlightBg;
+    color: $colorHighlightFg;
+  }
+}
+
+@mixin rule($thickness, $color, $margin: 2em 0, $clear: false) {
+  width: 100%;
+  height: $thickness;
+  background-color: $color;
+
+  @if $margin {
+    margin: $margin;
+  }
+
+  // Obsolete (?)
+  @if $clear {
+    clear: both;
+  }
+}
+
+@mixin table($border: none) {
+  width: 100%;
+  font-weight: 300;
+  margin: 1em 0 2em 0;
+  margin-left: auto;
+  margin-right: auto;
+  padding-right: 2em;
+
+  &, th, td {
+    border: $border;
+    font-size: 0.95em;
+  }
+  th, td {
+    padding: 1em;
+  }
+  td.header {
+    font-weigth: 400;
+  }
+}

data/lib/isodoc/class_utils.rb

@@ -20,8 +20,8 @@ module IsoDoc
 
     def liquid(doc)
       # unescape HTML escapes in doc
-      doc = doc.split(%r<(\{%|\}%)>).each_slice(4).map do |a|
-        a[2].gsub!("&lt;", "<").gsub!("&gt;", ">") if a.size > 2
+      doc = doc.split(%r<(\{%|%\})>).each_slice(4).map do |a|
+        a[2] = a[2].gsub("&lt;", "<").gsub("&gt;", ">") if a.size > 2
         a.join("")
       end.join("")
       Liquid::Template.parse(doc)

data/lib/isodoc/convert.rb

@@ -125,6 +125,9 @@ module IsoDoc
       stylesheet = File.read(filename, encoding: "UTF-8")
       stylesheet = populate_template(stylesheet, :word)
       stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, "\\1") if stripwordcss
+      SassC.load_paths << File.join(Gem.loaded_specs['isodoc'].full_gem_path,
+                                    "lib", "isodoc")
+      SassC.load_paths << File.dirname(filename)
       engine = SassC::Engine.new(fontheader + stylesheet, syntax: :scss)
       outname = File.basename(filename, ".*") + ".css"
       File.open(outname, "w:UTF-8") { |f| f.write(engine.render) }

data/lib/isodoc/function/blocks.rb

@@ -59,36 +59,37 @@ module IsoDoc::Function
 
     def figure_parse(node, out)
       @in_figure = true
-      name = node.at(ns("./name"))
       out.div **attr_code(id: node["id"], class: "figure") do |div|
         node.children.each do |n|
           figure_key(out) if n.name == "dl"
           parse(n, div) unless n.name == "name"
         end
-        figure_name_parse(node, div, name)
+        figure_name_parse(node, div, node.at(ns("./name")))
       end
       @in_figure = false
     end
 
-    def example_label(node)
+    def example_label(node, div, name)
       n = get_anchors[node["id"]]
-      return @example_lbl if n.nil? || n[:label].nil? || n[:label].empty?
-      l10n("#{@example_lbl} #{n[:label]}")
+      div.p **{ class: "example-title" } do |p|
+        lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @example_lbl :
+          l10n("#{@example_lbl} #{n[:label]}")
+        p << lbl
+        name and !lbl.nil? and p << "&nbsp;&mdash; "
+        name and name.children.each { |n| parse(n, div) }
+      end
     end
 
     EXAMPLE_TBL_ATTR =
-      #{ valign: "top", 
       { class: "example_label", style: "width:82.8pt;padding:0 0 0 0;\
         margin-left:0pt;vertical-align:top;" }.freeze
 
     # used if we are boxing examples
     def example_div_parse(node, out)
       out.div **attr_code(id: node["id"], class: "example") do |div|
-        div.p **{ class: "example-title" } do |p|
-          p << example_label(node)
-        end
+        example_label(node, div, node.at(ns("./name")))
         node.children.each do |n|
-          parse(n, div)
+          parse(n, div) unless n.name == "name"
         end
       end
     end
@@ -98,14 +99,17 @@ module IsoDoc::Function
                 style: "border-collapse:collapse;border-spacing:0;" )
     end
 
+    EXAMPLE_TD_ATTR =
+      { style: "vertical-align:top;padding:0;", class: "example" }.freeze
+
     def example_table_parse(node, out)
       out.table **example_table_attr(node) do |t|
         t.tr do |tr|
           tr.td **EXAMPLE_TBL_ATTR do |td|
-            td << example_label(node)
+            example_label(node, td, node.at(ns("./name")))
           end
-          tr.td **{ style: "vertical-align:top;padding:0;", class: "example" } do |td|
-            node.children.each { |n| parse(n, td) }
+          tr.td **EXAMPLE_TD_ATTR do |td|
+            node.children.each { |n| parse(n, td) unless n.name == "name" }
           end
         end
       end