metanorma-ieee 1.1.5 → 1.1.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.
Files changed (15) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/ieee/html/word_ieee_titlepage_wp.html +8 -9
  3. data/lib/isodoc/ieee/ieee.amendment.xsl +74 -27
  4. data/lib/isodoc/ieee/ieee.standard.xsl +74 -27
  5. data/lib/isodoc/ieee/init.rb +2 -2
  6. data/lib/isodoc/ieee/metadata.rb +6 -0
  7. data/lib/isodoc/ieee/word_convert.rb +1 -1
  8. data/lib/metanorma/ieee/basicdoc.rng +38 -35
  9. data/lib/metanorma/ieee/biblio.rng +9 -0
  10. data/lib/metanorma/ieee/front.rb +6 -2
  11. data/lib/metanorma/ieee/isodoc.rng +27 -1
  12. data/lib/metanorma/ieee/relaton-ieee.rng +8 -0
  13. data/lib/metanorma/ieee/version.rb +1 -1
  14. data/metanorma-ieee.gemspec +1 -1
  15. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ebf4fe11c594e86c71781ac8c2a16d7a815dd04f53a616ee5da3462810adc956
4
- data.tar.gz: dce75faa5c144a9b0d37394f5dcda16c0de22815c148d1e5c21ab6b5fe8a32e8
3
+ metadata.gz: 488633c44365b65e58adb02ffe2c51ca866e89d53cf0985f5dd8778248d8ba68
4
+ data.tar.gz: c05a10c895c67cd4ecec9c65dc94ab3d835f1f16c5c3ca39e8924c6985bb772a
5
5
  SHA512:
6
- metadata.gz: 82247285c8c984ab7df3fe822d7d29b3d69bef67c380ff8806ad69ca61d5c50adf8b7597cbcdbcffac7cac5038a8ce5347e1d0f8e28fbbabff0fec64b57a368a
7
- data.tar.gz: d61ec1d634b41d38afa224157aadab9c726b1df6c4486621ebacfec91e962677f27fbe06cb8601f887e4def4b3083cda8afe85a8bc99b3c313ee7d8b85c448df
6
+ metadata.gz: 00d766fd37eda2fa3c7f75b8dda2957e25cea1972d4e8bf3b27895ef9ba4172004fd491a190bb0d3e4d79779bce0a77b349dd55cc294b2b55534f6819e4b3544
7
+ data.tar.gz: 0b609e3e11d97b75867ba87bba6b8dec8fbb64afe6fc3285d8d287878177aaeec34a794af14b340fd961b9c935764e00afdbee231e0f008b3945a25fbe4a136e
data/lib/isodoc/ieee/html/word_ieee_titlepage_wp.html CHANGED
@@ -203,7 +203,7 @@ AAAPAAAAAAAAAAAAAAAAACEEAABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAAMwUAAAAA
203
203
  <p class="MsoBodyText"><span lang="EN-US"><o:p>&#xa0;</o:p></span></p>
204
204
 
205
205
  <p class="StyleHeading3Left175" style='margin-right:7.2pt'><span lang="EN-US"
206
- style='font-family:"Arial Black",sans-serif'>Program title to go here<o:p></o:p></span></p>
206
+ style='font-family:"Arial Black",sans-serif'>{{ program }}<o:p></o:p></span></p>
207
207
 
208
208
  <p class="MsoBodyText"><span lang="EN-US"><o:p>&#xa0;</o:p></span></p>
209
209
 
@@ -211,7 +211,7 @@ style='font-family:"Arial Black",sans-serif'>Program title to go here<o:p></o:p>
211
211
  name="_Toc45552042"></a><a name="_Toc45554015"></a><a name="_Toc46424326"></a><a
212
212
  name="_Toc46476187"><span style='mso-bookmark:_Toc46424326'><span
213
213
  style='mso-bookmark:_Toc45554015'><span style='mso-bookmark:_Toc45552042'><span
214
- style='mso-bookmark:_Toc45551699'><span lang="EN-US">Paper title to go here</span></span></span></span></span></a></p>
214
+ style='mso-bookmark:_Toc45551699'><span lang="EN-US">{{ doctitle }}</span></span></span></span></span></a></p>
215
215
 
216
216
  <p class="MsoBodyText"><span lang="EN-US"><o:p>&#xa0;</o:p></span></p>
217
217
 
@@ -222,17 +222,16 @@ by</span></p>
222
222
 
223
223
  <p class="AuthoredbyCover" style='margin-right:7.2pt'><span lang="EN-US"><o:p>&#xa0;</o:p></span></p>
224
224
 
225
+ {% for au in authors_affiliations %}
226
+ {% for name in au[1] %}
225
227
  <p class="Authornames" style='margin-right:7.2pt'><span class="SpellE"><span
226
- lang="EN-US">Firstname</span></span><span lang="EN-US"> <span class="SpellE">Lastname</span></span></p>
228
+ lang="EN-US">{{ name }}</span></span></p>
227
229
 
228
230
  <p class="Authornames" style='margin-right:7.2pt'><i style='mso-bidi-font-style:
229
- normal'><span lang="EN-US">Title<o:p></o:p></span></i></p>
231
+ normal'><span lang="EN-US">{{ au[0] }}<o:p></o:p></span></i></p>
230
232
 
231
- <p class="Authornames" style='margin-right:7.2pt'><span class="SpellE"><span
232
- lang="EN-US">Firstname</span></span><span lang="EN-US"> <span class="SpellE">Lastname</span></span></p>
233
-
234
- <p class="Authornames" style='margin-right:7.2pt'><i style='mso-bidi-font-style:
235
- normal'><span lang="EN-US">Title<o:p></o:p></span></i></p>
233
+ {% endfor %}
234
+ {% endfor %}
236
235
 
237
236
  <p class="names" style='margin-right:7.2pt'><v:shape id="_x0000_s2061"
238
237
  type="#_x0000_t75" style='position:absolute;left:0;text-align:left;
data/lib/isodoc/ieee/ieee.amendment.xsl CHANGED
@@ -782,22 +782,11 @@
782
782
 
783
783
  <fo:flow flow-name="xsl-region-body">
784
784
  <fo:block-container>
785
- <fo:block font-family="Arial Black" font-size="13pt">TRADEMARKS AND DISCLAIMERS</fo:block>
786
- <fo:block font-size="10pt" margin-top="12pt" margin-bottom="12pt" text-align="justify" line-height="{$line-height}">IEEE believes the information in this publication is accurate as of its publication date; such information is subject to change without notice. IEEE is not responsible for any inadvertent errors.</fo:block>
787
- <fo:block font-size="10pt" margin-top="12pt" margin-bottom="12pt" text-align="justify" line-height="{$line-height}">The ideas and proposals in this specification are the respective author’s views and do not represent the views of the affiliated organization.</fo:block>
788
- <fo:block font-family="Arial Black" font-size="13pt">ACKNOWLEDGEMENTS</fo:block>
789
- <fo:block font-family="Calibri">
790
- <fo:block margin-top="12pt" margin-bottom="12pt" line-height="{$line-height}">Special thanks are given to the following reviewers of this paper:</fo:block>
791
- <fo:block font-size="10pt">
792
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
793
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
794
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
795
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
796
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
797
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
798
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
799
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
800
- </fo:block>
785
+
786
+ <fo:block>
787
+ <!-- TRADEMARKS AND DISCLAIMERS -->
788
+ <!-- ACKNOWLEDGEMENTS -->
789
+ <xsl:apply-templates select="/ieee:ieee-standard/ieee:boilerplate/ieee:legal-statement/*[@id = 'boilerplate-tm' or ieee:title = 'Trademarks and Disclaimers' or @id = 'boilerplate-participants' or ieee:title = 'Acknowledgements']" mode="whitepaper"/>
801
790
  </fo:block>
802
791
 
803
792
  <!-- Example:
@@ -810,7 +799,8 @@
810
799
  </fo:block>
811
800
 
812
801
  <!-- NOTICE AND DISCLAIMER OF LIABILITY CONCERNING THE USE OF IEEE SA DOCUMENTS -->
813
- <xsl:apply-templates select="/ieee:ieee-standard/ieee:boilerplate/ieee:legal-statement"/>
802
+ <fo:block break-after="page"/>
803
+ <xsl:apply-templates select="/ieee:ieee-standard/ieee:boilerplate/ieee:legal-statement/*[not(@id = 'boilerplate-tm') and not(ieee:title = 'Trademarks and Disclaimers') and not(@id = 'boilerplate-participants') and not(ieee:title = 'Acknowledgements')]"/>
814
804
 
815
805
  </fo:block-container>
816
806
  </fo:flow>
@@ -912,7 +902,7 @@
912
902
 
913
903
  </fo:static-content>
914
904
  <fo:static-content flow-name="left-region" role="artifact">
915
- <fo:block-container font-family="Arial Black" font-weight="normal" reference-orientation="90" font-size="48pt" text-align="left" color="white">
905
+ <fo:block-container font-family="Arial Black" font-weight="normal" reference-orientation="90" font-size="48pt" text-align="left" color="white" id="__internal_layout__toc_{generate-id()}">
916
906
  <fo:block margin-left="31.4mm" margin-top="20mm">TABLE OF CONTENTS</fo:block>
917
907
  </fo:block-container>
918
908
  </fo:static-content>
@@ -944,6 +934,15 @@
944
934
  <xsl:choose>
945
935
 
946
936
  <xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
937
+
938
+ <item>
939
+ <xsl:apply-templates select="/ieee:ieee-standard/ieee:preface/ieee:introduction" mode="flatxml"/>
940
+ </item>
941
+
942
+ <item>
943
+ <xsl:apply-templates select="/ieee:ieee-standard/ieee:preface/ieee:acknowledgements" mode="flatxml"/>
944
+ </item>
945
+
947
946
  <item>
948
947
  <xsl:apply-templates select="/ieee:ieee-standard/ieee:preface/ieee:abstract" mode="flatxml"/>
949
948
  </item>
@@ -1613,6 +1612,41 @@
1613
1612
  </xsl:choose>
1614
1613
  </xsl:template>
1615
1614
 
1615
+ <xsl:template match="ieee:boilerplate/ieee:legal-statement" mode="whitepaper">
1616
+ <xsl:apply-templates mode="whitepaper"/>
1617
+ </xsl:template>
1618
+
1619
+ <xsl:template match="ieee:boilerplate/ieee:legal-statement/ieee:clause/ieee:title" mode="whitepaper">
1620
+ <fo:block font-family="Arial Black" font-size="13pt"><xsl:apply-templates mode="whitepaper"/></fo:block>
1621
+ </xsl:template>
1622
+
1623
+ <xsl:template match="ieee:boilerplate/ieee:legal-statement/ieee:clause/ieee:title//text()" mode="whitepaper">
1624
+ <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
1625
+ </xsl:template>
1626
+
1627
+ <xsl:template match="ieee:boilerplate/ieee:legal-statement/ieee:clause/ieee:p" mode="whitepaper">
1628
+ <fo:block font-size="10pt" margin-top="12pt" margin-bottom="12pt" text-align="justify" line-height="{$line-height}">
1629
+ <xsl:apply-templates/>
1630
+ </fo:block>
1631
+ </xsl:template>
1632
+
1633
+ <xsl:template match="ieee:boilerplate/ieee:legal-statement/ieee:clause/ieee:clause" mode="whitepaper">
1634
+ <fo:block font-family="Calibri">
1635
+ <xsl:apply-templates mode="whitepaper"/>
1636
+ </fo:block>
1637
+ </xsl:template>
1638
+
1639
+ <xsl:template match="ieee:boilerplate/ieee:legal-statement/ieee:clause/ieee:clause/ieee:p" mode="whitepaper">
1640
+ <fo:block font-size="10pt" margin-bottom="6pt">
1641
+ <xsl:if test="not(preceding-sibling::ieee:p)">
1642
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1643
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1644
+ <xsl:attribute name="font-size">inherit</xsl:attribute>
1645
+ </xsl:if>
1646
+ <xsl:apply-templates/>
1647
+ </fo:block>
1648
+ </xsl:template>
1649
+
1616
1650
  <xsl:template match="ieee:abstract">
1617
1651
  <fo:block>
1618
1652
  <xsl:call-template name="setId"/>
@@ -2245,7 +2279,7 @@
2245
2279
  </fo:block>
2246
2280
  </xsl:template>
2247
2281
 
2248
- <xsl:template match="*[local-name() = 'introduction'] | *[local-name() = 'foreword']">
2282
+ <xsl:template match="*[local-name() = 'introduction'] | *[local-name() = 'foreword'] | *[local-name() = 'acknowledgements']">
2249
2283
  <fo:block>
2250
2284
  <xsl:call-template name="setId"/>
2251
2285
  <xsl:apply-templates/>
@@ -2447,7 +2481,7 @@
2447
2481
 
2448
2482
  <fo:list-item>
2449
2483
  <fo:list-item-label end-indent="label-end()">
2450
- <fo:block>
2484
+ <fo:block id="__internal_layout__toc_section_{generate-id()}">
2451
2485
  <xsl:if test="$level = 1">
2452
2486
  <xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
2453
2487
  </xsl:if>
@@ -3451,7 +3485,7 @@
3451
3485
  <xsl:param name="title"/>
3452
3486
  <fo:page-sequence master-reference="cover-page-nonstandard" force-page-count="no-force">
3453
3487
  <fo:static-content flow-name="header" role="artifact">
3454
- <fo:block-container position="absolute" left="65mm"> <!-- top="-2.6mm" -->
3488
+ <fo:block-container position="absolute" left="65mm" id="__internal_layout__bluebox_{generate-id()}"> <!-- top="-2.6mm" -->
3455
3489
  <xsl:if test="$current_template = 'industry-connection-report'">
3456
3490
  <xsl:attribute name="left">76.5mm</xsl:attribute>
3457
3491
  </xsl:if>
@@ -3557,8 +3591,8 @@
3557
3591
  <xsl:attribute name="margin-right">-10mm</xsl:attribute>
3558
3592
  <xsl:text>IEEE CONFORMITY ASSESSMENT PROGRAM (ICAP)</xsl:text>
3559
3593
  </xsl:when>
3560
- <xsl:otherwise>
3561
- PROGRAM TITLE TO GO HERE
3594
+ <xsl:otherwise> <!-- PROGRAM TITLE TO GO HERE -->
3595
+ <xsl:value-of select="/ieee:ieee-standard/ieee:bibdata/ieee:ext/ieee:program"/>
3562
3596
  </xsl:otherwise>
3563
3597
  </xsl:choose>
3564
3598
  </fo:block>
@@ -3568,10 +3602,14 @@
3568
3602
  </fo:block-container>
3569
3603
  <fo:block-container font-family="Calibri Light" font-size="12pt" line-height="1.7">
3570
3604
  <fo:block space-after="6mm">Authored by</fo:block>
3571
- <fo:block>Firstname Lastname</fo:block>
3605
+ <!-- <fo:block>Firstname Lastname</fo:block>
3572
3606
  <fo:block font-style="italic">Title</fo:block>
3573
3607
  <fo:block>Firstname Lastname</fo:block>
3574
- <fo:block font-style="italic">Title</fo:block>
3608
+ <fo:block font-style="italic">Title</fo:block> -->
3609
+ <xsl:for-each select="/ieee:ieee-standard/ieee:bibdata/ieee:contributor[ieee:role[@type = 'author']]">
3610
+ <fo:block><xsl:value-of select="concat(ieee:person/ieee:name/ieee:forename, ' ', ieee:person/ieee:name/ieee:surname)"/></fo:block>
3611
+ <fo:block font-style="italic"><xsl:value-of select="ieee:person/ieee:affiliation/ieee:name"/></fo:block>
3612
+ </xsl:for-each>
3575
3613
  </fo:block-container>
3576
3614
  </fo:flow>
3577
3615
  </fo:page-sequence>
@@ -8100,8 +8138,17 @@
8100
8138
  <xsl:variable name="styles_">
8101
8139
  <xsl:for-each select="xalan:nodeset($styles__)/item">
8102
8140
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
8103
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
8104
- <xsl:if test="$key = 'font-family' or $key = 'color'">
8141
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
8142
+ <xsl:variable name="value">
8143
+ <xsl:choose>
8144
+ <!-- if font-size is digits only -->
8145
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
8146
+ <xsl:otherwise>
8147
+ <xsl:value-of select="$value_"/>
8148
+ </xsl:otherwise>
8149
+ </xsl:choose>
8150
+ </xsl:variable>
8151
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
8105
8152
  <style name="{$key}"><xsl:value-of select="$value"/></style>
8106
8153
  </xsl:if>
8107
8154
  </xsl:for-each>
data/lib/isodoc/ieee/ieee.standard.xsl CHANGED
@@ -782,22 +782,11 @@
782
782
 
783
783
  <fo:flow flow-name="xsl-region-body">
784
784
  <fo:block-container>
785
- <fo:block font-family="Arial Black" font-size="13pt">TRADEMARKS AND DISCLAIMERS</fo:block>
786
- <fo:block font-size="10pt" margin-top="12pt" margin-bottom="12pt" text-align="justify" line-height="{$line-height}">IEEE believes the information in this publication is accurate as of its publication date; such information is subject to change without notice. IEEE is not responsible for any inadvertent errors.</fo:block>
787
- <fo:block font-size="10pt" margin-top="12pt" margin-bottom="12pt" text-align="justify" line-height="{$line-height}">The ideas and proposals in this specification are the respective author’s views and do not represent the views of the affiliated organization.</fo:block>
788
- <fo:block font-family="Arial Black" font-size="13pt">ACKNOWLEDGEMENTS</fo:block>
789
- <fo:block font-family="Calibri">
790
- <fo:block margin-top="12pt" margin-bottom="12pt" line-height="{$line-height}">Special thanks are given to the following reviewers of this paper:</fo:block>
791
- <fo:block font-size="10pt">
792
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
793
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
794
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
795
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
796
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
797
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
798
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
799
- <fo:block margin-bottom="6pt">Firstname Lastname</fo:block>
800
- </fo:block>
785
+
786
+ <fo:block>
787
+ <!-- TRADEMARKS AND DISCLAIMERS -->
788
+ <!-- ACKNOWLEDGEMENTS -->
789
+ <xsl:apply-templates select="/ieee:ieee-standard/ieee:boilerplate/ieee:legal-statement/*[@id = 'boilerplate-tm' or ieee:title = 'Trademarks and Disclaimers' or @id = 'boilerplate-participants' or ieee:title = 'Acknowledgements']" mode="whitepaper"/>
801
790
  </fo:block>
802
791
 
803
792
  <!-- Example:
@@ -810,7 +799,8 @@
810
799
  </fo:block>
811
800
 
812
801
  <!-- NOTICE AND DISCLAIMER OF LIABILITY CONCERNING THE USE OF IEEE SA DOCUMENTS -->
813
- <xsl:apply-templates select="/ieee:ieee-standard/ieee:boilerplate/ieee:legal-statement"/>
802
+ <fo:block break-after="page"/>
803
+ <xsl:apply-templates select="/ieee:ieee-standard/ieee:boilerplate/ieee:legal-statement/*[not(@id = 'boilerplate-tm') and not(ieee:title = 'Trademarks and Disclaimers') and not(@id = 'boilerplate-participants') and not(ieee:title = 'Acknowledgements')]"/>
814
804
 
815
805
  </fo:block-container>
816
806
  </fo:flow>
@@ -912,7 +902,7 @@
912
902
 
913
903
  </fo:static-content>
914
904
  <fo:static-content flow-name="left-region" role="artifact">
915
- <fo:block-container font-family="Arial Black" font-weight="normal" reference-orientation="90" font-size="48pt" text-align="left" color="white">
905
+ <fo:block-container font-family="Arial Black" font-weight="normal" reference-orientation="90" font-size="48pt" text-align="left" color="white" id="__internal_layout__toc_{generate-id()}">
916
906
  <fo:block margin-left="31.4mm" margin-top="20mm">TABLE OF CONTENTS</fo:block>
917
907
  </fo:block-container>
918
908
  </fo:static-content>
@@ -944,6 +934,15 @@
944
934
  <xsl:choose>
945
935
 
946
936
  <xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
937
+
938
+ <item>
939
+ <xsl:apply-templates select="/ieee:ieee-standard/ieee:preface/ieee:introduction" mode="flatxml"/>
940
+ </item>
941
+
942
+ <item>
943
+ <xsl:apply-templates select="/ieee:ieee-standard/ieee:preface/ieee:acknowledgements" mode="flatxml"/>
944
+ </item>
945
+
947
946
  <item>
948
947
  <xsl:apply-templates select="/ieee:ieee-standard/ieee:preface/ieee:abstract" mode="flatxml"/>
949
948
  </item>
@@ -1613,6 +1612,41 @@
1613
1612
  </xsl:choose>
1614
1613
  </xsl:template>
1615
1614
 
1615
+ <xsl:template match="ieee:boilerplate/ieee:legal-statement" mode="whitepaper">
1616
+ <xsl:apply-templates mode="whitepaper"/>
1617
+ </xsl:template>
1618
+
1619
+ <xsl:template match="ieee:boilerplate/ieee:legal-statement/ieee:clause/ieee:title" mode="whitepaper">
1620
+ <fo:block font-family="Arial Black" font-size="13pt"><xsl:apply-templates mode="whitepaper"/></fo:block>
1621
+ </xsl:template>
1622
+
1623
+ <xsl:template match="ieee:boilerplate/ieee:legal-statement/ieee:clause/ieee:title//text()" mode="whitepaper">
1624
+ <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
1625
+ </xsl:template>
1626
+
1627
+ <xsl:template match="ieee:boilerplate/ieee:legal-statement/ieee:clause/ieee:p" mode="whitepaper">
1628
+ <fo:block font-size="10pt" margin-top="12pt" margin-bottom="12pt" text-align="justify" line-height="{$line-height}">
1629
+ <xsl:apply-templates/>
1630
+ </fo:block>
1631
+ </xsl:template>
1632
+
1633
+ <xsl:template match="ieee:boilerplate/ieee:legal-statement/ieee:clause/ieee:clause" mode="whitepaper">
1634
+ <fo:block font-family="Calibri">
1635
+ <xsl:apply-templates mode="whitepaper"/>
1636
+ </fo:block>
1637
+ </xsl:template>
1638
+
1639
+ <xsl:template match="ieee:boilerplate/ieee:legal-statement/ieee:clause/ieee:clause/ieee:p" mode="whitepaper">
1640
+ <fo:block font-size="10pt" margin-bottom="6pt">
1641
+ <xsl:if test="not(preceding-sibling::ieee:p)">
1642
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1643
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1644
+ <xsl:attribute name="font-size">inherit</xsl:attribute>
1645
+ </xsl:if>
1646
+ <xsl:apply-templates/>
1647
+ </fo:block>
1648
+ </xsl:template>
1649
+
1616
1650
  <xsl:template match="ieee:abstract">
1617
1651
  <fo:block>
1618
1652
  <xsl:call-template name="setId"/>
@@ -2245,7 +2279,7 @@
2245
2279
  </fo:block>
2246
2280
  </xsl:template>
2247
2281
 
2248
- <xsl:template match="*[local-name() = 'introduction'] | *[local-name() = 'foreword']">
2282
+ <xsl:template match="*[local-name() = 'introduction'] | *[local-name() = 'foreword'] | *[local-name() = 'acknowledgements']">
2249
2283
  <fo:block>
2250
2284
  <xsl:call-template name="setId"/>
2251
2285
  <xsl:apply-templates/>
@@ -2447,7 +2481,7 @@
2447
2481
 
2448
2482
  <fo:list-item>
2449
2483
  <fo:list-item-label end-indent="label-end()">
2450
- <fo:block>
2484
+ <fo:block id="__internal_layout__toc_section_{generate-id()}">
2451
2485
  <xsl:if test="$level = 1">
2452
2486
  <xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
2453
2487
  </xsl:if>
@@ -3451,7 +3485,7 @@
3451
3485
  <xsl:param name="title"/>
3452
3486
  <fo:page-sequence master-reference="cover-page-nonstandard" force-page-count="no-force">
3453
3487
  <fo:static-content flow-name="header" role="artifact">
3454
- <fo:block-container position="absolute" left="65mm"> <!-- top="-2.6mm" -->
3488
+ <fo:block-container position="absolute" left="65mm" id="__internal_layout__bluebox_{generate-id()}"> <!-- top="-2.6mm" -->
3455
3489
  <xsl:if test="$current_template = 'industry-connection-report'">
3456
3490
  <xsl:attribute name="left">76.5mm</xsl:attribute>
3457
3491
  </xsl:if>
@@ -3557,8 +3591,8 @@
3557
3591
  <xsl:attribute name="margin-right">-10mm</xsl:attribute>
3558
3592
  <xsl:text>IEEE CONFORMITY ASSESSMENT PROGRAM (ICAP)</xsl:text>
3559
3593
  </xsl:when>
3560
- <xsl:otherwise>
3561
- PROGRAM TITLE TO GO HERE
3594
+ <xsl:otherwise> <!-- PROGRAM TITLE TO GO HERE -->
3595
+ <xsl:value-of select="/ieee:ieee-standard/ieee:bibdata/ieee:ext/ieee:program"/>
3562
3596
  </xsl:otherwise>
3563
3597
  </xsl:choose>
3564
3598
  </fo:block>
@@ -3568,10 +3602,14 @@
3568
3602
  </fo:block-container>
3569
3603
  <fo:block-container font-family="Calibri Light" font-size="12pt" line-height="1.7">
3570
3604
  <fo:block space-after="6mm">Authored by</fo:block>
3571
- <fo:block>Firstname Lastname</fo:block>
3605
+ <!-- <fo:block>Firstname Lastname</fo:block>
3572
3606
  <fo:block font-style="italic">Title</fo:block>
3573
3607
  <fo:block>Firstname Lastname</fo:block>
3574
- <fo:block font-style="italic">Title</fo:block>
3608
+ <fo:block font-style="italic">Title</fo:block> -->
3609
+ <xsl:for-each select="/ieee:ieee-standard/ieee:bibdata/ieee:contributor[ieee:role[@type = 'author']]">
3610
+ <fo:block><xsl:value-of select="concat(ieee:person/ieee:name/ieee:forename, ' ', ieee:person/ieee:name/ieee:surname)"/></fo:block>
3611
+ <fo:block font-style="italic"><xsl:value-of select="ieee:person/ieee:affiliation/ieee:name"/></fo:block>
3612
+ </xsl:for-each>
3575
3613
  </fo:block-container>
3576
3614
  </fo:flow>
3577
3615
  </fo:page-sequence>
@@ -8100,8 +8138,17 @@
8100
8138
  <xsl:variable name="styles_">
8101
8139
  <xsl:for-each select="xalan:nodeset($styles__)/item">
8102
8140
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
8103
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
8104
- <xsl:if test="$key = 'font-family' or $key = 'color'">
8141
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
8142
+ <xsl:variable name="value">
8143
+ <xsl:choose>
8144
+ <!-- if font-size is digits only -->
8145
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
8146
+ <xsl:otherwise>
8147
+ <xsl:value-of select="$value_"/>
8148
+ </xsl:otherwise>
8149
+ </xsl:choose>
8150
+ </xsl:variable>
8151
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
8105
8152
  <style name="{$key}"><xsl:value-of select="$value"/></style>
8106
8153
  </xsl:if>
8107
8154
  </xsl:for-each>
data/lib/isodoc/ieee/init.rb CHANGED
@@ -50,7 +50,7 @@ module IsoDoc
50
50
  ret = std_docid_sdo(m[:text]) +
51
51
  "<span class='std_docNumber'>#{m[:num]}</span>"
52
52
  m[:yr] and ret += ":<span class='std_year'>#{m[:yr]}</span>"
53
- ret
53
+ ret.gsub(%r{</span>(\p{Zs}+)<}, "\\1</span><")
54
54
  end
55
55
 
56
56
  def std_docid_sdo(text)
@@ -63,7 +63,7 @@ module IsoDoc
63
63
  found = true
64
64
  "<span class='#{k}'>#{x}</span>"
65
65
  else x end
66
- end.reverse.join
66
+ end.reverse.join.gsub(%r{</span>(\p{Zs}+)<}, "\\1</span><")
67
67
  end
68
68
  end
69
69
  end
data/lib/isodoc/ieee/metadata.rb CHANGED
@@ -49,6 +49,12 @@ module IsoDoc
49
49
  tc(xml)
50
50
  wg(xml)
51
51
  bg(xml)
52
+ program(xml)
53
+ end
54
+
55
+ def program(xml)
56
+ p = xml.at(ns("//bibdata/ext/program")) and
57
+ set(:program, p.text)
52
58
  end
53
59
 
54
60
  def society(xml)
data/lib/isodoc/ieee/word_convert.rb CHANGED
@@ -28,7 +28,7 @@ module IsoDoc
28
28
  def convert(input_filename, file = nil, debug = false,
29
29
  output_filename = nil)
30
30
  file ||= File.read(input_filename, encoding: "utf-8")
31
- docxml = Nokogiri::XML(file) { |config| config.huge }
31
+ docxml = Nokogiri::XML(file, &:huge)
32
32
  doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
33
33
  if @wp && doctype == "whitepaper"
34
34
  @wp.convert(input_filename, file, debug, output_filename)
data/lib/metanorma/ieee/basicdoc.rng CHANGED
@@ -914,44 +914,47 @@
914
914
  -->
915
915
  <define name="image">
916
916
  <element name="image">
917
- <attribute name="id">
918
- <data type="ID"/>
917
+ <ref name="Image"/>
918
+ </element>
919
+ </define>
920
+ <define name="Image">
921
+ <attribute name="id">
922
+ <data type="ID"/>
923
+ </attribute>
924
+ <attribute name="src">
925
+ <data type="anyURI"/>
926
+ </attribute>
927
+ <attribute name="mimetype"/>
928
+ <optional>
929
+ <attribute name="filename"/>
930
+ </optional>
931
+ <optional>
932
+ <attribute name="width">
933
+ <choice>
934
+ <data type="int"/>
935
+ <value>auto</value>
936
+ </choice>
919
937
  </attribute>
920
- <attribute name="src">
938
+ </optional>
939
+ <optional>
940
+ <attribute name="height">
941
+ <choice>
942
+ <data type="int"/>
943
+ <value>auto</value>
944
+ </choice>
945
+ </attribute>
946
+ </optional>
947
+ <optional>
948
+ <attribute name="alt"/>
949
+ </optional>
950
+ <optional>
951
+ <attribute name="title"/>
952
+ </optional>
953
+ <optional>
954
+ <attribute name="longdesc">
921
955
  <data type="anyURI"/>
922
956
  </attribute>
923
- <attribute name="mimetype"/>
924
- <optional>
925
- <attribute name="filename"/>
926
- </optional>
927
- <optional>
928
- <attribute name="width">
929
- <choice>
930
- <data type="int"/>
931
- <value>auto</value>
932
- </choice>
933
- </attribute>
934
- </optional>
935
- <optional>
936
- <attribute name="height">
937
- <choice>
938
- <data type="int"/>
939
- <value>auto</value>
940
- </choice>
941
- </attribute>
942
- </optional>
943
- <optional>
944
- <attribute name="alt"/>
945
- </optional>
946
- <optional>
947
- <attribute name="title"/>
948
- </optional>
949
- <optional>
950
- <attribute name="longdesc">
951
- <data type="anyURI"/>
952
- </attribute>
953
- </optional>
954
- </element>
957
+ </optional>
955
958
  </define>
956
959
  <define name="video">
957
960
  <element name="video">
data/lib/metanorma/ieee/biblio.rng CHANGED
@@ -348,6 +348,9 @@
348
348
  <zeroOrMore>
349
349
  <ref name="contact"/>
350
350
  </zeroOrMore>
351
+ <optional>
352
+ <ref name="logo"/>
353
+ </optional>
351
354
  </element>
352
355
  </define>
353
356
  <define name="orgname">
@@ -366,6 +369,11 @@
366
369
  </choice>
367
370
  </element>
368
371
  </define>
372
+ <define name="logo">
373
+ <element name="logo">
374
+ <ref name="image"/>
375
+ </element>
376
+ </define>
369
377
  <define name="NameWithVariants">
370
378
  <element name="primary">
371
379
  <ref name="LocalizedString"/>
@@ -942,6 +950,7 @@
942
950
  <value>obsoleted</value>
943
951
  <value>confirmed</value>
944
952
  <value>updated</value>
953
+ <value>corrected</value>
945
954
  <value>issued</value>
946
955
  <value>transmitted</value>
947
956
  <value>copied</value>
data/lib/metanorma/ieee/front.rb CHANGED
@@ -93,11 +93,15 @@ module Metanorma
93
93
  def metadata_ext(node, xml)
94
94
  super
95
95
  structured_id(node, xml)
96
+ program(node, xml)
96
97
  end
97
98
 
98
- def structured_id(node, xml)
99
- return unless node.attr("docnumber")
99
+ def program(node, xml)
100
+ p = node.attr("program") and xml.program p
101
+ end
100
102
 
103
+ def structured_id(node, xml)
104
+ node.attr("docnumber") or return
101
105
  xml.structuredidentifier do |i|
102
106
  i.docnumber node.attr("docnumber")
103
107
  i.agency "IEEE"
data/lib/metanorma/ieee/isodoc.rng CHANGED
@@ -17,7 +17,7 @@
17
17
  these elements; we just want one namespace for any child grammars
18
18
  of this.
19
19
  -->
20
- <!-- VERSION v1.2.6 -->
20
+ <!-- VERSION v1.2.8 -->
21
21
  <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
22
22
  <include href="reqt.rng"/>
23
23
  <include href="basicdoc.rng">
@@ -1054,6 +1054,17 @@
1054
1054
  <ref name="date_inline"/>
1055
1055
  </choice>
1056
1056
  </define>
1057
+ <define name="PureTextElement" combine="choice">
1058
+ <ref name="passthrough_inline"/>
1059
+ </define>
1060
+ <define name="passthrough_inline">
1061
+ <element name="passthrough">
1062
+ <optional>
1063
+ <attribute name="formats"/>
1064
+ </optional>
1065
+ <text/>
1066
+ </element>
1067
+ </define>
1057
1068
  <define name="add">
1058
1069
  <element name="add">
1059
1070
  <choice>
@@ -1092,6 +1103,9 @@
1092
1103
  <optional>
1093
1104
  <attribute name="style"/>
1094
1105
  </optional>
1106
+ <optional>
1107
+ <attribute name="custom-charset"/>
1108
+ </optional>
1095
1109
  <oneOrMore>
1096
1110
  <ref name="TextElement"/>
1097
1111
  </oneOrMore>
@@ -1394,6 +1408,9 @@
1394
1408
  <optional>
1395
1409
  <attribute name="number"/>
1396
1410
  </optional>
1411
+ <optional>
1412
+ <attribute name="branch-number"/>
1413
+ </optional>
1397
1414
  <optional>
1398
1415
  <attribute name="obligation">
1399
1416
  <choice>
@@ -1617,6 +1634,9 @@
1617
1634
  <optional>
1618
1635
  <attribute name="number"/>
1619
1636
  </optional>
1637
+ <optional>
1638
+ <attribute name="branch-number"/>
1639
+ </optional>
1620
1640
  <optional>
1621
1641
  <attribute name="type"/>
1622
1642
  </optional>
@@ -1668,6 +1688,9 @@
1668
1688
  <optional>
1669
1689
  <attribute name="number"/>
1670
1690
  </optional>
1691
+ <optional>
1692
+ <attribute name="branch-number"/>
1693
+ </optional>
1671
1694
  <optional>
1672
1695
  <ref name="section-title"/>
1673
1696
  </optional>
@@ -1765,6 +1788,9 @@
1765
1788
  <optional>
1766
1789
  <attribute name="number"/>
1767
1790
  </optional>
1791
+ <optional>
1792
+ <attribute name="branch-number"/>
1793
+ </optional>
1768
1794
  <optional>
1769
1795
  <attribute name="obligation">
1770
1796
  <choice>
data/lib/metanorma/ieee/relaton-ieee.rng CHANGED
@@ -75,6 +75,9 @@
75
75
  <optional>
76
76
  <ref name="holdstatus"/>
77
77
  </optional>
78
+ <optional>
79
+ <ref name="program"/>
80
+ </optional>
78
81
  </define>
79
82
  </include>
80
83
  <define name="standard_status">
@@ -114,6 +117,11 @@
114
117
  </choice>
115
118
  </element>
116
119
  </define>
120
+ <define name="program">
121
+ <element name="program">
122
+ <text/>
123
+ </element>
124
+ </define>
117
125
  <define name="BibliographicDateType" combine="choice">
118
126
  <value>feedback-ended</value>
119
127
  </define>
data/lib/metanorma/ieee/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module IEEE
3
- VERSION = "1.1.5".freeze
3
+ VERSION = "1.1.6".freeze
4
4
  end
5
5
  end
data/metanorma-ieee.gemspec CHANGED
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
25
25
  spec.require_paths = ["lib"]
26
26
  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
27
27
 
28
- spec.add_dependency "metanorma-standoc", "~> 2.6.0"
28
+ spec.add_dependency "metanorma-standoc", "~> 2.6.3"
29
29
  spec.add_dependency "mnconvert", "~> 1.20"
30
30
  #spec.add_dependency "pubid-ieee", "~> 0.1.1"
31
31
  #spec.add_dependency "pubid-iso", "~> 0.5.3"
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.1.5
4
+ version: 1.1.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: 2023-11-06 00:00:00.000000000 Z
11
+ date: 2023-11-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 2.6.0
19
+ version: 2.6.3
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 2.6.0
26
+ version: 2.6.3
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: mnconvert
29
29
  requirement: !ruby/object:Gem::Requirement