metanorma-jis 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a064f0e798e321317671b5e491d584734b5c6348cce7a3b4724a6bc1f71460bf
-  data.tar.gz: d7f98949f0e67fa152423525138a0c203e544c102160c25b4852ddeee8dfde31
+  metadata.gz: c8dc64b7e2524636baafacbeb79db166d0de7fe32390f6863c2b424b43d6a236
+  data.tar.gz: b81a5ab243c3cde8b604a0481f17875d8931c9af92a8bdd8303a8a405e409c62
 SHA512:
-  metadata.gz: 47436176727b7d79fcf56ef5dae063d8235f4e238cee743b88f0da622f0babbe9dfc5d7c1b477f919c23990b0e75f4bd27f98a07dd7903e4aa11122acdcf7be5
-  data.tar.gz: 30fd069624c832d3527736d35f56d8f0ff52225579121f299f91d54b106b8584c2483d98ecac608583cd74323798fbbf6f2a60d9cdf89ec470d4943758ab7743
+  metadata.gz: 320ca25a90e1fe5df1f2ff17c8dee46ad4a8a9ac3b9756e07cf149a5ba16ab842fafcae3f19a12bc550235dfa589950841ba3e742e48bd844e84dfe898446927
+  data.tar.gz: 470d48f3536cf937d52a57cacf7890fff1d29aeb52f9c21581a38ef8019268fc71e8f51f1fe0913f393a3599eb4c4c8935b7d7b7366c50cadad72d1787c3c2cf

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

@@ -5858,7 +5858,8 @@
 	</xsl:template>
 
 	<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
-		<xsl:variable name="text" select="normalize-space(.)"/>
+		<!-- <xsl:variable name="text" select="normalize-space(.)"/> --> <!-- https://github.com/metanorma/metanorma-iso/issues/1115 -->
+		<xsl:variable name="text" select="."/>
 		<fo:inline font-size="75%" role="SKIP">
 				<xsl:if test="string-length($text) &gt; 0">
 					<xsl:variable name="smallCapsText">
@@ -7992,16 +7993,44 @@
 							</xsl:choose>
 
 							<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
-							<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
-							<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
+							<xsl:variable name="svg_width_" select="xalan:nodeset($svg_content)/*/@width"/>
+							<xsl:variable name="svg_width" select="number(translate($svg_width_, 'px', ''))"/>
+							<xsl:variable name="svg_height_" select="xalan:nodeset($svg_content)/*/@height"/>
+							<xsl:variable name="svg_height" select="number(translate($svg_height_, 'px', ''))"/>
+
+							<!-- Example: -->
 							<!-- effective height 297 - 27.4 - 13 =  256.6 -->
 							<!-- effective width 210 - 12.5 - 25 = 172.5 -->
 							<!-- effective height / width = 1.48, 1.4 - with title -->
-							<xsl:if test="$svg_height &gt; ($svg_width * 1.4)"> <!-- for images with big height -->
+
+							<xsl:variable name="scale_x">
+								<xsl:choose>
+									<xsl:when test="$svg_width &gt; $width_effective_px">
+										<xsl:value-of select="$width_effective_px div $svg_width"/>
+									</xsl:when>
+									<xsl:otherwise>1</xsl:otherwise>
+								</xsl:choose>
+							</xsl:variable>
+							<xsl:variable name="scale_y">
+								<xsl:choose>
+									<xsl:when test="$svg_height * $scale_x &gt; $height_effective_px">
+										<xsl:value-of select="$height_effective_px div ($svg_height * $scale_x)"/>
+									</xsl:when>
+									<xsl:otherwise>1</xsl:otherwise>
+								</xsl:choose>
+							</xsl:variable>
+
+							 <!-- for images with big height -->
+							<!-- <xsl:if test="$svg_height &gt; ($svg_width * 1.4)">
 								<xsl:variable name="width" select="(($svg_width * 1.4) div $svg_height) * 100"/>
 								<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
-							</xsl:if>
+							</xsl:if> -->
 							<xsl:attribute name="scaling">uniform</xsl:attribute>
+
+							<xsl:if test="$scale_y != 1">
+								<xsl:attribute name="content-height"><xsl:value-of select="round($scale_x * $scale_y * 100)"/>%</xsl:attribute>
+							</xsl:if>
+
 							<xsl:copy-of select="$svg_content"/>
 						</fo:instream-foreign-object>
 					<!-- </fo:block> -->
@@ -8039,8 +8068,12 @@
 			<xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
 			<xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
 
+			<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[1][local-name() = 'image']/@width)"/>
+			<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[1][local-name() = 'image']/@height)"/>
+
 			<xsl:attribute name="width">
 				<xsl:choose>
+					<xsl:when test="$parent_image_width != '' and $parent_image_width != 'auto'"><xsl:value-of select="$parent_image_width"/></xsl:when>
 					<xsl:when test="$width != ''">
 						<xsl:value-of select="round($width)"/>
 					</xsl:when>
@@ -8049,6 +8082,7 @@
 			</xsl:attribute>
 			<xsl:attribute name="height">
 				<xsl:choose>
+					<xsl:when test="$parent_image_height != '' and $parent_image_height != 'auto'"><xsl:value-of select="$parent_image_height"/></xsl:when>
 					<xsl:when test="$height != ''">
 						<xsl:value-of select="round($height)"/>
 					</xsl:when>
@@ -8060,6 +8094,28 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'svg']/@width" mode="svg_update">
+		<!-- image[@width]/svg -->
+		<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[2][local-name() = 'image']/@width)"/>
+		<xsl:attribute name="width">
+			<xsl:choose>
+				<xsl:when test="$parent_image_width != '' and $parent_image_width != 'auto'"><xsl:value-of select="$parent_image_width"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'svg']/@height" mode="svg_update">
+		<!-- image[@height]/svg -->
+		<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[2][local-name() = 'image']/@height)"/>
+		<xsl:attribute name="height">
+			<xsl:choose>
+				<xsl:when test="$parent_image_height != '' and $parent_image_height != 'auto'"><xsl:value-of select="$parent_image_height"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+	</xsl:template>
+
 	<!-- regex for 'display: inline-block;' -->
 	<xsl:variable name="regex_svg_style_notsupported">display(\s|\h)*:(\s|\h)*inline-block(\s|\h)*;</xsl:variable>
 	<xsl:template match="*[local-name() = 'svg']//*[local-name() = 'style']/text()" mode="svg_update">
@@ -10121,7 +10177,9 @@
 	</xsl:template> <!-- sections_element_style -->
 
 	<xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
-		<fo:block break-after="page"/>
+
+				<fo:block break-after="page"/>
+
 		<fo:block>
 			<xsl:call-template name="setId"/>
 			<xsl:apply-templates/>
@@ -10188,7 +10246,7 @@
 			<xsl:when test="ancestor::*[contains(local-name(), '-standard')] and not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
-			<xsl:when test="not(//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
+			<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 		</xsl:choose>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.2.3".freeze
+    VERSION = "0.2.4".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-04 00:00:00.000000000 Z
+date: 2024-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar