metanorma-csa 2.4.5 → 2.4.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/isodoc/csa/csa.standard.xsl +220 -53
- data/lib/metanorma/csa/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a36fcd0739fd84b4728aebd0f67176ef41ab9bd35758a118aaa22b04497429c3
|
|
4
|
+
data.tar.gz: d1922a54aa70a53be51731604d7d18dc870999d61856d5e6ccfe8fa0755eeb23
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5afa7e2ee289625315d4f1cd7d81dfdeb94112cfd9a2fd7410f0315d690ffd5cdf5fa60cd2610d38fab6e8663ea87290b8266a425917aaf0738043435a2724c5
|
|
7
|
+
data.tar.gz: a05f9e5b94467efd48feebf503977f480a348b9786ded6644203dee2ed26cd88430a921ea724dc6b3a0ebd01c95709280488c1e6e3de7cb7cc74c158760df463
|
|
@@ -590,17 +590,30 @@
|
|
|
590
590
|
<xsl:param name="add_math_as_text">true</xsl:param> <!-- add math in text behind svg formula, to copy-paste formula from PDF as text -->
|
|
591
591
|
|
|
592
592
|
<xsl:param name="table_if">false</xsl:param> <!-- generate extended table in IF for autolayout-algorithm -->
|
|
593
|
-
<xsl:param name="table_widths"/> <!-- path to xml with table's widths, generated on 1st pass, based on FOP Intermediate Format -->
|
|
593
|
+
<xsl:param name="table_widths"/> <!-- (debug: path to) xml with table's widths, generated on 1st pass, based on FOP Intermediate Format -->
|
|
594
594
|
<!-- Example: <tables>
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
595
|
+
<table page-width="509103" id="table1" width_max="223561" width_min="223560">
|
|
596
|
+
<column width_max="39354" width_min="39354"/>
|
|
597
|
+
<column width_max="75394" width_min="75394"/>
|
|
598
|
+
<column width_max="108813" width_min="108813"/>
|
|
599
|
+
<tbody>
|
|
600
|
+
<tr>
|
|
601
|
+
<td width_max="39354" width_min="39354">
|
|
602
|
+
<p_len>39354</p_len>
|
|
603
|
+
<word_len>39354</word_len>
|
|
604
|
+
</td>
|
|
605
|
+
|
|
606
|
+
OLD:
|
|
607
|
+
<tables>
|
|
608
|
+
<table id="table_if_tab-symdu" page-width="75"> - table id prefixed by 'table_if_' to simple search in IF
|
|
609
|
+
<tbody>
|
|
610
|
+
<tr>
|
|
611
|
+
<td id="tab-symdu_1_1">
|
|
612
|
+
<p_len>6</p_len>
|
|
613
|
+
<p_len>100</p_len> for 2nd paragraph
|
|
614
|
+
<word_len>6</word_len>
|
|
615
|
+
<word_len>20</word_len>
|
|
616
|
+
...
|
|
604
617
|
-->
|
|
605
618
|
|
|
606
619
|
<!-- for command line debug: <xsl:variable name="table_widths_from_if" select="document($table_widths)"/> -->
|
|
@@ -820,6 +833,9 @@
|
|
|
820
833
|
<xsl:variable name="hair_space"> </xsl:variable>
|
|
821
834
|
<xsl:variable name="en_dash">–</xsl:variable>
|
|
822
835
|
<xsl:variable name="em_dash">—</xsl:variable>
|
|
836
|
+
<xsl:variable name="cr"> </xsl:variable>
|
|
837
|
+
<xsl:variable name="lf">
|
|
838
|
+
</xsl:variable>
|
|
823
839
|
|
|
824
840
|
<xsl:template name="getTitle">
|
|
825
841
|
<xsl:param name="name"/>
|
|
@@ -2456,6 +2472,20 @@
|
|
|
2456
2472
|
</xsl:for-each>
|
|
2457
2473
|
</xsl:template>
|
|
2458
2474
|
|
|
2475
|
+
<xsl:param name="table_only_with_id"/><!-- Example: table1, for table auto-layout algorithm -->
|
|
2476
|
+
|
|
2477
|
+
<xsl:template match="*[local-name()='table']" priority="2">
|
|
2478
|
+
<xsl:choose>
|
|
2479
|
+
<xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id">
|
|
2480
|
+
<xsl:call-template name="table"/>
|
|
2481
|
+
</xsl:when>
|
|
2482
|
+
<xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when>
|
|
2483
|
+
<xsl:otherwise>
|
|
2484
|
+
<xsl:call-template name="table"/>
|
|
2485
|
+
</xsl:otherwise>
|
|
2486
|
+
</xsl:choose>
|
|
2487
|
+
</xsl:template>
|
|
2488
|
+
|
|
2459
2489
|
<xsl:template match="*[local-name()='table']" name="table">
|
|
2460
2490
|
|
|
2461
2491
|
<xsl:variable name="table-preamble">
|
|
@@ -2465,9 +2495,11 @@
|
|
|
2465
2495
|
<xsl:variable name="table">
|
|
2466
2496
|
|
|
2467
2497
|
<xsl:variable name="simple-table">
|
|
2468
|
-
<xsl:
|
|
2469
|
-
<xsl:
|
|
2470
|
-
|
|
2498
|
+
<xsl:if test="$isGenerateTableIF = 'true' and $isApplyAutolayoutAlgorithm = 'true'">
|
|
2499
|
+
<xsl:call-template name="getSimpleTable">
|
|
2500
|
+
<xsl:with-param name="id" select="@id"/>
|
|
2501
|
+
</xsl:call-template>
|
|
2502
|
+
</xsl:if>
|
|
2471
2503
|
</xsl:variable>
|
|
2472
2504
|
<!-- <xsl:variable name="simple-table" select="xalan:nodeset($simple-table_)"/> -->
|
|
2473
2505
|
|
|
@@ -2561,9 +2593,9 @@
|
|
|
2561
2593
|
</xsl:attribute>
|
|
2562
2594
|
</xsl:for-each>
|
|
2563
2595
|
|
|
2564
|
-
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
|
2596
|
+
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'][not(@type = 'units')] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
|
2565
2597
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
|
2566
|
-
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute
|
|
2598
|
+
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute><!-- set 0pt border, because there is a separete table below for footer -->
|
|
2567
2599
|
</xsl:if>
|
|
2568
2600
|
|
|
2569
2601
|
<xsl:choose>
|
|
@@ -2716,9 +2748,28 @@
|
|
|
2716
2748
|
|
|
2717
2749
|
</fo:block>
|
|
2718
2750
|
|
|
2751
|
+
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
|
2752
|
+
<xsl:if test="$continued = 'true'">
|
|
2753
|
+
<fo:block text-align="right">
|
|
2754
|
+
<xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
|
|
2755
|
+
</fo:block>
|
|
2756
|
+
</xsl:if>
|
|
2757
|
+
<!-- </xsl:if> -->
|
|
2758
|
+
|
|
2719
2759
|
</xsl:if>
|
|
2720
2760
|
</xsl:template> <!-- table/name -->
|
|
2721
2761
|
|
|
2762
|
+
<!-- workaround solution for https://github.com/metanorma/metanorma-iso/issues/1151#issuecomment-2033087938 -->
|
|
2763
|
+
<xsl:template match="*[local-name()='table']/*[local-name() = 'note'][@type = 'units']/*[local-name() = 'p']/text()" priority="4">
|
|
2764
|
+
<xsl:choose>
|
|
2765
|
+
<xsl:when test="preceding-sibling::*[local-name() = 'br']">
|
|
2766
|
+
<!-- remove CR or LF at start -->
|
|
2767
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'^( | | )', '')"/>
|
|
2768
|
+
</xsl:when>
|
|
2769
|
+
<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
|
|
2770
|
+
</xsl:choose>
|
|
2771
|
+
</xsl:template>
|
|
2772
|
+
|
|
2722
2773
|
<!-- SOURCE: ... -->
|
|
2723
2774
|
<xsl:template match="*[local-name()='table']/*[local-name() = 'source']" priority="2">
|
|
2724
2775
|
<xsl:call-template name="termsource"/>
|
|
@@ -3129,7 +3180,7 @@
|
|
|
3129
3180
|
<xsl:param name="colwidths"/>
|
|
3130
3181
|
<xsl:param name="colgroup"/>
|
|
3131
3182
|
|
|
3132
|
-
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
|
|
3183
|
+
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
|
|
3133
3184
|
|
|
3134
3185
|
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
|
3135
3186
|
|
|
@@ -3201,7 +3252,7 @@
|
|
|
3201
3252
|
|
|
3202
3253
|
<xsl:apply-templates select="../*[local-name()='p']"/>
|
|
3203
3254
|
<xsl:apply-templates select="../*[local-name()='dl']"/>
|
|
3204
|
-
<xsl:apply-templates select="../*[local-name()='note']"/>
|
|
3255
|
+
<xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
|
|
3205
3256
|
<xsl:apply-templates select="../*[local-name()='example']"/>
|
|
3206
3257
|
<xsl:apply-templates select="../*[local-name()='source']"/>
|
|
3207
3258
|
|
|
@@ -3211,7 +3262,7 @@
|
|
|
3211
3262
|
|
|
3212
3263
|
<!-- horizontal row separator -->
|
|
3213
3264
|
<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
|
|
3214
|
-
<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
|
|
3265
|
+
<xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
|
|
3215
3266
|
<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
|
|
3216
3267
|
|
|
3217
3268
|
<xsl:call-template name="setBordersTableArray"/>
|
|
@@ -3876,7 +3927,20 @@
|
|
|
3876
3927
|
<!-- Definition List -->
|
|
3877
3928
|
<!-- ===================== -->
|
|
3878
3929
|
|
|
3879
|
-
|
|
3930
|
+
<!-- for table auto-layout algorithm -->
|
|
3931
|
+
<xsl:template match="*[local-name()='dl']" priority="2">
|
|
3932
|
+
<xsl:choose>
|
|
3933
|
+
<xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id">
|
|
3934
|
+
<xsl:call-template name="dl"/>
|
|
3935
|
+
</xsl:when>
|
|
3936
|
+
<xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when>
|
|
3937
|
+
<xsl:otherwise>
|
|
3938
|
+
<xsl:call-template name="dl"/>
|
|
3939
|
+
</xsl:otherwise>
|
|
3940
|
+
</xsl:choose>
|
|
3941
|
+
</xsl:template>
|
|
3942
|
+
|
|
3943
|
+
<xsl:template match="*[local-name()='dl']" name="dl">
|
|
3880
3944
|
<xsl:variable name="isAdded" select="@added"/>
|
|
3881
3945
|
<xsl:variable name="isDeleted" select="@deleted"/>
|
|
3882
3946
|
<!-- <dl><xsl:copy-of select="."/></dl> -->
|
|
@@ -5807,7 +5871,13 @@
|
|
|
5807
5871
|
<xsl:value-of select="$language_current_2"/>
|
|
5808
5872
|
</xsl:when>
|
|
5809
5873
|
<xsl:otherwise>
|
|
5810
|
-
<xsl:
|
|
5874
|
+
<xsl:variable name="language_current_3" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'])"/>
|
|
5875
|
+
<xsl:choose>
|
|
5876
|
+
<xsl:when test="$language_current_3 != ''">
|
|
5877
|
+
<xsl:value-of select="$language_current_3"/>
|
|
5878
|
+
</xsl:when>
|
|
5879
|
+
<xsl:otherwise>en</xsl:otherwise>
|
|
5880
|
+
</xsl:choose>
|
|
5811
5881
|
</xsl:otherwise>
|
|
5812
5882
|
</xsl:choose>
|
|
5813
5883
|
</xsl:otherwise>
|
|
@@ -6673,10 +6743,11 @@
|
|
|
6673
6743
|
</xsl:template>
|
|
6674
6744
|
|
|
6675
6745
|
<xsl:template match="*[local-name() = 'image']">
|
|
6746
|
+
<xsl:param name="indent">0</xsl:param>
|
|
6676
6747
|
<xsl:variable name="isAdded" select="../@added"/>
|
|
6677
6748
|
<xsl:variable name="isDeleted" select="../@deleted"/>
|
|
6678
6749
|
<xsl:choose>
|
|
6679
|
-
<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
|
|
6750
|
+
<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']"> <!-- inline image ( 'image:path' in adoc, with one colon after image) -->
|
|
6680
6751
|
<fo:inline padding-left="1mm" padding-right="1mm">
|
|
6681
6752
|
<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
|
|
6682
6753
|
<xsl:attribute name="padding-left">0mm</xsl:attribute>
|
|
@@ -6685,7 +6756,43 @@
|
|
|
6685
6756
|
<xsl:variable name="src">
|
|
6686
6757
|
<xsl:call-template name="image_src"/>
|
|
6687
6758
|
</xsl:variable>
|
|
6688
|
-
|
|
6759
|
+
|
|
6760
|
+
<xsl:variable name="scale">
|
|
6761
|
+
<xsl:call-template name="getImageScale">
|
|
6762
|
+
<xsl:with-param name="indent" select="$indent"/>
|
|
6763
|
+
</xsl:call-template>
|
|
6764
|
+
</xsl:variable>
|
|
6765
|
+
|
|
6766
|
+
<!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
|
|
6767
|
+
|
|
6768
|
+
<!-- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/> -->
|
|
6769
|
+
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
|
|
6770
|
+
|
|
6771
|
+
<xsl:variable name="width">
|
|
6772
|
+
<xsl:call-template name="setImageWidth"/>
|
|
6773
|
+
</xsl:variable>
|
|
6774
|
+
<xsl:if test="$width != ''">
|
|
6775
|
+
<xsl:attribute name="width"><xsl:value-of select="$width"/></xsl:attribute>
|
|
6776
|
+
</xsl:if>
|
|
6777
|
+
<xsl:variable name="height">
|
|
6778
|
+
<xsl:call-template name="setImageHeight"/>
|
|
6779
|
+
</xsl:variable>
|
|
6780
|
+
<xsl:if test="$height != ''">
|
|
6781
|
+
<xsl:attribute name="height"><xsl:value-of select="$height"/></xsl:attribute>
|
|
6782
|
+
</xsl:if>
|
|
6783
|
+
|
|
6784
|
+
<xsl:if test="$width = '' and $height = ''">
|
|
6785
|
+
<xsl:if test="number($scale) < 100">
|
|
6786
|
+
<xsl:attribute name="content-width"><xsl:value-of select="number($scale)"/>%</xsl:attribute>
|
|
6787
|
+
<!-- <xsl:attribute name="content-width">scale-to-fit</xsl:attribute>
|
|
6788
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
6789
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
|
6790
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute> -->
|
|
6791
|
+
</xsl:if>
|
|
6792
|
+
</xsl:if>
|
|
6793
|
+
|
|
6794
|
+
</fo:external-graphic>
|
|
6795
|
+
|
|
6689
6796
|
</fo:inline>
|
|
6690
6797
|
</xsl:when>
|
|
6691
6798
|
<xsl:otherwise>
|
|
@@ -6706,25 +6813,23 @@
|
|
|
6706
6813
|
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
6707
6814
|
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
|
6708
6815
|
|
|
6709
|
-
|
|
6816
|
+
<xsl:apply-templates select="." mode="cross_image"/>
|
|
6710
6817
|
|
|
6711
6818
|
</fo:instream-foreign-object>
|
|
6712
6819
|
</xsl:when>
|
|
6713
6820
|
<xsl:otherwise>
|
|
6821
|
+
<!-- <fo:block>debug block image:
|
|
6822
|
+
<xsl:variable name="scale">
|
|
6823
|
+
<xsl:call-template name="getImageScale">
|
|
6824
|
+
<xsl:with-param name="indent" select="$indent"/>
|
|
6825
|
+
</xsl:call-template>
|
|
6826
|
+
</xsl:variable>
|
|
6827
|
+
<xsl:value-of select="concat('scale=', $scale,', indent=', $indent)"/>
|
|
6828
|
+
</fo:block> -->
|
|
6714
6829
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
|
6715
|
-
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
|
6716
|
-
|
|
6717
|
-
<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
|
|
6718
|
-
<xsl:attribute name="width">
|
|
6719
|
-
<xsl:value-of select="@width"/>
|
|
6720
|
-
</xsl:attribute>
|
|
6721
|
-
</xsl:if>
|
|
6830
|
+
<xsl:if test="not(@mimetype = 'image/svg+xml') and (../*[local-name() = 'name'] or parent::*[local-name() = 'figure'][@unnumbered = 'true']) and not(ancestor::*[local-name() = 'table'])">
|
|
6722
6831
|
|
|
6723
|
-
<xsl:
|
|
6724
|
-
<xsl:attribute name="height">
|
|
6725
|
-
<xsl:value-of select="@height"/>
|
|
6726
|
-
</xsl:attribute>
|
|
6727
|
-
</xsl:if>
|
|
6832
|
+
<xsl:call-template name="setImageWidthHeight"/>
|
|
6728
6833
|
|
|
6729
6834
|
<xsl:choose>
|
|
6730
6835
|
<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
|
|
@@ -6732,24 +6837,18 @@
|
|
|
6732
6837
|
</xsl:when>
|
|
6733
6838
|
<xsl:otherwise>
|
|
6734
6839
|
|
|
6735
|
-
<xsl:variable name="
|
|
6736
|
-
<xsl:
|
|
6737
|
-
<xsl:
|
|
6738
|
-
|
|
6739
|
-
</xsl:choose>
|
|
6840
|
+
<xsl:variable name="scale">
|
|
6841
|
+
<xsl:call-template name="getImageScale">
|
|
6842
|
+
<xsl:with-param name="indent" select="$indent"/>
|
|
6843
|
+
</xsl:call-template>
|
|
6740
6844
|
</xsl:variable>
|
|
6741
6845
|
|
|
6742
|
-
<xsl:variable name="
|
|
6743
|
-
|
|
6744
|
-
<xsl:value-of select="$width_effective"/>
|
|
6745
|
-
|
|
6846
|
+
<xsl:variable name="scaleRatio">
|
|
6847
|
+
1
|
|
6746
6848
|
</xsl:variable>
|
|
6747
6849
|
|
|
6748
|
-
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
|
6749
6850
|
<xsl:if test="number($scale) < 100">
|
|
6750
|
-
|
|
6751
|
-
<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
|
|
6752
|
-
|
|
6851
|
+
<xsl:attribute name="content-width"><xsl:value-of select="number($scale) * number($scaleRatio)"/>%</xsl:attribute>
|
|
6753
6852
|
</xsl:if>
|
|
6754
6853
|
</xsl:otherwise>
|
|
6755
6854
|
</xsl:choose>
|
|
@@ -6765,6 +6864,62 @@
|
|
|
6765
6864
|
</xsl:choose>
|
|
6766
6865
|
</xsl:template>
|
|
6767
6866
|
|
|
6867
|
+
<xsl:template name="setImageWidth">
|
|
6868
|
+
<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
|
|
6869
|
+
<xsl:value-of select="@width"/>
|
|
6870
|
+
</xsl:if>
|
|
6871
|
+
</xsl:template>
|
|
6872
|
+
<xsl:template name="setImageHeight">
|
|
6873
|
+
<xsl:if test="@height != '' and @height != 'auto'">
|
|
6874
|
+
<xsl:value-of select="@height"/>
|
|
6875
|
+
</xsl:if>
|
|
6876
|
+
</xsl:template>
|
|
6877
|
+
<xsl:template name="setImageWidthHeight">
|
|
6878
|
+
<xsl:variable name="width">
|
|
6879
|
+
<xsl:call-template name="setImageWidth"/>
|
|
6880
|
+
</xsl:variable>
|
|
6881
|
+
<xsl:if test="$width != ''">
|
|
6882
|
+
<xsl:attribute name="width">
|
|
6883
|
+
<xsl:value-of select="$width"/>
|
|
6884
|
+
</xsl:attribute>
|
|
6885
|
+
</xsl:if>
|
|
6886
|
+
<xsl:variable name="height">
|
|
6887
|
+
<xsl:call-template name="setImageHeight"/>
|
|
6888
|
+
</xsl:variable>
|
|
6889
|
+
<xsl:if test="$height != ''">
|
|
6890
|
+
<xsl:attribute name="height">
|
|
6891
|
+
<xsl:value-of select="$height"/>
|
|
6892
|
+
</xsl:attribute>
|
|
6893
|
+
</xsl:if>
|
|
6894
|
+
</xsl:template>
|
|
6895
|
+
|
|
6896
|
+
<xsl:template name="getImageScale">
|
|
6897
|
+
<xsl:param name="indent"/>
|
|
6898
|
+
<xsl:variable name="indent_left">
|
|
6899
|
+
<xsl:choose>
|
|
6900
|
+
<xsl:when test="$indent != ''"><xsl:value-of select="$indent"/></xsl:when>
|
|
6901
|
+
<xsl:otherwise>0</xsl:otherwise>
|
|
6902
|
+
</xsl:choose>
|
|
6903
|
+
</xsl:variable>
|
|
6904
|
+
<xsl:variable name="img_src">
|
|
6905
|
+
<xsl:choose>
|
|
6906
|
+
<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
|
|
6907
|
+
<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
|
|
6908
|
+
</xsl:choose>
|
|
6909
|
+
</xsl:variable>
|
|
6910
|
+
|
|
6911
|
+
<xsl:variable name="image_width_effective">
|
|
6912
|
+
|
|
6913
|
+
<xsl:value-of select="$width_effective - number($indent_left)"/>
|
|
6914
|
+
|
|
6915
|
+
</xsl:variable>
|
|
6916
|
+
<!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
|
|
6917
|
+
<xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
|
|
6918
|
+
<xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
|
|
6919
|
+
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
|
6920
|
+
<xsl:value-of select="$scale"/>
|
|
6921
|
+
</xsl:template>
|
|
6922
|
+
|
|
6768
6923
|
<xsl:template name="image_src">
|
|
6769
6924
|
<xsl:choose>
|
|
6770
6925
|
<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
|
|
@@ -9443,6 +9598,7 @@
|
|
|
9443
9598
|
</xsl:template>
|
|
9444
9599
|
|
|
9445
9600
|
<xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
|
|
9601
|
+
<xsl:param name="indent">0</xsl:param>
|
|
9446
9602
|
<xsl:choose>
|
|
9447
9603
|
<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
|
|
9448
9604
|
<fo:block-container role="SKIP">
|
|
@@ -9457,7 +9613,9 @@
|
|
|
9457
9613
|
|
|
9458
9614
|
<fo:block-container margin-left="0mm" role="SKIP">
|
|
9459
9615
|
<fo:block>
|
|
9460
|
-
<xsl:apply-templates select="." mode="list"
|
|
9616
|
+
<xsl:apply-templates select="." mode="list">
|
|
9617
|
+
<xsl:with-param name="indent" select="$indent"/>
|
|
9618
|
+
</xsl:apply-templates>
|
|
9461
9619
|
</fo:block>
|
|
9462
9620
|
</fo:block-container>
|
|
9463
9621
|
</fo:block-container>
|
|
@@ -9465,7 +9623,9 @@
|
|
|
9465
9623
|
<xsl:otherwise>
|
|
9466
9624
|
|
|
9467
9625
|
<fo:block role="SKIP">
|
|
9468
|
-
<xsl:apply-templates select="." mode="list"
|
|
9626
|
+
<xsl:apply-templates select="." mode="list">
|
|
9627
|
+
<xsl:with-param name="indent" select="$indent"/>
|
|
9628
|
+
</xsl:apply-templates>
|
|
9469
9629
|
</fo:block>
|
|
9470
9630
|
|
|
9471
9631
|
</xsl:otherwise>
|
|
@@ -9550,6 +9710,13 @@
|
|
|
9550
9710
|
</xsl:template>
|
|
9551
9711
|
|
|
9552
9712
|
<xsl:template match="*[local-name()='li']">
|
|
9713
|
+
<xsl:param name="indent">0</xsl:param>
|
|
9714
|
+
<!-- <fo:list-item xsl:use-attribute-sets="list-item-style">
|
|
9715
|
+
<fo:list-item-label end-indent="label-end()"><fo:block>x</fo:block></fo:list-item-label>
|
|
9716
|
+
<fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
|
|
9717
|
+
<fo:block>debug li indent=<xsl:value-of select="$indent"/></fo:block>
|
|
9718
|
+
</fo:list-item-body>
|
|
9719
|
+
</fo:list-item> -->
|
|
9553
9720
|
<fo:list-item xsl:use-attribute-sets="list-item-style">
|
|
9554
9721
|
<xsl:copy-of select="@id"/>
|
|
9555
9722
|
|
|
@@ -9574,7 +9741,9 @@
|
|
|
9574
9741
|
|
|
9575
9742
|
<xsl:call-template name="refine_list-item-body-style"/>
|
|
9576
9743
|
|
|
9577
|
-
<xsl:apply-templates
|
|
9744
|
+
<xsl:apply-templates>
|
|
9745
|
+
<xsl:with-param name="indent" select="$indent"/>
|
|
9746
|
+
</xsl:apply-templates>
|
|
9578
9747
|
|
|
9579
9748
|
<!-- <xsl:apply-templates select="node()[not(local-name() = 'note')]" />
|
|
9580
9749
|
|
|
@@ -11713,6 +11882,4 @@
|
|
|
11713
11882
|
</xsl:if>
|
|
11714
11883
|
</xsl:template>
|
|
11715
11884
|
|
|
11716
|
-
<!-- update -->
|
|
11717
|
-
|
|
11718
11885
|
</xsl:stylesheet>
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-csa
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.4.
|
|
4
|
+
version: 2.4.6
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2024-
|
|
11
|
+
date: 2024-04-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-generic
|