metanorma-cc 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07c45fe4f604cab972f79a468705ee05762ac0b3507b5f3913ca6f9af502620d
-  data.tar.gz: 4b7df285e50dde89ed98e31911c9b91922b28bb8e833be8deba2bcc60a3b49f1
+  metadata.gz: 88bc148aeb63cade7c68d91da1dc250240d0fba5af3ff1b54f6f534537c1804b
+  data.tar.gz: 34f5cb4620035bc1ca634dc5df59f74545a9ec8d76e730cc98cfb0b467668c41
 SHA512:
-  metadata.gz: 215992c1581b9513cbf3c116f7e5e5ed3cf18ef0475119fae9f6e6016ed6fffa0e6545f3924bfe02f0f35523484843db1421121935b32a9cc59624289f497ca2
-  data.tar.gz: 03b7cab1948c042ddee3d5369db24964a1a9da162067a8405482462f97fec9a0945b41e3592de4600c1dca72e0218859afd99b2534b96ef35e15151a27724d25
+  metadata.gz: d75117fd92a91bf21873f72c61c30340be4bec5a2172395992aab5d7e1520c17485259e2d2a77dcc12fdae34e71d59e898ef78b57f073231205abf54457b7a84
+  data.tar.gz: 7a6e32230a72b16da83e57dd4212bb0e6da24ba215c1af357113a775d5c92afc975218cb818e58fad8fb809501e09745380dfd7264e6c4db090e35408bcdf7b6

data/lib/isodoc/cc/cc.standard.xsl

@@ -569,14 +569,41 @@
 	</xsl:template>
 
 	
-<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:param name="add_math_as_text">true</xsl:param><xsl:param name="table_if">false</xsl:param><xsl:param name="table_widths"/><xsl:variable name="table_widths_from_if" select="xalan:nodeset($table_widths)"/><xsl:param name="table_if_debug">false</xsl:param><xsl:variable name="isGenerateTableIF_">
+<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:param name="add_math_as_text">true</xsl:param><xsl:param name="table_if">false</xsl:param><xsl:param name="table_widths"/><xsl:variable name="table_widths_from_if" select="xalan:nodeset($table_widths)"/><xsl:variable name="table_widths_from_if_calculated_">
+		<xsl:for-each select="$table_widths_from_if//table">
+			<xsl:copy>
+				<xsl:copy-of select="@*"/>
+				<xsl:call-template name="calculate-column-widths-autolayout-algorithm"/>
+			</xsl:copy>
+		</xsl:for-each>
+	</xsl:variable><xsl:variable name="table_widths_from_if_calculated" select="xalan:nodeset($table_widths_from_if_calculated_)"/><xsl:param name="table_if_debug">false</xsl:param><xsl:variable name="isGenerateTableIF_">
 		false
 	</xsl:variable><xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/><xsl:variable name="lang">
 		<xsl:call-template name="getLang"/>
-	</xsl:variable><xsl:variable name="pageWidth_">
-		210
+	</xsl:variable><xsl:variable name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/><xsl:variable name="papersize_width_">
+		<xsl:choose>
+			<xsl:when test="$papersize = 'letter'">215.9</xsl:when>
+			<xsl:when test="$papersize = 'a4'">210</xsl:when>
+		</xsl:choose>
+	</xsl:variable><xsl:variable name="papersize_width" select="normalize-space($papersize_width_)"/><xsl:variable name="papersize_height_">
+		<xsl:choose>
+			<xsl:when test="$papersize = 'letter'">279.4</xsl:when>
+			<xsl:when test="$papersize = 'a4'">297</xsl:when>
+		</xsl:choose>
+	</xsl:variable><xsl:variable name="papersize_height" select="normalize-space($papersize_height_)"/><xsl:variable name="pageWidth_">
+		<xsl:choose>
+			<xsl:when test="$papersize_width != ''"><xsl:value-of select="$papersize_width"/></xsl:when>
+			<xsl:otherwise>
+				210
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:variable><xsl:variable name="pageWidth" select="normalize-space($pageWidth_)"/><xsl:variable name="pageHeight_">
-		297
+		<xsl:choose>
+			<xsl:when test="$papersize_height != ''"><xsl:value-of select="$papersize_height"/></xsl:when>
+			<xsl:otherwise>
+				297
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="marginLeftRight1_">
 		19
 	</xsl:variable><xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/><xsl:variable name="marginLeftRight2_">
@@ -1147,6 +1174,25 @@
 		
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="dl-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			
+		
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+		
+		
+		
+		
+				
+		
+		
+		
+				
+		
+		
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="dd-cell-style">
 		<xsl:attribute name="padding-left">2mm</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
@@ -1465,6 +1511,24 @@
 		
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="list-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			
+		
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+		
+		
+		
+		
+				
+		
+		
+		
+				
+		
+		
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="list-item-style">
 		
 		
@@ -1849,13 +1913,13 @@
 		
 	</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:variable name="ace_tag">ace-tag_</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
-			<xsl:for-each select="/*/*[local-name()='preface']/*">
+			<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
 				<node id="{@id}"/>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
 		
-		<xsl:for-each select="/*/*[local-name()='preface']/*">
+		<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			
 			<!-- process Section's title -->
@@ -1921,7 +1985,7 @@
 			</xsl:for-each>
 		</figures>
 	</xsl:template><xsl:template name="processPrefaceSectionsDefault">
-		<xsl:for-each select="/*/*[local-name()='preface']/*">
+		<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="."/>
 		</xsl:for-each>
@@ -2532,8 +2596,9 @@
 			<xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
 		</xsl:if>
 	</xsl:template><xsl:template name="calculate-column-widths-autolayout-algorithm">
-		<xsl:param name="table"/>
-		<xsl:param name="if">false</xsl:param> <!-- via intermediate format -->
+		<xsl:param name="parent_table_page-width"/> <!-- for nested tables, in re-calculate step -->
+		
+		<!-- via intermediate format -->
 
 		<!-- The algorithm uses two passes through the table data and scales linearly with the size of the table -->
 	 
@@ -2544,9 +2609,8 @@
 		<!-- get current table id -->
 		<xsl:variable name="table_id" select="@id"/>
 		<!-- find table by id in the file 'table_widths' -->
-		<xsl:variable name="table-if_" select="$table_widths_from_if//table[@id = $table_id]"/>
-		<xsl:variable name="table-if" select="xalan:nodeset($table-if_)"/>
-		
+	<!-- 	<xsl:variable name="table-if_" select="$table_widths_from_if//table[@id = $table_id]"/>
+		<xsl:variable name="table-if" select="xalan:nodeset($table-if_)"/> -->
 		
 		<!-- table='<xsl:copy-of select="$table"/>' -->
 		<!-- table_id='<xsl:value-of select="$table_id"/>\ -->
@@ -2554,24 +2618,13 @@
 		<!-- table_widths_from_if='<xsl:copy-of select="$table_widths_from_if"/>' -->
 		
 		<xsl:variable name="table_with_cell_widths_">
-			<xsl:choose>
-				<xsl:when test="$if = 'true' and normalize-space($table-if) != ''"> <!-- if we read column's width from IF and there is table in IF -->
-				
-					<!-- Example: <column>10</column>
-							<column>11</column> 
-					-->
-					<xsl:apply-templates select="$table-if" mode="determine_cell_widths-if"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates select="xalan:nodeset($table)" mode="determine_cell_widths"/>
-				</xsl:otherwise>
-			</xsl:choose>
+			<xsl:apply-templates select="." mode="determine_cell_widths-if"/> <!-- read column's width from IF -->
 		</xsl:variable>
 		<xsl:variable name="table_with_cell_widths" select="xalan:nodeset($table_with_cell_widths_)"/>
 		
-		<xsl:if test="$table_if_debug = 'true'">
+		<!-- <xsl:if test="$table_if_debug = 'true'">
 			<xsl:copy-of select="$table_with_cell_widths"/>
-		</xsl:if>
+		</xsl:if> -->
 		
 		
 		<!-- The minimum and maximum cell widths are then used to determine the corresponding minimum and maximum widths for the columns. -->
@@ -2617,8 +2670,12 @@
 		
 		<xsl:variable name="page_width">
 			<xsl:choose>
-				<xsl:when test="$if = 'true'"><xsl:value-of select="$table-if/@page-width"/></xsl:when>
-				<xsl:otherwise>75</xsl:otherwise>
+				<xsl:when test="$parent_table_page-width != ''">
+					<xsl:value-of select="$parent_table_page-width"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="@page-width"/>
+				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
 		
@@ -2626,9 +2683,6 @@
 			<table_width>
 				<xsl:copy-of select="$table_widths"/>
 			</table_width>
-			<!-- <debug>$table_widths/@width_min=<xsl:value-of select="$table_widths/table/@width_min"/></debug>
-			<debug>$table_widths/@width_max=<xsl:value-of select="$table_widths/table/@width_max"/></debug>
-			 -->
 			<debug>$page_width=<xsl:value-of select="$page_width"/></debug>
 		</xsl:if>
 		
@@ -2639,11 +2693,11 @@
 			<xsl:when test="$table_widths/table/@width_min &gt;= $page_width and 1 = 2"> <!-- this condition isn't working see case 3 below -->
 				<!-- call old algorithm -->
 				<case1/>
-				<xsl:variable name="cols-count" select="count(xalan:nodeset($table)/*/tr[1]/td)"/>
+				<!-- <xsl:variable name="cols-count" select="count(xalan:nodeset($table)/*/tr[1]/td)"/>
 				<xsl:call-template name="calculate-column-widths-proportional">
 					<xsl:with-param name="cols-count" select="$cols-count"/>
 					<xsl:with-param name="table" select="$table"/>
-				</xsl:call-template>
+				</xsl:call-template> -->
 			</xsl:when>
 			<!-- 2. The maximum table width fits within the available space. In this case, set the columns to their maximum widths. -->
 			<xsl:when test="$table_widths/table/@width_max &lt;= $page_width">
@@ -2687,95 +2741,49 @@
 			<xsl:otherwise><unknown_case/></xsl:otherwise>
 		</xsl:choose>
 		
+	</xsl:template><xsl:template name="get-calculated-column-widths-autolayout-algorithm">
 		
-	</xsl:template><xsl:template match="@*|node()" mode="determine_cell_widths">
-		<xsl:copy>
-				<xsl:apply-templates select="@*|node()" mode="determine_cell_widths"/>
-		</xsl:copy>
-	</xsl:template><xsl:template match="td | th" mode="determine_cell_widths">
-		<xsl:copy>
-			<xsl:copy-of select="@*"/>
+		<!-- if nested 'dl' or 'table' -->
+		<xsl:variable name="parent_table_id" select="normalize-space(ancestor::*[local-name() = 'table' or local-name() = 'dl'][1]/@id)"/>
+		<parent_table_id><xsl:value-of select="$parent_table_id"/></parent_table_id>
 			
-			 <!-- The maximum width is given by the widest line.  -->
-			<xsl:variable name="widths_max">
-				<xsl:for-each select=".//*[local-name() = 'p']">
-					<xsl:call-template name="add_width"/>
-				</xsl:for-each>
-				<xsl:if test="not(*[local-name() = 'p'])">
-					<xsl:call-template name="add_width"/>
-				</xsl:if>
-			</xsl:variable>
-			<xsl:variable name="width_max">
-				<xsl:for-each select="xalan:nodeset($widths_max)//width">
-					<xsl:sort select="." data-type="number" order="descending"/>
-					<xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if>
-				</xsl:for-each>
-			</xsl:variable>
-			<xsl:attribute name="width_max">
-				<xsl:value-of select="$width_max"/>
-			</xsl:attribute>
+		<parent_element><xsl:value-of select="local-name(..)"/></parent_element>
 			
-			<!-- The minimum width is given by the widest text element (word, image, etc.) -->
-			<!-- To do: image width -->
-			<xsl:variable name="td_text">
-				<xsl:apply-templates select="." mode="td_text"/>
-			</xsl:variable>
-			<xsl:variable name="words">
-				<xsl:variable name="string_with_added_zerospaces">
-					<xsl:call-template name="add-zero-spaces-java">
-						<xsl:with-param name="text" select="$td_text"/>
-					</xsl:call-template>
+		<xsl:variable name="parent_table_page-width_">
+			<xsl:if test="$parent_table_id != ''">
+				<!-- determine column number in the parent table -->
+				<xsl:variable name="parent_table_column_number">
+					<xsl:choose>
+						<xsl:when test="parent::*[local-name() = 'dd']">2</xsl:when>
+						<xsl:otherwise> <!-- parent is table -->
+							<xsl:value-of select="count(ancestor::*[local-name() = 'td'][1]/preceding-sibling::*[local-name() = 'td']) + 1"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:variable>
-				<xsl:call-template name="tokenize">
-					<xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '​­', '  '))"/> <!-- replace zero-width-space and soft-hyphen to space -->
-				</xsl:call-template>
-			</xsl:variable>
-			
-			<xsl:variable name="max_word_length">
-				<xsl:call-template name="max_length">
-					<xsl:with-param name="words" select="xalan:nodeset($words)"/>
-				</xsl:call-template>
-			</xsl:variable>
-			<xsl:variable name="width_min">
-				<xsl:value-of select="$max_word_length"/>
-			</xsl:variable>
-			<xsl:attribute name="width_min">
-				<xsl:value-of select="$width_min"/>
-			</xsl:attribute>
-			<!-- width_max="1" width_min="1.5"> --> <!-- see 'tokenize' template, multiply 1.5 for all latin capitals -->
-			<xsl:if test="$width_min &gt; $width_max">
-				<xsl:attribute name="width_max">
-					<xsl:value-of select="$width_min"/>
-				</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="$width_min = 0">
-				<xsl:attribute name="width_min">1</xsl:attribute>
+				<!-- find table by id in the file 'table_widths' and get all Nth `<column>...</column> -->
+				<xsl:value-of select="$table_widths_from_if_calculated//table[@id = $parent_table_id]/column[number($parent_table_column_number)]"/>
 			</xsl:if>
-			
-			<xsl:apply-templates select="node()" mode="determine_cell_widths"/>
-			
-		</xsl:copy>
-	</xsl:template><xsl:template name="add_width">
-		<xsl:variable name="p_text"><xsl:apply-templates select="." mode="td_text"/></xsl:variable>
-		<xsl:variable name="p_text_len_" select="string-length(normalize-space($p_text))"/>
-		
-		<xsl:variable name="p_text_len">
-			<xsl:choose>
-				<xsl:when test="normalize-space(translate($p_text, concat($upper,'0123456789'), '')) = ''"> <!-- english word in CAPITAL letters -->
-					<xsl:value-of select="$p_text_len_ * 1.5"/>
-				</xsl:when>
-				<xsl:otherwise><xsl:value-of select="$p_text_len_"/></xsl:otherwise>
-			</xsl:choose>
 		</xsl:variable>
+		<xsl:variable name="parent_table_page-width" select="normalize-space($parent_table_page-width_)"/>
 		
-		<xsl:variable name="math_addon_text">
-			<xsl:for-each select=".//*[local-name() = 'math']">
-				<xsl:apply-templates mode="td_text"/>
-			</xsl:for-each>
-		</xsl:variable>
-		<xsl:variable name="math_addon_length" select="string-length(normalize-space($math_addon_text)) * 0.2"/> <!-- plus 20% -->
+		<!-- get current table id -->
+		<xsl:variable name="table_id" select="@id"/>
+		
+		<xsl:choose>
+			<xsl:when test="$parent_table_id = '' or $parent_table_page-width = ''">
+				<!-- find table by id in the file 'table_widths' and get all `<column>...</column> -->
+				<xsl:copy-of select="$table_widths_from_if_calculated//table[@id = $table_id]/node()"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<!-- recalculate columns width based on parent table width -->
+				<xsl:for-each select="$table_widths_from_if//table[@id = $table_id]">
+					<xsl:call-template name="calculate-column-widths-autolayout-algorithm">
+						<xsl:with-param name="parent_table_page-width" select="$parent_table_page-width"/> <!-- padding-left = 2mm  = 50000-->
+					</xsl:call-template>
+				</xsl:for-each>
+			</xsl:otherwise>
+		</xsl:choose>
 		
-		<width><xsl:value-of select="$p_text_len + $math_addon_length"/></width>
 	</xsl:template><xsl:template match="@*|node()" mode="determine_cell_widths-if">
 		<xsl:copy>
 				<xsl:apply-templates select="@*|node()" mode="determine_cell_widths-if"/>
@@ -3553,11 +3561,19 @@
 						
 						
 						
+						
+						<xsl:if test="ancestor::*[local-name() = 'dd' or local-name() = 'td']">
+							<xsl:attribute name="margin-top">0</xsl:attribute>
+						</xsl:if>
+						
 						<fo:block>
 							
 							
 							
 							
+							<xsl:apply-templates select="*[local-name() = 'name']">
+								<xsl:with-param name="process">true</xsl:with-param>
+							</xsl:apply-templates>
 							
 							<xsl:if test="$isGenerateTableIF = 'true'">
 								<!-- to determine start of table -->
@@ -3580,6 +3596,7 @@
 								</xsl:choose>
 								
 								
+								
 								<xsl:choose>
 									<xsl:when test="$isGenerateTableIF = 'true'">
 										<!-- generate IF for table widths -->
@@ -3708,6 +3725,18 @@
 				</xsl:if> <!-- END: a few components -->
 			</fo:block-container>
 		</fo:block-container>
+		
+		<xsl:if test="$isGenerateTableIF = 'true'"> <!-- process nested 'dl' -->
+			<xsl:apply-templates select="*[local-name() = 'dd']/*[local-name() = 'dl']"/>
+		</xsl:if>
+		
+	</xsl:template><xsl:template match="*[local-name() = 'dl']/*[local-name() = 'name']">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<fo:block xsl:use-attribute-sets="dl-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
 	</xsl:template><xsl:template name="setColumnWidth_dl">
 		<xsl:param name="colwidths"/>		
 		<xsl:param name="maxlength_dt"/>
@@ -3716,6 +3745,11 @@
 		<!-- <colwidths><xsl:copy-of select="$colwidths"/></colwidths> -->
 		
 		<xsl:choose>
+			<xsl:when test="xalan:nodeset($colwidths)/autolayout">
+				<xsl:call-template name="insertTableColumnWidth">
+					<xsl:with-param name="colwidths" select="$colwidths"/>
+				</xsl:call-template>
+			</xsl:when>
 			<xsl:when test="ancestor::*[local-name()='dl']"><!-- second level, i.e. inlined table -->
 				<fo:table-column column-width="50%"/>
 				<fo:table-column column-width="50%"/>
@@ -3968,12 +4002,24 @@
 			</td>
 			<td>
 				
-						<xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()"/>
+						<xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/>
+						
+						<!-- get paragraphs from nested 'dl' -->
+						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'dl']" mode="dl_if_nested"/>
+						
 					
 			</td>
 		</tr>
 		
-	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if"/><xsl:template match="*[local-name()='em']">
+	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if"/><xsl:template match="*[local-name()='dl']" mode="dl_if_nested">
+		<xsl:for-each select="*[local-name() = 'dt']">
+			<p>
+				<xsl:copy-of select="node()"/>
+				<xsl:text> </xsl:text>
+				<xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'p']/node()"/>
+			</p>
+		</xsl:for-each>
+	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if_nested"/><xsl:template match="*[local-name()='em']">
 		<fo:inline font-style="italic">
 			<xsl:apply-templates/>
 		</fo:inline>
@@ -4004,7 +4050,7 @@
 				
 				
 				
-				
+				 <!-- 10 -->
 				
 				
 				
@@ -6024,7 +6070,7 @@
 						
 						
 						
-						
+						<!-- 9 -->
 						
 						
 						
@@ -6108,7 +6154,7 @@
 		<xsl:for-each select="xalan:nodeset($text_step4)/node()">
 			<xsl:choose>
 				<xsl:when test="local-name() = 'interspers'"> <!-- word with length more than 30 will be interspersed with zero-width space -->
-					<xsl:call-template name="interspers">
+					<xsl:call-template name="interspers-java">
 						<xsl:with-param name="str" select="."/>
 					</xsl:call-template>
 				</xsl:when>
@@ -6158,6 +6204,10 @@
 				<xsl:with-param name="char" select="$char"/>
 			</xsl:call-template>
 		</xsl:if>
+	</xsl:template><xsl:template name="interspers-java">
+		<xsl:param name="str"/>
+		<xsl:param name="char" select="$zero_width_space"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($str),'([^ -.:=_—])',concat('$1', $char))"/> <!-- insert $char after each char excep space, - . : = _ etc. -->
 	</xsl:template><xsl:template match="*" mode="syntax_highlight">
 		<xsl:apply-templates mode="syntax_highlight"/>
 	</xsl:template><xsl:variable name="syntax_highlight_styles_">
@@ -7115,6 +7165,11 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
+	
+		<xsl:apply-templates select="*[local-name() = 'name']">
+			<xsl:with-param name="process">true</xsl:with-param>
+		</xsl:apply-templates>
+	
 		<fo:list-block xsl:use-attribute-sets="list-style">
 		
 			
@@ -7129,12 +7184,23 @@
 
 			
 			
+			<xsl:if test="*[local-name() = 'name']">
+				<xsl:attribute name="margin-top">0pt</xsl:attribute>
+			</xsl:if>
+			
 			<xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
 		</fo:list-block>
 		<!-- <xsl:for-each select="./iho:note">
 			<xsl:call-template name="note"/>
 		</xsl:for-each> -->
 		<xsl:apply-templates select="./*[local-name() = 'note']"/>
+	</xsl:template><xsl:template match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<fo:block xsl:use-attribute-sets="list-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='li']">
 		<fo:list-item xsl:use-attribute-sets="list-item-style">
 			<xsl:copy-of select="@id"/>
@@ -7438,26 +7504,23 @@
 				<xsl:if test=".//*[local-name() = 'fn']">
 					<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
 				</xsl:if>
+				
+				<!-- display document identifier, not number [1] -->
 				<xsl:variable name="docidentifier">
 					<xsl:choose>
 						<xsl:when test="*[local-name() = 'docidentifier']/@type = 'metanorma'"/>
 						<xsl:otherwise><xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma-ordinal')]"/></xsl:otherwise>
 					</xsl:choose>
 				</xsl:variable>
-				<fo:inline><xsl:value-of select="$docidentifier"/></fo:inline>
+				<xsl:value-of select="$docidentifier"/>
+				
 				<xsl:apply-templates select="*[local-name() = 'note']"/>
-				<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
-				<xsl:choose>
-					<xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = $lang]">
-						<xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = $lang]"/>
-					</xsl:when>
-					<xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = 'en']">
-						<xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = 'en']"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:apply-templates select="*[local-name() = 'title']"/>
-					</xsl:otherwise>
-				</xsl:choose>
+				
+				<xsl:if test="normalize-space($docidentifier) != '' and *[local-name() = 'formattedref']">
+					<xsl:text>,</xsl:text>
+					<xsl:text> </xsl:text>
+				</xsl:if>
+				
 				<xsl:apply-templates select="*[local-name() = 'formattedref']"/>
 				<!-- end bibitem processing -->
 			
@@ -7769,36 +7832,58 @@
 				
 					
 					
+					<xsl:if test="@type = 'editorial'">
+						<xsl:attribute name="color">green</xsl:attribute>
+						<xsl:attribute name="font-weight">normal</xsl:attribute>
+						
+						<!-- <xsl:variable name="note-style">
+							<style xsl:use-attribute-sets="note-style"></style>
+						</xsl:variable>
+						<xsl:for-each select="xalan:nodeset($note-style)//style/@*">
+							<xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
+						</xsl:for-each> -->
+					</xsl:if>
+					
+					
+					
 					
 					
 					
-						<xsl:call-template name="displayAdmonitionName"/>
-						<xsl:text> — </xsl:text>
+						<xsl:call-template name="displayAdmonitionName">
+							<xsl:with-param name="sep"> — </xsl:with-param>
+						</xsl:call-template>
 					
 					
 					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 				</fo:block>
 			
 	</xsl:template><xsl:template name="displayAdmonitionName">
-		
+		<xsl:param name="sep"/> <!-- Example: ' - ' -->
+		<!-- <xsl:choose>
+			<xsl:when test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
+				<xsl:choose>
+					<xsl:when test="@type='important'"><xsl:apply-templates select="@type"/></xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:otherwise>
 				<xsl:apply-templates select="*[local-name() = 'name']"/>
 				<xsl:if test="not(*[local-name() = 'name'])">
 					<xsl:apply-templates select="@type"/>
 				</xsl:if>
-			
-	</xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
-		<xsl:apply-templates/>
-	</xsl:template><xsl:template match="*[local-name() = 'admonition']/@type">
-		<xsl:variable name="admonition_type_">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">admonition.<xsl:value-of select="."/></xsl:with-param>
-			</xsl:call-template>
+			</xsl:otherwise>
+		</xsl:choose> -->
+		<xsl:variable name="name">
+			<xsl:apply-templates select="*[local-name() = 'name']"/>
 		</xsl:variable>
-		<xsl:variable name="admonition_type" select="normalize-space(java:toUpperCase(java:java.lang.String.new($admonition_type_)))"/>
-		<xsl:value-of select="$admonition_type"/>
-		<xsl:if test="$admonition_type = ''">
-			<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
+		<xsl:copy-of select="$name"/>
+		<xsl:if test="normalize-space($name) != ''">
+			<xsl:value-of select="$sep"/>
 		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
+		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
 		
 				<fo:block xsl:use-attribute-sets="admonition-p-style">

data/lib/isodoc/cc/html/cc.css

@@ -111,7 +111,7 @@ p.AdmonitionTitle, p.RecommendationTitle {
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
-p.TableTitle {
+p.TableTitle, p.ListTitle {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "";
@@ -142,13 +142,16 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: {{smallerfontsize}};
   mso-bidi-font-size: 11.0pt;
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
+p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}}; }
+
 p.ANNEX, li.ANNEX, div.ANNEX {
   mso-style-name: ANNEX;
   mso-style-priority: 10;
@@ -495,12 +498,14 @@ p.Quote, li.Quote, div.Quote {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: {{normalfontsize}};
-  font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
+p.Quote, li.Quote {
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}}; }
+
 p.QuoteAttribution {
   text-align: right;
   mso-style-priority: 99;
@@ -530,8 +535,6 @@ p.Admonition, li.Admonition, div.Admonition {
   mso-border-themecolor: accent1;
   padding: 0cm;
   mso-padding-alt: 10.0pt 10.0pt 10.0pt 10.0pt;
-  font-size: 12.0pt;
-  font-family: {{bodyfont}};
   mso-ascii-font-family: {{bodyfont}};
   mso-ascii-theme-font: minor-latin;
   mso-fareast-font-family: {{bodyfont}};
@@ -542,7 +545,11 @@ p.Admonition, li.Admonition, div.Admonition {
   mso-bidi-theme-font: minor-bidi;
   color: #4472C4;
   mso-themecolor: accent1;
-  mso-ansi-language: EN-AU;
+  mso-ansi-language: EN-AU; }
+
+p.Admonition, li.Admonition {
+  font-size: 12.0pt;
+  font-family: {{bodyfont}};
   font-style: italic; }
 
 p.Code, li.Code, div.Code {
@@ -767,7 +774,9 @@ aside {
 
 p.example, li.example, td.example {
   margin-right: 0pt;
-  margin-left: 0pt; }
+  margin-left: 0pt;
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}}; }
 
 div.example {
   margin-top: 0cm;
@@ -776,9 +785,7 @@ div.example {
   margin-left: 36.0pt; }
 
 p.example, li.example, div.example, td.example {
-  mso-pagination: none;
-  font-size: {{smallerfontsize}};
-  font-family: {{bodyfont}}; }
+  mso-pagination: none; }
 
 td.example p.MsoListParagraph {
   font-size: {{smallerfontsize}}; }

data/lib/isodoc/cc/html/cc.scss

@@ -105,7 +105,7 @@ p.AdmonitionTitle, p.RecommendationTitle
         mso-fareast-font-family:$bodyfont;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
-p.TableTitle
+p.TableTitle, p.ListTitle
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"";
@@ -135,12 +135,15 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:$smallerfontsize;
 	mso-bidi-font-size:11.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
+	font-size:$smallerfontsize;
+	font-family:$bodyfont;
+        }
 p.ANNEX, li.ANNEX, div.ANNEX
 	{mso-style-name:ANNEX;
 	mso-style-priority:10;
@@ -472,11 +475,13 @@ p.Quote, li.Quote, div.Quote
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:$normalfontsize;
-	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Quote, li.Quote {
+	font-size:$normalfontsize;
+	font-family:$bodyfont;
+        }
 p.QuoteAttribution
         {text-align:right;
         mso-style-priority:99;
@@ -506,8 +511,6 @@ p.Admonition, li.Admonition, div.Admonition
 	mso-border-themecolor:accent1;
 	padding:0cm;
 	mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt;
-	font-size:12.0pt;
-	font-family:$bodyfont;
 	mso-ascii-font-family:$bodyfont;
 	mso-ascii-theme-font:minor-latin;
 	mso-fareast-font-family:$bodyfont;
@@ -519,6 +522,10 @@ p.Admonition, li.Admonition, div.Admonition
 	color:#4472C4;
 	mso-themecolor:accent1;
 	mso-ansi-language:EN-AU;
+      }
+p.Admonition, li.Admonition {
+	font-size:12.0pt;
+	font-family:$bodyfont;
 	font-style:italic;}
 p.Code, li.Code, div.Code
 	{mso-style-name:Code;
@@ -722,6 +729,8 @@ margin-left: -36.0pt;
 p.example, li.example, td.example {
   margin-right: 0pt;
   margin-left: 0pt;
+  font-size:$smallerfontsize;
+  font-family:$bodyfont;
 }
 
 div.example {
@@ -733,8 +742,7 @@ div.example {
 
 p.example, li.example, div.example, td.example {
         mso-pagination:none;
-        font-size:$smallerfontsize;
-        font-family:$bodyfont;}
+      }
 
 td.example p.MsoListParagraph {
   font-size: $smallerfontsize;

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

@@ -904,6 +904,12 @@ pre {
   font-size: 1em;
   text-align: center; }
 
+.ListTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+  text-align: left; }
+
 .Note, .Admonition {
   color: #47430c;
   padding: 0.25em;

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

@@ -251,6 +251,7 @@ pre {
   @include recommendationBlock();
 }
 
+@include listBlock();
 
 .Note, .Admonition {
   color: #47430c;

data/lib/metanorma/cc/biblio.rng

@@ -614,12 +614,12 @@
     <optional>
       <ref name="fetched"/>
     </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="btitle"/>
-      </oneOrMore>
+    <optional>
       <ref name="formattedref"/>
-    </choice>
+    </optional>
+    <oneOrMore>
+      <ref name="btitle"/>
+    </oneOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -986,36 +986,34 @@
           <ref name="SeriesType"/>
         </attribute>
       </optional>
-      <choice>
+      <optional>
         <ref name="formattedref"/>
-        <group>
-          <ref name="btitle"/>
-          <optional>
-            <ref name="bplace"/>
-          </optional>
-          <optional>
-            <ref name="seriesorganization"/>
-          </optional>
-          <optional>
-            <ref name="abbreviation"/>
-          </optional>
-          <optional>
-            <ref name="seriesfrom"/>
-          </optional>
-          <optional>
-            <ref name="seriesto"/>
-          </optional>
-          <optional>
-            <ref name="seriesnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriespartnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriesrun"/>
-          </optional>
-        </group>
-      </choice>
+      </optional>
+      <ref name="btitle"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriesrun"/>
+      </optional>
     </element>
   </define>
   <define name="SeriesType">

data/lib/metanorma/cc/isodoc.rng

@@ -282,6 +282,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -324,6 +327,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -360,6 +366,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "2.1.1".freeze
+    VERSION = "2.1.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -188,8 +188,6 @@ files:
 - bin/console
 - bin/rspec
 - bin/setup
-- docs/navigation.adoc
-- docs/quickstart.adoc
 - lib/isodoc/cc/base_convert.rb
 - lib/isodoc/cc/cc.standard.xsl
 - lib/isodoc/cc/html/_coverpage.css
@@ -250,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: metanorma-cc lets you write CalConnect standards in AsciiDoc.

data/docs/navigation.adoc

@@ -1,8 +0,0 @@
----
-items:
-- title: Introduction
-  items:
-    - { title: Quickstart, path: quickstart/ }
----
-
-= Navigation

data/docs/quickstart.adoc

@@ -1,368 +0,0 @@
-= Quickstart Guide for Metanorma-CSD
-
-Start using Metanorma-CSD to author CalConnect docs in these steps:
-
-. Get Metanorma running on your machine
-. Fetch and compile an example Metanorma-CSD document
-. Modify the document to fit your goals while keeping it valid AsciiCSD
-
-This guide assumes proficiency with the terminal,
-and uses the Docker option of running Metanorma
-(there’re other
-https://www.metanorma.com/overview/getting-started/[options of installing Metanorma],
-too).
-
-
-== Get Metanorma running on your machine
-
-Assuming you have Docker installed, it’s as easy as:
-
-[source,console]
---
-docker pull metanorma/metanorma
---
-
-
-== Fetch and compile an example Metanorma-CSD document
-
-We’re going to use the vCard Format Specification sample document here.
-Clone the Metanorma-CSD repository and change into the directory with the example:
-
-[source,console]
---
-git clone https://github.com/metanorma/metanorma-csd.git
-cd /spec/examples/
---
-
-To compile the document, run the Docker container as follows:
-
-[source,console]
---
-docker run -v "$(pwd)":/metanorma/ -w /metanorma metanorma/metanorma metanorma -t csd -x xml,html,pdf,doc rfc6350.adoc
---
-
-NOTE: If you use Metanorma-CLI instead of Docker,
-http://metanorma.com:4001/software/metanorma-cli/docs/usage/[see how to use the metanorma executable to compile documnts].
-
-
-== Write valid AsciiCSD
-
-A Metanorma-CSD is a file in AsciiDoc format with certain extensions
-specific to Metanorma as a whole and Metanorma-CSD in particular.
-(We call the format AsciiCSD for short.)
-
-
-=== AsciiDoc basics
-
-NOTE: Skip this section if you’re already familiar with AsciiDoc syntax.
-
-==== Inline formatting
-
-[source,asciidoc]
---
-*bold emphasis*, _italic emphasis_, `monospace / code snippet`
-"`Typographic double quotes`", '`typographic single quotes`'
-Subscript: H~2~O; superscript: E=mc^2^
---
-
-==== Sections, anchors and references
-
-[source,asciidoc]
---
-== Section 1
-
-Content (see <<anchor>>)
-
-== Section 2
-
-=== Section 2.1
-
-[[anchor]]
-==== Section 2.2
-
-Content 2.2. http://www.calconnect.org/[CalConnect]
---
-
-==== Lists and blocks
-
-[source,asciidoc]
---
-* Unordered list item 1
-* Unordered list item 2
-
-. Ordered list item 1
-. Ordered list item 2
-
-Definition list:
-
-stem:[w]:: is the mass fraction of grains with defects in the test sample;
-stem:[m_D]:: is the mass, in grams, of grains with that defect;
-mag:: is the mass, in grams, of the aggregated test sample.
---
-
-==== Tables, figures, footnotes
-
-A rather complex table:
-
-[source,adoc]
-----
-[[tableD-1]]
-[cols="<,^,^,^,^",headerrows=2]
-.Repeatability and reproducibility of husked rice yield
-|===
-.2+| Description 4+| Rice sample
-| Arborio | Drago footnote:[Parboiled rice.] | Balilla | Thaibonnet
-
-| Number of laboratories retained after eliminating outliers | 13 | 11 | 13 | 13
-| Mean value, g/100 g | 81,2 | 82,0 | 81,8 | 77,7
-|===
-----
-
-Images (figures) and footnotes:
-
-[source,adoc]
-----
-[[figureC-1]]
-.Typical gelatinization curve
-image::images/rice_image2.png[]
-footnote:[The time stem:[t_90] was estimated to be 18,2 min for this example.]
-----
-
-
-==== Admonition blocks, quotes & code listings
-
-Admonitions (notes, warnings, cautions, etc.) and examples:
-
-[source,adoc]
-----
-NOTE: It is unnecessary to compare rice yield across years.
-
-[example]
-5 + 3 = 8
-----
-
-Block quotes:
-
-[source,adoc]
-----
-[quote,ISO,"ISO7301,clause 1"]
-_____
-This Standard gives the minimum specifications for rice (_Oryza sativa_ L.)
-_____
-----
-
-Source code:
-
-[source,adoc]
-----
-[source,some-lang]
-------
-function () -> {}
-------
-----
-
-
-=== Extensions to AsciiDoc
-
-==== Document header & custom AsciiDoc attributes
-
-`:docnumber:`: CalConnect document number, as allocated by TCC.
-
-`:status:`: The status of the document can be one of:
-
-* proposal
-* working-draft
-* committee-draft
-* draft-standard
-* final-draft
-* published
-* withdrawn
-
-`:doctype:`: The type of the document can be one of:
-
-* standard
-* directive
-* guide
-* specification
-* report
-* amendment
-* technical-corrigendum
-
-`:technical-committee:`, `:technical-committee_N:` (where N is a positive integer):
-Technical committee; there can be more than one.
-
-`:draft:`: Enables comments in Word and XML.
-
-`:local-cache-only:`: Used with Metanorma under Docker to ensure bibliographic entries
-do not get unnecessarily fetched all the time.
-
-
-==== Foreword & Introduction
-
-Foreword must be put before the first real section/clause (the `==` one).
-
-----
-[[foreword]]
-.Foreword
-The Calendaring and Scheduling Consortium ("`CalConnect`") is global non-profit
-organization with the aim to facilitate interoperability of technologies across
-user-centric systems and applications...
-----
-
-Introduction comes after Foreword and is unnumbered (actually "`0`"):
-
-----
-[[introduction]]
-:sectnums!:     <== disables display of section number
-== Introduction
-
-<<ISO8601>> has been the international standard for date and time representations
-and is applied widely, including in the <<RFC5545>> and <<RFC6350>> standards
-...
-
-:sectnums:      <== re-enables display of section number
-----
-
-NOTE: Some ISO standards display Introduction section numbers (the "`0`") if there are
-too many sub-sections.
-
-
-==== Normative references & bibliography
-
-What is a normative vs informative reference?
-
-* A change to a normative reference requires updating of the document;
-* A change to an informative reference should not trigger a change in the document.
-
-
-Clause 2 must be this:
-
-----
-[bibliography]
-== Normative references
-
-* [[[ISO3696,ISO 3696]]], _Water for analytical laboratory use -- Test methods_
-----
-
-Last section must be this:
-
-----
-[bibliography]
-== Bibliography
-
-* [[[ISO5609,ISO 5609]]], _Soil for laboratory analysis -- Test methods_
-----
-
-NOTE: the Bibliography is identical in usage with the IETF RFC section "`Informative references`".
-
-
-==== Citations
-
-In a CSD you often want to cite external or internal references.
-
-Internal:
-[source,adoc]
-----
-[[dog-food]]
-== Dog food
-
-Dogs love food, not only bones. Mine especially loves eating Oreo's.
-
-== Living with your dog
-
-My dog, Cookie, loves to eat cookies (see <<dog-food>>).
-
-----
-
-
-External (remember to add the reference!):
-
-[source,adoc]
-----
-The quality requirements on wheat are described in <<ISO7301>>.
-
-In particular, those for bread wheat (T. aestivum) are given in
-<<ISO7301,clause=5.6>>.
-----
-
-
-==== Terms and definitions
-
-This must be clause 3.
-
-[source,adoc]
-----
-[[tda]]                      <= anchor if you want it
-[source=ISO8601-1]           <= allows inheriting terms and definitions from
-another document
-== Terms, definitions, symbols and abbreviations   <= can combine T&D and S&A
-
-=== Terms and definitions    <= the real T&D clause
-
-[[term-explicit]]            <= anchor if you want it
-==== explicit form           <= term item
-
-date and time representation that uses designator symbols to delimit
-time scale components
-----
-
-
-==== Term entry in T&D
-
-The structure is strict; the following illustrates the complete structure of a term entry.
-
-In the term source (`[.source]`), all content after the reference and the "`comma`" is about "`modifications`" to the original definition.
-
-[source,adoc]
-----
-[[paddy]]                  <= anchor
-=== paddy                  <= term
-alt:[paddy rice]           <= alternative term
-alt:[rough rice]           <= second alternative
-deprecated:[cargo rice]    <= deprecated term
-domain:[rice]              <= domain
-
-rice retaining its husk after threshing  <= definition
-
-[example]              <= example
-Foreign seeds, husks, bran, sand, dust.
-
-NOTE: The starch of waxy rice consists almost entirely of amylopectin. <= note
-
-[.source]
-<<ISO7301,section 3.2>>, The term "cargo rice" is shown as deprecated, <= source
-and Note 1 to entry is not included here.
-----
-
-
-==== Term entry sourced from IEC Electropedia (IEV)
-
-In the `[.source]`, a termbase such as the IEC Electropedia ("`IEV`") can be used, such as:
-
-[source,adoc]
-----
-[.source]
-<<IEV,clause "113-01-01">>, the term "space-time" is further explained
-in a new Note 2 to entry.
-----
-
-References to the specific IEC 60500 documents (where IEV terms came
-from) are automatically added to the Bibliography.
-
-
-==== Annex
-
-Annexes have to be placed before the "`Bibliography`".
-
-[source,adoc]
-----
-[[AnnexA]]
-[appendix,subtype=informative]
-== Example date and time expressions, and representations
-...
-----
-
-
-== Where next?
-
-* https://www.metanorma.com/overview/[Learn more about Metanorma]