metanorma-ribose 1.6.11 → 1.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09692ec54e7186049ced9245aa545eec4014cef2ed4870c3b2316ddb5baa9c26'
-  data.tar.gz: 9bae1a6920887f47f736c29af7eb769a941a1874a70624e125951a23824481b3
+  metadata.gz: aa8a5850aab200ce451f3f80eb1c469938c22d51116cf7eba406868b678b5277
+  data.tar.gz: 1b79657578876f5241a5ce3bd1a84d8bfdb0abbf2733c8c95c4b25691da28536
 SHA512:
-  metadata.gz: 751876bd18696125f64ddff27d8965c752653d69cde5816278cc9f1939521eedf7b5d456a99b7beb25bc6b5846bcdbe72a99298a70196aec0a2a50fb816e17cf
-  data.tar.gz: 1693d7cb5bd93863b3b685cbc25ee3209a0e60d545d78b3041eb3ad5f438e2fad7e314f879f89d12fb8637a2c326b60ebef7facf076eacf30140f9e0dc9e2989
+  metadata.gz: 024526b40521713d0b975f3e1fd480bdea460294fe37630f43a6fcc02b04a26f677c31118c385c2cf14dc701461822ac676b54fda28b0d14a1b9de7791c7c142
+  data.tar.gz: 68cdf413a3c7540df45f7410c9e4949ceec2d816475a1150cd1ac93d9595b9c27536633ba3ccbcd076e816c8cf0252d14d7a371fa0f9d23c966efabf117aed26

data/lib/asciidoctor/ribose/basicdoc.rng

@@ -729,9 +729,11 @@
   </define>
   <define name="index">
     <element name="index">
-      <attribute name="to">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="to">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <element name="primary">
         <oneOrMore>
           <ref name="PureTextElement"/>

data/lib/asciidoctor/ribose/isodoc.rng

@@ -789,6 +789,9 @@
       <attribute name="width"/>
     </element>
   </define>
+  <define name="BibItemType" combine="choice">
+    <value>internal</value>
+  </define>
   <define name="TextElement" combine="choice">
     <ref name="concept"/>
   </define>

data/lib/isodoc/ribose/html/wordstyle.css

@@ -505,7 +505,7 @@ h3 {
   mso-list: l1 level3 lfo6;
   mso-hyphenate: none;
   tab-stops: list 36.0pt left 44.0pt;
-  font-size: {{smallerfontsize}};
+  font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   font-weight: normal;
   color: #0E1A85;
@@ -533,7 +533,7 @@ h4 {
   mso-list: l1 level4 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt 57.0pt 68.0pt;
-  font-size: {{smallerfontsize}};
+  font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   font-weight: normal;
   color: #0E1A85;
@@ -561,7 +561,7 @@ h5 {
   mso-list: l1 level5 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt list 54.0pt;
-  font-size: {{smallerfontsize}};
+  font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   font-weight: normal;
   mso-fareast-font-family: {{headerfont}};
@@ -589,7 +589,7 @@ h6 {
   mso-list: l1 level6 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt list 72.0pt;
-  font-size: {{smallerfontsize}};
+  font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   font-weight: normal;
   color: #0E1A85;

data/lib/isodoc/ribose/html/wordstyle.scss

@@ -471,7 +471,7 @@ h3
 	mso-list:l1 level3 lfo6;
 	mso-hyphenate:none;
 	tab-stops:list 36.0pt left 44.0pt;
-	font-size:$smallerfontsize;
+	font-size:$normalfontsize;
 	font-family:$headerfont;
         font-weight:normal;
         color:#0E1A85;
@@ -498,7 +498,7 @@ h4
 	mso-list:l1 level4 lfo6;
 	mso-hyphenate:none;
 	tab-stops:51.05pt 57.0pt 68.0pt;
-	font-size:$smallerfontsize;
+	font-size:$normalfontsize;
 	font-family:$headerfont;
         font-weight:normal;
         color:#0E1A85;
@@ -525,7 +525,7 @@ h5
 	mso-list:l1 level5 lfo6;
 	mso-hyphenate:none;
 	tab-stops:51.05pt list 54.0pt;
-	font-size:$smallerfontsize;
+	font-size:$normalfontsize;
 	font-family:$headerfont;
         font-weight:normal;
 	mso-fareast-font-family:$headerfont;
@@ -552,7 +552,7 @@ h6
 	mso-list:l1 level6 lfo6;
 	mso-hyphenate:none;
 	tab-stops:51.05pt list 72.0pt;
-	font-size:$smallerfontsize;
+	font-size:$normalfontsize;
 	font-family:$headerfont;
         font-weight:normal;
         color:#0E1A85;

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

@@ -1297,6 +1297,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-source-style">		
 		
 			<xsl:attribute name="text-align">right</xsl:attribute>
@@ -1440,7 +1441,7 @@
 	</xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
 		<!-- <xsl:call-template name="add-zero-spaces"/> -->
 		<xsl:call-template name="add-zero-spaces-java"/>
-	</xsl:template><xsl:template match="*[local-name()='table']">
+	</xsl:template><xsl:template match="*[local-name()='table']" name="table">
 	
 		<xsl:variable name="simple-table">	
 			<xsl:call-template name="getSimpleTable"/>			
@@ -2669,6 +2670,7 @@
 				
 				
 				
+				
 				10
 						
 			</xsl:variable>
@@ -3271,7 +3273,7 @@
 				</xsl:if> -->
 			</fo:inline>
 		</xsl:if>
-	</xsl:template><xsl:template match="*[local-name() = 'figure']">
+	</xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
 		<fo:block-container id="{@id}">			
 			
 			<fo:block>
@@ -3478,6 +3480,12 @@
 		<!-- <xsl:text> </xsl:text> -->
 	</xsl:template><xsl:template name="getSection">
 		<xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+		<!-- 
+		<xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()">
+			<xsl:value-of select="."/>
+		</xsl:for-each>
+		-->
+		
 	</xsl:template><xsl:template name="getName">
 		<xsl:choose>
 			<xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
@@ -3530,6 +3538,10 @@
 		<xsl:copy>
 			<xsl:apply-templates mode="contents_item"/>
 		</xsl:copy>		
+	</xsl:template><xsl:template match="*[local-name() = 'em']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>		
 	</xsl:template><xsl:template match="*[local-name() = 'br']" mode="contents_item">
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
@@ -3555,6 +3567,7 @@
 						
 						
 						
+						
 								
 						
 						
@@ -4085,6 +4098,7 @@
 			
 			
 			
+			
 						
 			
 				<xsl:variable name="pos"><xsl:number count="rsd:sections/rsd:clause[not(@type='scope') and not(@type='conformance')]"/></xsl:variable> <!--  | rsd:sections/rsd:terms -->
@@ -4101,7 +4115,7 @@
 		
 		
 		
-	</xsl:template><xsl:template match="/*/*[local-name() = 'preface']/*" priority="2">
+	</xsl:template><xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
 		<fo:block break-after="page"/>
 		<fo:block>
 			<xsl:call-template name="setId"/>
@@ -4109,7 +4123,8 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'clause']">
 		<fo:block>
-			<xsl:call-template name="setId"/>			
+			<xsl:call-template name="setId"/>
+			
 			
 			<xsl:apply-templates/>
 		</fo:block>
@@ -4281,6 +4296,57 @@
 		</xsl:variable>
 		<xsl:variable name="result">
 			<xsl:choose>
+				<xsl:when test="$format = 'ddMMyyyy'">
+					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
+					<xsl:text> </xsl:text>
+					<xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
+				</xsl:when>
+				<xsl:when test="$format = 'ddMM'">
+					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
+					<xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
+				</xsl:when>
+				<xsl:when test="$format = 'short' or $day = ''">
+					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:value-of select="$result"/>
+	</xsl:template><xsl:template name="convertDateLocalized">
+		<xsl:param name="date"/>
+		<xsl:param name="format" select="'short'"/>
+		<xsl:variable name="year" select="substring($date, 1, 4)"/>
+		<xsl:variable name="month" select="substring($date, 6, 2)"/>
+		<xsl:variable name="day" select="substring($date, 9, 2)"/>
+		<xsl:variable name="monthStr">
+			<xsl:choose>
+				<xsl:when test="$month = '01'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_january</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '02'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_february</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '03'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_march</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '04'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_april</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '05'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_may</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '06'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_june</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '07'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_july</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '08'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_august</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '09'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_september</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '10'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_october</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '11'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_november</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '12'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_december</xsl:with-param></xsl:call-template></xsl:when>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="result">
+			<xsl:choose>
+				<xsl:when test="$format = 'ddMMyyyy'">
+					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
+					<xsl:text> </xsl:text>
+					<xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
+				</xsl:when>
+				<xsl:when test="$format = 'ddMM'">
+					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
+					<xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
+				</xsl:when>
 				<xsl:when test="$format = 'short' or $day = ''">
 					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
 				</xsl:when>
@@ -4475,6 +4541,7 @@
 			
 			
 			
+			
 		</xsl:variable>
 		<xsl:if test="$documentNS != $XSLNS">
 			<xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>

data/lib/metanorma/ribose/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ribose
-    VERSION = "1.6.11"
+    VERSION = "1.6.12"
   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.4.0")
 
-  spec.add_dependency 'metanorma-generic', '~> 1.8.2'
+  spec.add_dependency 'metanorma-generic', '~> 1.9.0'
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ribose
 version: !ruby/object:Gem::Version
-  version: 1.6.11
+  version: 1.6.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement