metanorma-iho 1.0.1 → 1.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iho/iho.specification.xsl +68 -21
  3. data/lib/isodoc/iho/iho.standard.xsl +68 -21
  4. data/lib/metanorma/iho/basicdoc.rng +71 -6
  5. data/lib/metanorma/iho/biblio.rng +3 -1
  6. data/lib/metanorma/iho/isodoc.rng +3 -0
  7. data/lib/metanorma/iho/reqt.rng +3 -0
  8. data/lib/metanorma/iho/version.rb +1 -1
  9. data/metanorma.yml +1 -0
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9c69fb1fa7ffaa584eb5f056c9e35b8c47b5a864ed79c518dadcd2badb75aa27
4
- data.tar.gz: fd19d981d27d26211c6955120c65dc1fc2b7dfdddca987fa539bd463f1a60810
3
+ metadata.gz: 05a203f22784ce681da92a4fdc0ddbd6ce9a7c84eb31cfb5bdf74f77c1bb9af0
4
+ data.tar.gz: 49637d3ae2979f792b62b01b59de8580bd666fb70d22d0c38a708642c3eb6466
5
5
  SHA512:
6
- metadata.gz: 0b2b97c6194a316247e56cbf946d42507644bd6abe1f9e1bc511e8b8dc75cc30e43ce5b525d37fbd34264c5c4cf71bdf58068a252e6f051c8c49f05fa2a84960
7
- data.tar.gz: 461af02ce4d8cab801a1b2c615e3e15bf5269de393324ddf729a7c8a994f6fdc2df6478ed7351f34977ce73bb41bb2afa64260ab548cb9e0182b731d9c2ae254
6
+ metadata.gz: 7b37773f0263b8117f61861950a07ccea4ccab6c96daf662192f3438c2c609f808f325059ba6d2bc461c0b4d3a193c76fa6db3a4bff38ee359b854c2308ae0d6
7
+ data.tar.gz: 87da8344231ed03e60022942921bf1618dbf3221ac9d06618d306bf8b301865e41458f81c86eae347004450c3e9a5f64873015a4e962e4123c2d975bce245569
data/lib/isodoc/iho/iho.specification.xsl CHANGED
@@ -6993,6 +6993,12 @@
6993
6993
  <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
6994
6994
  <attachment filename="{@name}"/>
6995
6995
  </xsl:for-each>
6996
+ <xsl:if test="not(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment'])">
6997
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
6998
+ <xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
6999
+ <attachment filename="{$attachment_path}"/>
7000
+ </xsl:for-each>
7001
+ </xsl:if>
6996
7002
  </xsl:variable>
6997
7003
  <xsl:variable name="pdfAttachmentsList" select="xalan:nodeset($pdfAttachmentsList_)"/>
6998
7004
 
@@ -7005,7 +7011,7 @@
7005
7011
  <xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
7006
7012
  </xsl:when>
7007
7013
  <!-- link to the PDF attachment -->
7008
- <xsl:when test="$pdfAttachmentsList//attachment[@filename = current()/@target]">
7014
+ <xsl:when test="@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target]">
7009
7015
  <xsl:value-of select="concat('url(embedded-file:', @target, ')')"/>
7010
7016
  </xsl:when>
7011
7017
  <!-- <xsl:when test="starts-with($target_normalized, '_') and contains($target_normalized, '_attachments/') and $pdfAttachmentsList//attachment[@filename = $target_attachment_name]">
@@ -7654,7 +7660,16 @@
7654
7660
  </xsl:variable>
7655
7661
  <xsl:variable name="img_src">
7656
7662
  <xsl:choose>
7657
- <xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
7663
+ <xsl:when test="not(starts-with(@src, 'data:'))">
7664
+ <xsl:choose>
7665
+ <xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
7666
+ <xsl:value-of select="@src"/>
7667
+ </xsl:when>
7668
+ <xsl:otherwise>
7669
+ <xsl:value-of select="concat($basepath, @src)"/>
7670
+ </xsl:otherwise>
7671
+ </xsl:choose>
7672
+ </xsl:when>
7658
7673
  <xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
7659
7674
  </xsl:choose>
7660
7675
  </xsl:variable>
@@ -7667,7 +7682,7 @@
7667
7682
  <!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
7668
7683
  <xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
7669
7684
  <xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
7670
- <xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
7685
+ <xsl:variable name="scale" select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
7671
7686
  <xsl:value-of select="$scale"/>
7672
7687
  </xsl:template>
7673
7688
 
@@ -7686,7 +7701,14 @@
7686
7701
  <xsl:value-of select="concat('url(file:///',$basepath, $src_png, ')')"/>
7687
7702
  </xsl:when>
7688
7703
  <xsl:when test="not(starts-with(@src, 'data:'))">
7689
- <xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
7704
+ <xsl:choose>
7705
+ <xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
7706
+ <xsl:value-of select="concat('url(file:///', @src, ')')"/>
7707
+ </xsl:when>
7708
+ <xsl:otherwise>
7709
+ <xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
7710
+ </xsl:otherwise>
7711
+ </xsl:choose>
7690
7712
  </xsl:when>
7691
7713
  <xsl:otherwise>
7692
7714
  <xsl:value-of select="@src"/>
@@ -7708,7 +7730,14 @@
7708
7730
  </xsl:when>
7709
7731
  <xsl:when test="not(starts-with(@src, 'data:'))">
7710
7732
  <xsl:variable name="src">
7711
- <xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
7733
+ <xsl:choose>
7734
+ <xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
7735
+ <xsl:value-of select="concat('url(file:///', @src, ')')"/>
7736
+ </xsl:when>
7737
+ <xsl:otherwise>
7738
+ <xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
7739
+ </xsl:otherwise>
7740
+ </xsl:choose>
7712
7741
  </xsl:variable>
7713
7742
  <xsl:variable name="file" select="java:java.io.File.new(@src)"/>
7714
7743
  <xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($file)"/>
@@ -12488,26 +12517,37 @@
12488
12517
  </x:xmpmeta>
12489
12518
  <!-- add attachments -->
12490
12519
  <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
12491
- <xsl:choose>
12492
- <xsl:when test="normalize-space() != ''">
12493
- <xsl:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', '')"/> <!-- remove line breaks -->
12494
- <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$src_attachment}" filename="{@name}"/>
12495
- </xsl:when>
12496
- <xsl:otherwise>
12497
- <!-- _{filename}_attachments -->
12498
- <!-- <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, '_', $inputxml_filename_prefix, '_attachments', '/', @name, ')')"/> -->
12499
- <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath , @name, ')')"/>
12500
- <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{@name}"/>
12501
- </xsl:otherwise>
12502
- </xsl:choose>
12520
+ <xsl:variable name="description" select="normalize-space(//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment'] = current()/@name]/*[local-name() = 'formattedref'])"/>
12521
+
12522
+ <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" filename="{@name}">
12523
+ <xsl:attribute name="src">
12524
+ <xsl:choose>
12525
+ <xsl:when test="normalize-space() != ''">
12526
+ <xsl:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', '')"/> <!-- remove line breaks -->
12527
+ <xsl:value-of select="$src_attachment"/>
12528
+ </xsl:when>
12529
+ <xsl:otherwise>
12530
+ <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath , @name, ')')"/>
12531
+ <xsl:value-of select="$url"/>
12532
+ </xsl:otherwise>
12533
+ </xsl:choose>
12534
+ </xsl:attribute>
12535
+ <xsl:if test="$description != ''">
12536
+ <xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
12537
+ </xsl:if>
12538
+ </pdf:embedded-file>
12503
12539
  </xsl:for-each>
12504
12540
  <!-- references to external attachments (no binary-encoded within the Metanorma XML file) -->
12505
12541
  <xsl:if test="not(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment'])">
12506
12542
  <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
12507
12543
  <xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
12508
- <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, $attachment_path, ')')"/>
12509
- <xsl:variable name="filename_embedded" select="substring-after($attachment_path, concat('_', $inputxml_filename_prefix, '_attachments', '/'))"/>
12510
- <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{$filename_embedded}"/>
12544
+ <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
12545
+ <xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
12546
+ <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{$attachment_path}">
12547
+ <xsl:if test="$description != ''">
12548
+ <xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
12549
+ </xsl:if>
12550
+ </pdf:embedded-file>
12511
12551
  </xsl:for-each>
12512
12552
  </xsl:if>
12513
12553
  </xsl:template> <!-- addPDFUAmeta -->
@@ -12885,7 +12925,14 @@
12885
12925
  <xsl:value-of select="$src"/>
12886
12926
  </xsl:when>
12887
12927
  <xsl:otherwise>
12888
- <xsl:value-of select="concat('url(file:///',$basepath, $src, ')')"/>
12928
+ <xsl:choose>
12929
+ <xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
12930
+ <xsl:value-of select="concat('url(file:///', @src, ')')"/>
12931
+ </xsl:when>
12932
+ <xsl:otherwise>
12933
+ <xsl:value-of select="concat('url(file:///',$basepath, $src, ')')"/>
12934
+ </xsl:otherwise>
12935
+ </xsl:choose>
12889
12936
  </xsl:otherwise>
12890
12937
  </xsl:choose>
12891
12938
  </xsl:template>
data/lib/isodoc/iho/iho.standard.xsl CHANGED
@@ -6993,6 +6993,12 @@
6993
6993
  <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
6994
6994
  <attachment filename="{@name}"/>
6995
6995
  </xsl:for-each>
6996
+ <xsl:if test="not(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment'])">
6997
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
6998
+ <xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
6999
+ <attachment filename="{$attachment_path}"/>
7000
+ </xsl:for-each>
7001
+ </xsl:if>
6996
7002
  </xsl:variable>
6997
7003
  <xsl:variable name="pdfAttachmentsList" select="xalan:nodeset($pdfAttachmentsList_)"/>
6998
7004
 
@@ -7005,7 +7011,7 @@
7005
7011
  <xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
7006
7012
  </xsl:when>
7007
7013
  <!-- link to the PDF attachment -->
7008
- <xsl:when test="$pdfAttachmentsList//attachment[@filename = current()/@target]">
7014
+ <xsl:when test="@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target]">
7009
7015
  <xsl:value-of select="concat('url(embedded-file:', @target, ')')"/>
7010
7016
  </xsl:when>
7011
7017
  <!-- <xsl:when test="starts-with($target_normalized, '_') and contains($target_normalized, '_attachments/') and $pdfAttachmentsList//attachment[@filename = $target_attachment_name]">
@@ -7654,7 +7660,16 @@
7654
7660
  </xsl:variable>
7655
7661
  <xsl:variable name="img_src">
7656
7662
  <xsl:choose>
7657
- <xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
7663
+ <xsl:when test="not(starts-with(@src, 'data:'))">
7664
+ <xsl:choose>
7665
+ <xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
7666
+ <xsl:value-of select="@src"/>
7667
+ </xsl:when>
7668
+ <xsl:otherwise>
7669
+ <xsl:value-of select="concat($basepath, @src)"/>
7670
+ </xsl:otherwise>
7671
+ </xsl:choose>
7672
+ </xsl:when>
7658
7673
  <xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
7659
7674
  </xsl:choose>
7660
7675
  </xsl:variable>
@@ -7667,7 +7682,7 @@
7667
7682
  <!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
7668
7683
  <xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
7669
7684
  <xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
7670
- <xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
7685
+ <xsl:variable name="scale" select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
7671
7686
  <xsl:value-of select="$scale"/>
7672
7687
  </xsl:template>
7673
7688
 
@@ -7686,7 +7701,14 @@
7686
7701
  <xsl:value-of select="concat('url(file:///',$basepath, $src_png, ')')"/>
7687
7702
  </xsl:when>
7688
7703
  <xsl:when test="not(starts-with(@src, 'data:'))">
7689
- <xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
7704
+ <xsl:choose>
7705
+ <xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
7706
+ <xsl:value-of select="concat('url(file:///', @src, ')')"/>
7707
+ </xsl:when>
7708
+ <xsl:otherwise>
7709
+ <xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
7710
+ </xsl:otherwise>
7711
+ </xsl:choose>
7690
7712
  </xsl:when>
7691
7713
  <xsl:otherwise>
7692
7714
  <xsl:value-of select="@src"/>
@@ -7708,7 +7730,14 @@
7708
7730
  </xsl:when>
7709
7731
  <xsl:when test="not(starts-with(@src, 'data:'))">
7710
7732
  <xsl:variable name="src">
7711
- <xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
7733
+ <xsl:choose>
7734
+ <xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
7735
+ <xsl:value-of select="concat('url(file:///', @src, ')')"/>
7736
+ </xsl:when>
7737
+ <xsl:otherwise>
7738
+ <xsl:value-of select="concat('url(file:///',$basepath, @src, ')')"/>
7739
+ </xsl:otherwise>
7740
+ </xsl:choose>
7712
7741
  </xsl:variable>
7713
7742
  <xsl:variable name="file" select="java:java.io.File.new(@src)"/>
7714
7743
  <xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($file)"/>
@@ -12488,26 +12517,37 @@
12488
12517
  </x:xmpmeta>
12489
12518
  <!-- add attachments -->
12490
12519
  <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']">
12491
- <xsl:choose>
12492
- <xsl:when test="normalize-space() != ''">
12493
- <xsl:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', '')"/> <!-- remove line breaks -->
12494
- <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$src_attachment}" filename="{@name}"/>
12495
- </xsl:when>
12496
- <xsl:otherwise>
12497
- <!-- _{filename}_attachments -->
12498
- <!-- <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, '_', $inputxml_filename_prefix, '_attachments', '/', @name, ')')"/> -->
12499
- <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath , @name, ')')"/>
12500
- <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{@name}"/>
12501
- </xsl:otherwise>
12502
- </xsl:choose>
12520
+ <xsl:variable name="description" select="normalize-space(//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment'] = current()/@name]/*[local-name() = 'formattedref'])"/>
12521
+
12522
+ <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" filename="{@name}">
12523
+ <xsl:attribute name="src">
12524
+ <xsl:choose>
12525
+ <xsl:when test="normalize-space() != ''">
12526
+ <xsl:variable name="src_attachment" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', '')"/> <!-- remove line breaks -->
12527
+ <xsl:value-of select="$src_attachment"/>
12528
+ </xsl:when>
12529
+ <xsl:otherwise>
12530
+ <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath , @name, ')')"/>
12531
+ <xsl:value-of select="$url"/>
12532
+ </xsl:otherwise>
12533
+ </xsl:choose>
12534
+ </xsl:attribute>
12535
+ <xsl:if test="$description != ''">
12536
+ <xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
12537
+ </xsl:if>
12538
+ </pdf:embedded-file>
12503
12539
  </xsl:for-each>
12504
12540
  <!-- references to external attachments (no binary-encoded within the Metanorma XML file) -->
12505
12541
  <xsl:if test="not(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment'])">
12506
12542
  <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
12507
12543
  <xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
12508
- <xsl:variable name="url" select="concat('url(file:///',$inputxml_basepath, $attachment_path, ')')"/>
12509
- <xsl:variable name="filename_embedded" select="substring-after($attachment_path, concat('_', $inputxml_filename_prefix, '_attachments', '/'))"/>
12510
- <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{$filename_embedded}"/>
12544
+ <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
12545
+ <xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
12546
+ <pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{$attachment_path}">
12547
+ <xsl:if test="$description != ''">
12548
+ <xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
12549
+ </xsl:if>
12550
+ </pdf:embedded-file>
12511
12551
  </xsl:for-each>
12512
12552
  </xsl:if>
12513
12553
  </xsl:template> <!-- addPDFUAmeta -->
@@ -12885,7 +12925,14 @@
12885
12925
  <xsl:value-of select="$src"/>
12886
12926
  </xsl:when>
12887
12927
  <xsl:otherwise>
12888
- <xsl:value-of select="concat('url(file:///',$basepath, $src, ')')"/>
12928
+ <xsl:choose>
12929
+ <xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
12930
+ <xsl:value-of select="concat('url(file:///', @src, ')')"/>
12931
+ </xsl:when>
12932
+ <xsl:otherwise>
12933
+ <xsl:value-of select="concat('url(file:///',$basepath, $src, ')')"/>
12934
+ </xsl:otherwise>
12935
+ </xsl:choose>
12889
12936
  </xsl:otherwise>
12890
12937
  </xsl:choose>
12891
12938
  </xsl:template>
data/lib/metanorma/iho/basicdoc.rng CHANGED
@@ -1000,14 +1000,14 @@
1000
1000
  <define name="PureTextElement">
1001
1001
  <choice>
1002
1002
  <text/>
1003
- <ref name="em"/>
1004
- <ref name="strong"/>
1003
+ <ref name="pure_em"/>
1004
+ <ref name="pure_strong"/>
1005
1005
  <ref name="sub"/>
1006
1006
  <ref name="sup"/>
1007
- <ref name="tt"/>
1008
- <ref name="underline"/>
1009
- <ref name="strike"/>
1010
- <ref name="smallcap"/>
1007
+ <ref name="pure_tt"/>
1008
+ <ref name="pure_underline"/>
1009
+ <ref name="pure_strike"/>
1010
+ <ref name="pure_smallcap"/>
1011
1011
  <ref name="br"/>
1012
1012
  </choice>
1013
1013
  </define>
@@ -1031,6 +1031,13 @@
1031
1031
  </zeroOrMore>
1032
1032
  </element>
1033
1033
  </define>
1034
+ <define name="pure_em">
1035
+ <element name="em">
1036
+ <zeroOrMore>
1037
+ <ref name="PureTextElement"/>
1038
+ </zeroOrMore>
1039
+ </element>
1040
+ </define>
1034
1041
  <define name="strong">
1035
1042
  <element name="strong">
1036
1043
  <zeroOrMore>
@@ -1046,6 +1053,13 @@
1046
1053
  </zeroOrMore>
1047
1054
  </element>
1048
1055
  </define>
1056
+ <define name="pure_strong">
1057
+ <element name="strong">
1058
+ <zeroOrMore>
1059
+ <ref name="PureTextElement"/>
1060
+ </zeroOrMore>
1061
+ </element>
1062
+ </define>
1049
1063
  <define name="tt">
1050
1064
  <element name="tt">
1051
1065
  <zeroOrMore>
@@ -1060,6 +1074,13 @@
1060
1074
  </zeroOrMore>
1061
1075
  </element>
1062
1076
  </define>
1077
+ <define name="pure_tt">
1078
+ <element name="tt">
1079
+ <zeroOrMore>
1080
+ <ref name="PureTextElement"/>
1081
+ </zeroOrMore>
1082
+ </element>
1083
+ </define>
1063
1084
  <define name="keyword">
1064
1085
  <element name="keyword">
1065
1086
  <zeroOrMore>
@@ -1090,13 +1111,42 @@
1090
1111
  <zeroOrMore>
1091
1112
  <choice>
1092
1113
  <ref name="PureTextElement"/>
1114
+ <ref name="stem"/>
1115
+ <ref name="eref"/>
1116
+ <ref name="xref"/>
1117
+ <ref name="hyperlink"/>
1093
1118
  <ref name="index"/>
1094
1119
  <ref name="index-xref"/>
1095
1120
  </choice>
1096
1121
  </zeroOrMore>
1097
1122
  </element>
1098
1123
  </define>
1124
+ <define name="pure_strike">
1125
+ <element name="strike">
1126
+ <zeroOrMore>
1127
+ <ref name="PureTextElement"/>
1128
+ </zeroOrMore>
1129
+ </element>
1130
+ </define>
1099
1131
  <define name="underline">
1132
+ <element name="underline">
1133
+ <optional>
1134
+ <attribute name="style"/>
1135
+ </optional>
1136
+ <zeroOrMore>
1137
+ <choice>
1138
+ <ref name="PureTextElement"/>
1139
+ <ref name="stem"/>
1140
+ <ref name="eref"/>
1141
+ <ref name="xref"/>
1142
+ <ref name="hyperlink"/>
1143
+ <ref name="index"/>
1144
+ <ref name="index-xref"/>
1145
+ </choice>
1146
+ </zeroOrMore>
1147
+ </element>
1148
+ </define>
1149
+ <define name="pure_underline">
1100
1150
  <element name="underline">
1101
1151
  <optional>
1102
1152
  <attribute name="style"/>
@@ -1107,6 +1157,21 @@
1107
1157
  </element>
1108
1158
  </define>
1109
1159
  <define name="smallcap">
1160
+ <element name="smallcap">
1161
+ <zeroOrMore>
1162
+ <choice>
1163
+ <ref name="PureTextElement"/>
1164
+ <ref name="stem"/>
1165
+ <ref name="eref"/>
1166
+ <ref name="xref"/>
1167
+ <ref name="hyperlink"/>
1168
+ <ref name="index"/>
1169
+ <ref name="index-xref"/>
1170
+ </choice>
1171
+ </zeroOrMore>
1172
+ </element>
1173
+ </define>
1174
+ <define name="pure_smallcap">
1110
1175
  <element name="smallcap">
1111
1176
  <zeroOrMore>
1112
1177
  <ref name="PureTextElement"/>
data/lib/metanorma/iho/biblio.rng CHANGED
@@ -1204,7 +1204,9 @@
1204
1204
  <optional>
1205
1205
  <ref name="formattedref"/>
1206
1206
  </optional>
1207
- <ref name="btitle"/>
1207
+ <oneOrMore>
1208
+ <ref name="btitle"/>
1209
+ </oneOrMore>
1208
1210
  <optional>
1209
1211
  <ref name="bplace"/>
1210
1212
  </optional>
data/lib/metanorma/iho/isodoc.rng CHANGED
@@ -662,6 +662,9 @@
662
662
  <value>LatexMath</value>
663
663
  </choice>
664
664
  </attribute>
665
+ <optional>
666
+ <attribute name="number-format"/>
667
+ </optional>
665
668
  <attribute name="block">
666
669
  <data type="boolean"/>
667
670
  </attribute>
data/lib/metanorma/iho/reqt.rng CHANGED
@@ -66,6 +66,9 @@
66
66
  <ref name="MultilingualRenderingType"/>
67
67
  </attribute>
68
68
  </optional>
69
+ <optional>
70
+ <attribute name="class"/>
71
+ </optional>
69
72
  <optional>
70
73
  <ref name="reqtitle"/>
71
74
  </optional>
data/lib/metanorma/iho/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module IHO
3
- VERSION = "1.0.1".freeze
3
+ VERSION = "1.0.2".freeze
4
4
  end
5
5
  end
data/metanorma.yml CHANGED
@@ -26,6 +26,7 @@ header: lib/isodoc/iho/html/header.html
26
26
  wordcoverpage: lib/isodoc/iho/html/word_iho_titlepage.html
27
27
  wordintropage: lib/isodoc/iho/html/word_iho_intro.html
28
28
  wordstylesheet: lib/isodoc/iho/html/wordstyle.scss
29
+ pdf_stylesheet: lib/isodoc/iho/iho.specification.xsl
29
30
  word_bodyfont: 'Arial,sans-serif'
30
31
  word_headerfont: 'Arial,sans-serif'
31
32
  word_monospacefont: '"Fira Code",Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iho
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.0.2
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-08-19 00:00:00.000000000 Z
11
+ date: 2024-09-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic