metanorma-nist 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4718e306a8584f427aa244ce10552c267eca1310510e99981582dc7d028ba3d
-  data.tar.gz: 4c976e465bfbd218bd3b02577ce2a2ee64b031cec48a5168a717d91f04cc6698
+  metadata.gz: 72c7502d9dc8978bc2402c8fdd67a5cb1c8d1c2776c15d74468ea5310d4f6d62
+  data.tar.gz: b1ce3e575c5037b59efe26d4ad95081fa54faccb3314cb9e38f697a0636cf6df
 SHA512:
-  metadata.gz: ca687ca19884fd7aa3d63e174811448a8bc2380a60721bdb39d87c76d6a93951223bb27f70f4f54d422476f82255606fcc798cb0f3734a937472391a09e551f1
-  data.tar.gz: 5cd16e3ed0dd3bd4f9b6655f50e184c6499fd784599436b3d81a2e422e90d69505ece3bcdc1b9f08118588ff03d14e48e784686baa523048279ac8b0dd575c69
+  metadata.gz: 6cb6ee595c62afbf5b0e827d8f06b56bc8eb19f382c7f01f6937eca0eb73a88d666a9261545d28330290e3e57a7cd4d8d4d08bfa793b4deecedecf53999f9553
+  data.tar.gz: b340ff8aa99bdfd02185c86235624ab56cf18193be0265da03e5770d9d95e6df1be22c8bed76db2d90d3189f9297e4a264281d888838b29e8bffe9a59268aa29

data/lib/asciidoctor/nist/converter.rb

@@ -151,36 +151,12 @@ module Asciidoctor
         end
       end
 
-      def section(node)
-        a = section_attributes(node)
-        noko do |xml|
-          case sectiontype(node)
-            #when "normative references" then norm_ref_parse(a, xml, node)
-          when "terms and definitions"
-            if node.attr("style") == "appendix" && node.level == 1
-              @term_def = true
-              terms_annex_parse(a, xml, node)
-              @term_def = false
-            else
-              clause_parse(a, xml, node)
-            end
-          when "acknowledgements"
-            acknowledgements_parse(a, xml, node)
-          else
-            if @term_def 
-              term_def_subclause_parse(a, xml, node)
-            elsif @biblio then bibliography_parse(a, xml, node)
-            elsif node.attr("style") == "bibliography"
-              bibliography_parse(a, xml, node)
-            elsif node.attr("style") == "abstract"
-              abstract_parse(a, xml, node)
-            elsif node.attr("style") == "appendix" && node.level == 1
-              annex_parse(a, xml, node)
-            else
-              clause_parse(a, xml, node)
-            end
-          end
-        end.join("\n")
+      def term_def_parse(attrs, xml, node, toplevel)
+        if node.attr("style") == "appendix" && node.level == 1
+          terms_annex_parse(attrs, xml, node)
+        else
+          clause_parse(attrs, xml, node)
+        end
       end
 
       def bibliography_parse(a, xml, node)

data/lib/asciidoctor/nist/isodoc.rng

@@ -129,6 +129,9 @@
             </choice>
           </attribute>
         </optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
         <optional>
           <ref name="section-title"/>
         </optional>
@@ -303,11 +306,11 @@
         <ref name="paragraph"/>
       </element>
     </define>
-    <define name="TextElement" combine="choice">
-      <ref name="concept"/>
-    </define>
   </include>
   <!-- end overrides -->
+  <define name="TextElement" combine="choice">
+    <ref name="concept"/>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/isodoc/nist/metadata.rb

@@ -116,12 +116,6 @@ module IsoDoc
         Date.parse(isodate).strftime("%m-%d-%Y")
       end
 
-      def MMMddyyyy(isodate)
-        return nil if isodate.nil?
-        isodate += "-01" if /^\d\d\d\d-\d\d$/.match(isodate)
-        Date.parse(isodate).strftime("%B %d, %Y")
-      end
-
       def keywords(ixml, _out)
         keywords = []
         ixml.xpath(ns("//bibdata/keyword")).each { |kw| keywords << kw.text }

data/lib/isodoc/nist/nist.cswp.xsl

@@ -1391,19 +1391,21 @@
 				<xsl:attribute name="text-decoration">underline</xsl:attribute>
 			</xsl:if>
 			<!-- <xsl:text>[</xsl:text> --><xsl:value-of select="@citeas" disable-output-escaping="yes"/><!-- <xsl:text>]</xsl:text> -->
-			<xsl:if test="nist:locality">
-				<xsl:text>, </xsl:text>
-				<xsl:choose>
-					<xsl:when test="nist:locality/@type = 'section'">Section </xsl:when>
-					<xsl:when test="nist:locality/@type = 'clause'">Clause </xsl:when>
-					<xsl:otherwise/>
-				</xsl:choose>
-				<xsl:apply-templates select="nist:locality"/>
-			</xsl:if>
+			
+			<xsl:apply-templates select="nist:localityStack"/>
+			
 		</fo:basic-link>
 		<!-- </fo:inline> -->
 	</xsl:template>
 
+	<xsl:template match="nist:locality">
+		<xsl:choose>
+			<xsl:when test="@type = 'section'">Section </xsl:when>
+			<xsl:when test="@type = 'clause'">Clause </xsl:when>
+			<xsl:otherwise/>
+		</xsl:choose>
+		<xsl:text> </xsl:text><xsl:value-of select="nist:referenceFrom"/>
+	</xsl:template>	
 
 	<xsl:template match="nist:terms[nist:term[nist:preferred and nist:definition]]">
 		<fo:block id="{@id}">

data/lib/isodoc/nist/nist.sp.xsl

@@ -2092,7 +2092,7 @@
 		</xsl:variable>
 		<fo:list-item>
 			<fo:list-item-label end-indent="label-end()">
-				<fo:block>
+				<fo:block display-align="center">
 					<xsl:choose>
 						<!-- <xsl:when test="local-name(..) = 'ul'">&#x2014;</xsl:when>--> <!-- dash -->
 						<xsl:when test="local-name(..) = 'ul'">•</xsl:when>
@@ -2340,19 +2340,21 @@
 				<xsl:attribute name="text-decoration">underline</xsl:attribute>
 			</xsl:if>
 			<xsl:text>[</xsl:text><xsl:value-of select="@citeas" disable-output-escaping="yes"/><xsl:text>]</xsl:text>
-			<xsl:if test="nist:locality">
-				<xsl:text>, </xsl:text>
-				<xsl:choose>
-					<xsl:when test="nist:locality/@type = 'section'">Section </xsl:when>
-					<xsl:when test="nist:locality/@type = 'clause'">Clause </xsl:when>
-					<xsl:otherwise/>
-				</xsl:choose>
-				<xsl:apply-templates select="nist:locality"/>
-			</xsl:if>
+			
+			<xsl:apply-templates select="nist:localityStack"/>
+			
 		</fo:basic-link>
 		<!-- </fo:inline> -->
 	</xsl:template>
 
+	<xsl:template match="nist:locality">
+		<xsl:choose>
+			<xsl:when test="@type = 'section'">Section </xsl:when>
+			<xsl:when test="@type = 'clause'">Clause </xsl:when>
+			<xsl:otherwise/>
+		</xsl:choose>
+		<xsl:text> </xsl:text><xsl:value-of select="nist:referenceFrom"/>
+	</xsl:template>
 
 	<xsl:template match="nist:terms[nist:term[nist:preferred and nist:definition]]">
 		<fo:block id="{@id}">

data/lib/isodoc/nist/xrefs.rb

@@ -70,27 +70,6 @@ module IsoDoc
         "-"
       end
 
-      def annex_names(clause, num)
-        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num), type: "clause",
-                                   xref: "#{@annex_lbl} #{num}", level: 1 }
-        clause.xpath(ns("./clause")).each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", 2)
-        end
-        clause.xpath(ns("./terms | ./term | ./references")).each_with_index do |c, i|
-          suppress_biblio_title(c) ?
-            annex_names1(c, "#{num}", 1) : annex_names1(c, "#{num}.#{i + 1}", 2)
-        end
-        hierarchical_asset_names(clause, num)
-      end
-
-      def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = { label: num, xref: "#{@annex_lbl} #{num}",
-                                   level: level, type: "clause" }
-        clause.xpath(ns("./clause | ./terms | ./term | ./references")).each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", level + 1)
-        end
-      end
-
       def terms_parse(node, out)
         out.div **attr_code(id: node["id"]) do |div|
           node.at(ns("./title")) and

data/lib/metanorma/nist/processor.rb

@@ -3,6 +3,9 @@ require "metanorma/processor"
 module Metanorma
   module NIST
     class Processor < Metanorma::Processor
+      def self.fonts_used
+        ["Times New Roman", "Arial", "Courier New"]
+      end
 
       def initialize
         @short = :nist

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities