metanorma-iec 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc93e8e07d5be4e94b78dbb0fbca3ce2d1950154566e5fa4726ebfdbdcdee9c9
-  data.tar.gz: 4b25cebefe0d6a9890b5e3bee62f0bc2493fef0d874a08b8b22fee5bac5318bd
+  metadata.gz: '0478aec1aa1acf4dbf00c1992325723e57ebe14121769810ef6a230b2dfbf7a9'
+  data.tar.gz: 3d63928086246375072c6039e814e6b3c2344fbbdf84fc5ba0725b9ee3389548
 SHA512:
-  metadata.gz: 2e3cfceb34bd1079babd73f1ee5748c3efa5eb7bf8ea41cbcb58532c447b30424284ec7c70750c3d3837b3452f8d2330f6c53742c3cea39222fabc3bedcfbd87
-  data.tar.gz: 38d31f9043008880da563b634031dcac86a045ba6247863eebf2cc934a780703d12b84a74bcf64d8b57862c6e7bdf9179b9cea07bedffcb262b28cb24872e3fc
+  metadata.gz: 6374795004440b778feaf50fc4f0ddb6fe515e673428ce4c743d81aed019ad311b97cc038a7038318e9d92a881454e058df17c19c54cc9f01131fe44ff188b3b
+  data.tar.gz: '098debb725126f728718996db03b5adad76e2a13badd47808f9f51f602a2f2724fe7acad96f2b45c00820c00a4656b2ee2b0daedf22d0758b74578e5fe132f8b'

data/lib/asciidoctor/iec/converter.rb

@@ -46,16 +46,23 @@ module Asciidoctor
         part, subpart = node&.attr("partnumber")&.split(/-/)
         dn = add_id_parts(node.attr("docnumber"), part, subpart)
         dn = id_stage_prefix(dn, node)
+        dn = id_edition_suffix(dn, node)
         xml.docidentifier dn, **attr_code(type: "iso")
       end
 
+      def id_edition_suffix(dn, node)
+        ed = node.attr("edition") || 1
+        dn += " ED #{ed}"
+        dn
+      end
+
       def boilerplate_file(x_orig)
         lang = case x_orig&.at("//bibdata/language")&.text
                when "fr" then "fr"
                else
                  "en"
                end
-          File.join(@libdir, "iec_intro_#{lang}.xml")
+        File.join(@libdir, "iec_intro_#{lang}.xml")
       end
 
       def doctype_validate(xmldoc)

data/lib/isodoc/iec/html/htmlstyle.scss

@@ -7,123 +7,10 @@
    License: none (public domain)
 */
 
-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;
-}
-
-dl {
-  display: grid;
-  grid-template-columns: max-content auto;
-}
-
-dt {
-  grid-column-start: 1;
-}
-
-dd {
-  grid-column-start: 2;
-}
-
-dd p, dt p {
-  margin-top: 0px;
-}
+@import 'base_style/all';
 
-h1, h2, h3, h4, h5, h6, .h2Annex {
-  font-family: $headerfont;
-}
-
-
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-	display: block;
-}
 body {
-	line-height: 1.3;
-}
-blockquote, q {
-	quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: '';
-	content: none;
-}
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
+    line-height: 1.3;
 }
 
 /* New CSS */
@@ -159,7 +46,7 @@ main {
     margin-left: -3em;
     /*padding-top: 2em;*/
     padding-bottom: 2em;
-    
+
 }
 
 .doctitle-en span {
@@ -210,7 +97,7 @@ span.partlabel {
     display: block;
 }
 
-#boilerplate-message, #boilerplate-name, 
+#boilerplate-message, #boilerplate-name,
 #boilerplate-address {
     font-size: 0.9em;
 }
@@ -269,11 +156,11 @@ h2 p {
     display: inline;
 }
 
-  
+
   ul > li {
     list-style: none;
   }
-  
+
 ul > li > p:first-child:before {
   content: "\2014";
   display: inline-block;
@@ -287,7 +174,7 @@ ul > li > p:first-child:before {
       margin-bottom: 0.6em;
       line-height: 1.2;
   }
-  
+
 
   #toc li:before {
     content: " ";
@@ -307,42 +194,44 @@ p.Terms {
 
 /* Navigation*/
 
+nav {
+    @include sidebarNav(#f7f7f7, 278px, 20px);
+}
+
+#toggle {
+    @include sidebarNavToggle(black, #f7f7f7)
+}
+
+#toc {
+    @include toc(black, black, black);
+    @include sidebarToc();
+
+    .toc-active,
+    li:hover {
+        box-shadow: 0px 1px 0px 0px black !important;
+        color: black;
+        background: none;
+    }
+
+    ul {
+        a:hover {
+            box-shadow: none;
+            color: black;
+        }
+    }
+}
+
 @media screen and (min-width: 768px) {
     nav {
-        position: fixed;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        width: 278px;
-        font-size: 0.9em;
-        overflow: auto;
-        padding: 0 0 0 20px;
-        background-color:#f7f7f7; 
         line-height: 1.2em;
     }
 
     #toggle {
-        position: fixed;
-        height: 100%;
-        width: 30px;
         border-right: solid black 1px;
-        background-color: #f7f7f7;
-        color: black!important;
-        cursor: pointer;
         margin-left: -4em;
         margin-top: -2em;
     }
 
-    #toggle span {
-        text-align: center;
-        width: 100%;
-        position: absolute;             
-        top: 50%;
-        transform: translate(0, -50%);
-        
-    }
-
-
     .container {
         padding-left: 360px;
     }
@@ -362,11 +251,6 @@ p.Terms {
 }
 
 @media screen and (max-width: 768px) {
-    #toc {
-        padding: 0 1.5em 0 1.5em;
-        overflow: visible;
-    }
-
     #toggle {
         display: none;
         margin-left: -4em;
@@ -387,61 +271,13 @@ p.Terms {
         width: 100%;
     }
 }
-  
-  div.figure > img { 
-    margin-left: auto;
-margin-right: auto;
-display: block;
-max-width: 100%;
-height: auto;
-  }
-    
-
-
-#toc ul {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-}
-
-#toc li a {
-    padding: 5px 10px;
-}
 
-#toc a {
-    text-decoration: none;
+div.figure > img {
+    margin-left: auto;
+    margin-right: auto;
     display: block;
-}
-
-#toc a:hover {
-    box-shadow: none;
-    color: black;
-}
-
-#toc .h2 {
-    padding-left: 30px;
-}
-
-#toc .h3 {
-    padding-left: 50px;
-}
-
-#toc .toc-active a {
-    color: black;
-}
-
-/*#toc .toc-active, #toc li:hover {
-    background: #1d1d1d;
-    box-shadow: inset -5px 0px 10px -5px #1d1d1d!important;
-}*/
-
-#toc .toc-active, #toc li:hover {
-    box-shadow: 0px 1px 0px 0px black!important;
-    color: black;
-}
-
-#toc li:hover a {
-    color: black;
+    max-width: 100%;
+    height: auto;
 }
 
 /*
@@ -449,56 +285,16 @@ height: auto;
 */
 
 .document-type-band {
-    left:0;
-    top:180px;
-    height: 100%;
-    position: fixed;
-    display: block;
-    z-index: 99;
-    /*box-shadow: -5px 0px 10px #1d1d1d*/
-
+    @include docBand(2, 100%, 180px);
 }
 
 .document-stage-band {
-    left:0;
-    top:0;
-    height: 100%;
-    position: fixed;
-    display: block;
-    z-index: 98;
-    box-shadow: -5px 0px 10px #1d1d1d
-}
-
-.document-type {
-    position: relative;
-    width: 25px;
-}
-
-.document-stage {
-    position: relative;
-    width: 25px;
+    @include docBand(1, 210px);
 }
 
-p.document-type, p.document-stage {
-    color: white;
-    text-transform: uppercase;
-    font-size: 0.9em;
-    font-weight: 400;
-    letter-spacing: 0.05em;
-    margin:0;
-    margin-left: 6px;
-    writing-mode:tb-rl;
-	-webkit-transform:rotate(180deg);
-	-moz-transform:rotate(180deg);
-	-o-transform: rotate(180deg);
-	white-space:nowrap;
-	display:block;
-    bottom:0;
-}
-
-p.document-type {
-    font-weight: 400;
-    height: 210px;
+p.document-type,
+p.document-stage {
+    @include docBandTitle(210px);
 }
 
 #governance-band p.document-type {
@@ -589,54 +385,148 @@ p.document-stage {
 /*
     3.3 Lists
 */
-        
+
 ul, ol {margin-left: 2em;}
-      
+
 #toc-list ul {margin-bottom: 0.25em;}
-  
+
 #toc-list ol li {list-style-type: none;}
 
+/* https://github.com/metanorma/metanorma-iso/issues/319 : ordered list rendering */
+
+ol[type="alphabet"] {
+  counter-reset: alphabet;
+}
+ol[type="arabic"] {
+  counter-reset: arabic;
+}
+ol[type="roman"] {
+  counter-reset: roman;
+}
+ol[type="alphabet_upper"] {
+  counter-reset: alphabet_upper;
+}
+ol[type="roman_upper"] {
+  counter-reset: roman_upper;
+}
+ol[type="alphabet"] ol[type="alphabet"] {
+  counter-reset: alphabet2;
+}
+ol[type="arabic"] ol[type="arabic"] {
+  counter-reset: arabic2;
+}
+ol[type="roman"] ol[type="roman"] {
+  counter-reset: roman2;
+}
+ol[type="alphabet_upper"] ol[type="alphabet_upper"] {
+  counter-reset: alphabet_upper2;
+}
+ol[type="roman_upper"] ol[type="roman_upper"] {
+  counter-reset: roman_upper2;
+}
+ol {
+  counter-reset: alphabet;
+}
+
+ol > li {
+  list-style: none;
+  position: relative;
+}
+ol > li:before {
+  position: absolute;
+  left: -1.4em;
+}
+ol[type="roman"] > li:before {
+  left: -2.0em;
+}
+ol[type="roman_upper"] > li:before {
+  left: -2.3em;
+}
+ol[type="alphabet"] > li:before {
+  counter-increment: alphabet;
+  content: counter(alphabet, lower-alpha)") "
+}
+ol[type="arabic"] > li:before {
+  counter-increment: arabic;
+  content: counter(arabic, decimal)") "
+}
+ol[type="roman"] > li:before {
+  counter-increment: roman;
+  content: counter(roman, lower-roman)") "
+}
+ol[type="alphabet_upper"] > li:before {
+  counter-increment: alphabet_upper;
+  content: counter(alphabet_upper, upper-alpha)") "
+}
+ol[type="roman_upper"] > li:before {
+  counter-increment: roman_upper;
+  content: counter(roman_upper, upper-roman)") "
+}
+ol > li:before {
+  counter-increment: alphabet;
+  content: counter(alphabet, lower-alpha)") "
+}
+ol[type="alphabet"] ol[type="alphabet"] > li:before {
+  counter-increment: alphabet2;
+  content: counter(alphabet2, lower-alpha)") "
+}
+ol[type="arabic"] ol[type="arabic"] > li:before {
+  counter-increment: arabic2;
+  content: counter(arabic2, decimal)") "
+}
+ol[type="roman"] ol[type="roman"] > li:before {
+  counter-increment: roman2;
+  content: counter(roman2, lower-roman)") "
+}
+ol[type="alphabet_upper"] ol[type="alphabet_upper"] > li:before {
+  counter-increment: alphabet_upper2;
+  content: counter(alphabet_upper2, upper-alpha)") "
+}
+ol[type="roman_upper"] ol[type="roman_upper"] > li:before {
+  counter-increment: roman_upper2;
+  content: counter(roman_upper2, upper-roman)") "
+}
+
+
 /*
 3.4 Rules
 */
 
 .rule {
-    width: 100%;
-    height: 1px;
-    background-color: #0e1a85;
-    margin: 2em 0;
-  }
+    @include rule(1px, #0e1a85)
+}
 
 /*
-3.5 Bibliograhy
+    3.5 Bibliograhy
 */
 
-p.Biblio, p.NormRef {
-margin-top: 1em;
-margin-left: 2em;
+p.Biblio,
+p.NormRef {
+    margin-top: 1em;
+    margin-left: 2em;
 }
 
 /*
 3.6 Source Code + figures
 */
 
-.Sourcecode {
-font-family: $monospacefont;
-font-variant-ligatures: none;
+.figure,
+pre,
+.pseudocode {
+    @include pseudocodeBlock(#f7f7f7);
+    font-size: 1em;
 }
 
-.figure, .Sourcecode, .pseudocode {
-background-color: #f7f7f7;
-line-height: 1.6em;
-padding: 1.5em;
-margin: 2em 0 1em 0;
-overflow: auto;
+pre {
+    @include monospaceBlockStyle()
 }
 
-.figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
-font-weight: 700;
-font-size: 1em;
-text-align: center;
+@include admonitionBlock();
+@include recommendationBlock();
+
+.FigureTitle,
+.SourceTitle {
+    @include blockTitle()
 }
 
 /*
@@ -644,11 +534,11 @@ text-align: center;
 */
 
 .Note, .note {
-background-color: #fff495;
-color: #47430c;
-padding: 0.5em;
-margin: 1.5em 0 1.5em 0;
-text-align: left;
+    background-color: #fff495;
+    color: #47430c;
+    padding: 0.5em;
+    margin: 1.5em 0 1.5em 0;
+    text-align: left;
 }
 
 .Note p, .note p {
@@ -656,11 +546,11 @@ text-align: left;
 }
 
 .Admonition {
-background-color: #ffcccc;
-color: #47430c;
-padding: 0.5em;
-margin: 1.5em 0 1.5em 0;
-text-align: left;
+    background-color: #ffcccc;
+    color: #47430c;
+    padding: 0.5em;
+    margin: 1.5em 0 1.5em 0;
+    text-align: left;
 }
 
 .Admonition p {
@@ -673,60 +563,42 @@ text-align: left;
 */
 
 .example {
-background-color: #e1eef1;
-padding: 0.5em;
-margin: 2em 0 1em 0;
-text-align: left;
-}
-
-.example p {
-    margin: 0;
-}
-
-.example .example-title {
-font-weight: 700;
-text-transform: uppercase;
-margin-top:0;
-}
+    @include exampleBlock(#e1eef1, #424242, 0.5em);
+    text-align: left;
 
+    .example-title {
+        margin-top: 0;
+    }
 
-.example .Sourcecode, .example .pseudocode {
-      background: none;
+    pre,
+    .pseudocode {
+        background: none;
+    }
 }
 
 /*
 3.9 Tables
 */
 
-table {
-border-collapse: collapse;
-width: 100%;
-font-weight: 300;
-margin: 1em 0 2em 0;
-margin-left: auto;
-margin-right: auto;
-padding-right: 2em;
-text-align: center;
-}
-
-table, th, td {
-border: 1px solid black;
-font-size: 0.95em;
-}
-
-td, th {
-padding: 1em!important;
-}
+/*
+    3.9 Tables
+*/
 
-td.header {
-font-weight: 400;
+table {
+    @include table(1px solid black);
+    text-align: center;
+    td,
+    th {
+        font-size: 0.95em;
+        padding: 1em !important;
+    }
 }
 
 p.TableTitle {
-text-align: center;
-margin-top: 2.5em;
-font-weight: 800;
-font-size: 1.1em;
+    text-align: center;
+    margin-top: 2.5em;
+    font-weight: 800;
+    font-size: 1.1em;
 }
 
 .TableFootnote {
@@ -738,32 +610,32 @@ font-size: 1.1em;
 */
 
 a.footnote-number, a.TableFootnoteRef, span.TableFootnoteRef {
-vertical-align: super;
-font-size: 0.8em;
+    vertical-align: super;
+    font-size: 0.8em;
 }
 
 .footnote {
-font-size: 0.9em;
+    font-size: 0.9em;
 }
 
-sup a { 
-  vertical-align: super; 
-  font-size: 0.8em;
+sup a {
+    vertical-align: super;
+    font-size: 0.8em;
 }
 #footnote_box {
-  font-size: 14px;
-  background: white;
-  padding: 0 10px;
-  margin: 10px;
-  border: 1px solid #888;
-  -moz-box-shadow: 0px 0px 5px #888;
-  -webkit-box-shadow: 0px 0px 5px #888;
-  box-shadow: 0px 0px 5px #888;
+    font-size: 14px;
+    background: white;
+    padding: 0 10px;
+    margin: 10px;
+    border: 1px solid #888;
+    -moz-box-shadow: 0px 0px 5px #888;
+    -webkit-box-shadow: 0px 0px 5px #888;
+    box-shadow: 0px 0px 5px #888;
 }
 
 ol.footnotes-list, aside.footnote {
     margin-left: 1em;
-    
+
 }
 
 ol.footnotes-list li, aside.footnote {
@@ -791,28 +663,16 @@ ol > li > p:before {
 3.11 Blockquotes
 */
 
-.blockquote, .Quote {
-background-color: #f7f7f7;
-font-style: italic;
-width: 80%;
-padding: 1.5em;
-margin-top: 2em;
-margin-left: auto;
-margin-right: auto;
+.Quote {
+    @include blockquoteBlock(#f7f7f7);
 }
 
-
 /*
 3.12 Formulas
 */
 
 .formula {
-background-color: #f7f7f7;
-padding: 1.5em;
-margin-top: 2em;
-text-align: center;
-margin-left: 20%;
-margin-right: 20%;
+    @include formulaBlock(#f7f7f7)
 }
 
 /*
@@ -820,7 +680,7 @@ Keywords
 */
 
 span.keyword {
-font-weight: 600;
+    font-weight: 600;
 }
 
 .Admonition, .admonition {