metanorma-iec 2.0.4 → 2.0.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/iec/html/wordstyle.css +20 -0
- data/lib/isodoc/iec/html/wordstyle.scss +19 -0
- data/lib/isodoc/iec/iec.international-standard.xsl +312 -117
- data/lib/metanorma/iec/version.rb +1 -1
- data/spec/isodoc/iev_spec.rb +3 -10
- data/spec/isodoc/postproc_spec.rb +1 -1
- data/spec/isodoc/terms_spec.rb +4 -7
- 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: 4d7748699d6414de9def85acc9298a31f507492ca7a1fb5bc94b19264fdbbbba
|
4
|
+
data.tar.gz: 342bcbd3c66cd744bd8c1a63f4a2867f6cb024c504ce9b4a45e90b0d1d50ba8c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 583090be4e32cfcb95eed3071775b35959703175e3821623a43c5e46c3e279d2b7519e7e5367513759f4765298a7edbe32d4efbf7d05ff1d9d8e7e880c925381
|
7
|
+
data.tar.gz: ccbeaecab184817d9e92d5767e7ce2ed6b53d7dfb3745048570489747cf986f16abdf6607672cf66d57c2702d3234bd321ae5022f9725986754d2f52e514fa3a
|
@@ -1410,6 +1410,26 @@ p.MsoIndexHeading, li.MsoIndexHeading, div.MsoIndexHeading {
|
|
1410
1410
|
mso-fareast-language: ZH-CN;
|
1411
1411
|
font-weight: bold; }
|
1412
1412
|
|
1413
|
+
p.TOCTitle, li.TOCTitle, div.TOCTitle {
|
1414
|
+
mso-style-name: "TOC Title";
|
1415
|
+
mso-style-unhide: no;
|
1416
|
+
margin-top: 0in;
|
1417
|
+
margin-right: 0in;
|
1418
|
+
margin-bottom: {{normalfontsize}};
|
1419
|
+
margin-left: 0in;
|
1420
|
+
text-align: left;
|
1421
|
+
page-break-after: avoid;
|
1422
|
+
mso-pagination: none;
|
1423
|
+
mso-hyphenate: none;
|
1424
|
+
mso-layout-grid-align: none;
|
1425
|
+
font-size: {{normalfontsize}};
|
1426
|
+
mso-bidi-font-size: 10.0pt;
|
1427
|
+
font-weight: bold;
|
1428
|
+
font-family: {{headerfont}};
|
1429
|
+
mso-fareast-font-family: {{headerfont}};
|
1430
|
+
mso-bidi-font-family: {{headerfont}};
|
1431
|
+
mso-fareast-language: EN-US; }
|
1432
|
+
|
1413
1433
|
/* Page Definitions */
|
1414
1434
|
@page {
|
1415
1435
|
mso-mirror-margins: yes;
|
@@ -1324,6 +1324,25 @@ p.MsoIndexHeading, li.MsoIndexHeading, div.MsoIndexHeading
|
|
1324
1324
|
mso-ansi-language:EN-GB;
|
1325
1325
|
mso-fareast-language:ZH-CN;
|
1326
1326
|
font-weight:bold;}
|
1327
|
+
p.TOCTitle, li.TOCTitle, div.TOCTitle
|
1328
|
+
{mso-style-name:"TOC Title";
|
1329
|
+
mso-style-unhide:no;
|
1330
|
+
margin-top:0in;
|
1331
|
+
margin-right:0in;
|
1332
|
+
margin-bottom:$normalfontsize;
|
1333
|
+
margin-left:0in;
|
1334
|
+
text-align:left;
|
1335
|
+
page-break-after:avoid;
|
1336
|
+
mso-pagination:none;
|
1337
|
+
mso-hyphenate:none;
|
1338
|
+
mso-layout-grid-align:none;
|
1339
|
+
font-size:$normalfontsize;
|
1340
|
+
mso-bidi-font-size:10.0pt;
|
1341
|
+
font-weight:bold;
|
1342
|
+
font-family:$headerfont;
|
1343
|
+
mso-fareast-font-family:$headerfont;
|
1344
|
+
mso-bidi-font-family:$headerfont;
|
1345
|
+
mso-fareast-language:EN-US;}
|
1327
1346
|
|
1328
1347
|
/* Page Definitions */
|
1329
1348
|
@page
|
@@ -74,7 +74,7 @@
|
|
74
74
|
<item level="1" id="Foreword" display="true">Foreword</item>
|
75
75
|
<item id="term-script" display="false">3.2</item>
|
76
76
|
-->
|
77
|
-
<xsl:variable name="
|
77
|
+
<xsl:variable name="contents_">
|
78
78
|
|
79
79
|
<xsl:for-each select="//iec:iec-standard">
|
80
80
|
<xsl:variable name="lang" select="*[local-name()='bibdata']/*[local-name()='language'][@current = 'true']"/>
|
@@ -92,22 +92,16 @@
|
|
92
92
|
</xsl:for-each>
|
93
93
|
|
94
94
|
</xsl:variable>
|
95
|
+
<xsl:variable name="contents" select="xalan:nodeset($contents_)"/>
|
95
96
|
|
96
97
|
<xsl:template name="generateContents">
|
97
98
|
<contents>
|
98
99
|
<xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
|
99
100
|
<xsl:call-template name="processMainSectionsDefault_Contents"/>
|
100
101
|
<xsl:apply-templates select="//iec:indexsect" mode="contents"/>
|
101
|
-
<xsl:
|
102
|
-
<
|
103
|
-
|
104
|
-
</figure>
|
105
|
-
</xsl:for-each>
|
106
|
-
<xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name']]">
|
107
|
-
<table id="{@id}">
|
108
|
-
<title><xsl:value-of select="*[local-name() = 'name']/text()"/></title>
|
109
|
-
</table>
|
110
|
-
</xsl:for-each>
|
102
|
+
<xsl:call-template name="processTablesFigures_Contents">
|
103
|
+
<xsl:with-param name="always">true</xsl:with-param>
|
104
|
+
</xsl:call-template>
|
111
105
|
</contents>
|
112
106
|
</xsl:template>
|
113
107
|
|
@@ -816,7 +810,7 @@
|
|
816
810
|
<xsl:if test="$debug = 'true'">
|
817
811
|
<xsl:text disable-output-escaping="yes"><!--</xsl:text>
|
818
812
|
DEBUG
|
819
|
-
contents=<xsl:copy-of select="
|
813
|
+
contents=<xsl:copy-of select="$contents"/>
|
820
814
|
<xsl:text disable-output-escaping="yes">--></xsl:text>
|
821
815
|
</xsl:if>
|
822
816
|
|
@@ -845,7 +839,7 @@
|
|
845
839
|
<fo:flow flow-name="xsl-region-body">
|
846
840
|
|
847
841
|
<xsl:call-template name="insertTOCpages">
|
848
|
-
<xsl:with-param name="contents" select="
|
842
|
+
<xsl:with-param name="contents" select="$contents/doc[@id = $docid]"/>
|
849
843
|
</xsl:call-template>
|
850
844
|
|
851
845
|
<xsl:call-template name="insertPrefacepages">
|
@@ -1192,39 +1186,36 @@
|
|
1192
1186
|
</fo:block>
|
1193
1187
|
</xsl:for-each>
|
1194
1188
|
|
1195
|
-
<xsl:if test="//
|
1196
|
-
<fo:block margin-bottom="5pt"> </fo:block>
|
1197
|
-
<xsl:for-each select="//
|
1198
|
-
<
|
1199
|
-
<fo:basic-link internal-destination="{@id}" fox:alt-text="Figure {@id}">
|
1200
|
-
<xsl:apply-templates select="iec:name" mode="contents"/>
|
1201
|
-
<fo:inline keep-together.within-line="always">
|
1202
|
-
<fo:leader leader-pattern="dots"/>
|
1203
|
-
<fo:page-number-citation ref-id="{@id}"/>
|
1204
|
-
</fo:inline>
|
1205
|
-
</fo:basic-link>
|
1206
|
-
</fo:block>
|
1189
|
+
<xsl:if test="$contents//figures/figure">
|
1190
|
+
<fo:block margin-bottom="5pt"> </fo:block>
|
1191
|
+
<xsl:for-each select="$contents//figures/figure">
|
1192
|
+
<xsl:call-template name="insertListOf_Item"/>
|
1207
1193
|
</xsl:for-each>
|
1208
1194
|
</xsl:if>
|
1209
1195
|
|
1210
|
-
<xsl:if test="//
|
1211
|
-
<fo:block margin-bottom="5pt"> </fo:block>
|
1212
|
-
<xsl:for-each select="//
|
1213
|
-
<
|
1214
|
-
<fo:basic-link internal-destination="{@id}" fox:alt-text="Table {@id}">
|
1215
|
-
<xsl:apply-templates select="iec:name" mode="contents"/>
|
1216
|
-
<fo:inline keep-together.within-line="always">
|
1217
|
-
<fo:leader leader-pattern="dots"/>
|
1218
|
-
<fo:page-number-citation ref-id="{@id}"/>
|
1219
|
-
</fo:inline>
|
1220
|
-
</fo:basic-link>
|
1221
|
-
</fo:block>
|
1196
|
+
<xsl:if test="$contents//tables/table">
|
1197
|
+
<fo:block margin-bottom="5pt"> </fo:block>
|
1198
|
+
<xsl:for-each select="$contents//tables/table">
|
1199
|
+
<xsl:call-template name="insertListOf_Item"/>
|
1222
1200
|
</xsl:for-each>
|
1223
1201
|
</xsl:if>
|
1202
|
+
|
1224
1203
|
</fo:block>
|
1225
1204
|
</fo:block-container>
|
1226
1205
|
</xsl:template>
|
1227
1206
|
|
1207
|
+
<xsl:template name="insertListOf_Item">
|
1208
|
+
<fo:block text-align-last="justify" margin-bottom="5pt" margin-left="8mm" text-indent="-8mm" role="TOCI">
|
1209
|
+
<fo:basic-link internal-destination="{@id}" fox:alt-text="{local-name()} {@id}">
|
1210
|
+
<xsl:apply-templates select="." mode="contents"/>
|
1211
|
+
<fo:inline keep-together.within-line="always">
|
1212
|
+
<fo:leader leader-pattern="dots"/>
|
1213
|
+
<fo:page-number-citation ref-id="{@id}"/>
|
1214
|
+
</fo:inline>
|
1215
|
+
</fo:basic-link>
|
1216
|
+
</fo:block>
|
1217
|
+
</xsl:template>
|
1218
|
+
|
1228
1219
|
<xsl:template name="insertPrefacepages">
|
1229
1220
|
<xsl:param name="lang" select="$lang"/>
|
1230
1221
|
<fo:block break-after="page"/>
|
@@ -1931,7 +1922,7 @@
|
|
1931
1922
|
</xsl:copy>
|
1932
1923
|
</xsl:template> -->
|
1933
1924
|
|
1934
|
-
<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
|
1925
|
+
<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:key name="bibitems" match="*[local-name() = 'bibitem']" use="@id"/><xsl:key name="bibitems_hidden" match="*[local-name() = 'bibitem'][@hidden='true'] | *[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']" use="@id"/><xsl:variable name="lang">
|
1935
1926
|
<xsl:call-template name="getLang"/>
|
1936
1927
|
</xsl:variable><xsl:variable name="pageWidth_">
|
1937
1928
|
210
|
@@ -1975,7 +1966,7 @@
|
|
1975
1966
|
<xsl:text>Contents</xsl:text>
|
1976
1967
|
|
1977
1968
|
</title-toc>
|
1978
|
-
|
1969
|
+
|
1979
1970
|
<title-descriptors lang="en">Descriptors</title-descriptors>
|
1980
1971
|
|
1981
1972
|
<title-part lang="en">
|
@@ -2017,7 +2008,31 @@
|
|
2017
2008
|
<title-continued lang="en">(continued)</title-continued>
|
2018
2009
|
<title-continued lang="fr">(continué)</title-continued>
|
2019
2010
|
|
2020
|
-
</xsl:variable><xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="
|
2011
|
+
</xsl:variable><xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="title-list-tables">
|
2012
|
+
<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
|
2013
|
+
<xsl:value-of select="$toc_table_title"/>
|
2014
|
+
<xsl:if test="normalize-space($toc_table_title) = ''">
|
2015
|
+
<xsl:call-template name="getTitle">
|
2016
|
+
<xsl:with-param name="name" select="'title-list-tables'"/>
|
2017
|
+
</xsl:call-template>
|
2018
|
+
</xsl:if>
|
2019
|
+
</xsl:variable><xsl:variable name="title-list-figures">
|
2020
|
+
<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
|
2021
|
+
<xsl:value-of select="$toc_figure_title"/>
|
2022
|
+
<xsl:if test="normalize-space($toc_figure_title) = ''">
|
2023
|
+
<xsl:call-template name="getTitle">
|
2024
|
+
<xsl:with-param name="name" select="'title-list-figures'"/>
|
2025
|
+
</xsl:call-template>
|
2026
|
+
</xsl:if>
|
2027
|
+
</xsl:variable><xsl:variable name="title-list-recommendations">
|
2028
|
+
<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
|
2029
|
+
<xsl:value-of select="$toc_requirement_title"/>
|
2030
|
+
<xsl:if test="normalize-space($toc_requirement_title) = ''">
|
2031
|
+
<xsl:call-template name="getTitle">
|
2032
|
+
<xsl:with-param name="name" select="'title-list-recommendations'"/>
|
2033
|
+
</xsl:call-template>
|
2034
|
+
</xsl:if>
|
2035
|
+
</xsl:variable><xsl:variable name="bibdata">
|
2021
2036
|
<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']"/>
|
2022
2037
|
<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'localized-strings']"/>
|
2023
2038
|
</xsl:variable><xsl:variable name="linebreak">
</xsl:variable><xsl:variable name="tab_zh"> </xsl:variable><xsl:variable name="non_breaking_hyphen">‑</xsl:variable><xsl:variable name="thin_space"> </xsl:variable><xsl:variable name="zero_width_space"></xsl:variable><xsl:variable name="en_dash">–</xsl:variable><xsl:template name="getTitle">
|
@@ -3283,6 +3298,30 @@
|
|
3283
3298
|
<xsl:sort select="@displayorder" data-type="number"/>
|
3284
3299
|
<xsl:apply-templates select="." mode="contents"/>
|
3285
3300
|
</xsl:for-each>
|
3301
|
+
</xsl:template><xsl:template name="processTablesFigures_Contents">
|
3302
|
+
<xsl:param name="always"/>
|
3303
|
+
<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
|
3304
|
+
<xsl:call-template name="processTables_Contents"/>
|
3305
|
+
</xsl:if>
|
3306
|
+
<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
|
3307
|
+
<xsl:call-template name="processFigures_Contents"/>
|
3308
|
+
</xsl:if>
|
3309
|
+
</xsl:template><xsl:template name="processTables_Contents">
|
3310
|
+
<tables>
|
3311
|
+
<xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
|
3312
|
+
<table id="{@id}" alt-text="{*[local-name() = 'name']}">
|
3313
|
+
<xsl:copy-of select="*[local-name() = 'name']"/>
|
3314
|
+
</table>
|
3315
|
+
</xsl:for-each>
|
3316
|
+
</tables>
|
3317
|
+
</xsl:template><xsl:template name="processFigures_Contents">
|
3318
|
+
<figures>
|
3319
|
+
<xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name'] and not(@unnumbered = 'true') and normalize-space(@id) != ''] | //*[@id and starts-with(*[local-name() = 'name'], 'Figure ') and normalize-space(@id) != '']">
|
3320
|
+
<figure id="{@id}" alt-text="{*[local-name() = 'name']}">
|
3321
|
+
<xsl:copy-of select="*[local-name() = 'name']"/>
|
3322
|
+
</figure>
|
3323
|
+
</xsl:for-each>
|
3324
|
+
</figures>
|
3286
3325
|
</xsl:template><xsl:template name="processPrefaceSectionsDefault">
|
3287
3326
|
<xsl:for-each select="/*/*[local-name()='preface']/*">
|
3288
3327
|
<xsl:sort select="@displayorder" data-type="number"/>
|
@@ -4087,37 +4126,7 @@
|
|
4087
4126
|
|
4088
4127
|
<!-- list of footnotes to calculate actual footnotes number -->
|
4089
4128
|
<xsl:variable name="p_fn_">
|
4090
|
-
<xsl:
|
4091
|
-
<xsl:when test="@current_fn_number"> <!-- for BSI, footnote reference number calculated already -->
|
4092
|
-
<fn gen_id="{generate-id(.)}">
|
4093
|
-
<xsl:copy-of select="@*"/>
|
4094
|
-
<xsl:copy-of select="node()"/>
|
4095
|
-
</fn>
|
4096
|
-
</xsl:when>
|
4097
|
-
<xsl:otherwise>
|
4098
|
-
<!-- itetation for:
|
4099
|
-
footnotes in bibdata/title
|
4100
|
-
footnotes in bibliography
|
4101
|
-
footnotes in document's body (except table's head/body/foot and figure text)
|
4102
|
-
-->
|
4103
|
-
<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']/*[local-name() = 'note'][@type='title-footnote']">
|
4104
|
-
<fn gen_id="{generate-id(.)}">
|
4105
|
-
<xsl:copy-of select="@*"/>
|
4106
|
-
<xsl:copy-of select="node()"/>
|
4107
|
-
</fn>
|
4108
|
-
</xsl:for-each>
|
4109
|
-
<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
|
4110
|
-
<xsl:sort select="@displayorder" data-type="number"/>
|
4111
|
-
<xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] | .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
|
4112
|
-
<!-- copy unique fn -->
|
4113
|
-
<fn gen_id="{generate-id(.)}">
|
4114
|
-
<xsl:copy-of select="@*"/>
|
4115
|
-
<xsl:copy-of select="node()"/>
|
4116
|
-
</fn>
|
4117
|
-
</xsl:for-each>
|
4118
|
-
</xsl:for-each>
|
4119
|
-
</xsl:otherwise>
|
4120
|
-
</xsl:choose>
|
4129
|
+
<xsl:call-template name="get_fn_list"/>
|
4121
4130
|
</xsl:variable>
|
4122
4131
|
<xsl:variable name="p_fn" select="xalan:nodeset($p_fn_)"/>
|
4123
4132
|
|
@@ -4178,6 +4187,38 @@
|
|
4178
4187
|
<xsl:copy-of select="$footnote_inline"/>
|
4179
4188
|
</xsl:otherwise>
|
4180
4189
|
</xsl:choose>
|
4190
|
+
</xsl:template><xsl:template name="get_fn_list">
|
4191
|
+
<xsl:choose>
|
4192
|
+
<xsl:when test="@current_fn_number"> <!-- for BSI, footnote reference number calculated already -->
|
4193
|
+
<fn gen_id="{generate-id(.)}">
|
4194
|
+
<xsl:copy-of select="@*"/>
|
4195
|
+
<xsl:copy-of select="node()"/>
|
4196
|
+
</fn>
|
4197
|
+
</xsl:when>
|
4198
|
+
<xsl:otherwise>
|
4199
|
+
<!-- itetation for:
|
4200
|
+
footnotes in bibdata/title
|
4201
|
+
footnotes in bibliography
|
4202
|
+
footnotes in document's body (except table's head/body/foot and figure text)
|
4203
|
+
-->
|
4204
|
+
<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']/*[local-name() = 'note'][@type='title-footnote']">
|
4205
|
+
<fn gen_id="{generate-id(.)}">
|
4206
|
+
<xsl:copy-of select="@*"/>
|
4207
|
+
<xsl:copy-of select="node()"/>
|
4208
|
+
</fn>
|
4209
|
+
</xsl:for-each>
|
4210
|
+
<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
|
4211
|
+
<xsl:sort select="@displayorder" data-type="number"/>
|
4212
|
+
<xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] | .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
|
4213
|
+
<!-- copy unique fn -->
|
4214
|
+
<fn gen_id="{generate-id(.)}">
|
4215
|
+
<xsl:copy-of select="@*"/>
|
4216
|
+
<xsl:copy-of select="node()"/>
|
4217
|
+
</fn>
|
4218
|
+
</xsl:for-each>
|
4219
|
+
</xsl:for-each>
|
4220
|
+
</xsl:otherwise>
|
4221
|
+
</xsl:choose>
|
4181
4222
|
</xsl:template><xsl:template name="table_fn_display">
|
4182
4223
|
<xsl:variable name="references">
|
4183
4224
|
|
@@ -4354,7 +4395,7 @@
|
|
4354
4395
|
</fo:inline>
|
4355
4396
|
</xsl:template><xsl:template match="*[local-name()='fn']/text()[normalize-space() != '']">
|
4356
4397
|
<fo:inline><xsl:value-of select="."/></fo:inline>
|
4357
|
-
</xsl:template><xsl:template match="*[local-name()='fn']
|
4398
|
+
</xsl:template><xsl:template match="*[local-name()='fn']//*[local-name()='p']">
|
4358
4399
|
<fo:inline>
|
4359
4400
|
<xsl:apply-templates/>
|
4360
4401
|
</fo:inline>
|
@@ -6062,13 +6103,14 @@
|
|
6062
6103
|
<xsl:apply-templates mode="bookmarks"/>
|
6063
6104
|
</xsl:template><xsl:template name="addBookmarks">
|
6064
6105
|
<xsl:param name="contents"/>
|
6065
|
-
<xsl:
|
6106
|
+
<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
|
6107
|
+
<xsl:if test="$contents_nodes//item">
|
6066
6108
|
<fo:bookmark-tree>
|
6067
6109
|
<xsl:choose>
|
6068
|
-
<xsl:when test="
|
6110
|
+
<xsl:when test="$contents_nodes/doc">
|
6069
6111
|
<xsl:choose>
|
6070
|
-
<xsl:when test="count(
|
6071
|
-
<xsl:for-each select="
|
6112
|
+
<xsl:when test="count($contents_nodes/doc) > 1">
|
6113
|
+
<xsl:for-each select="$contents_nodes/doc">
|
6072
6114
|
<fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
|
6073
6115
|
<xsl:if test="@bundle = 'true'">
|
6074
6116
|
<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
|
@@ -6119,7 +6161,7 @@
|
|
6119
6161
|
</xsl:for-each>
|
6120
6162
|
</xsl:when>
|
6121
6163
|
<xsl:otherwise>
|
6122
|
-
<xsl:for-each select="
|
6164
|
+
<xsl:for-each select="$contents_nodes/doc">
|
6123
6165
|
|
6124
6166
|
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
6125
6167
|
|
@@ -6137,25 +6179,36 @@
|
|
6137
6179
|
</xsl:choose>
|
6138
6180
|
</xsl:when>
|
6139
6181
|
<xsl:otherwise>
|
6140
|
-
<xsl:apply-templates select="
|
6182
|
+
<xsl:apply-templates select="$contents_nodes/contents/item" mode="bookmark"/>
|
6183
|
+
|
6184
|
+
<xsl:call-template name="insertFigureBookmarks">
|
6185
|
+
<xsl:with-param name="contents" select="$contents_nodes/contents"/>
|
6186
|
+
</xsl:call-template>
|
6187
|
+
|
6188
|
+
<xsl:call-template name="insertTableBookmarks">
|
6189
|
+
<xsl:with-param name="contents" select="$contents_nodes/contents"/>
|
6190
|
+
<xsl:with-param name="lang" select="@lang"/>
|
6191
|
+
</xsl:call-template>
|
6192
|
+
|
6141
6193
|
</xsl:otherwise>
|
6142
6194
|
</xsl:choose>
|
6143
6195
|
|
6196
|
+
|
6144
6197
|
|
6145
6198
|
|
6146
6199
|
|
6147
6200
|
|
6148
|
-
|
6149
|
-
|
6201
|
+
|
6150
6202
|
|
6151
6203
|
</fo:bookmark-tree>
|
6152
6204
|
</xsl:if>
|
6153
6205
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
6154
6206
|
<xsl:param name="contents"/>
|
6155
|
-
<xsl:
|
6156
|
-
|
6207
|
+
<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
|
6208
|
+
<xsl:if test="$contents_nodes/figure">
|
6209
|
+
<fo:bookmark internal-destination="{$contents_nodes/figure[1]/@id}" starting-state="hide">
|
6157
6210
|
<fo:bookmark-title>Figures</fo:bookmark-title>
|
6158
|
-
<xsl:for-each select="
|
6211
|
+
<xsl:for-each select="$contents_nodes/figure">
|
6159
6212
|
<fo:bookmark internal-destination="{@id}">
|
6160
6213
|
<fo:bookmark-title>
|
6161
6214
|
<xsl:value-of select="normalize-space(title)"/>
|
@@ -6164,18 +6217,42 @@
|
|
6164
6217
|
</xsl:for-each>
|
6165
6218
|
</fo:bookmark>
|
6166
6219
|
</xsl:if>
|
6220
|
+
|
6221
|
+
|
6222
|
+
<xsl:if test="$contents_nodes//figures/figure">
|
6223
|
+
<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
|
6224
|
+
|
6225
|
+
|
6226
|
+
<xsl:attribute name="internal-destination">
|
6227
|
+
<xsl:value-of select="$contents_nodes//figures/figure[1]/@id"/>
|
6228
|
+
</xsl:attribute>
|
6229
|
+
|
6230
|
+
|
6231
|
+
<xsl:variable name="bookmark-title">
|
6232
|
+
Figures
|
6233
|
+
</xsl:variable>
|
6234
|
+
<fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
|
6235
|
+
<xsl:for-each select="$contents_nodes//figures/figure">
|
6236
|
+
<fo:bookmark internal-destination="{@id}">
|
6237
|
+
<fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
|
6238
|
+
</fo:bookmark>
|
6239
|
+
</xsl:for-each>
|
6240
|
+
</fo:bookmark>
|
6241
|
+
</xsl:if>
|
6242
|
+
|
6167
6243
|
</xsl:template><xsl:template name="insertTableBookmarks">
|
6168
6244
|
<xsl:param name="contents"/>
|
6169
6245
|
<xsl:param name="lang"/>
|
6170
|
-
<xsl:
|
6171
|
-
|
6246
|
+
<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
|
6247
|
+
<xsl:if test="$contents_nodes/table">
|
6248
|
+
<fo:bookmark internal-destination="{$contents_nodes/table[1]/@id}" starting-state="hide">
|
6172
6249
|
<fo:bookmark-title>
|
6173
6250
|
<xsl:choose>
|
6174
6251
|
<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
|
6175
6252
|
<xsl:otherwise>Tables</xsl:otherwise>
|
6176
6253
|
</xsl:choose>
|
6177
6254
|
</fo:bookmark-title>
|
6178
|
-
<xsl:for-each select="
|
6255
|
+
<xsl:for-each select="$contents_nodes/table">
|
6179
6256
|
<fo:bookmark internal-destination="{@id}">
|
6180
6257
|
<fo:bookmark-title>
|
6181
6258
|
<xsl:value-of select="normalize-space(title)"/>
|
@@ -6184,6 +6261,36 @@
|
|
6184
6261
|
</xsl:for-each>
|
6185
6262
|
</fo:bookmark>
|
6186
6263
|
</xsl:if>
|
6264
|
+
|
6265
|
+
|
6266
|
+
<xsl:if test="$contents_nodes//tables/table">
|
6267
|
+
<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
|
6268
|
+
|
6269
|
+
|
6270
|
+
<xsl:attribute name="internal-destination">
|
6271
|
+
<xsl:value-of select="$contents_nodes//tables/table[1]/@id"/>
|
6272
|
+
</xsl:attribute>
|
6273
|
+
|
6274
|
+
|
6275
|
+
<xsl:variable name="bookmark-title">
|
6276
|
+
|
6277
|
+
<xsl:choose>
|
6278
|
+
<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
|
6279
|
+
<xsl:otherwise>Tables</xsl:otherwise>
|
6280
|
+
</xsl:choose>
|
6281
|
+
|
6282
|
+
</xsl:variable>
|
6283
|
+
|
6284
|
+
<fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
|
6285
|
+
|
6286
|
+
<xsl:for-each select="$contents_nodes//tables/table">
|
6287
|
+
<fo:bookmark internal-destination="{@id}">
|
6288
|
+
<fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
|
6289
|
+
</fo:bookmark>
|
6290
|
+
</xsl:for-each>
|
6291
|
+
</fo:bookmark>
|
6292
|
+
</xsl:if>
|
6293
|
+
|
6187
6294
|
</xsl:template><xsl:template name="getLangVersion">
|
6188
6295
|
<xsl:param name="lang"/>
|
6189
6296
|
<xsl:param name="doctype" select="''"/>
|
@@ -6846,6 +6953,8 @@
|
|
6846
6953
|
</xsl:otherwise>
|
6847
6954
|
</xsl:choose> -->
|
6848
6955
|
</fo:block>
|
6956
|
+
</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ')]" priority="2">
|
6957
|
+
<xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
|
6849
6958
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()">
|
6850
6959
|
<xsl:if test="normalize-space() != ''">
|
6851
6960
|
<xsl:value-of select="."/>
|
@@ -6920,26 +7029,11 @@
|
|
6920
7029
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
6921
7030
|
<xsl:text>— </xsl:text>
|
6922
7031
|
<xsl:apply-templates/>
|
6923
|
-
</xsl:template><xsl:
|
6924
|
-
<xsl:
|
6925
|
-
|
6926
|
-
</xsl:for-each>
|
6927
|
-
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
|
6928
|
-
<xsl:copy-of select="."/>
|
6929
|
-
</xsl:for-each>
|
6930
|
-
</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
6931
|
-
|
6932
|
-
<xsl:variable name="bibitemid">
|
6933
|
-
<xsl:choose>
|
6934
|
-
<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
|
6935
|
-
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
|
6936
|
-
<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
|
6937
|
-
<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
|
6938
|
-
</xsl:choose>
|
6939
|
-
</xsl:variable>
|
6940
|
-
|
7032
|
+
</xsl:template><xsl:template match="*[local-name() = 'eref']">
|
7033
|
+
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
7034
|
+
<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
|
6941
7035
|
<xsl:choose>
|
6942
|
-
<xsl:when test="
|
7036
|
+
<xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
|
6943
7037
|
<fo:inline xsl:use-attribute-sets="eref-style">
|
6944
7038
|
<xsl:if test="@type = 'footnote'">
|
6945
7039
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
@@ -6953,8 +7047,8 @@
|
|
6953
7047
|
<xsl:variable name="text" select="normalize-space()"/>
|
6954
7048
|
|
6955
7049
|
|
6956
|
-
|
6957
|
-
<fo:basic-link
|
7050
|
+
|
7051
|
+
<fo:basic-link fox:alt-text="{@citeas}">
|
6958
7052
|
<xsl:if test="normalize-space(@citeas) = ''">
|
6959
7053
|
<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
|
6960
7054
|
</xsl:if>
|
@@ -6964,14 +7058,21 @@
|
|
6964
7058
|
|
6965
7059
|
</xsl:if>
|
6966
7060
|
|
6967
|
-
|
7061
|
+
<xsl:choose>
|
7062
|
+
<xsl:when test="$external-destination != ''"> <!-- external hyperlink -->
|
7063
|
+
<xsl:attribute name="external-destination"><xsl:value-of select="$external-destination"/></xsl:attribute>
|
7064
|
+
</xsl:when>
|
7065
|
+
<xsl:otherwise>
|
7066
|
+
<xsl:attribute name="internal-destination"><xsl:value-of select="@bibitemid"/></xsl:attribute>
|
7067
|
+
</xsl:otherwise>
|
7068
|
+
</xsl:choose>
|
6968
7069
|
|
6969
7070
|
<xsl:apply-templates/>
|
6970
7071
|
</fo:basic-link>
|
6971
|
-
|
7072
|
+
|
6972
7073
|
</fo:inline>
|
6973
7074
|
</xsl:when>
|
6974
|
-
<xsl:otherwise>
|
7075
|
+
<xsl:otherwise> <!-- if there is key('bibitems_hidden', $current_bibitemid) -->
|
6975
7076
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
6976
7077
|
</xsl:otherwise>
|
6977
7078
|
</xsl:choose>
|
@@ -7712,23 +7813,45 @@
|
|
7712
7813
|
<xsl:apply-templates/>
|
7713
7814
|
</fo:inline>
|
7714
7815
|
</xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'note']" priority="2">
|
7816
|
+
|
7817
|
+
<!-- list of footnotes to calculate actual footnotes number -->
|
7818
|
+
<xsl:variable name="p_fn_">
|
7819
|
+
<xsl:call-template name="get_fn_list"/>
|
7820
|
+
</xsl:variable>
|
7821
|
+
<xsl:variable name="p_fn" select="xalan:nodeset($p_fn_)"/>
|
7822
|
+
<xsl:variable name="gen_id" select="generate-id(.)"/>
|
7823
|
+
<xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
|
7824
|
+
<!-- fn sequence number in document -->
|
7825
|
+
<xsl:variable name="current_fn_number">
|
7826
|
+
<xsl:choose>
|
7827
|
+
<xsl:when test="@current_fn_number"><xsl:value-of select="@current_fn_number"/></xsl:when> <!-- for BSI -->
|
7828
|
+
<xsl:otherwise>
|
7829
|
+
<!-- <xsl:value-of select="count($p_fn//fn[@reference = $reference]/preceding-sibling::fn) + 1" /> -->
|
7830
|
+
<xsl:value-of select="count($p_fn//fn[@gen_id = $gen_id]/preceding-sibling::fn) + 1"/>
|
7831
|
+
</xsl:otherwise>
|
7832
|
+
</xsl:choose>
|
7833
|
+
</xsl:variable>
|
7715
7834
|
<fo:footnote>
|
7716
7835
|
<xsl:variable name="number">
|
7717
7836
|
|
7718
|
-
<xsl:
|
7837
|
+
<xsl:value-of select="$current_fn_number"/>
|
7719
7838
|
|
7720
7839
|
</xsl:variable>
|
7840
|
+
|
7841
|
+
<xsl:variable name="current_fn_number_text">
|
7842
|
+
<xsl:value-of select="$number"/>
|
7843
|
+
|
7844
|
+
</xsl:variable>
|
7845
|
+
|
7721
7846
|
<fo:inline xsl:use-attribute-sets="bibitem-note-fn-style">
|
7722
|
-
<fo:basic-link internal-destination="{
|
7723
|
-
<xsl:value-of select="$
|
7724
|
-
|
7847
|
+
<fo:basic-link internal-destination="{$gen_id}" fox:alt-text="footnote {$number}">
|
7848
|
+
<xsl:value-of select="$current_fn_number_text"/>
|
7725
7849
|
</fo:basic-link>
|
7726
7850
|
</fo:inline>
|
7727
7851
|
<fo:footnote-body>
|
7728
7852
|
<fo:block xsl:use-attribute-sets="bibitem-note-fn-body-style">
|
7729
|
-
<fo:inline id="{
|
7730
|
-
<xsl:value-of select="$
|
7731
|
-
|
7853
|
+
<fo:inline id="{$gen_id}" xsl:use-attribute-sets="bibitem-note-fn-number-style">
|
7854
|
+
<xsl:value-of select="$current_fn_number_text"/>
|
7732
7855
|
</fo:inline>
|
7733
7856
|
<xsl:apply-templates/>
|
7734
7857
|
</fo:block>
|
@@ -7970,6 +8093,78 @@
|
|
7970
8093
|
<!-- processing for admonition/p found in the template for 'p' -->
|
7971
8094
|
<xsl:call-template name="paragraph"/>
|
7972
8095
|
|
8096
|
+
</xsl:template><xsl:template match="@*|node()" mode="update_xml_step1">
|
8097
|
+
<xsl:copy>
|
8098
|
+
<xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
|
8099
|
+
</xsl:copy>
|
8100
|
+
</xsl:template><xsl:template match="*[local-name() = 'preface']" mode="update_xml_step1">
|
8101
|
+
<xsl:copy>
|
8102
|
+
<xsl:copy-of select="@*"/>
|
8103
|
+
|
8104
|
+
<xsl:variable name="nodes_preface_">
|
8105
|
+
<xsl:for-each select="*">
|
8106
|
+
<node id="{@id}"/>
|
8107
|
+
</xsl:for-each>
|
8108
|
+
</xsl:variable>
|
8109
|
+
<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
|
8110
|
+
|
8111
|
+
<xsl:for-each select="*">
|
8112
|
+
<xsl:sort select="@displayorder" data-type="number"/>
|
8113
|
+
|
8114
|
+
<!-- process Section's title -->
|
8115
|
+
<xsl:variable name="preceding-sibling_id" select="$nodes_preface/node[@id = current()/@id]/preceding-sibling::node[1]/@id"/>
|
8116
|
+
<xsl:if test="$preceding-sibling_id != ''">
|
8117
|
+
<xsl:apply-templates select="parent::*/*[@type = 'section-title' and @id = $preceding-sibling_id and not(@displayorder)]" mode="update_xml_step1"/>
|
8118
|
+
</xsl:if>
|
8119
|
+
|
8120
|
+
<xsl:choose>
|
8121
|
+
<xsl:when test="@type = 'section-title' and not(@displayorder)"><!-- skip, don't copy, because copied in above 'apply-templates' --></xsl:when>
|
8122
|
+
<xsl:otherwise>
|
8123
|
+
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
8124
|
+
</xsl:otherwise>
|
8125
|
+
</xsl:choose>
|
8126
|
+
|
8127
|
+
</xsl:for-each>
|
8128
|
+
</xsl:copy>
|
8129
|
+
</xsl:template><xsl:template match="*[local-name() = 'sections']" mode="update_xml_step1">
|
8130
|
+
<xsl:copy>
|
8131
|
+
<xsl:copy-of select="@*"/>
|
8132
|
+
|
8133
|
+
<xsl:variable name="nodes_sections_">
|
8134
|
+
<xsl:for-each select="*">
|
8135
|
+
<node id="{@id}"/>
|
8136
|
+
</xsl:for-each>
|
8137
|
+
</xsl:variable>
|
8138
|
+
<xsl:variable name="nodes_sections" select="xalan:nodeset($nodes_sections_)"/>
|
8139
|
+
|
8140
|
+
<!-- move section 'Normative references' inside 'sections' -->
|
8141
|
+
<xsl:for-each select="* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
|
8142
|
+
<xsl:sort select="@displayorder" data-type="number"/>
|
8143
|
+
|
8144
|
+
<!-- process Section's title -->
|
8145
|
+
<xsl:variable name="preceding-sibling_id" select="$nodes_sections/node[@id = current()/@id]/preceding-sibling::node[1]/@id"/>
|
8146
|
+
<xsl:if test="$preceding-sibling_id != ''">
|
8147
|
+
<xsl:apply-templates select="parent::*/*[@type = 'section-title' and @id = $preceding-sibling_id and not(@displayorder)]" mode="update_xml_step1"/>
|
8148
|
+
</xsl:if>
|
8149
|
+
|
8150
|
+
<xsl:choose>
|
8151
|
+
<xsl:when test="@type = 'section-title' and not(@displayorder)"><!-- skip, don't copy, because copied in above 'apply-templates' --></xsl:when>
|
8152
|
+
<xsl:otherwise>
|
8153
|
+
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
8154
|
+
</xsl:otherwise>
|
8155
|
+
</xsl:choose>
|
8156
|
+
|
8157
|
+
</xsl:for-each>
|
8158
|
+
</xsl:copy>
|
8159
|
+
</xsl:template><xsl:template match="*[local-name() = 'bibliography']" mode="update_xml_step1">
|
8160
|
+
<xsl:copy>
|
8161
|
+
<xsl:copy-of select="@*"/>
|
8162
|
+
<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
|
8163
|
+
<xsl:for-each select="*[not(@normative='true') and not(*[*[@normative='true']])]">
|
8164
|
+
<xsl:sort select="@displayorder" data-type="number"/>
|
8165
|
+
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
8166
|
+
</xsl:for-each>
|
8167
|
+
</xsl:copy>
|
7973
8168
|
</xsl:template><xsl:template name="convertDate">
|
7974
8169
|
<xsl:param name="date"/>
|
7975
8170
|
<xsl:param name="format" select="'short'"/>
|
data/spec/isodoc/iev_spec.rb
CHANGED
@@ -399,9 +399,7 @@ RSpec.describe IsoDoc do
|
|
399
399
|
</ul>
|
400
400
|
</div>
|
401
401
|
<p>
|
402
|
-
SOURCE:
|
403
|
-
<a href='#ISO7301'>ISO 7301:2011, 3.1</a>
|
404
|
-
, modified – The term "cargo rice" is shown as deprecated, and
|
402
|
+
SOURCE: ISO 7301:2011, 3.1, modified – The term "cargo rice" is shown as deprecated, and
|
405
403
|
Note 1 to entry is not included here
|
406
404
|
</p>
|
407
405
|
<p class='TermNum' id='paddy'>192-01-02</p>
|
@@ -440,10 +438,7 @@ RSpec.describe IsoDoc do
|
|
440
438
|
</p>
|
441
439
|
</p>
|
442
440
|
</div>
|
443
|
-
<p>
|
444
|
-
SOURCE:
|
445
|
-
<a href='#ISO7301'>ISO 7301:2011, 3.1</a>
|
446
|
-
</p>
|
441
|
+
<p>SOURCE: ISO 7301:2011, 3.1 </p>
|
447
442
|
</div>
|
448
443
|
</div>
|
449
444
|
</div>
|
@@ -553,9 +548,7 @@ RSpec.describe IsoDoc do
|
|
553
548
|
rice retaining its husk after threshing
|
554
549
|
</p>
|
555
550
|
<p class='MsoNormal'>
|
556
|
-
SOURCE:
|
557
|
-
<a href='#ISO7301'>ISO 7301:2011, 3.1</a>
|
558
|
-
, modified – The term "cargo rice" is shown as deprecated, and
|
551
|
+
SOURCE: ISO 7301:2011, 3.1, modified – The term "cargo rice" is shown as deprecated, and
|
559
552
|
Note 1 to entry is not included here
|
560
553
|
</p>
|
561
554
|
</div>
|
@@ -147,7 +147,7 @@ RSpec.describe IsoDoc do
|
|
147
147
|
<div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1 class="main">1<span style="mso-tab-count:1">  </span>Terms and Definitions</h1>
|
148
148
|
<p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1</p><p class="Terms" style="text-align:left;">paddy</p>
|
149
149
|
<p class="MsoNormal"><a name="_eb29b35e-123e-4d1c-b50b-2714d41e747f" id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"></a>rice retaining its husk after threshing</p>
|
150
|
-
<p class="MsoNormal">[SOURCE:
|
150
|
+
<p class="MsoNormal">[SOURCE: ISO 7301:2011, 3.1, modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
|
151
151
|
</div>
|
152
152
|
OUTPUT
|
153
153
|
end
|
data/spec/isodoc/terms_spec.rb
CHANGED
@@ -129,7 +129,7 @@ RSpec.describe IsoDoc do
|
|
129
129
|
</div>
|
130
130
|
|
131
131
|
<p>[SOURCE:
|
132
|
-
|
132
|
+
ISO 7301:2011, 3.1, modified – The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]
|
133
133
|
</p><p class="TermNum" id="paddy">1.2</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
|
134
134
|
<p class="AltTerms" style="text-align:left;">rough rice</p>
|
135
135
|
<p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
|
@@ -141,8 +141,7 @@ RSpec.describe IsoDoc do
|
|
141
141
|
</div>
|
142
142
|
<div id="_671a1994-4783-40d0-bc81-987d06ffb74e" class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
|
143
143
|
<div id='_671a1994-4783-40d0-bc81-987d06ffb74f' class="Note"><p>Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
|
144
|
-
<p>[SOURCE:
|
145
|
-
<a href="#ISO7301">ISO 7301:2011, 3.1</a>]</p></div>
|
144
|
+
<p>[SOURCE: ISO 7301:2011, 3.1]</p></div>
|
146
145
|
</div>
|
147
146
|
</body>
|
148
147
|
</html>
|
@@ -162,8 +161,7 @@ RSpec.describe IsoDoc do
|
|
162
161
|
</ul>
|
163
162
|
</div>
|
164
163
|
|
165
|
-
<p>[SOURCE:
|
166
|
-
<a href="#ISO7301">ISO 7301:2011, 3.1</a>, modified –
|
164
|
+
<p>[SOURCE: ISO 7301:2011, 3.1, modified –
|
167
165
|
The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p><p class="TermNum" id="paddy">1.2</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
|
168
166
|
<p class="AltTerms" style="text-align:left;">rough rice</p>
|
169
167
|
<p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
|
@@ -176,8 +174,7 @@ RSpec.describe IsoDoc do
|
|
176
174
|
|
177
175
|
|
178
176
|
|
179
|
-
<p>[SOURCE:
|
180
|
-
<a href="#ISO7301">ISO 7301:2011, 3.1</a>]</p></div>
|
177
|
+
<p>[SOURCE: ISO 7301:2011, 3.1]</p></div>
|
181
178
|
OUTPUT
|
182
179
|
expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({})
|
183
180
|
.convert("test", input, true)))
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-iec
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-03-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-iso
|