metanorma-iso 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 714a368be85c8da9ffe28d8fa5897da7d8b0dff0939c7b108681cc5720241513
-  data.tar.gz: feb31751f9388342066e14b68dbd1589bddfe87fd6b7cf48100606f2b4c5e820
+  metadata.gz: f3ba54e8bd089ed40863fa57aad10fe877dd6b25e6750739da0633002396116f
+  data.tar.gz: ce7882d56cbe92bd8b199cceab33def08a9f993925a8619d0792a6c8b851d167
 SHA512:
-  metadata.gz: eec64e6e178acbea0e0f391068c2cef244c22c4568490e5cf27c185497e132df5457e4bed8ffa03da71cd54fa66f55746ba83e5f67bb0ef38fd6e8b87129fbc9
-  data.tar.gz: e8effac1511a8364303574f1ec1a3ff70188c9f528700fa2c5e3fb59f35caf5e7be439e9742718b61546cc2d39a41533a6032786323603a6fcfd802dcaf463b9
+  metadata.gz: 6374d26fe1c9735cbb7792a82f8bfcdd2d93d89a5450b26206f1462f672fc6490dc3f16a32c35bce5c61acf6d14ab03c8f4d207f53eaf901fb33b7b54090af8a
+  data.tar.gz: e7484d6860caa5fa96dcfa9fee1bd29f61d9c1bc70ef47a39a4278867e9c331aab50af18dd7105d6ca85832a1e0d458c0bc9b387b422e2e8526193fe176b7aab

data/lib/isodoc/iso/html/style-human.css

@@ -1339,7 +1339,7 @@ span.TableFootnoteRef {
   font-size: {{footnotefontsize}};
 }
 
-sup a {
+sup {
   vertical-align: super;
   font-size: 0.8em;
 }

data/lib/isodoc/iso/html/style-human.scss

@@ -655,7 +655,7 @@ span.TableFootnoteRef {
     font-size: $footnotefontsize;
 }
 
-sup a {
+sup {
     vertical-align: super;
     font-size: 0.8em;
 }

data/lib/isodoc/iso/html/style-iso.css

@@ -1403,7 +1403,7 @@ a.footnote-number, a.TableFootnoteRef, span.TableFootnoteRef {
   font-size: {{footnotefontsize}};
 }
 
-sup a {
+sup {
   vertical-align: super;
   font-size: 0.8em;
 }

data/lib/isodoc/iso/html/style-iso.scss

@@ -688,7 +688,7 @@ a.footnote-number, a.TableFootnoteRef, span.TableFootnoteRef {
     font-size: $footnotefontsize;
 }
 
-sup a {
+sup {
   vertical-align: super;
   font-size: 0.8em;
 }

data/lib/isodoc/iso/i18n-de.yaml

@@ -12,6 +12,7 @@ price: Preis
 date_first_printing: Datum des ersten Drucks
 date_printing: "Datum des {{ var1 | ordinal_word: '', '' }} Drucks"
 descriptor: Deskriptor
+reference: Referenz
 under_preparation: In Vorbereitung. (Stadium zum Zeitpunkt der Veröffentlichung %).
 withdrawn: Zurückgezogen.
 cancelled_and_replaced: Abgebrochen und ersetzt durch %.
@@ -25,8 +26,8 @@ voting_begins_on: Die Abstimmung beginnt am
 voting_terminates_on: Die Abstimmung endet am
 corrected_version: Korrigierte Version
 fast-track-procedue: Beschleunigtes Verfahren
-multiple_and: "%1 und %2"
-multiple_or: "%1 oder %2"
+multiple_and: "%1 <span class='fmt-conn'>und</span> %2"
+multiple_or: "%1 <span class='fmt-conn'>oder</span> %2"
 classification-UDC: UDK
 edition_ordinal_old: "{{ var1 | ordinal_num: 'edition', '' }} AUSGABE"
 edition_replacement: "Diese {{ var1 | ordinal_word: 'edition', '' }} Ausgabe ersetzt die {{ var2 | ordinal_word: 'edition', '' }} Ausgabe"
@@ -158,3 +159,6 @@ inflection:
   Deskriptor:
     sg: Deskriptor
     pl: Deskriptoren
+  Referenz:
+    sg: Referenz
+    pl: Referenzen

data/lib/isodoc/iso/i18n-en.yaml

@@ -12,6 +12,7 @@ price: Price
 date_first_printing: Date of the first printing
 date_printing: "Date of the {{ var1 | ordinal_word: '', '' }} printing"
 descriptor: Descriptor
+reference: Reference
 under_preparation: Under preparation. (Stage at the time of publication %).
 withdrawn: Withdrawn.
 cancelled_and_replaced: Cancelled and replaced by %.
@@ -27,8 +28,8 @@ voting_begins_on: Voting begins on
 voting_terminates_on: Voting terminates on
 corrected_version: Corrected version
 fast-track-procedure: Fast track procedure
-multiple_and: "%1 and %2"
-multiple_or: "%1 or %2"
+multiple_and: "%1 <span class='fmt-conn'>and</span> %2"
+multiple_or: "%1 <span class='fmt-conn'>or</span> %2"
 classification-UDC: UDC
 website: website
 formerly_id: "(formerly %)"
@@ -161,3 +162,6 @@ inflection:
   Descriptor:
     sg: Descriptor
     pl: Descriptors
+  Reference:
+    sg: Reference
+    pl: References

data/lib/isodoc/iso/i18n-fr.yaml

@@ -13,6 +13,7 @@ price: Prix
 date_first_printing: Date de la première impression
 date_printing: "Date de la {{ var1 | ordinal_word: '', 'f' }} impression"
 descriptor: Descripteur
+reference: Référence
 under_preparation: En cours d'élaboration. (Stade au moment de la publication %).
 withdrawn: Retiré.
 cancelled_and_replaced: Annulé et remplacé par %.
@@ -159,3 +160,6 @@ inflection:
   Descripteur:
     sg: Descripteur
     pl: Descripteurs
+  Référence:
+    sg: Référence
+    pl: Références

data/lib/isodoc/iso/i18n-ja.yaml

@@ -1,4 +1,5 @@
 descriptor: 記述子
+reference: 参考文献
 fast-track-procedure:  ファストトラック手順
 availablefrom: 入手先
 website: ウェブサイト

data/lib/isodoc/iso/i18n-ru.yaml

@@ -7,6 +7,7 @@ all_rights_reserved: Все права защищены
 reference_number: Ссылочный номер
 reference_number_abbrev: Исх. №
 descriptor: Дескриптор
+reference: Ссылка
 price_based_on: Цена рассчитана на % стр.
 price: Цена
 date_first_printing: Дата первой печати
@@ -159,3 +160,6 @@ inflection:
   Дескриптор:
     sg: Дескриптор
     pl: Дескрипторы
+  Ссылка:
+    sg: Ссылка
+    pl: Ссылки

data/lib/isodoc/iso/i18n-zh-Hans.yaml

@@ -8,6 +8,7 @@ reference_number: 参考编号
 reference_number_abbrev: 参考编号
 price_based_on: 价格基于%页
 descriptor: 描述符
+reference: 参考文献
 under_preparation: 制定中（出版时最新状态为%）
 withdrawn: 撤回 .
 cancelled_and_replaced: 已取消并由%取代。

data/lib/isodoc/iso/init.rb

@@ -36,8 +36,8 @@ module IsoDoc
       end
 
       def bibrenderer(options = {})
-        ::Relaton::Render::Iso::General.new(options.merge(language: @lang,
-                                                          i18nhash: @i18n.get))
+        ::Relaton::Render::Iso::General.new(options
+          .merge(language: @lang, script: @script, i18nhash: @i18n.get))
       end
 
       def amd?(_docxml)

data/lib/isodoc/iso/iso.amendment.xsl

@@ -1082,7 +1082,7 @@
 							<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num &lt;= 19981231)"><!-- copyright renders in the footer footer-preface-first_1987-1998--></xsl:when>
 							<xsl:otherwise>
 
-								<xsl:call-template name="copyright-statement"/>
+								<xsl:call-template name="inner-cover-page"/>
 
 							</xsl:otherwise>
 						</xsl:choose>
@@ -2849,7 +2849,8 @@
 		</xsl:if> <!-- $isGenerateTableIF = 'false' -->
 	</xsl:template> <!-- END cover-page -->
 
-	<xsl:template name="copyright-statement">
+	<!-- copyright-statement -->
+	<xsl:template name="inner-cover-page">
 		<xsl:if test="normalize-space(/mn:metanorma/mn:boilerplate/mn:copyright-statement) != ''">
 
 			<fo:page-sequence format="i" force-page-count="no-force">
@@ -7715,7 +7716,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">
@@ -13827,15 +13827,22 @@
 			<xsl:attribute name="margin-left">7mm</xsl:attribute>
 			<xsl:attribute name="margin-right">0mm</xsl:attribute>
 		</xsl:if>
-	</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-set> <!-- source-style -->
+
+	<xsl:template name="refine_source-style">
+
+	</xsl:template> <!-- refine_source-style -->
+
 	<!-- ====== -->
 	<!-- quote -->
 	<!-- source -->
@@ -13883,7 +13890,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}">
@@ -16044,7 +16053,7 @@
 			<xsl:attribute name="baseline-shift">15%</xsl:attribute>
 		</xsl:if>
 		<!-- 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">
@@ -16055,7 +16064,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">80%</xsl:attribute>
 		<!--<xsl:attribute name="vertical-align">super</xsl:attribute> -->
 		<xsl:attribute name="baseline-shift">30%</xsl:attribute>
@@ -16149,26 +16160,9 @@
 		<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]">
@@ -16178,7 +16172,7 @@
 					<xsl:attribute name="font-size">70%</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">
@@ -16483,32 +16477,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">8pt</xsl:attribute>
-		<xsl:attribute name="baseline-shift">30%</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 name="alignment-baseline">hanging</xsl:attribute>
-		<xsl:attribute name="padding-right">3mm</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 name="margin-bottom">4pt</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 -->
 
@@ -18887,6 +18855,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/iso/iso.international-standard.xsl

@@ -1082,7 +1082,7 @@
 							<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num &lt;= 19981231)"><!-- copyright renders in the footer footer-preface-first_1987-1998--></xsl:when>
 							<xsl:otherwise>
 
-								<xsl:call-template name="copyright-statement"/>
+								<xsl:call-template name="inner-cover-page"/>
 
 							</xsl:otherwise>
 						</xsl:choose>
@@ -2849,7 +2849,8 @@
 		</xsl:if> <!-- $isGenerateTableIF = 'false' -->
 	</xsl:template> <!-- END cover-page -->
 
-	<xsl:template name="copyright-statement">
+	<!-- copyright-statement -->
+	<xsl:template name="inner-cover-page">
 		<xsl:if test="normalize-space(/mn:metanorma/mn:boilerplate/mn:copyright-statement) != ''">
 
 			<fo:page-sequence format="i" force-page-count="no-force">
@@ -7715,7 +7716,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">
@@ -13827,15 +13827,22 @@
 			<xsl:attribute name="margin-left">7mm</xsl:attribute>
 			<xsl:attribute name="margin-right">0mm</xsl:attribute>
 		</xsl:if>
-	</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-set> <!-- source-style -->
+
+	<xsl:template name="refine_source-style">
+
+	</xsl:template> <!-- refine_source-style -->
+
 	<!-- ====== -->
 	<!-- quote -->
 	<!-- source -->
@@ -13883,7 +13890,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}">
@@ -16044,7 +16053,7 @@
 			<xsl:attribute name="baseline-shift">15%</xsl:attribute>
 		</xsl:if>
 		<!-- 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">
@@ -16055,7 +16064,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">80%</xsl:attribute>
 		<!--<xsl:attribute name="vertical-align">super</xsl:attribute> -->
 		<xsl:attribute name="baseline-shift">30%</xsl:attribute>
@@ -16149,26 +16160,9 @@
 		<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]">
@@ -16178,7 +16172,7 @@
 					<xsl:attribute name="font-size">70%</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">
@@ -16483,32 +16477,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">8pt</xsl:attribute>
-		<xsl:attribute name="baseline-shift">30%</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 name="alignment-baseline">hanging</xsl:attribute>
-		<xsl:attribute name="padding-right">3mm</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 name="margin-bottom">4pt</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 -->
 
@@ -18887,6 +18855,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/iso/presentation_xml_convert.rb

@@ -211,6 +211,14 @@ module IsoDoc
         end
       end
 
+      def citeas_cleanup1(citeas)
+        ret = super
+        if /^\[\d+\]$/.match?(ret)
+          ret = @i18n.l10n("#{@i18n.reference} #{ret}")
+        end
+        ret
+      end
+      
       include Init
     end
   end

data/lib/isodoc/iso/presentation_xref.rb

@@ -56,7 +56,7 @@ module IsoDoc
           target&.gsub(/<[^<>]+>/, "")&.match(/^IEV$|^IEC 60050-/)
       end
 
-      # ISO has not bothered to communicate to us what most of these 
+      # ISO has not bothered to communicate to us what most of these
       # span classes mean
       LOCALITY2SPAN = {
         annex: "citeapp",
@@ -147,6 +147,77 @@ module IsoDoc
         locality_span_wrap(super, @xrefs.anchor(node["target"], :subtype) ||
                            @xrefs.anchor(node["target"], :type))
       end
+
+      def origin(docxml)
+        super
+        bracketed_refs_processing(docxml)
+      end
+
+      # style [1] references as [Reference 1], eref or origin
+      def bracketed_refs_processing(docxml)
+        (docxml.xpath(ns("//semx[@element = 'eref']")) -
+        docxml.xpath(ns("//semx[@element = 'erefstack']//semx[@element = 'eref']")))
+          .each { |n| bracket_eref_style(n) }
+        docxml.xpath(ns("//semx[@element = 'erefstack']")).each do |n|
+          bracket_erefstack_style(n)
+        end
+        docxml.xpath(ns("//semx[@element = 'origin']")).each do |n|
+          bracket_origin_style(n)
+        end
+      end
+
+      def bracket_eref_style(elem)
+        semx = bracket_eref_original(elem) or return
+        if semx["style"] == "superscript"
+          elem.children.wrap("<sup></sup>")
+          remove_preceding_space(elem)
+        else
+          r = @i18n.reference
+          elem.add_first_child l10n("#{r} ")
+        end
+      end
+
+      # is the eref corresponding to this semx a simple [n] reference?
+      def bracket_eref_original(elem)
+        semx = elem.document.at("//*[@id = '#{elem['source']}']") or return
+        non_locality_elems(semx).empty? or return
+        /^\[\d+\]$/.match?(semx["citeas"]) or return
+        semx
+      end
+
+      def bracket_erefstack_style(elem)
+        semx, erefstack_orig = bracket_erefstack_style_prep(elem)
+        semx.empty? and return
+        if erefstack_orig && erefstack_orig["style"]
+          elem.children.each do |e|
+            e.name == "span" and e.remove
+            e.text.strip.empty? and e.remove
+          end
+          elem.children.wrap("<sup></sup>")
+          remove_preceding_space(elem)
+        else
+          r = @i18n.inflect(@i18n.reference, number: "pl")
+          elem.add_first_child l10n("#{r} ")
+        end
+      end
+
+      def bracket_erefstack_style_prep(elem)
+        semx = elem.xpath(ns(".//semx[@element = 'eref']"))
+          .map { |e| bracket_eref_original(e) }.compact
+        erefstack_orig = elem.document.at("//*[@id = '#{elem['source']}']")
+        [semx, erefstack_orig]
+      end
+
+      def bracket_origin_style(elem)
+        bracket_eref_style(elem)
+      end
+
+      def remove_preceding_space(elem)
+        # Find the preceding text node that has actual content
+        prec = elem.at("./preceding-sibling::text()" \
+          "[normalize-space(.) != ''][1]") or return
+        prec.content.end_with?(" ") and prec.content = prec.content.rstrip
+      end
     end
   end
 end

data/lib/isodoc/iso/word_convert.rb

@@ -169,7 +169,7 @@ module IsoDoc
 
       def termref_parse(node, out)
         out.p **termref_attrs do |p|
-          node.children.each { |n| parse(n, p) }
+          children_parse(node, p)
         end
       end
 
@@ -181,7 +181,7 @@ module IsoDoc
       def figure_name_parse(node, div, name)
         name.nil? and return
         div.p **figure_name_attrs(node) do |p|
-          name.children.each { |n| parse(n, p) }
+          children_parse(name, p)
         end
       end
 
@@ -193,7 +193,7 @@ module IsoDoc
       def table_title_parse(node, out)
         name = node.at(ns("./fmt-name")) or return
         out.p **table_title_attrs(node) do |p|
-          name&.children&.each { |n| parse(n, p) }
+          children_parse(name, p)
         end
       end
 

data/lib/isodoc/iso/xref.rb

@@ -158,7 +158,6 @@ module IsoDoc
             s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
           c = Counter.new
           notes.noblank.each do |n|
-            # n["id"] ||= "_#{UUIDTools::UUID.random_create}"
             @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
                                               @labels["list"], "list",
                                               { unnumb: false, container: true })
@@ -203,7 +202,6 @@ module IsoDoc
       end
 
       def xref_to_modspec(id, table_label)
-        # (@anchors[id] && !@anchors[id][:has_modspec]) or return
         (@anchors[id] && !@anchors[id][:has_table_prefix]) or return
         @anchors[id][:has_table_prefix] = true
         x = @anchors_previous[id][:xref_bare] || @anchors_previous[id][:xref]

data/lib/isodoc/iso/xref_section.rb

@@ -23,7 +23,6 @@ module IsoDoc
             { label:, xref:, elem: @labels["section"],
               title: clause_title(clause), level: level, type: "clause" }
         elsif level > 1
-          #num = semx(clause, num)
           @anchors[clause["id"]] =
             { label: num, level: level, xref: num, subtype: "clause" }
         else super end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.1.5".freeze
+    VERSION = "3.1.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.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-standoc