metanorma-nist 1.2.1 → 1.2.2

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

@@ -174,7 +174,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
 	margin:0cm;
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-	tab-stops:right 482.0pt;
+	tab-stops:center 3.25in;
 	font-size:12pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
@@ -185,7 +185,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
         margin:0cm;
         margin-bottom:.0001pt;
         mso-pagination:widow-orphan;
-        tab-stops:right 9.0in;
+        tab-stops:center 4.5in;
         font-size:12pt;
         font-family:$bodyfont;
         mso-fareast-font-family:"Times New Roman";
@@ -425,7 +425,6 @@ h1.Annex {
         mso-style-parent:"Heading 1";
         mso-style-link:"Heading 2 Char";
         mso-style-next:Normal;
-	text-align:center;
         margin-top:3.0pt;
         margin-right:0cm;
         margin-bottom:12.0pt;
@@ -445,6 +444,12 @@ h1.Annex {
         mso-ansi-language:EN-GB;
         mso-fareast-language:JA;
         mso-bidi-font-weight:normal;}
+.h2Annex {
+	text-align:left;
+}
+.h2Preface {
+	text-align:center;
+}
 h2
 	{mso-style-priority:2;
 	mso-style-unhide:no;
@@ -1288,6 +1293,72 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	mso-level-number-position:left;
 	margin-left:162.0pt;
 	text-indent:-18.0pt;}
+/* steps ordered list */
+@list l4
+        {mso-list-id:525294608;
+        mso-list-template-ids:676331812}
+@list l4:level1
+        {mso-level-text:"%1\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:1.4cm;
+        text-indent:-1.4cm;}
+@list l4:level2
+        {mso-level-text:"%2\)";
+        mso-level-number-format:alpha-lower;
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:2.1cm;
+        text-indent:-0.7cm;}
+@list l4:level3
+        {mso-level-number-format:roman-lower;
+        mso-level-text:"%3\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:2.8cm;
+        text-indent:-0.7cm;}
+@list l4:level4
+        {mso-level-number-format:alpha-upper;
+        mso-level-text:"%4\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:3.5cm;
+        text-indent:-0.7cm;}
+@list l4:level5
+        {mso-level-number-format:roman-upper;
+        mso-level-text:"%5\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:4.2cm;
+        text-indent:-0.7cm;}
+@list l4:level6
+        {mso-level-text:"%6\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:4.9cm;
+        text-indent:-0.7cm;}
+@list l4:level7
+        {mso-level-tab-stop:none;
+        mso-level-number-format:alpha-lower;
+        mso-level-text:"%7\)";
+        mso-level-number-position:left;
+        margin-left:5.6cm;
+        text-indent:-0.7cm;}
+@list l4:level8
+        {mso-level-number-format:roman-lower;
+        mso-level-text:"%8\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:6.3cm;
+        text-indent:-0.7cm;}
+@list l4:level9
+        {mso-level-number-format:alpha-upper;
+        mso-level-text:"%9\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:7.0cm;
+        text-indent:-0.7cm;}
+
 
 div.ListContLevel1
         {mso-style-priority:34;

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

@@ -167,7 +167,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter {
   margin-right: 0cm;
   margin-bottom: 12.0pt;
   margin-left: 0cm;
-  tab-stops: right 482.0pt;
+  tab-stops: center 3.25in;
   font-size: 12.0pt;
   font-family: {{bodyfont}}; }
 
@@ -177,7 +177,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape {
   margin-right: 0cm;
   margin-bottom: 12.0pt;
   margin-left: 0cm;
-  tab-stops: right 9.0in;
+  tab-stops: center 4.5in;
   font-size: 12.0pt;
   font-family: {{bodyfont}}; }
 
@@ -1050,6 +1050,81 @@ p.Tablebody, li.Tablebody, div.Tablebody {
   margin-left: 162.0pt;
   text-indent: -18.0pt; }
 
+/* steps ordered list */
+@list l4 {
+  mso-list-id: 525294608;
+  mso-list-template-ids: 676331812; }
+
+@list l4:level1 {
+  mso-level-text: "%1\)";
+  mso-level-tab-stop: none;
+  mso-level-number-position: left;
+  margin-left: 1.4cm;
+  text-indent: -1.4cm; }
+
+@list l4:level2 {
+  mso-level-text: "%2\)";
+  mso-level-number-format: alpha-lower;
+  mso-level-tab-stop: none;
+  mso-level-number-position: left;
+  margin-left: 2.1cm;
+  text-indent: -0.7cm; }
+
+@list l4:level3 {
+  mso-level-number-format: roman-lower;
+  mso-level-text: "%3\)";
+  mso-level-tab-stop: none;
+  mso-level-number-position: left;
+  margin-left: 2.8cm;
+  text-indent: -0.7cm; }
+
+@list l4:level4 {
+  mso-level-number-format: alpha-upper;
+  mso-level-text: "%4\)";
+  mso-level-tab-stop: none;
+  mso-level-number-position: left;
+  margin-left: 3.5cm;
+  text-indent: -0.7cm; }
+
+@list l4:level5 {
+  mso-level-number-format: roman-upper;
+  mso-level-text: "%5\)";
+  mso-level-tab-stop: none;
+  mso-level-number-position: left;
+  margin-left: 4.2cm;
+  text-indent: -0.7cm; }
+
+@list l4:level6 {
+  mso-level-text: "%6\)";
+  mso-level-tab-stop: none;
+  mso-level-number-position: left;
+  margin-left: 4.9cm;
+  text-indent: -0.7cm; }
+
+@list l4:level7 {
+  mso-level-tab-stop: none;
+  mso-level-number-format: alpha-lower;
+  mso-level-text: "%7\)";
+  mso-level-number-position: left;
+  margin-left: 5.6cm;
+  text-indent: -0.7cm; }
+
+@list l4:level8 {
+  mso-level-number-format: roman-lower;
+  mso-level-text: "%8\)";
+  mso-level-tab-stop: none;
+  mso-level-number-position: left;
+  margin-left: 6.3cm;
+  text-indent: -0.7cm; }
+
+@list l4:level9 {
+  mso-level-number-format: alpha-upper;
+  mso-level-text: "%9\)";
+  mso-level-tab-stop: none;
+  mso-level-number-position: left;
+  margin-left: 7.0cm;
+  text-indent: -0.7cm; }
+
 div.ListContLevel1 {
   mso-style-priority: 34;
   margin-left: 18.0pt;

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

@@ -149,7 +149,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
 	margin-right:0cm;
 	margin-bottom:12.0pt;
 	margin-left:0cm;
-        tab-stops:right 482.0pt;
+        tab-stops:center 3.25in;
 	font-size:12.0pt;
 	font-family:$bodyfont;}
 p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
@@ -158,7 +158,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
         margin-right:0cm;
         margin-bottom:12.0pt;
         margin-left:0cm;
-        tab-stops:right 9.0in;
+        tab-stops:center 4.5in;
         font-size:12.0pt;
         font-family:$bodyfont;}
 span.MsoCommentReference
@@ -966,6 +966,72 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	mso-level-number-position:left;
 	margin-left:162.0pt;
 	text-indent:-18.0pt;}
+/* steps ordered list */
+@list l4
+        {mso-list-id:525294608;
+        mso-list-template-ids:676331812}
+@list l4:level1
+        {mso-level-text:"%1\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:1.4cm;
+        text-indent:-1.4cm;}
+@list l4:level2
+        {mso-level-text:"%2\)";
+        mso-level-number-format:alpha-lower;
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:2.1cm;
+        text-indent:-0.7cm;}
+@list l4:level3
+        {mso-level-number-format:roman-lower;
+        mso-level-text:"%3\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:2.8cm;
+        text-indent:-0.7cm;}
+@list l4:level4
+        {mso-level-number-format:alpha-upper;
+        mso-level-text:"%4\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:3.5cm;
+        text-indent:-0.7cm;}
+@list l4:level5
+        {mso-level-number-format:roman-upper;
+        mso-level-text:"%5\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:4.2cm;
+        text-indent:-0.7cm;}
+@list l4:level6
+        {mso-level-text:"%6\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:4.9cm;
+        text-indent:-0.7cm;}
+@list l4:level7
+        {mso-level-tab-stop:none;
+        mso-level-number-format:alpha-lower;
+        mso-level-text:"%7\)";
+        mso-level-number-position:left;
+        margin-left:5.6cm;
+        text-indent:-0.7cm;}
+@list l4:level8
+        {mso-level-number-format:roman-lower;
+        mso-level-text:"%8\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:6.3cm;
+        text-indent:-0.7cm;}
+@list l4:level9
+        {mso-level-number-format:alpha-upper;
+        mso-level-text:"%9\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:7.0cm;
+        text-indent:-0.7cm;}
+
 
 div.ListContLevel1
         {mso-style-priority:34;

data/lib/isodoc/nist/html_convert.rb

@@ -109,6 +109,7 @@ module IsoDoc
       def make_body3(body, docxml)
         body.div **{ class: "main-section" } do |div3|
           foreword docxml, div3
+          preface_block docxml, div3
           abstract docxml, div3
           keywords docxml, div3
           boilerplate docxml, div3

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

@@ -812,6 +812,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>
@@ -2354,16 +2357,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>
@@ -2371,7 +2376,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>
@@ -2381,7 +2386,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">
@@ -3137,22 +3142,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>
@@ -3168,17 +3181,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">
@@ -3192,21 +3208,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">
@@ -3226,24 +3246,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']">
@@ -3580,6 +3601,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'"/>