metanorma-ieee 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6227353f56d9415296be8d468d8d8117149929514dc33caf73e154347c7fa839
-  data.tar.gz: 2b4bcfeeedde0039d75dab66d1124cb4336fa6270933b9adb8d1a794c64dfdca
+  metadata.gz: f8929322a9a987ee96a1c831dec2ff64ebb4933dfa76aec941054d887db637dc
+  data.tar.gz: b27dfd1da70c300b0721458d3973edd88175bff053c2479d9b48ea5d0785ab21
 SHA512:
-  metadata.gz: 53db1e0ae3f5afc98fadc61a427eff494e5ef58ffbc05680dce7f6070a356d72d7fe8e1fcfe68faa8a205a4b306035920ae4856d91bf50ac020804ec97952572
-  data.tar.gz: 94064f7e573b6d9be2e0a28ab6dbe34d727198fc573d7faf5aa09135baa07bf2a2d262b75f5f1d9eca8a4c4fb5d5cc7f816e61a397df9cb5ad852f821b0d9d71
+  metadata.gz: 7262aee1a6ac6b9f085b916c549d4b9497d8bb9d57cd5f547ab3458f17d166c791ced5eb08af0de9a1330f9af23b8ef00ce7aff1c10f5acb5b763bbb4328292d
+  data.tar.gz: 6d7f7a677c80f6de11699c83ef5545b8b9b64a055cf80cc468fcafca95bec19a7ad0834dc7c43271b470cd214914e3b54c67451520a6b54be8e3d0f77f89a6c6

data/lib/isodoc/ieee/html/htmlstyle.css

@@ -145,16 +145,6 @@ 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;
@@ -704,6 +694,124 @@ li p {
   display: none;
 }
 
+/* https://github.com/metanorma/metanorma-iso/issues/319 : force a) parentheses for ordered lists */
+ol[class=alphabet] {
+  counter-reset: alphabet;
+}
+
+ol[class=arabic] {
+  counter-reset: arabic;
+}
+
+ol[class=roman] {
+  counter-reset: roman;
+}
+
+ol[class=alphabet_upper] {
+  counter-reset: alphabet_upper;
+}
+
+ol[class=roman_upper] {
+  counter-reset: roman_upper;
+}
+
+ol[class=alphabet] ol[class=alphabet] {
+  counter-reset: alphabet2;
+}
+
+ol[class=arabic] ol[class=arabic] {
+  counter-reset: arabic2;
+}
+
+ol[class=roman] ol[class=roman] {
+  counter-reset: roman2;
+}
+
+ol[class=alphabet_upper] ol[class=alphabet_upper] {
+  counter-reset: alphabet_upper2;
+}
+
+ol[class=roman_upper] ol[class=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[class=roman] > li::before {
+  left: -2em;
+}
+
+ol[class=roman_upper] > li::before {
+  left: -2.3em;
+}
+
+ol[class=alphabet] > li::before {
+  counter-increment: alphabet;
+  content: counter(alphabet, lower-alpha) ") ";
+}
+
+ol[class=arabic] > li::before {
+  counter-increment: arabic;
+  content: counter(arabic, decimal) ") ";
+}
+
+ol[class=roman] > li::before {
+  counter-increment: roman;
+  content: counter(roman, lower-roman) ") ";
+}
+
+ol[class=alphabet_upper] > li::before {
+  counter-increment: alphabet_upper;
+  content: counter(alphabet_upper, upper-alpha) ") ";
+}
+
+ol[class=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[class=alphabet] ol[class=alphabet] > li::before {
+  counter-increment: alphabet2;
+  content: counter(alphabet2, lower-alpha) ") ";
+}
+
+ol[class=arabic] ol[class=arabic] > li::before {
+  counter-increment: arabic2;
+  content: counter(arabic2, decimal) ") ";
+}
+
+ol[class=roman] ol[class=roman] > li::before {
+  counter-increment: roman2;
+  content: counter(roman2, lower-roman) ") ";
+}
+
+ol[class=alphabet_upper] ol[class=alphabet_upper] > li::before {
+  counter-increment: alphabet_upper2;
+  content: counter(alphabet_upper2, upper-alpha) ") ";
+}
+
+ol[class=roman_upper] ol[class=roman_upper] > li::before {
+  counter-increment: roman_upper2;
+  content: counter(roman_upper2, upper-roman) ") ";
+}
+
 p.AltTerms {
   margin-bottom: 0;
   margin-left: 2em;
@@ -714,10 +822,6 @@ p.Terms {
 }
 
 /* Navigation*/
-#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
-  font-family: {{bodyfont}};
-  font-weight: 400;
-}
 #toc ul, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
   margin: 0;
   padding: 0;
@@ -765,6 +869,10 @@ p.Terms {
     color: black;
   }
 }
+#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  font-family: {{bodyfont}};
+  font-weight: 400;
+}
 @media screen and (max-width: 768px) {
   #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0 1.5em;
@@ -782,9 +890,6 @@ p.Terms {
   font-size: 100%;
 }
 
-nav {
-  line-height: 1.2em;
-}
 @media screen and (min-width: 768px) {
   nav {
     position: fixed;
@@ -809,11 +914,10 @@ nav {
     background-color: white;
   }
 }
-
-#toggle {
-  margin-left: -4em;
-  margin-top: -2em;
+nav {
+  line-height: 1.2em;
 }
+
 @media screen and (min-width: 768px) {
   #toggle {
     position: fixed;
@@ -842,6 +946,10 @@ nav {
     display: none;
   }
 }
+#toggle {
+  margin-left: -4em;
+  margin-top: -2em;
+}
 
 @media screen and (min-width: 768px) {
   .container {
@@ -872,17 +980,6 @@ nav {
     width: 100%;
   }
 }
-.figure,
-pre,
-.pseudocode {
-  background-color: #f7f7f7;
-  font-size: {{monospacefontsize}};
-  line-height: 1.6em;
-  padding: 1.5em;
-  margin: 2em 0 1em 0;
-  overflow: auto;
-  font-size: {{normalfontsize}};
-}
 .figure .SourceTitle,
 pre .SourceTitle,
 .pseudocode .SourceTitle {
@@ -890,13 +987,18 @@ pre .SourceTitle,
   font-size: 1em;
   text-align: center;
 }
-
-div.figure {
+.figure,
+pre,
+.pseudocode {
+  background-color: #f7f7f7;
+  font-size: {{monospacefontsize}};
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
   overflow: auto;
+  font-size: {{normalfontsize}};
 }
+
 div.figure .FigureTitle, div.figure .figure-title {
   font-weight: 700;
   font-size: 1em;
@@ -909,6 +1011,12 @@ div.figure > img, div.figure > svg {
   max-width: 100%;
   height: auto;
 }
+div.figure {
+  line-height: 1.6em;
+  padding: 1.5em;
+  margin: 2em 0 1em 0;
+  overflow: auto;
+}
 
 table div.figure {
   padding: 0;
@@ -1140,6 +1248,13 @@ p.NormRef {
 /*
 3.6 Source Code + figures
 */
+.figure .SourceTitle,
+pre .SourceTitle,
+.pseudocode .SourceTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+}
 .figure,
 pre,
 .pseudocode {
@@ -1151,13 +1266,6 @@ pre,
   overflow: auto;
   font-size: {{normalfontsize}};
 }
-.figure .SourceTitle,
-pre .SourceTitle,
-.pseudocode .SourceTitle {
-  font-weight: 700;
-  font-size: 1em;
-  text-align: center;
-}
 
 pre {
   font-family: {{monospacefont}};
@@ -1230,19 +1338,23 @@ pre {
   padding: 0.5em;
   margin: 2em 0 1em 0;
   text-align: left;
-  color: #424242;
-  padding-left: 2em;
-  color: black;
-  padding-left: 2em;
 }
 .example p {
   margin: 0;
 }
+.example {
+  color: #424242;
+  padding-left: 2em;
+}
 .example .example-title {
   font-weight: 700;
   text-transform: uppercase;
   margin-left: -1.5em;
 }
+.example {
+  color: black;
+  padding-left: 2em;
+}
 .example .example-title {
   margin-left: -1.5em;
   font-style: italic;
@@ -1262,7 +1374,6 @@ table {
   margin-left: auto;
   margin-right: auto;
   padding-right: 2em;
-  text-align: center;
 }
 table, table th, table td {
   border: 1px solid black;
@@ -1274,6 +1385,9 @@ table th, table td {
 table td.header {
   font-weight: 400;
 }
+table {
+  text-align: center;
+}
 
 td,
 th {

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

@@ -247,6 +247,102 @@ li p {
     display: none;
 }
 
+/* https://github.com/metanorma/metanorma-iso/issues/319 : force a) parentheses for ordered lists */
+
+ol[class="alphabet"] {
+  counter-reset: alphabet;
+}
+ol[class="arabic"] {
+  counter-reset: arabic;
+}
+ol[class="roman"] {
+  counter-reset: roman;
+}
+ol[class="alphabet_upper"] {
+  counter-reset: alphabet_upper;
+}
+ol[class="roman_upper"] {
+  counter-reset: roman_upper;
+}
+ol[class="alphabet"] ol[class="alphabet"] {
+  counter-reset: alphabet2;
+}
+ol[class="arabic"] ol[class="arabic"] {
+  counter-reset: arabic2;
+}
+ol[class="roman"] ol[class="roman"] {
+  counter-reset: roman2;
+}
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] {
+  counter-reset: alphabet_upper2;
+}
+ol[class="roman_upper"] ol[class="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[class="roman"] > li::before {
+  left: -2.0em;
+}
+ol[class="roman_upper"] > li::before {
+  left: -2.3em;
+}
+ol[class="alphabet"] > li::before {
+  counter-increment: alphabet;
+  content: counter(alphabet, lower-alpha)") "
+}
+ol[class="arabic"] > li::before {
+  counter-increment: arabic;
+  content: counter(arabic, decimal)") "
+}
+ol[class="roman"] > li::before {
+  counter-increment: roman;
+  content: counter(roman, lower-roman)") "
+}
+ol[class="alphabet_upper"] > li::before {
+  counter-increment: alphabet_upper;
+  content: counter(alphabet_upper, upper-alpha)") "
+}
+ol[class="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[class="alphabet"] ol[class="alphabet"] > li::before {
+  counter-increment: alphabet2;
+  content: counter(alphabet2, lower-alpha)") "
+}
+ol[class="arabic"] ol[class="arabic"] > li::before {
+  counter-increment: arabic2;
+  content: counter(arabic2, decimal)") "
+}
+ol[class="roman"] ol[class="roman"] > li::before {
+  counter-increment: roman2;
+ content: counter(roman2, lower-roman)") "
+}
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li::before {
+  counter-increment: alphabet_upper2;
+  content: counter(alphabet_upper2, upper-alpha)") "
+}
+ol[class="roman_upper"] ol[class="roman_upper"] > li::before {
+  counter-increment: roman_upper2;
+  content: counter(roman_upper2, upper-roman)") "
+}
+
+
 p.AltTerms {
     margin-bottom: 0;
     margin-left: 2em;

data/lib/isodoc/ieee/html_convert.rb

@@ -83,6 +83,11 @@ module IsoDoc
         else super
         end
       end
+      
+      def ol_attrs(node)
+        ret = super
+        ret.merge(class: OL_STYLE.invert[ret[:type]])
+      end
 
       include BaseConvert
       include Init

data/lib/isodoc/ieee/i18n-en.yaml

@@ -21,6 +21,7 @@ doctype_abbrev:
 term_def_boilerplate: |
   For the purposes of this document, the following terms and definitions apply. The _IEEE Standards Dictionary Online_ should be consulted for terms not defined in this clause.footnote:[_IEEE Standards Dictionary Online_ is available at: http://dictionary.ieee.org[]. An IEEE Account is required for access to the dictionary, and one can be created at no charge on the dictionary sign-in page.]
 norm_with_refs_pref: The following referenced documents are indispensable for the application of this document (i.e., they must be understood and used, so each referenced document is cited in text and its relationship to this document is explained). For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments or corrigenda) applies.
+norm_empty_pref: There are no normative references in this {{ doctype | downcase}}.
 biblio_pref: Bibliographical references are resources that provide additional or helpful material but do not need to be understood or used to implement this standard. Reference to these resources is made for informational use only. 
 note_inform_fn: Notes to text, tables, and figures are for information only and do not contain requirements needed to implement the standard.
 biblio_ref_inform_fn: The numbers in brackets correspond to those of the bibliography in Annex B.