metanorma-nist 1.2.1 → 1.2.2

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

@@ -1656,6 +1656,9 @@
 						<xsl:when test="local-name(..) = 'ul'">•</xsl:when>
 						<xsl:otherwise> <!-- for ordered lists -->
 							<xsl:choose>
+								<xsl:when test="../@class = 'steps'">
+									<xsl:number format="1."/>
+								</xsl:when>
 								<xsl:when test="../@type = 'arabic'">
 									<xsl:number format="a)"/>
 								</xsl:when>
@@ -1843,27 +1846,26 @@
 	</xsl:template>
 	
 	<xsl:template match="nist:references">
-		<fo:block break-after="page"/>
 		<fo:block id="{@id}">			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="nist:dl[@type = 'glossary']" priority="2">
-		<xsl:apply-templates/>
+	<!-- <xsl:template match="nist:dl[@type = 'glossary']" priority="2">
+		<xsl:apply-templates />
 	</xsl:template>
 	
-	<xsl:template match="nist:dt[../@type = 'glossary']" priority="2">
+	<xsl:template match="nist:dt[../@type = 'glossary']"  priority="2">
 		<fo:block margin-bottom="12pt">
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 		</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="nist:dd[../@type = 'glossary']" priority="2">
+	<xsl:template match="nist:dd[../@type = 'glossary']"  priority="2">
 		<fo:block margin-bottom="12pt" margin-left="12.7mm">
-			<xsl:apply-templates/>
+			<xsl:apply-templates />
 		</fo:block>
-	</xsl:template>
+	</xsl:template> -->
 	
 	<xsl:template name="insertHeaderFooter">
 		<xsl:call-template name="insertHeader"/>
@@ -3439,16 +3441,18 @@
 			<fo:table-cell>
 				<fo:block>
 					
-					
+					<!-- <xsl:if test="$namespace = 'nist-cswp'  or $namespace = 'nist-sp'">
 						<xsl:if test="local-name(*[1]) != 'stem'">
 							<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
 						</xsl:if>
+					</xsl:if> -->
 					
+						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
 					
 				</fo:block>
 			</fo:table-cell>
 		</fo:table-row>
-		
+		<!-- <xsl:if test="$namespace = 'nist-cswp'  or $namespace = 'nist-sp'">
 			<xsl:if test="local-name(*[1]) = 'stem'">
 				<fo:table-row>
 				<fo:table-cell>
@@ -3456,7 +3460,7 @@
 						<xsl:if test="normalize-space($key_iso) = 'true'">
 							<xsl:attribute name="margin-top">0</xsl:attribute>
 						</xsl:if>
-						<xsl:text> </xsl:text>
+						<xsl:text>&#xA0;</xsl:text>
 					</fo:block>
 				</fo:table-cell>
 				<fo:table-cell>
@@ -3466,7 +3470,7 @@
 				</fo:table-cell>
 			</fo:table-row>
 			</xsl:if>
-		
+		</xsl:if> -->
 	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
@@ -4224,22 +4228,30 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
 		<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
+			<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
+				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			</xsl:if>
 			<fo:block-container margin-left="0mm" margin-right="0mm">
-				<fo:table id="{@id}" table-layout="fixed" width="100%" border="0pt solid black">					
+				<fo:table id="{@id}" table-layout="fixed" width="100%" border="1pt solid black">
+					<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
+						<xsl:attribute name="border">0.5pt solid black</xsl:attribute>
+					</xsl:if>
 					<xsl:variable name="simple-table">	
 						<xsl:call-template name="getSimpleTable"/>			
 					</xsl:variable>					
 					<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
 					<xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])">
-						<fo:table-column column-width="35mm"/>
-						<fo:table-column column-width="115mm"/>
+						<!-- <fo:table-column column-width="35mm"/>
+						<fo:table-column column-width="115mm"/> -->
+						<fo:table-column column-width="25%"/>
+						<fo:table-column column-width="75%"/>
 					</xsl:if>
 					<xsl:apply-templates mode="requirement"/>
 				</fo:table>
 				<!-- fn processing -->
 				<xsl:if test=".//*[local-name() = 'fn']">
 					<xsl:for-each select="*[local-name() = 'tbody']">
-						<fo:block font-size="90%" border-bottom="1.pt solid black">
+						<fo:block font-size="90%" border-bottom="1pt solid black">
 							<xsl:call-template name="fn_display"/>
 						</fo:block>
 					</xsl:for-each>
@@ -4255,17 +4267,20 @@
 			<xsl:apply-templates mode="requirement"/>
 		</fo:table-body>
 	</xsl:template><xsl:template match="*[local-name()='tr']" mode="requirement">
-		<fo:table-row>			
+		<fo:table-row height="7mm">
+			<xsl:if test="parent::*[local-name()='thead'] and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission'])">
+				<xsl:attribute name="border">1pt solid black</xsl:attribute>
+			</xsl:if>
 			<xsl:apply-templates mode="requirement"/>
 		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
-		<fo:table-cell text-align="{@align}">
+		<fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm" border="0.5pt solid black">
 			<xsl:attribute name="text-align">
 				<xsl:choose>
 					<xsl:when test="@align">
 						<xsl:value-of select="@align"/>
 					</xsl:when>
-					<xsl:otherwise>center</xsl:otherwise>
+					<xsl:otherwise>left</xsl:otherwise>
 				</xsl:choose>
 			</xsl:attribute>
 			<xsl:if test="@colspan">
@@ -4279,21 +4294,25 @@
 				</xsl:attribute>
 			</xsl:if>
 			
-			<xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
+			<!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
 				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
 				<xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute>				
 			</xsl:if>
 			<xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'">
 				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
 				<xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>				
-			</xsl:if>
+			</xsl:if> -->
 			
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
 	</xsl:template><xsl:template match="*[local-name()='td']" mode="requirement">
-		<fo:table-cell text-align="{@align}">
+		<fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm" border="0.5pt solid black">
+			<xsl:if test="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
+				<xsl:attribute name="padding">0mm</xsl:attribute>
+				<xsl:attribute name="padding-left">0mm</xsl:attribute>
+			</xsl:if>
 			<xsl:attribute name="text-align">
 				<xsl:choose>
 					<xsl:when test="@align">
@@ -4313,24 +4332,25 @@
 				</xsl:attribute>
 			</xsl:if>
 			
-			<xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
+			<!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
 				<xsl:attribute name="padding-left">0.5mm</xsl:attribute>
-				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
-				<xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])"> <!-- 2nd line and below -->
+				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>				 
+				<xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])">
 					<xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>					
 				</xsl:if>
-			</xsl:if>
+			</xsl:if> -->
+			<!-- 2nd line and below -->
 			
 			<fo:block>			
 				<xsl:apply-templates/>
 			</fo:block>			
 		</fo:table-cell>
 	</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
-		<fo:block font-size="11pt" font-weight="bold" text-align="center" margin-bottom="4pt">
+		<fo:block font-size="11pt" font-weight="bold"> <!-- margin-bottom="4pt" text-align="center"  -->
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'p'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
-		<fo:block margin-bottom="10pt">
+	</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
+		<fo:block> <!-- margin-bottom="10pt" -->
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'termexample']">
@@ -4614,6 +4634,8 @@
 		</fo:block>
 	</xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
 		
+			<fo:block break-after="page"/>
+		
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
@@ -4661,6 +4683,44 @@
 		<fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
 			<fo:block><xsl:apply-templates/></fo:block>
 		</fo:table-cell>
+	</xsl:template><xsl:template name="processBibitem">
+		
+	</xsl:template><xsl:template name="processPersonalAuthor">
+		<xsl:choose>
+			<xsl:when test="*[local-name() = 'name']/*[local-name() = 'completename']">
+				<author>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'completename']"/>
+				</author>
+			</xsl:when>
+			<xsl:when test="*[local-name() = 'name']/*[local-name() = 'surname'] and *[local-name() = 'name']/*[local-name() = 'initial']">
+				<author>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'surname']"/>
+					<xsl:text> </xsl:text>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'initial']" mode="strip"/>
+				</author>
+			</xsl:when>
+			<xsl:when test="*[local-name() = 'name']/*[local-name() = 'surname'] and *[local-name() = 'name']/*[local-name() = 'forename']">
+				<author>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'surname']"/>
+					<xsl:text> </xsl:text>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'forename']" mode="strip"/>
+				</author>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="renderDate">		
+			<xsl:if test="normalize-space(*[local-name() = 'on']) != ''">
+				<xsl:value-of select="*[local-name() = 'on']"/>
+			</xsl:if>
+			<xsl:if test="normalize-space(*[local-name() = 'from']) != ''">
+				<xsl:value-of select="concat(*[local-name() = 'from'], '–', *[local-name() = 'to'])"/>
+			</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'initial']/text()" mode="strip">
+		<xsl:value-of select="translate(.,'. ','')"/>
+	</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'forename']/text()" mode="strip">
+		<xsl:value-of select="substring(.,1,1)"/>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>

data/lib/isodoc/nist/section.rb

@@ -1,6 +1,18 @@
 module IsoDoc
   module NIST
     module BaseConvert
+      def keywords(docxml, out)
+        f = docxml.at(ns("//preface/clause[@type = 'keyword']")) || return
+        preface1(f, f&.at(ns("./title")), false, out)
+      end
+
+      def skip_render(c, isoxml)
+        return false unless c.name == "reviewernote"
+        status = isoxml&.at(ns("//bibdata/status/stage"))&.text
+        return true if status.nil?
+        /^final/.match status
+      end
+
       def abstract(isoxml, out)
         f = isoxml.at(ns("//preface/abstract")) || return
         out.div **attr_code(id: f["id"]) do |s|
@@ -11,13 +23,13 @@ module IsoDoc
       end
 
       FRONT_CLAUSE = "//*[parent::preface][not(local-name() = 'abstract' or "\
-        "local-name() = 'foreword') or @type = 'keyword']".freeze
+        "local-name() = 'foreword' or @type = 'keyword')]".freeze
 
       # All "[preface]" sections should have class "IntroTitle" to prevent
       # page breaks, but for the Exec Summary
       def preface(isoxml, out)
         isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
-          next if skip_render(c, isoxml)
+          next if skip_render(c, isoxml) || !is_clause?(c.name)
           title = c&.at(ns("./title"))
           patent = ["Call for Patent Claims",
                     "Patent Disclosure Notice"].include? title&.text
@@ -37,12 +49,6 @@ module IsoDoc
         end
       end
 
-      def middle(isoxml, out)
-        clause isoxml, out
-        bibliography isoxml, out
-        annex isoxml, out
-      end
-
       def foreword(isoxml, out)
         f = isoxml.at(ns("//foreword")) || return
         out.div **attr_code(id: f["id"]) do |s|
@@ -53,6 +59,11 @@ module IsoDoc
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
+
+      def is_clause?(name)
+        return true if %w(reviewernote executivesummary).include? name
+        super
+      end
     end
   end
 end

data/lib/isodoc/nist/word_convert.rb

@@ -14,6 +14,10 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
+        @wordToClevels = options[:doctoclevels].to_i
+        @wordToClevels = 3 if @wordToClevels.zero?
+        @htmlToClevels = options[:htmltoclevels].to_i
+        @htmlToClevels = 3 if @htmlToClevels.zero?
       end
 
       def convert1(docxml, filename, dir)
@@ -62,8 +66,10 @@ module IsoDoc
         body.div **{ class: "WordSection2" } do |div2|
           @prefacenum = 0
           info docxml, div2
+          preface_block docxml, div2
           foreword docxml, div2
           abstract docxml, div2
+          keywords docxml, div2
           boilerplate docxml, div2
           preface docxml, div2
           div2.p { |p| p << "&nbsp;" } # placeholder
@@ -71,6 +77,24 @@ module IsoDoc
         section_break(body)
       end
 
+      def toWord(result, filename, dir, header)
+        result = populate_template(result, :word)
+        result = from_xhtml(word_cleanup(to_xhtml(result)))
+        unless @landscapestyle.nil? || @landscapestyle.empty?
+          @wordstylesheet&.open
+          @wordstylesheet&.write(@landscapestyle)
+          @wordstylesheet&.close
+        end
+        Html2Doc.process(result, filename: filename,
+                         stylesheet: @wordstylesheet&.path,
+                         header_file: header&.path, dir: dir,
+                         asciimathdelims: [@openmathdelim, @closemathdelim],
+                         liststyles: { ul: @ulstyle, ol: @olstyle,
+                                       steps: "l4" })
+        header&.unlink
+        @wordstylesheet&.unlink
+      end
+
       def authority_cleanup(docxml)
         docxml&.xpath("//div[@class = 'authority']//h1 | "\
                       "//div[@class = 'authority']//h2")&.each do |h|
@@ -125,6 +149,7 @@ module IsoDoc
       end
 
       def word_annex_cleanup(docxml)
+        word_annex_cleanup1(docxml, 1)
         word_annex_cleanup1(docxml, 2)
         word_annex_cleanup1(docxml, 3)
         word_annex_cleanup1(docxml, 4)
@@ -165,6 +190,22 @@ module IsoDoc
         end
       end
 
+      def glossary_parse(node, out)
+        out.table  **attr_code(id: node["id"], class: "terms_dl") do |t|
+          node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
+            t.tr do |v|
+              v.td **attr_code(id: dt["id"], valign: "top", align: "left") do |term|
+                dt_parse(dt, term)
+              end
+              v.td  **attr_code(id: dd["id"], valign: "top") do |listitem|
+                dd.children.each { |n| parse(n, listitem) }
+              end
+            end
+          end
+        end
+        node.elements.reject { |n| dt_dd? n }.each { |n| parse(n, out) }
+      end
+
       include BaseConvert
       include Init
     end

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
   end
 end

metadata

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