metanorma-plateau 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b23e63986fff161bebe0f798b8fac7466c3d189c3a1bf83fef16e19d6a65476e
-  data.tar.gz: 9381fb2e626585dd9fcd72340ead9e07612a39f5a155059090ccddb96aed943f
+  metadata.gz: 3b9502dbb12bc7774d093699d7859cbabce81c4e290f14e6a0921c97b30068f1
+  data.tar.gz: 885b279f620ec1f8ca940c46d8226106c92b6a79a83735a8c85f833c902f2f4e
 SHA512:
-  metadata.gz: 0cae4166ba63c6a506ebfb508b3d14530e42dfce96406ef302ada3f63a1b737eb9a5bf23d07c6425627a93d4918f58cc9f3a69fb4837053a067a61a960ce003b
-  data.tar.gz: e508fc80f0ba7e7e2cf7cf71a41636a9325729cb98ae1301ba77bf37da598fa92c4fa4b6d2b261b8d98be035ca013c166144244b2ac4b66ead1382eff67af5c3
+  metadata.gz: fd5b15979492ead604a2b194a33b88359cc7c8abdb9e54f46074f40d40ffdf9686bf6caa83f64f3d617a1028c753207ad32d9644a13297ada7d64d514426619e
+  data.tar.gz: f8b6f02d94ecd5148be9aaddb50097d4c69d1087fc2412da2b510730386dabdfeace0d58fb822064ae4d6cfd862422a2134ee5625a989044e0a03d7037c9429f

data/lib/isodoc/plateau/plateau.international-standard.xsl

@@ -80,7 +80,7 @@
 				<fo:region-end region-name="right-region" extent="8.5mm"/>
 			</fo:simple-page-master>
 
-			<fo:simple-page-master master-name="document_preface" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="preface" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<xsl:if test="$vertical_layout = 'true'">
 					<xsl:attribute name="page-width"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
 					<xsl:attribute name="page-height"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
@@ -96,7 +96,16 @@
 				<fo:region-end region-name="right-region" extent="34mm"/>
 			</fo:simple-page-master>
 
-			<fo:simple-page-master master-name="document_toc" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<!-- preface landscape -->
+			<fo:simple-page-master master-name="preface-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
+				<fo:region-body margin-top="15mm" margin-bottom="{$cover_page_margin_bottom}mm" margin-left="36mm" margin-right="8.5mm"/>
+				<fo:region-before region-name="header" extent="15mm"/>
+				<fo:region-after region-name="footer" extent="{$cover_page_margin_bottom}mm"/>
+				<fo:region-start region-name="left-region-landscape" extent="36mm"/>
+				<fo:region-end region-name="right-region-landscape" extent="8.5mm"/>
+			</fo:simple-page-master>
+
+			<fo:simple-page-master master-name="toc" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<xsl:if test="$vertical_layout = 'true'">
 					<xsl:attribute name="page-width"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
 					<xsl:attribute name="page-height"><xsl:value-of select="$pageWidth"/>mm</xsl:attribute>
@@ -137,7 +146,7 @@
 				<fo:region-end region-name="right-region-landscape" extent="{$marginLeftRight2}mm"/>
 			</fo:simple-page-master>
 
-			<fo:simple-page-master master-name="last-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="back-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="179.5mm" margin-bottom="30mm" margin-left="15mm" margin-right="22.7mm"/>
 				<fo:region-before region-name="header" extent="179.5mm"/>
 				<fo:region-after region-name="footer" extent="30mm"/>
@@ -145,7 +154,7 @@
 				<fo:region-end region-name="right-region" extent="22.7mm"/>
 			</fo:simple-page-master>
 
-			<fo:simple-page-master master-name="last-page_technical-report" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="back-page_technical-report" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="191mm" margin-bottom="41mm" margin-left="26mm" margin-right="26mm"/>
 				<fo:region-before region-name="header" extent="{$marginTop}mm"/>
 				<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
@@ -179,13 +188,13 @@
 				<xsl:with-param name="contents" select="$contents"/>
 			</xsl:call-template>
 
-			<!-- <xsl:if test="$debug = 'true'">
+			<xsl:if test="$debug = 'true'">
 				<xsl:message>start contents redirect</xsl:message>
 				<redirect:write file="contents.xml">
 					<xsl:copy-of select="$contents"/>
 				</redirect:write>
 				<xsl:message>end contents redirect</xsl:message>
-			</xsl:if> -->
+			</xsl:if>
 
 			<xsl:variable name="updated_xml_pres">
 				<xsl:apply-templates mode="update_xml_pres"/>
@@ -252,7 +261,7 @@
 
 						<xsl:choose>
 							<xsl:when test="mn:clause[@type = 'toc']">
-								<fo:page-sequence master-reference="document_toc" initial-page-number="1" force-page-count="no-force">
+								<fo:page-sequence master-reference="toc" initial-page-number="1" force-page-count="no-force">
 									<xsl:if test="$doctype = 'technical-report'">
 										<xsl:attribute name="master-reference">document</xsl:attribute>
 									</xsl:if>
@@ -275,12 +284,9 @@
 							</xsl:when>
 							<xsl:otherwise>
 
-								<fo:page-sequence master-reference="document_preface" force-page-count="no-force" font-family="Noto Sans JP" font-size="10pt">
+								<xsl:variable name="page_orientation"><xsl:call-template name="getPageSequenceOrientation"/></xsl:variable>
 
-									<xsl:attribute name="master-reference">
-										<xsl:text>document_preface</xsl:text>
-										<xsl:call-template name="getPageSequenceOrientation"/>
-									</xsl:attribute>
+								<fo:page-sequence master-reference="preface{$page_orientation}" force-page-count="no-force" font-family="Noto Sans JP" font-size="10pt">
 
 									<fo:static-content flow-name="header" role="artifact" id="__internal_layout__preface_header_{generate-id()}">
 										<!-- grey background  -->
@@ -317,12 +323,9 @@
 					<!-- ========================== -->
 
 					<xsl:for-each select=".//mn:page_sequence[not(parent::mn:preface)][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
-						<fo:page-sequence master-reference="document" force-page-count="no-force">
+						<xsl:variable name="page_orientation"><xsl:call-template name="getPageSequenceOrientation"/></xsl:variable>
 
-							<xsl:attribute name="master-reference">
-								<xsl:text>document</xsl:text>
-								<xsl:call-template name="getPageSequenceOrientation"/>
-							</xsl:attribute>
+						<fo:page-sequence master-reference="document{$page_orientation}" force-page-count="no-force">
 
 							<xsl:if test="position() = 1">
 								<xsl:attribute name="initial-page-number">1</xsl:attribute>
@@ -1886,7 +1889,7 @@
 	<xsl:template name="back-page">
 		<xsl:choose>
 			<xsl:when test="$doctype = 'technical-report'">
-				<fo:page-sequence master-reference="last-page_technical-report" force-page-count="no-force">
+				<fo:page-sequence master-reference="back-page_technical-report" force-page-count="no-force">
 					<xsl:call-template name="insertHeaderFooter"/>
 					<fo:flow flow-name="xsl-region-body">
 						<fo:block-container width="100%" height="64mm" border="0.75pt solid black" font-size="14pt" text-align="center" display-align="center" line-height="1.7">
@@ -1908,7 +1911,7 @@
 				</fo:page-sequence>
 			</xsl:when>
 			<xsl:otherwise> <!-- handbook -->
-				<fo:page-sequence master-reference="last-page" force-page-count="no-force">
+				<fo:page-sequence master-reference="back-page" force-page-count="no-force">
 					<fo:flow flow-name="xsl-region-body">
 						<fo:block-container width="100%" border="0.75pt solid black" font-size="10pt" line-height="1.7">
 							<fo:block margin-left="4.5mm" margin-top="1mm">
@@ -7140,6 +7143,16 @@
 		</xsl:variable>
 		<xsl:variable name="quot">"</xsl:variable>
 		<xsl:variable name="styles_">
+			<!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
+			<xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
+				<style name="border-top">none</style>
+				<style name="border-right">none</style>
+				<style name="border-left">none</style>
+				<style name="border-bottom">none</style>
+				<style name="color">inherit</style>
+				<style name="background-color">transparent</style>
+			</xsl:if>
+
 			<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
 				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
@@ -9165,7 +9178,10 @@
 
 		<xsl:call-template name="setNamedDestination"/>
 
-		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
+		<fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
+			<xsl:if test="not(parent::mn:references)">
+				<xsl:copy-of select="@id"/>
+			</xsl:if>
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
@@ -11845,8 +11861,8 @@
 	</xsl:template> <!-- bibitem -->
 
 	<!-- Bibliography (non-normative references) -->
-	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
-		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or 
+	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
+		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or 
 			$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
 		<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
 		<xsl:call-template name="setNamedDestination"/>
@@ -11898,7 +11914,7 @@
 				</fo:list-item>
 			</xsl:otherwise>
 		</xsl:choose>
-		<xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]">
+		<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
 			<xsl:with-param name="skip">false</xsl:with-param>
 		</xsl:apply-templates>
 	</xsl:template>
@@ -11915,8 +11931,26 @@
 		</xsl:apply-templates>
 		<xsl:apply-templates select="mn:formattedref"/>
 		<!-- end bibitem processing -->
+
+		<xsl:call-template name="processBibliographyNote"/>
 	</xsl:template> <!-- processBibitem (bibitem) -->
 
+	<xsl:template name="processBibliographyNote">
+		<xsl:if test="self::mn:note">
+			<xsl:variable name="note_node">
+				<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
+					<xsl:copy> <!-- skip @id -->
+						<xsl:copy-of select="node()"/>
+					</xsl:copy>
+				</xsl:element>
+			</xsl:variable>
+			<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
+				<xsl:call-template name="note"/>
+			</xsl:for-each> -->
+			<xsl:call-template name="note"/>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template match="mn:title" mode="title">
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template>
@@ -12466,6 +12500,48 @@
 	<!-- End Form's elements processing -->
 	<!-- =================== -->
 
+	<xsl:attribute-set name="toc-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_toc-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="toc-title-style">
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-title-page-style">
+	</xsl:attribute-set> <!-- toc-title-page-style -->
+
+	<xsl:attribute-set name="toc-item-block-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_toc-item-block-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="toc-item-style">
+		<xsl:attribute name="role">TOCI</xsl:attribute>
+	</xsl:attribute-set> <!-- END: toc-item-style -->
+
+	<xsl:template name="refine_toc-item-style">
+	</xsl:template> <!-- END: refine_toc-item-style -->
+
+	<xsl:attribute-set name="toc-leader-style">
+	</xsl:attribute-set> <!-- END: toc-leader-style -->
+
+	<xsl:attribute-set name="toc-pagenumber-style">
+	</xsl:attribute-set>
+
+	<!-- List of Figures, Tables -->
+	<xsl:attribute-set name="toc-listof-title-style">
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-listof-item-block-style">
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-listof-item-style">
+		<xsl:attribute name="role">TOCI</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
 			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">

data/lib/metanorma/plateau/basicdoc.rng

@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
         </zeroOrMore>
       </element>
     </optional>
-    <optional>
+    <zeroOrMore>
       <element name="description">
-        <a:documentation>Description of the change described in this block</a:documentation>
-        <zeroOrMore>
+        <a:documentation>Description(s) of the change described in this block</a:documentation>
+        <oneOrMore>
           <ref name="BasicBlock"/>
-        </zeroOrMore>
+        </oneOrMore>
       </element>
-    </optional>
+    </zeroOrMore>
     <optional>
       <element name="newcontent">
         <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>

data/lib/metanorma/plateau/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.0.8 -->
+<!-- VERSION v2.1.0 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -735,6 +735,12 @@ titlecase, or lowercase</a:documentation>
     <ref name="BlockAttributes"/>
   </define>
   <define name="TableAttributes" combine="interleave">
+    <optional>
+      <attribute name="plain">
+        <a:documentation>Render as a plain attribute, with no shading or borders</a:documentation>
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="width">
         <a:documentation>Width of the table block in rendering</a:documentation>

data/lib/metanorma/plateau/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Plateau
-    VERSION = "1.1.0".freeze
+    VERSION = "1.1.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plateau
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-05 00:00:00.000000000 Z
+date: 2025-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-jis