metanorma-ieee 1.2.6 → 1.2.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/ieee/ieee.amendment.xsl +83 -23
- data/lib/isodoc/ieee/ieee.standard.xsl +83 -23
- data/lib/isodoc/ieee/word_cleanup.rb +0 -3
- data/lib/isodoc/ieee/word_wp_cleanup.rb +0 -3
- data/lib/metanorma/ieee/version.rb +1 -1
- data/lib/relaton/render/config.yml +1 -1
- data/metanorma-ieee.gemspec +1 -3
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 710f4bee007f0e7159c0d4fb92069b38e4f5626d3d34d1399b013d92db862bcb
|
4
|
+
data.tar.gz: ea510070d80ec5b32961ccdc3d03f274d4368296f0cc4e4375d4a4e5686255d8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6faa187ccecea80276a1584f607f80a54e550ec836cca69699a8bb4335107d3ccc56aec1d1659eb99b531475cf4ddf5916efcb6c9cefe3082daaf59998011e0b
|
7
|
+
data.tar.gz: 367816ece10ffea1106d3515276c0215820fc7b06b500ee97da72149a16720d00d3d770f12ac97e988298918be063286d8e7dcedf6745b66595b05eaf7515451
|
@@ -3811,17 +3811,30 @@
|
|
3811
3811
|
<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 -->
|
3812
3812
|
|
3813
3813
|
<xsl:param name="table_if">false</xsl:param> <!-- generate extended table in IF for autolayout-algorithm -->
|
3814
|
-
<xsl:param name="table_widths"/> <!-- path to xml with table's widths, generated on 1st pass, based on FOP Intermediate Format -->
|
3814
|
+
<xsl:param name="table_widths"/> <!-- (debug: path to) xml with table's widths, generated on 1st pass, based on FOP Intermediate Format -->
|
3815
3815
|
<!-- Example: <tables>
|
3816
|
-
|
3817
|
-
|
3818
|
-
|
3819
|
-
|
3820
|
-
|
3821
|
-
|
3822
|
-
|
3823
|
-
|
3824
|
-
|
3816
|
+
<table page-width="509103" id="table1" width_max="223561" width_min="223560">
|
3817
|
+
<column width_max="39354" width_min="39354"/>
|
3818
|
+
<column width_max="75394" width_min="75394"/>
|
3819
|
+
<column width_max="108813" width_min="108813"/>
|
3820
|
+
<tbody>
|
3821
|
+
<tr>
|
3822
|
+
<td width_max="39354" width_min="39354">
|
3823
|
+
<p_len>39354</p_len>
|
3824
|
+
<word_len>39354</word_len>
|
3825
|
+
</td>
|
3826
|
+
|
3827
|
+
OLD:
|
3828
|
+
<tables>
|
3829
|
+
<table id="table_if_tab-symdu" page-width="75"> - table id prefixed by 'table_if_' to simple search in IF
|
3830
|
+
<tbody>
|
3831
|
+
<tr>
|
3832
|
+
<td id="tab-symdu_1_1">
|
3833
|
+
<p_len>6</p_len>
|
3834
|
+
<p_len>100</p_len> for 2nd paragraph
|
3835
|
+
<word_len>6</word_len>
|
3836
|
+
<word_len>20</word_len>
|
3837
|
+
...
|
3825
3838
|
-->
|
3826
3839
|
|
3827
3840
|
<!-- for command line debug: <xsl:variable name="table_widths_from_if" select="document($table_widths)"/> -->
|
@@ -4041,6 +4054,9 @@
|
|
4041
4054
|
<xsl:variable name="hair_space"> </xsl:variable>
|
4042
4055
|
<xsl:variable name="en_dash">–</xsl:variable>
|
4043
4056
|
<xsl:variable name="em_dash">—</xsl:variable>
|
4057
|
+
<xsl:variable name="cr"> </xsl:variable>
|
4058
|
+
<xsl:variable name="lf">
|
4059
|
+
</xsl:variable>
|
4044
4060
|
|
4045
4061
|
<xsl:template name="getTitle">
|
4046
4062
|
<xsl:param name="name"/>
|
@@ -5767,6 +5783,20 @@
|
|
5767
5783
|
</xsl:for-each>
|
5768
5784
|
</xsl:template>
|
5769
5785
|
|
5786
|
+
<xsl:param name="table_only_with_id"/><!-- Example: table1, for table auto-layout algorithm -->
|
5787
|
+
|
5788
|
+
<xsl:template match="*[local-name()='table']" priority="2">
|
5789
|
+
<xsl:choose>
|
5790
|
+
<xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id">
|
5791
|
+
<xsl:call-template name="table"/>
|
5792
|
+
</xsl:when>
|
5793
|
+
<xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when>
|
5794
|
+
<xsl:otherwise>
|
5795
|
+
<xsl:call-template name="table"/>
|
5796
|
+
</xsl:otherwise>
|
5797
|
+
</xsl:choose>
|
5798
|
+
</xsl:template>
|
5799
|
+
|
5770
5800
|
<xsl:template match="*[local-name()='table']" name="table">
|
5771
5801
|
|
5772
5802
|
<xsl:variable name="table-preamble">
|
@@ -5776,9 +5806,11 @@
|
|
5776
5806
|
<xsl:variable name="table">
|
5777
5807
|
|
5778
5808
|
<xsl:variable name="simple-table">
|
5779
|
-
<xsl:
|
5780
|
-
<xsl:
|
5781
|
-
|
5809
|
+
<xsl:if test="$isGenerateTableIF = 'true' and $isApplyAutolayoutAlgorithm = 'true'">
|
5810
|
+
<xsl:call-template name="getSimpleTable">
|
5811
|
+
<xsl:with-param name="id" select="@id"/>
|
5812
|
+
</xsl:call-template>
|
5813
|
+
</xsl:if>
|
5782
5814
|
</xsl:variable>
|
5783
5815
|
<!-- <xsl:variable name="simple-table" select="xalan:nodeset($simple-table_)"/> -->
|
5784
5816
|
|
@@ -5879,9 +5911,9 @@
|
|
5879
5911
|
</xsl:attribute>
|
5880
5912
|
</xsl:for-each>
|
5881
5913
|
|
5882
|
-
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
5914
|
+
<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']"/>
|
5883
5915
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
5884
|
-
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute
|
5916
|
+
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute><!-- set 0pt border, because there is a separete table below for footer -->
|
5885
5917
|
</xsl:if>
|
5886
5918
|
|
5887
5919
|
<xsl:choose>
|
@@ -6009,6 +6041,17 @@
|
|
6009
6041
|
</xsl:if>
|
6010
6042
|
</xsl:template> <!-- table/name -->
|
6011
6043
|
|
6044
|
+
<!-- workaround solution for https://github.com/metanorma/metanorma-iso/issues/1151#issuecomment-2033087938 -->
|
6045
|
+
<xsl:template match="*[local-name()='table']/*[local-name() = 'note'][@type = 'units']/*[local-name() = 'p']/text()" priority="4">
|
6046
|
+
<xsl:choose>
|
6047
|
+
<xsl:when test="preceding-sibling::*[local-name() = 'br']">
|
6048
|
+
<!-- remove CR or LF at start -->
|
6049
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'^( | | )', '')"/>
|
6050
|
+
</xsl:when>
|
6051
|
+
<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
|
6052
|
+
</xsl:choose>
|
6053
|
+
</xsl:template>
|
6054
|
+
|
6012
6055
|
<!-- SOURCE: ... -->
|
6013
6056
|
<xsl:template match="*[local-name()='table']/*[local-name() = 'source']" priority="2">
|
6014
6057
|
<xsl:call-template name="termsource"/>
|
@@ -6430,7 +6473,7 @@
|
|
6430
6473
|
<xsl:param name="colwidths"/>
|
6431
6474
|
<xsl:param name="colgroup"/>
|
6432
6475
|
|
6433
|
-
<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']"/>
|
6476
|
+
<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']"/>
|
6434
6477
|
|
6435
6478
|
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
6436
6479
|
|
@@ -6502,7 +6545,7 @@
|
|
6502
6545
|
|
6503
6546
|
<xsl:apply-templates select="../*[local-name()='p']"/>
|
6504
6547
|
<xsl:apply-templates select="../*[local-name()='dl']"/>
|
6505
|
-
<xsl:apply-templates select="../*[local-name()='note']"/>
|
6548
|
+
<xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
|
6506
6549
|
<xsl:apply-templates select="../*[local-name()='example']"/>
|
6507
6550
|
<xsl:apply-templates select="../*[local-name()='source']"/>
|
6508
6551
|
|
@@ -6512,7 +6555,7 @@
|
|
6512
6555
|
|
6513
6556
|
<!-- horizontal row separator -->
|
6514
6557
|
<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
|
6515
|
-
<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
|
6558
|
+
<xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
|
6516
6559
|
<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
|
6517
6560
|
|
6518
6561
|
<xsl:call-template name="setBordersTableArray"/>
|
@@ -7219,7 +7262,20 @@
|
|
7219
7262
|
<!-- Definition List -->
|
7220
7263
|
<!-- ===================== -->
|
7221
7264
|
|
7222
|
-
|
7265
|
+
<!-- for table auto-layout algorithm -->
|
7266
|
+
<xsl:template match="*[local-name()='dl']" priority="2">
|
7267
|
+
<xsl:choose>
|
7268
|
+
<xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id">
|
7269
|
+
<xsl:call-template name="dl"/>
|
7270
|
+
</xsl:when>
|
7271
|
+
<xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when>
|
7272
|
+
<xsl:otherwise>
|
7273
|
+
<xsl:call-template name="dl"/>
|
7274
|
+
</xsl:otherwise>
|
7275
|
+
</xsl:choose>
|
7276
|
+
</xsl:template>
|
7277
|
+
|
7278
|
+
<xsl:template match="*[local-name()='dl']" name="dl">
|
7223
7279
|
<xsl:variable name="isAdded" select="@added"/>
|
7224
7280
|
<xsl:variable name="isDeleted" select="@deleted"/>
|
7225
7281
|
<!-- <dl><xsl:copy-of select="."/></dl> -->
|
@@ -9148,7 +9204,13 @@
|
|
9148
9204
|
<xsl:value-of select="$language_current_2"/>
|
9149
9205
|
</xsl:when>
|
9150
9206
|
<xsl:otherwise>
|
9151
|
-
<xsl:
|
9207
|
+
<xsl:variable name="language_current_3" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'])"/>
|
9208
|
+
<xsl:choose>
|
9209
|
+
<xsl:when test="$language_current_3 != ''">
|
9210
|
+
<xsl:value-of select="$language_current_3"/>
|
9211
|
+
</xsl:when>
|
9212
|
+
<xsl:otherwise>en</xsl:otherwise>
|
9213
|
+
</xsl:choose>
|
9152
9214
|
</xsl:otherwise>
|
9153
9215
|
</xsl:choose>
|
9154
9216
|
</xsl:otherwise>
|
@@ -10055,7 +10117,7 @@
|
|
10055
10117
|
</xsl:when>
|
10056
10118
|
<xsl:otherwise>
|
10057
10119
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
10058
|
-
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
10120
|
+
<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'])">
|
10059
10121
|
|
10060
10122
|
<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
|
10061
10123
|
<xsl:attribute name="width">
|
@@ -15231,6 +15293,4 @@
|
|
15231
15293
|
</xsl:if>
|
15232
15294
|
</xsl:template>
|
15233
15295
|
|
15234
|
-
<!-- update -->
|
15235
|
-
|
15236
15296
|
</xsl:stylesheet>
|
@@ -3811,17 +3811,30 @@
|
|
3811
3811
|
<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 -->
|
3812
3812
|
|
3813
3813
|
<xsl:param name="table_if">false</xsl:param> <!-- generate extended table in IF for autolayout-algorithm -->
|
3814
|
-
<xsl:param name="table_widths"/> <!-- path to xml with table's widths, generated on 1st pass, based on FOP Intermediate Format -->
|
3814
|
+
<xsl:param name="table_widths"/> <!-- (debug: path to) xml with table's widths, generated on 1st pass, based on FOP Intermediate Format -->
|
3815
3815
|
<!-- Example: <tables>
|
3816
|
-
|
3817
|
-
|
3818
|
-
|
3819
|
-
|
3820
|
-
|
3821
|
-
|
3822
|
-
|
3823
|
-
|
3824
|
-
|
3816
|
+
<table page-width="509103" id="table1" width_max="223561" width_min="223560">
|
3817
|
+
<column width_max="39354" width_min="39354"/>
|
3818
|
+
<column width_max="75394" width_min="75394"/>
|
3819
|
+
<column width_max="108813" width_min="108813"/>
|
3820
|
+
<tbody>
|
3821
|
+
<tr>
|
3822
|
+
<td width_max="39354" width_min="39354">
|
3823
|
+
<p_len>39354</p_len>
|
3824
|
+
<word_len>39354</word_len>
|
3825
|
+
</td>
|
3826
|
+
|
3827
|
+
OLD:
|
3828
|
+
<tables>
|
3829
|
+
<table id="table_if_tab-symdu" page-width="75"> - table id prefixed by 'table_if_' to simple search in IF
|
3830
|
+
<tbody>
|
3831
|
+
<tr>
|
3832
|
+
<td id="tab-symdu_1_1">
|
3833
|
+
<p_len>6</p_len>
|
3834
|
+
<p_len>100</p_len> for 2nd paragraph
|
3835
|
+
<word_len>6</word_len>
|
3836
|
+
<word_len>20</word_len>
|
3837
|
+
...
|
3825
3838
|
-->
|
3826
3839
|
|
3827
3840
|
<!-- for command line debug: <xsl:variable name="table_widths_from_if" select="document($table_widths)"/> -->
|
@@ -4041,6 +4054,9 @@
|
|
4041
4054
|
<xsl:variable name="hair_space"> </xsl:variable>
|
4042
4055
|
<xsl:variable name="en_dash">–</xsl:variable>
|
4043
4056
|
<xsl:variable name="em_dash">—</xsl:variable>
|
4057
|
+
<xsl:variable name="cr"> </xsl:variable>
|
4058
|
+
<xsl:variable name="lf">
|
4059
|
+
</xsl:variable>
|
4044
4060
|
|
4045
4061
|
<xsl:template name="getTitle">
|
4046
4062
|
<xsl:param name="name"/>
|
@@ -5767,6 +5783,20 @@
|
|
5767
5783
|
</xsl:for-each>
|
5768
5784
|
</xsl:template>
|
5769
5785
|
|
5786
|
+
<xsl:param name="table_only_with_id"/><!-- Example: table1, for table auto-layout algorithm -->
|
5787
|
+
|
5788
|
+
<xsl:template match="*[local-name()='table']" priority="2">
|
5789
|
+
<xsl:choose>
|
5790
|
+
<xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id">
|
5791
|
+
<xsl:call-template name="table"/>
|
5792
|
+
</xsl:when>
|
5793
|
+
<xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when>
|
5794
|
+
<xsl:otherwise>
|
5795
|
+
<xsl:call-template name="table"/>
|
5796
|
+
</xsl:otherwise>
|
5797
|
+
</xsl:choose>
|
5798
|
+
</xsl:template>
|
5799
|
+
|
5770
5800
|
<xsl:template match="*[local-name()='table']" name="table">
|
5771
5801
|
|
5772
5802
|
<xsl:variable name="table-preamble">
|
@@ -5776,9 +5806,11 @@
|
|
5776
5806
|
<xsl:variable name="table">
|
5777
5807
|
|
5778
5808
|
<xsl:variable name="simple-table">
|
5779
|
-
<xsl:
|
5780
|
-
<xsl:
|
5781
|
-
|
5809
|
+
<xsl:if test="$isGenerateTableIF = 'true' and $isApplyAutolayoutAlgorithm = 'true'">
|
5810
|
+
<xsl:call-template name="getSimpleTable">
|
5811
|
+
<xsl:with-param name="id" select="@id"/>
|
5812
|
+
</xsl:call-template>
|
5813
|
+
</xsl:if>
|
5782
5814
|
</xsl:variable>
|
5783
5815
|
<!-- <xsl:variable name="simple-table" select="xalan:nodeset($simple-table_)"/> -->
|
5784
5816
|
|
@@ -5879,9 +5911,9 @@
|
|
5879
5911
|
</xsl:attribute>
|
5880
5912
|
</xsl:for-each>
|
5881
5913
|
|
5882
|
-
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
|
5914
|
+
<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']"/>
|
5883
5915
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
5884
|
-
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute
|
5916
|
+
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute><!-- set 0pt border, because there is a separete table below for footer -->
|
5885
5917
|
</xsl:if>
|
5886
5918
|
|
5887
5919
|
<xsl:choose>
|
@@ -6009,6 +6041,17 @@
|
|
6009
6041
|
</xsl:if>
|
6010
6042
|
</xsl:template> <!-- table/name -->
|
6011
6043
|
|
6044
|
+
<!-- workaround solution for https://github.com/metanorma/metanorma-iso/issues/1151#issuecomment-2033087938 -->
|
6045
|
+
<xsl:template match="*[local-name()='table']/*[local-name() = 'note'][@type = 'units']/*[local-name() = 'p']/text()" priority="4">
|
6046
|
+
<xsl:choose>
|
6047
|
+
<xsl:when test="preceding-sibling::*[local-name() = 'br']">
|
6048
|
+
<!-- remove CR or LF at start -->
|
6049
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'^( | | )', '')"/>
|
6050
|
+
</xsl:when>
|
6051
|
+
<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
|
6052
|
+
</xsl:choose>
|
6053
|
+
</xsl:template>
|
6054
|
+
|
6012
6055
|
<!-- SOURCE: ... -->
|
6013
6056
|
<xsl:template match="*[local-name()='table']/*[local-name() = 'source']" priority="2">
|
6014
6057
|
<xsl:call-template name="termsource"/>
|
@@ -6430,7 +6473,7 @@
|
|
6430
6473
|
<xsl:param name="colwidths"/>
|
6431
6474
|
<xsl:param name="colgroup"/>
|
6432
6475
|
|
6433
|
-
<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']"/>
|
6476
|
+
<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']"/>
|
6434
6477
|
|
6435
6478
|
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
6436
6479
|
|
@@ -6502,7 +6545,7 @@
|
|
6502
6545
|
|
6503
6546
|
<xsl:apply-templates select="../*[local-name()='p']"/>
|
6504
6547
|
<xsl:apply-templates select="../*[local-name()='dl']"/>
|
6505
|
-
<xsl:apply-templates select="../*[local-name()='note']"/>
|
6548
|
+
<xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
|
6506
6549
|
<xsl:apply-templates select="../*[local-name()='example']"/>
|
6507
6550
|
<xsl:apply-templates select="../*[local-name()='source']"/>
|
6508
6551
|
|
@@ -6512,7 +6555,7 @@
|
|
6512
6555
|
|
6513
6556
|
<!-- horizontal row separator -->
|
6514
6557
|
<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
|
6515
|
-
<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
|
6558
|
+
<xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
|
6516
6559
|
<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
|
6517
6560
|
|
6518
6561
|
<xsl:call-template name="setBordersTableArray"/>
|
@@ -7219,7 +7262,20 @@
|
|
7219
7262
|
<!-- Definition List -->
|
7220
7263
|
<!-- ===================== -->
|
7221
7264
|
|
7222
|
-
|
7265
|
+
<!-- for table auto-layout algorithm -->
|
7266
|
+
<xsl:template match="*[local-name()='dl']" priority="2">
|
7267
|
+
<xsl:choose>
|
7268
|
+
<xsl:when test="$table_only_with_id != '' and @id = $table_only_with_id">
|
7269
|
+
<xsl:call-template name="dl"/>
|
7270
|
+
</xsl:when>
|
7271
|
+
<xsl:when test="$table_only_with_id != ''"><fo:block/><!-- to prevent empty fo:block-container --></xsl:when>
|
7272
|
+
<xsl:otherwise>
|
7273
|
+
<xsl:call-template name="dl"/>
|
7274
|
+
</xsl:otherwise>
|
7275
|
+
</xsl:choose>
|
7276
|
+
</xsl:template>
|
7277
|
+
|
7278
|
+
<xsl:template match="*[local-name()='dl']" name="dl">
|
7223
7279
|
<xsl:variable name="isAdded" select="@added"/>
|
7224
7280
|
<xsl:variable name="isDeleted" select="@deleted"/>
|
7225
7281
|
<!-- <dl><xsl:copy-of select="."/></dl> -->
|
@@ -9148,7 +9204,13 @@
|
|
9148
9204
|
<xsl:value-of select="$language_current_2"/>
|
9149
9205
|
</xsl:when>
|
9150
9206
|
<xsl:otherwise>
|
9151
|
-
<xsl:
|
9207
|
+
<xsl:variable name="language_current_3" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'])"/>
|
9208
|
+
<xsl:choose>
|
9209
|
+
<xsl:when test="$language_current_3 != ''">
|
9210
|
+
<xsl:value-of select="$language_current_3"/>
|
9211
|
+
</xsl:when>
|
9212
|
+
<xsl:otherwise>en</xsl:otherwise>
|
9213
|
+
</xsl:choose>
|
9152
9214
|
</xsl:otherwise>
|
9153
9215
|
</xsl:choose>
|
9154
9216
|
</xsl:otherwise>
|
@@ -10055,7 +10117,7 @@
|
|
10055
10117
|
</xsl:when>
|
10056
10118
|
<xsl:otherwise>
|
10057
10119
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
10058
|
-
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
10120
|
+
<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'])">
|
10059
10121
|
|
10060
10122
|
<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
|
10061
10123
|
<xsl:attribute name="width">
|
@@ -15231,6 +15293,4 @@
|
|
15231
15293
|
</xsl:if>
|
15232
15294
|
</xsl:template>
|
15233
15295
|
|
15234
|
-
<!-- update -->
|
15235
|
-
|
15236
15296
|
</xsl:stylesheet>
|
@@ -2,9 +2,6 @@ module IsoDoc
|
|
2
2
|
module IEEE
|
3
3
|
class WordConvert < IsoDoc::WordConvert
|
4
4
|
def toWord(result, filename, dir, header)
|
5
|
-
result = from_xhtml(word_cleanup(to_xhtml(result)))
|
6
|
-
.gsub("-DOUBLE_HYPHEN_ESCAPE-", "--")
|
7
|
-
@wordstylesheet = wordstylesheet_update
|
8
5
|
::Html2Doc::IEEE.new(
|
9
6
|
filename: filename,
|
10
7
|
imagedir: @localdir,
|
@@ -75,9 +75,6 @@ module IsoDoc
|
|
75
75
|
end
|
76
76
|
|
77
77
|
def toWord(result, filename, dir, header)
|
78
|
-
result = from_xhtml(word_cleanup(to_xhtml(result)))
|
79
|
-
.gsub("-DOUBLE_HYPHEN_ESCAPE-", "--")
|
80
|
-
@wordstylesheet = wordstylesheet_update
|
81
78
|
::Html2Doc::IEEE_WP.new(
|
82
79
|
filename: filename,
|
83
80
|
imagedir: @localdir,
|
@@ -19,7 +19,7 @@ template:
|
|
19
19
|
inproceedings: "{{ creatornames }}, “{{ title }},” <em>{{host_title}}</em>, {{place}}, {{extent}}, {{date}}, {{ labels['viewed'] }}_{{date_accessed}}, {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: ', ' }}{% endif %}{% endif %} ."
|
20
20
|
inbook: "{{ creatornames }}, “{{ title }},” {{ labels['in'] }} {{ host_creatornames}} ({{ host_role}}) : <em>{{host_title}}</em>, {{place}}: {{publisher}}, {{date}}, {{extent}}, {{ labels['viewed'] }}_{{date_accessed}}, {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: ', ' }}{% endif %}{% endif %} ."
|
21
21
|
incollection: inbook
|
22
|
-
thesis: "{{ creatornames }} , “{{ title }}
|
22
|
+
thesis: "{{ creatornames }} , “{{ title }},” {{ medium | capitalize }}, {{ publisher }}, {{ date }}, {{ labels['viewed'] }}_{{date_accessed}}, {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: ', ' }}{% endif %}{% endif %} ."
|
23
23
|
unpublished: thesis
|
24
24
|
misc: thesis
|
25
25
|
website: thesis
|
data/metanorma-ieee.gemspec
CHANGED
@@ -27,9 +27,7 @@ Gem::Specification.new do |spec|
|
|
27
27
|
|
28
28
|
spec.add_dependency "metanorma-standoc", "~> 2.8.4"
|
29
29
|
spec.add_dependency "mnconvert", "~> 1.20"
|
30
|
-
spec.add_dependency "pubid
|
31
|
-
#spec.add_dependency "pubid-iso", "~> 0.5.3"
|
32
|
-
#spec.add_dependency "relaton-iso", "~> 1.15.4"
|
30
|
+
spec.add_dependency "pubid"
|
33
31
|
|
34
32
|
spec.add_development_dependency "debug"
|
35
33
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-ieee
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.2.
|
4
|
+
version: 1.2.7
|
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-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-standoc
|
@@ -39,7 +39,7 @@ dependencies:
|
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: '1.20'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
|
-
name: pubid
|
42
|
+
name: pubid
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
45
|
- - ">="
|