metanorma-nist 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb6a46ab09b565bb49b1d6071a774b367e453438176f5bffb29a094df0535256
-  data.tar.gz: 65711ba670c7b3874dc25e9aae6d9bae9617611a066d096dcdc5d91260cd435f
+  metadata.gz: 76b612ddae877500cbbc398c12a44867549fa1c987772eb781fc7aa33ac63e2b
+  data.tar.gz: d6def5426449912f9890f09834da5ed430c1fc04958b8c2850d59c5730b7cae7
 SHA512:
-  metadata.gz: cebd778e6f74ca1f1a07cef424c467b509b6ef9ff206e2f9c0125e99ec4990d350c5327ed9f21b74edcd8702455801f7e9a5467968514fff4ff7e404341c5088
-  data.tar.gz: 8b3a2f422fe2e0dbe75ac806d8095cd99d38c72ac8e95d852e0e188f2cdfa500b8218eb45cf5046ee2eb8cf1bcd02ac427829350d862afe5a1d615e4c057c8cb
+  metadata.gz: 5ce949e7353a14d240b75037b5a68736490a3fd2efe227af16d34ec0b7b1ecb82c689117bc743cc99f33f68a22824d40ed8126516d929de75e14767de2e78bd4
+  data.tar.gz: e077d67bfb18798c77dbd0573e0988771b0a6d273149950c7ba5f11a12f50c17a728c5d978eaee82f716696fcdbe9fd50b29015485f918913cda27059ec71fd9

data/.github/workflows/rake.yml

@@ -36,7 +36,7 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
 
-      - uses: actions/cache@v1
+      - uses: actions/cache@v2
         with:
           path: vendor/bundle
           key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
@@ -48,15 +48,14 @@ jobs:
 
       - run: bundle exec rake
 
-  notify:
-    name: Trigger notify workflow
+  tests-passed:
     needs: rake
     runs-on: ubuntu-latest
     steps:
-      - name: Trigger notify workflow
+      - name: Trigger tests passed event
         uses: Sibz/github-status-action@v1
         with:
-          authToken: ${{ secrets.GITHUB_TOKEN }}
+          authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
           context: 'tests-passed-successfully'
           description: 'Tests passed successfully'
           state: 'success'

data/lib/asciidoctor/nist/cleanup.rb

@@ -44,6 +44,7 @@ module Asciidoctor
       end
 
       def move_clauses_into_preface1(x, preface)
+        x.xpath("//acknowledgements[@preface]").each { |c| c.delete("preface") }
         x.xpath("//clause[@preface]").each do |c|
           c.delete("preface")
           title = c&.at("./title")&.text.downcase

data/lib/asciidoctor/nist/converter.rb

@@ -151,6 +151,8 @@ module Asciidoctor
           "terms and definitions"
         when "introduction"
           "donotrecognise_introduction"
+        when "normative references"
+          "bibliography"
         else
           super
         end

data/lib/asciidoctor/nist/nist.rng

@@ -43,6 +43,7 @@
           <choice>
             <ref name="clause"/>
             <ref name="errata_clause"/>
+            <ref name="acknowledgements"/>
           </choice>
         </zeroOrMore>
         <optional>

data/lib/isodoc/nist/fonts_manifest.yaml

@@ -0,0 +1,4 @@
+---
+Times New Roman:
+Arial:
+Courier New:

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

@@ -180,223 +180,6 @@ a.FootnoteRef + a.FootnoteRef:before {
 #withdrawn {
   border-bottom: solid 3px #7e0d13; }
 
-dl {
-  grid-template-columns: 25% 75%; }
-  dl.glossary dt {
-    font-weight: bold; }
-
-body {
-  margin-left: auto;
-  margin-right: auto;
-  max-width: 100%;
-  font-size: 14px;
-  font-weight: 400;
-  line-height: 1.6em;
-  color: #141115;
-  background-color: #fff; }
-  body main {
-    margin: 0 3em 0 6em; }
-
-.rule {
-  width: 100%;
-  height: 1px;
-  background-color: #2677ea;
-  margin: 2em 0; }
-
-.rule-2 {
-  width: 100%;
-  height: 1px;
-  background-color: #2677ea; }
-
-.rule-thick {
-  width: 100%;
-  height: 3px;
-  background-color: #2677ea;
-  margin: 3em 0 0 0; }
-
-#toc {
-  font-family: 'Source Sans Pro', sans-serif; }
-  #toc ul {
-    margin: 0;
-    padding: 0;
-    list-style: none; }
-    #toc ul li a {
-      padding: 5px 10px; }
-    #toc ul a {
-      color: #141115;
-      text-decoration: none;
-      display: block; }
-      #toc ul a:hover {
-        box-shadow: none;
-        color: white; }
-  #toc .h2 {
-    padding-left: 30px; }
-  #toc .h3 {
-    padding-left: 50px; }
-  #toc .toc-active, #toc li:hover {
-    background: #006494;
-    box-shadow: inset -5px 0px 10px -5px #006494 !important; }
-    #toc .toc-active a, #toc li:hover a {
-      color: white; }
-  @media print {
-    #toc .toc-active, #toc li:hover {
-      background: white;
-      box-shadow: none !important; }
-    #toc .toc-active a {
-      color: #141115; }
-    #toc li:hover a {
-      color: black; } }
-  #toc li a {
-    font-size: 14px; }
-  #toc li:before {
-    content: " ";
-    display: none; }
-
-@media screen and (min-width: 768px) {
-  nav {
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    width: 323px;
-    font-size: 0.9em;
-    overflow: auto;
-    padding: 0 0 0 45px;
-    background-color: white; } }
-
-@media print {
-  nav {
-    position: relative;
-    width: auto;
-    font-size: 0.9em;
-    overflow: auto;
-    padding: 0;
-    margin-right: 0;
-    background-color: white; } }
-
-nav #toc {
-  font-family: {{bodyfont}};
-  font-weight: 400; }
-  @media screen and (max-width: 768px) {
-    nav #toc {
-      padding: 0 1.5em;
-      overflow: visible; } }
-@media screen and (min-width: 768px) {
-  #toggle {
-    position: fixed;
-    height: 100%;
-    width: 30px;
-    background-color: #006494;
-    color: white !important;
-    cursor: pointer;
-    z-index: 100; }
-    #toggle span {
-      text-align: center;
-      width: 100%;
-      position: absolute;
-      top: 50%;
-      transform: translate(0, -50%); } }
-
-@media screen and (max-width: 768px) {
-  #toggle {
-    display: none; } }
-
-@media print {
-  #toggle {
-    display: none; } }
-
-@media screen and (min-width: 768px) {
-  .container {
-    padding-left: 360px; } }
-
-@media print {
-  .container {
-    padding-left: 0; } }
-
-@media screen and (min-width: 768px) {
-  .rule.toc {
-    display: none; } }
-
-span.nistvariable {
-  font-family: {{bodyfont}};
-  font-style: italic; }
-
-/* Document bands */
-.document-stage-band {
-  left: 0;
-  top: 0;
-  height: 100%;
-  position: fixed;
-  display: block;
-  z-index: 101;
-  box-shadow: -5px 0px 10px #1d1d1d; }
-  .document-stage-band > :first-child {
-    position: relative;
-    width: 25px;
-    font-family: 'Source Sans Pro', sans-serif;
-    font-weight: 300;
-    height: 160px;
-    color: #7ba812;
-    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; }
-  @media print {
-    .document-stage-band {
-      display: none; } }
-.document-type-band {
-  left: 0;
-  top: 180px;
-  height: 100%;
-  position: fixed;
-  display: block;
-  z-index: 102; }
-  .document-type-band > :first-child {
-    position: relative;
-    width: 25px;
-    font-family: 'Source Sans Pro', sans-serif;
-    font-weight: 400;
-    color: #7ba812;
-    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; }
-  @media print {
-    .document-type-band {
-      display: none; } }
-  .document-type-band .document-type {
-    top: 20px; }
-
-#governance-band p.document-type {
-  height: 230px !important; }
-
-#standard-band p {
-  height: 270px !important; }
-
-#proposal-band p {
-  height: 150px !important; }
-
-#standard, #final {
-  color: #9ABD48; }
-
 .coverpage-maturity, .coverpage-stage {
   font-family: 'Source Sans Pro', sans-serif;
   font-weight: 400;
@@ -641,6 +424,223 @@ table.coverpage-table {
   .coverpage {
     height: 23cm; } }
 
+dl {
+  grid-template-columns: 25% 75%; }
+  dl.glossary dt {
+    font-weight: bold; }
+
+body {
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 100%;
+  font-size: {{normalfontsize}};
+  font-weight: 400;
+  line-height: 1.6em;
+  color: #141115;
+  background-color: #fff; }
+  body main {
+    margin: 0 3em 0 6em; }
+
+.rule {
+  width: 100%;
+  height: 1px;
+  background-color: #2677ea;
+  margin: 2em 0; }
+
+.rule-2 {
+  width: 100%;
+  height: 1px;
+  background-color: #2677ea; }
+
+.rule-thick {
+  width: 100%;
+  height: 3px;
+  background-color: #2677ea;
+  margin: 3em 0 0 0; }
+
+#toc {
+  font-family: 'Source Sans Pro', sans-serif; }
+  #toc ul {
+    margin: 0;
+    padding: 0;
+    list-style: none; }
+    #toc ul li a {
+      padding: 5px 10px; }
+    #toc ul a {
+      color: #141115;
+      text-decoration: none;
+      display: block; }
+      #toc ul a:hover {
+        box-shadow: none;
+        color: white; }
+  #toc .h2 {
+    padding-left: 30px; }
+  #toc .h3 {
+    padding-left: 50px; }
+  #toc .toc-active, #toc li:hover {
+    background: #006494;
+    box-shadow: inset -5px 0px 10px -5px #006494 !important; }
+    #toc .toc-active a, #toc li:hover a {
+      color: white; }
+  @media print {
+    #toc .toc-active, #toc li:hover {
+      background: white;
+      box-shadow: none !important; }
+    #toc .toc-active a {
+      color: #141115; }
+    #toc li:hover a {
+      color: black; } }
+  #toc li a {
+    font-size: {{normalfontsize}}; }
+  #toc li:before {
+    content: " ";
+    display: none; }
+
+@media screen and (min-width: 768px) {
+  nav {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    width: 323px;
+    font-size: 0.9em;
+    overflow: auto;
+    padding: 0 0 0 45px;
+    background-color: white; } }
+
+@media print {
+  nav {
+    position: relative;
+    width: auto;
+    font-size: 0.9em;
+    overflow: auto;
+    padding: 0;
+    margin-right: 0;
+    background-color: white; } }
+
+nav #toc {
+  font-family: {{bodyfont}};
+  font-weight: 400; }
+  @media screen and (max-width: 768px) {
+    nav #toc {
+      padding: 0 1.5em;
+      overflow: visible; } }
+@media screen and (min-width: 768px) {
+  #toggle {
+    position: fixed;
+    height: 100%;
+    width: 30px;
+    background-color: #006494;
+    color: white !important;
+    cursor: pointer;
+    z-index: 100; }
+    #toggle span {
+      text-align: center;
+      width: 100%;
+      position: absolute;
+      top: 50%;
+      transform: translate(0, -50%); } }
+
+@media screen and (max-width: 768px) {
+  #toggle {
+    display: none; } }
+
+@media print {
+  #toggle {
+    display: none; } }
+
+@media screen and (min-width: 768px) {
+  .container {
+    padding-left: 360px; } }
+
+@media print {
+  .container {
+    padding-left: 0; } }
+
+@media screen and (min-width: 768px) {
+  .rule.toc {
+    display: none; } }
+
+span.nistvariable {
+  font-family: {{bodyfont}};
+  font-style: italic; }
+
+/* Document bands */
+.document-stage-band {
+  left: 0;
+  top: 0;
+  height: 100%;
+  position: fixed;
+  display: block;
+  z-index: 101;
+  box-shadow: -5px 0px 10px #1d1d1d; }
+  .document-stage-band > :first-child {
+    position: relative;
+    width: 25px;
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: 300;
+    height: 160px;
+    color: #7ba812;
+    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; }
+  @media print {
+    .document-stage-band {
+      display: none; } }
+.document-type-band {
+  left: 0;
+  top: 180px;
+  height: 100%;
+  position: fixed;
+  display: block;
+  z-index: 102; }
+  .document-type-band > :first-child {
+    position: relative;
+    width: 25px;
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: 400;
+    color: #7ba812;
+    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; }
+  @media print {
+    .document-type-band {
+      display: none; } }
+  .document-type-band .document-type {
+    top: 20px; }
+
+#governance-band p.document-type {
+  height: 230px !important; }
+
+#standard-band p {
+  height: 270px !important; }
+
+#proposal-band p {
+  height: 150px !important; }
+
+#standard, #final {
+  color: #9ABD48; }
+
 .recommend {
   background-color: #ccffcc;
   padding: 1.2em;
@@ -739,7 +739,7 @@ p.Biblio, p.NormRef {
   overflow: auto;
   font-family: {{monospacefont}};
   font-variant-ligatures: none;
-  font-size: 0.8em;
+  font-size: {{monospacefontsize}};
   background-color: #f6f6f6; }
   .figure .FigureTitle, .figure .figure-title {
     font-weight: 700;
@@ -761,7 +761,7 @@ pre {
   font-family: {{monospacefont}};
   font-variant-ligatures: none;
   background-color: #f6f6f6;
-  font-size: 0.8em;
+  font-size: {{monospacefontsize}};
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
@@ -770,7 +770,7 @@ pre {
 
 .pseudocode {
   background-color: #f6f6f6;
-  font-size: 0.8em;
+  font-size: {{monospacefontsize}};
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
@@ -879,7 +879,7 @@ a.footnote-number {
   font-size: 0.8em; }
 
 .footnote {
-  font-size: 0.9em; }
+  font-size: {{footnotefontsize}}; }
 
 /* Keywords */
 span.keyword {