metanorma-plateau 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36e96c27e5a94c5855c471a72fbb115416e208d884f0bb0f74158def02671151
-  data.tar.gz: 1feeb3f4449a2503653da24cc18130f272d9d21abdf702c6b3ca5a723ec79e1b
+  metadata.gz: 843c28dd5ffac493f6cae6c19881b2f916ecc248f525e399815c27071a7d48f3
+  data.tar.gz: 9770bc7dfac3671e9863296316e7fd0ccc8d12403b6f007f42136e3b8d5e4a4f
 SHA512:
-  metadata.gz: 71f87996b8eadccf3fe979c4060975a760205e795ffef8eeb854420d23288956e43cecc84ebfaedbff1bee3069528c0003661a5eca466f74be281635fa5518a5
-  data.tar.gz: 624aa94e13f3174f08a4cb8601423563165e2601479af4dff99cce3f6938ec35b786b75305d1ade63241800e4a41d0ee8a26fba8aec55e412094716badc49cf1
+  metadata.gz: 94e9153d5c042e1190f2583a4e469d43d2fcbbaa5439d5b0d26a093281fc5da9009355694f122ccd4f8600e6c70355ad58b736876429cb7c7543cedaa8b49554
+  data.tar.gz: 5ae50d8ef9feb33aa7a6ca5741dce0aa8be30cb8104f2ff4e6ba39d93359f7feded5ef4cd5166053a52db2e3b87cdddbaa2fff5c96d600b19fe0cc2dd1712550

data/lib/isodoc/plateau/init.rb

@@ -22,7 +22,7 @@ module IsoDoc
 
       def bibrenderer(options = {})
         ::Relaton::Render::Jis::General.new(options
-          .merge(language: @lang, i18nhash: @i18n.get))
+          .merge(language: @lang, script: @script, i18nhash: @i18n.get))
       end
     end
   end

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

@@ -252,6 +252,8 @@
 						<xsl:with-param name="num" select="$num"/>
 					</xsl:call-template>
 
+					<xsl:call-template name="inner-cover-page"/>
+
 					<!-- ========================== -->
 					<!-- Preface and contents pages -->
 					<!-- ========================== -->
@@ -723,6 +725,9 @@
 		</fo:page-sequence>
 	</xsl:template> <!-- cover-page -->
 
+	<xsl:template name="inner-cover-page">
+	</xsl:template>
+
 	<xsl:template match="mn:p[@class = 'JapaneseIndustrialStandard']" priority="4"/>
 	<xsl:template match="mn:p[@class = 'StandardNumber']" priority="4"/>
 	<xsl:template match="mn:p[@class = 'IDT']" priority="4"/>
@@ -1579,7 +1584,7 @@
 	</xsl:template>
 
 	<!-- <name>注記  1</name> to <name>注記<font_en>  1</font_en></name> -->
-	<xsl:template match="mn:title/text() | mn:fmt-title/text() |        mn:note/mn:name/text() | mn:note/mn:fmt-name/text() |        mn:termnote/mn:name/text() | mn:termnote/mn:fmt-name/text() |       mn:table/mn:name/text() | mn:table/mn:fmt-name/text() |       mn:figure/mn:name/text() | mn:figure/mn:fmt-name/text() |       mn:termexample/mn:name/text() | mn:termexample/mn:fmt-name/text() |       mn:xref//text() | mn:fmt-xref//text() |       mn:origin/text() | mn:fmt-origin/text()" mode="update_xml_step1">
+	<xsl:template match="mn:title/text() | mn:fmt-title/text() |        mn:note/mn:name/text() | mn:note/mn:fmt-name/text() |        mn:termnote/mn:name/text() | mn:termnote/mn:fmt-name/text() |       mn:table/mn:name/text() | mn:table/mn:fmt-name/text() |       mn:figure/mn:name/text() | mn:figure/mn:fmt-name/text() |       mn:termexample/mn:name/text() | mn:termexample/mn:fmt-name/text() |       mn:xref//text() | mn:fmt-xref//text() |       mn:origin/text() | mn:fmt-origin/text() |       mn:fmt-link/text()" mode="update_xml_step1">
 		<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new(.), $regex_en, concat($tag_font_en_bold_open,'$1',$tag_font_en_bold_close))"/>
 		<xsl:variable name="text_en">
 			<xsl:element name="text" namespace="{$namespace_full}">
@@ -3769,7 +3774,6 @@
 	</xsl:attribute-set> <!-- feedback-statement-title-style -->
 
 	<xsl:template name="refine_feedback-statement-title-style">
-
 	</xsl:template>
 
 	<xsl:attribute-set name="feedback-statement-p-style">
@@ -9592,15 +9596,23 @@
 	</xsl:attribute-set> <!-- quote-style -->
 
 	<xsl:template name="refine_quote-style">
-	</xsl:template>
+	</xsl:template> <!-- refine_quote-style -->
 
 	<xsl:attribute-set name="quote-source-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- quote-source-style -->
 
 	<xsl:template name="refine_quote-source-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="source-style">
+		<xsl:attribute name="space-after">8pt</xsl:attribute>
+	</xsl:attribute-set> <!-- source-style -->
+
+	<xsl:template name="refine_source-style">
+
+	</xsl:template> <!-- refine_source-style -->
+
 	<!-- ====== -->
 	<!-- quote -->
 	<!-- source -->
@@ -9648,7 +9660,9 @@
 		</xsl:if>
 		<xsl:choose>
 			<xsl:when test="not(parent::quote)">
-				<fo:block>
+				<fo:block xsl:use-attribute-sets="source-style">
+					<xsl:call-template name="refine_source-style"/>
+
 					<xsl:call-template name="insert_basic_link">
 						<xsl:with-param name="element">
 							<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
@@ -11762,7 +11776,7 @@
 
 	<xsl:template name="refine_fn-reference-style">
 		<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
-		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
+		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if><!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas'"></xsl:if> -->
 	</xsl:template> <!-- refine_fn-reference-style -->
 
 	<xsl:attribute-set name="fn-style">
@@ -11773,7 +11787,9 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="fn-num-style">
+		<xsl:attribute name="role">Reference</xsl:attribute>
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
+		<xsl:attribute name="font-size">65%</xsl:attribute>
 		<xsl:attribute name="font-size">6pt</xsl:attribute>
 		<xsl:attribute name="baseline-shift">25%</xsl:attribute>
 	</xsl:attribute-set> <!-- fn-num-style -->
@@ -11845,33 +11861,16 @@
 		<xsl:variable name="ref_id" select="@target"/>
 
 		<xsl:variable name="footnote_inline">
-			<fo:inline role="Reference">
+			<fo:inline xsl:use-attribute-sets="fn-num-style">
 
-				<xsl:variable name="fn_styles">
-					<xsl:choose>
-						<xsl:when test="ancestor::mn:bibitem">
-							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
-								<xsl:call-template name="refine_bibitem-note-fn-style"/>
-							</fn_styles>
-						</xsl:when>
-						<xsl:otherwise>
-							<fn_styles xsl:use-attribute-sets="fn-num-style">
-								<xsl:call-template name="refine_fn-num-style"/>
-							</fn_styles>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:variable>
-
-				<xsl:for-each select="xalan:nodeset($fn_styles)/fn_styles/@*">
-					<xsl:copy-of select="."/>
-				</xsl:for-each>
+				<xsl:call-template name="refine_fn-num-style"/>
 
 				<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
 				<!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
 					<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
 				</xsl:if> -->
 
-				<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
+				<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if>
 
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
@@ -12164,29 +12163,6 @@
 	<xsl:template name="refine_bibitem-non-normative-list-body-style">
 	</xsl:template>
 
-	<!-- footnote reference number for bibitem, in the text  -->
-	<xsl:attribute-set name="bibitem-note-fn-style">
-		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
-		<xsl:attribute name="font-size">65%</xsl:attribute>
-		<xsl:attribute name="font-size">6pt</xsl:attribute>
-		<xsl:attribute name="baseline-shift">25%</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-style -->
-
-	<xsl:template name="refine_bibitem-note-fn-style">
-	</xsl:template>
-
-	<!-- footnote number on the page bottom -->
-	<xsl:attribute-set name="bibitem-note-fn-number-style">
-		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
-
-	<!-- footnote body (text) on the page bottom -->
-	<xsl:attribute-set name="bibitem-note-fn-body-style">
-		<xsl:attribute name="font-size">10pt</xsl:attribute>
-		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-		<xsl:attribute name="start-indent">0pt</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
-
 	<xsl:attribute-set name="references-non-normative-style">
 	</xsl:attribute-set> <!-- references-non-normative-style -->
 
@@ -14535,6 +14511,17 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_clause-style">
+		<!-- commented for https://github.com/metanorma/metanorma-ribose/issues/421 -->
+		<!-- <xsl:if test="$namespace = 'rsd'">
+			<xsl:variable name="level">
+				<xsl:call-template name="getLevel">
+					<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:if test="$level &gt;= 4">
+				<xsl:attribute name="margin-left">13mm</xsl:attribute>
+			</xsl:if>
+		</xsl:if> -->
 	</xsl:template>
 
 	<!-- main sections -->

data/lib/isodoc/plateau/presentation_xml_convert.rb

@@ -36,14 +36,12 @@ module IsoDoc
         source1(elem, :para)
         # if we haven't already removed it...
         elem.parent or return
-        # elem.parent.next = "<p>#{to_xml(elem.remove)}</p>"
         elem.parent.next = elem.remove
       end
 
       def listsource(elem, ancestor)
         source1(elem, ancestor)
         elem.parent or return
-        # elem.parent.next = "<p>#{to_xml(elem.remove)}</p>"
         elem.parent.next = elem.remove
       end
 

data/lib/metanorma/plateau/cleanup.rb

@@ -1,14 +1,16 @@
 module Metanorma
   module Plateau
+    # after term def processed, process source after paragraphs so that
+    # the moving of paragraphs there does not nclude termdef
     class Converter < Jis::Converter
-      def blocksource_cleanup(xmldoc)
+      def termdef_cleanup(xmldoc)
+        super
         xmldoc.xpath("//source").each do |s|
           p = s.previous_element or next
           %w[p ol ul dl].include? p.name or next
           s.delete("type")
           s.parent = p
         end
-        super
       end
 
       # Abandoned in favour of JIS ordering

data/lib/metanorma/plateau/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Plateau
-    VERSION = "1.1.5".freeze
+    VERSION = "1.1.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plateau
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-15 00:00:00.000000000 Z
+date: 2025-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-jis