metanorma-ribose 2.1.8.1 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49a6039f8dfaf5bfb62b8240a29cb3be67bb36c85f572f1ad94b2c9f949b6beb
-  data.tar.gz: 51e16ed6a2a3c55ac11d53e2f57855e5c85f81815631c73a8812341d5cb75444
+  metadata.gz: ef9a985447d820480b91f3e3ddeb51dacaaf704aba771de6e359b3b525ec9669
+  data.tar.gz: 356fdaf4ffc1ad22287ab3daa9bf24fe7eda1efb5b7879c3e5b2238cc5eec891
 SHA512:
-  metadata.gz: 16127cb7ba8291037f8c015a6983f817ff7ee2cff85095a7645ae490b5da0e5aaeebb48181fd23fab520af41f3a2b51e7cee11910ce378398d744d5fa501618e
-  data.tar.gz: a73e644bb3d92a83340e5b568673085e4925130cacb7f6903c6076b5611e2ba1d16dfc98c017c8d6f453d07239a35b40a40cff92458ae75c77f5d80efa302629
+  metadata.gz: 8399e3993cdf02d45ae4f91a2b4d78a6b37ec23fd08215aeae37efe51118ba862cd572535edd18b7b61a30a07d2001df005a56f189e86fae67768d793202d667
+  data.tar.gz: e90b600180866ff7798a14dd14039b6f4822000533e9743a60e877f98cc5f9c1e72de9a62f352dd5e385ae18464f497e8ba513a92207a62d4891e0411445934f

data/lib/isodoc/ribose/init.rb

@@ -5,8 +5,8 @@ require_relative "xref"
 module IsoDoc
   module Ribose
     module Init
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
+      def metadata_init(lang, script, locale, labels)
+        @meta = Metadata.new(lang, script, locale, labels)
       end
 
       def xref_init(lang, script, _klass, labels, options)
@@ -14,9 +14,9 @@ module IsoDoc
         @xrefs = Xref.new(lang, script, html, labels, options)
       end
 
-      def i18n_init(lang, script, i18nyaml = nil)
+      def i18n_init(lang, script, locale, i18nyaml = nil)
         @i18n = I18n.new(
-          lang, script, i18nyaml: i18nyaml ||
+          lang, script, locale: locale, i18nyaml: i18nyaml ||
           Metanorma::Ribose.configuration.i18nyaml || @i18nyaml
         )
       end

data/lib/isodoc/ribose/ribose.standard.xsl

@@ -7093,6 +7093,18 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'sub']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'sup']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'stem']" mode="contents_item">
 		<xsl:copy-of select="."/>
 	</xsl:template>
@@ -8066,7 +8078,7 @@
 	<!-- ====== -->
 	<!-- eref -->
 	<!-- ====== -->
-	<xsl:template match="*[local-name() = 'eref']">
+	<xsl:template match="*[local-name() = 'eref']" name="eref">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
 		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
 		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -8560,21 +8572,29 @@
 	</xsl:variable>
 
 	<xsl:template match="@*|node()" mode="index_add_id">
+		<xsl:param name="docid"/>
 		<xsl:copy>
-				<xsl:apply-templates select="@*|node()" mode="index_add_id"/>
+			<xsl:apply-templates select="@*|node()" mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'xref']" mode="index_add_id">
+		<xsl:param name="docid"/>
 		<xsl:variable name="id">
-			<xsl:call-template name="generateIndexXrefId"/>
+			<xsl:call-template name="generateIndexXrefId">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:call-template>
 		</xsl:variable>
 		<xsl:copy> <!-- add id to xref -->
 			<xsl:apply-templates select="@*" mode="index_add_id"/>
 			<xsl:attribute name="id">
 				<xsl:value-of select="$id"/>
 			</xsl:attribute>
-			<xsl:apply-templates mode="index_add_id"/>
+			<xsl:apply-templates mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 		<!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
 		<xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
@@ -8586,7 +8606,9 @@
 				<xsl:attribute name="id">
 					<xsl:value-of select="$id"/><xsl:text>_to</xsl:text>
 				</xsl:attribute>
-				<xsl:apply-templates mode="index_add_id"/>
+				<xsl:apply-templates mode="index_add_id">
+					<xsl:with-param name="docid" select="$docid"/>
+				</xsl:apply-templates>
 			</xsl:copy>
 		</xsl:if>
 	</xsl:template>
@@ -8623,12 +8645,33 @@
 			</xsl:when>
 			<xsl:when test="self::* and local-name(.) = 'xref'">
 				<xsl:variable name="id" select="@id"/>
-				<xsl:variable name="page" select="$index//item[@id = $id]"/>
-				<xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
-				<xsl:variable name="page_next" select="$index//item[@id = $id_next]"/>
 
+				<xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
 				<xsl:variable name="id_prev" select="preceding-sibling::*[local-name() = 'xref'][1]/@id"/>
-				<xsl:variable name="page_prev" select="$index//item[@id = $id_prev]"/>
+
+				<xsl:variable name="pages_">
+					<xsl:for-each select="$index/index/item[@id = $id or @id = $id_next or @id = $id_prev]">
+						<xsl:choose>
+							<xsl:when test="@id = $id">
+								<page><xsl:value-of select="."/></page>
+							</xsl:when>
+							<xsl:when test="@id = $id_next">
+								<page_next><xsl:value-of select="."/></page_next>
+							</xsl:when>
+							<xsl:when test="@id = $id_prev">
+								<page_prev><xsl:value-of select="."/></page_prev>
+							</xsl:when>
+						</xsl:choose>
+					</xsl:for-each>
+				</xsl:variable>
+				<xsl:variable name="pages" select="xalan:nodeset($pages_)"/>
+
+				<!-- <xsl:variable name="page" select="$index/index/item[@id = $id]"/> -->
+				<xsl:variable name="page" select="$pages/page"/>
+				<!-- <xsl:variable name="page_next" select="$index/index/item[@id = $id_next]"/> -->
+				<xsl:variable name="page_next" select="$pages/page_next"/>
+				<!-- <xsl:variable name="page_prev" select="$index/index/item[@id = $id_prev]"/> -->
+				<xsl:variable name="page_prev" select="$pages/page_prev"/>
 
 				<xsl:choose>
 					<!-- 2nd pass -->
@@ -8688,16 +8731,20 @@
 	</xsl:template>
 
 	<xsl:template name="generateIndexXrefId">
+		<xsl:param name="docid"/>
+
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 
-		<xsl:variable name="docid">
-			<xsl:call-template name="getDocumentId"/>
+		<xsl:variable name="docid_curr">
+			<xsl:value-of select="$docid"/>
+			<xsl:if test="normalize-space($docid) = ''"><xsl:call-template name="getDocumentId"/></xsl:if>
 		</xsl:variable>
+
 		<xsl:variable name="item_number">
 			<xsl:number count="*[local-name() = 'li'][ancestor::*[local-name() = 'indexsect']]" level="any"/>
 		</xsl:variable>
 		<xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
-		<xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
+		<xsl:value-of select="concat($docid_curr, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4">

data/lib/metanorma/ribose/biblio.rng

@@ -73,8 +73,14 @@
       <text/>
     </element>
   </define>
-  <define name="script">
+  <define name="locale">
     <a:documentation>ISO-639</a:documentation>
+    <element name="locale">
+      <text/>
+    </element>
+  </define>
+  <define name="script">
+    <a:documentation>ISO-3166</a:documentation>
     <element name="script">
       <text/>
     </element>
@@ -93,6 +99,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -136,6 +145,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -650,6 +662,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -741,6 +756,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -854,6 +872,15 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <data type="anyURI"/>
   </define>
   <define name="DateType">
@@ -882,6 +909,7 @@
       <value>vote-started</value>
       <value>vote-ended</value>
       <value>announced</value>
+      <value>stable-until</value>
     </choice>
   </define>
   <define name="bdate">
@@ -930,6 +958,9 @@
       <optional>
         <attribute name="language"/>
       </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
       <optional>
         <attribute name="script"/>
       </optional>

data/lib/metanorma/ribose/isodoc.rng

@@ -205,6 +205,15 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="style">
+            <choice>
+              <value>basic</value>
+              <value>full</value>
+              <value>short</value>
+            </choice>
+          </attribute>
+        </optional>
         <ref name="XrefBody"/>
       </element>
     </define>

data/lib/metanorma/ribose/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ribose
-    VERSION = "2.1.8.1".freeze
+    VERSION = "2.1.10".freeze
   end
 end

data/metanorma-ribose.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.2.0"
+  spec.add_dependency "metanorma-generic", "~> 2.2.2"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ribose
 version: !ruby/object:Gem::Version
-  version: 2.1.8.1
+  version: 2.1.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement