metanorma-nist 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6ae543de690dd020ac74e2280856256cd9829c4feaba03f5117ff06b94503e7
-  data.tar.gz: 8fff504c3e2f1e67cd8e53ab575232e7a6ee163a69dabeb029adf75e1f94f444
+  metadata.gz: a4818565d5633ec9cea585e074bc8f7c9449672331ed2833ed63a70b49f7dfac
+  data.tar.gz: 6c2c0527b902d4864dd7363aa2fcb3bc0b539d360a91623428fd75ac7ac4c535
 SHA512:
-  metadata.gz: db138f59cc24bf891c216268e4c2e606087cf6a1f8e121c5ebbfcf259ac21b131ad17120d11e1130517df9ca399fc6abd08c9debe6b985311d900827e532cd14
-  data.tar.gz: 996c32e285216e20b908b0a5cb3075598e5e5857f102a84d84267202beec064ba745226c9133c41047977f7bae2c6b14c29717f5779134d5a32b73208d07d28d
+  metadata.gz: 2028d967bc1bb08d9aa1c4458136b5b29946b80f9b27e8a35b14caefd5e6c147cba1fc3e3c1484c15bd81d61b538fe95879d8259a46f7eacc60e6db5c43fbe43
+  data.tar.gz: a7d0fb358ba5113880f438d00d786f0c89a4995b56bd1e7242a31ecf3b6a7592d90c9c6453204ff76012fafe4f04a7c0f85cead8071f59c8650e0c3499e5c461

data/README.adoc

@@ -1,11 +1,11 @@
 = metanorma-nist: Metanorma processor for the NIST SP 800 document classes
 
 image:https://img.shields.io/gem/v/metanorma-nist.svg["Gem Version", link="https://rubygems.org/gems/metanorma-nist"]
-image:https://img.shields.io/travis/metanorma/metanorma-nist/master.svg["Build Status", link="https://travis-ci.com/metanorma/metanorma-nist"]
-image:https://ci.appveyor.com/api/projects/status/c5e8e3qtn689a5h0?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/ribose/metanorma-nist"]
+image:https://travis-ci.com/metanorma/metanorma-nist.svg["Build Status", link="https://travis-ci.com/metanorma/metanorma-nist"]
+image:https://ci.appveyor.com/api/projects/status/vflfr333319tofbi?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/metanorma/metanorma-nist"]
 image:https://codeclimate.com/github/metanorma/metanorma-nist/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-nist"]
-
-WARNING: This gem is still under development.
+image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-nist.svg["Pull Requests", link="https://github.com/metanorma/metanorma-nist/pulls"]
+image:https://img.shields.io/github/commits-since/metanorma/metanorma-nist/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-nist/releases"]
 
 == Functionality
 
@@ -551,11 +551,12 @@ title "Glossary" or "Terminology" is treated as a Terms & Definitions section.
 
 === Pseudocode
 
-Pseudocode shall be marked up as an example, with role attribute `[.pseudocode]`:
+Pseudocode shall be marked up as an example, with style attribute `[pseudocode]`
+(implemented as a macro):
 
 [source,asciidoctor]
 ----
-[.pseudocode]
+[pseudocode]
 ====
 _Input: S=(s1,...,sL)_
 
@@ -567,7 +568,20 @@ _Output:_ Shuffled _S=(s1,...,sL)_
 ====
 ----
 
-They will be rendered as figures, and included in the count of figures of the document.
+Pseudocode will respect initial indentation in paragraph lines, with line breaks:
+
+[source,asciidoctor]
+----
+[pseudocode]
+====
+  *def* __increment__(x) +
+    x = x + 1 +
+  *enddef*
+====
+----
+
+They will be rendered as figures, but are not included in the count of figures of the document.
+(If they must be included, embed them within another figure.)
 
 === Recommendations, requirements, and permissions
 

data/lib/asciidoctor/nist/basicdoc.rng

@@ -341,11 +341,6 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="tclass">
-    <element name="name">
-      <text/>
-    </element>
-  </define>
   <define name="thead">
     <element name="thead">
       <ref name="tr"/>
@@ -515,19 +510,22 @@
         <attribute name="subsequence"/>
       </optional>
       <optional>
-        <ref name="source"/>
+        <attribute name="class"/>
       </optional>
       <optional>
-        <ref name="tname"/>
+        <ref name="source"/>
       </optional>
       <optional>
-        <ref name="tclass"/>
+        <ref name="tname"/>
       </optional>
       <choice>
         <ref name="image"/>
         <ref name="video"/>
         <ref name="audio"/>
         <ref name="pre"/>
+        <oneOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </oneOrMore>
         <zeroOrMore>
           <ref name="figure"/>
         </zeroOrMore>

data/lib/asciidoctor/nist/converter.rb

@@ -15,22 +15,6 @@ module Asciidoctor
 
       register_for "nist"
 
-      def example(node)
-        role = node.role || node.attr("style")
-        return pseudocode_example(node) if role == "pseudocode"
-        super
-      end
-
-      def pseudocode_example(node)
-        noko do |xml|
-          xml.figure **{id: Asciidoctor::Standoc::Utils::anchor_or_uuid(node), 
-                        type: "pseudocode"} do |ex|
-            figure_title(node, ex)
-            wrap_in_para(node, ex)
-          end
-        end.join("\n")
-      end
-
       def table(node)
         role = node.role || node.attr("style")
         return errata(node) if role == "errata"

data/lib/isodoc/nist/base_convert.rb

@@ -70,11 +70,6 @@ module IsoDoc
         docxml
       end
 
-      def figure_parse(node, out)
-        return pseudocode_parse(node, out) if node["type"] == "pseudocode"
-        super
-      end
-
       def dl_parse(node, out)
         return glossary_parse(node, out) if node["type"] == "glossary"
         super
@@ -290,18 +285,6 @@ module IsoDoc
         r.parent.add_child ::Iso690Render.render(bibitem, true)
       end
 
-      def pseudocode_parse(node, out)
-        @in_figure = true
-        name = node.at(ns("./name"))
-        out.div **attr_code(id: node["id"], class: "pseudocode") do |div|
-          node.children.each do |n|
-            parse(n, div) unless n.name == "name"
-          end
-          figure_name_parse(node, div, name)
-        end
-        @in_figure = false
-      end
-
       def foreword(isoxml, out)
         f = isoxml.at(ns("//foreword")) || return
         out.div **attr_code(id: f["id"]) do |s|

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

@@ -241,6 +241,10 @@ p.Biblio, p.NormRef {
   @include sourceBlock(#f6f6f6);
 }
 
+.pseudocode {
+  @include pseudocodeBlock(#f6f6f6);
+}
+
 .Note {
   background-color: #ffca3a;
   color: #141115;
@@ -286,7 +290,7 @@ p.blockQuote {
   margin: 2em 0 1em 0;
   padding-left: 2em;
 
-  .Sourcecode {
+  .Sourcecode, .pseudocode {
     background: none;
   }
 
@@ -313,7 +317,9 @@ p.blockQuote {
   }
 }
 
-
+.example .Sourcecode, .example .pseudocode {
+      background: none;
+}
 
 /* Tables */
 
@@ -385,7 +391,7 @@ span.keyword {
     margin-top: 1.2em;
   }
 
-  .note, .figure, .Sourcecode, table {
+  .note, .figure, .Sourcecode, .pseudocode, table {
     page-break-inside: avoid;
   }
 

data/lib/isodoc/nist/html/nist.scss

@@ -162,6 +162,22 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode, pre
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Courier New";
 	mso-ansi-language:EN-GB;}
+p.pseudocode, li.pseudocode, div.pseudocode
+        {mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-parent:"";
+        margin-top:6.0pt;
+        margin-right:0cm;
+        margin-bottom:6.0pt;
+        margin-left:0cm;
+        text-align:left;
+        mso-pagination:widow-orphan;
+        tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
+        font-size:10.0pt;
+        font-family:$bodyfont;
+        mso-fareast-font-family:Calibri;
+        mso-bidi-font-family:"Courier New";
+        mso-ansi-language:EN-GB;}
 p.Biblio, li.Biblio, div.Biblio, p.NormRef, li.NormRef, div.NormRef
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -887,6 +903,10 @@ div.example p.MsoListParagraph {
   font-size: 10.0pt;
 }
 
+div.Note p.MsoListParagraph {
+  font-size: 10.0pt;
+}
+
 span.note_label, span.example_label, td.example_label, td.note_label
 {
 font-size: 10.0pt;

data/lib/isodoc/nist/html/nist_cswp.scss

@@ -128,6 +128,22 @@ p.CoverSubtitle, li.CoverSubtitle, div.CoverSubtitle
 	mso-bidi-font-weight:normal;}
 
 p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode, pre
+        {mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-parent:"";
+        margin-top:0cm;
+        margin-right:0cm;
+        margin-bottom:12.0pt;
+        margin-left:0cm;
+        text-align:left;
+        mso-pagination:widow-orphan;
+        tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
+        font-size:10.0pt;
+        font-family:$monospacefont;
+        mso-fareast-font-family:Calibri;
+        mso-bidi-font-family:"Courier New";
+        mso-ansi-language:EN-GB;}
+p.pseudocode, li.pseudocode, div.pseudocode
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"";
@@ -139,7 +155,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode, pre
 	mso-pagination:widow-orphan;
 	tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
 	font-size:10.0pt;
-	font-family:$monospacefont;
+	font-family:$bodyfont;
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Courier New";
 	mso-ansi-language:EN-GB;}
@@ -854,6 +870,10 @@ div.example p.MsoListParagraph {
   font-size: 10.0pt;
 }
 
+div.Note p.MsoListParagraph {
+  font-size: 10.0pt;
+}
+
 span.note_label, span.example_label, td.example_label, td.note_label
 {
 font-size: 10.0pt;

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "0.2.6"
+    VERSION = "0.2.7"
   end
 end

data/metanorma-nist.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "twitter_cldr"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-27 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: asciidoctor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.7
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement