metanorma-itu 2.3.2 → 2.3.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e4a2af7108e4cc46b5baae30adab35ca6b676562ac34fb83a4ad575a75c0af3f
4
- data.tar.gz: 409987853945566a26ce6b68b90135dd3430fa4ce7b3d564d0103ad795547f01
3
+ metadata.gz: 89153ccca8d96bb635d80f3c5cdf1cd624a830eb7cf438e40ad3fb79d345e833
4
+ data.tar.gz: 0ac5aa2db96f8d8195c8c376b247b231c918b5f2f48d901e0d7cea48fdf53eb3
5
5
  SHA512:
6
- metadata.gz: 6731878ecfb46064d3094c58558bb865b5dd9819a012d2c01f0cfe6e9b63d51b69702860f332b3edaf4581a65d41daecf5a1a301dd298857039b712cf25b5a47
7
- data.tar.gz: b9ee173f2d18f21355540173d566fa3b4eb348147e2947c27316f5e0f38778ec0e94015c98aab0aface77e2ae218d45141e3b8198e91c437bb9dbe90c493532b
6
+ metadata.gz: 56384d0dd8b0bb6311a28576cdcb77ff9af449921b8603e55a353ba570a6c874fa9da03fe16c8b1e7b294c165fa766ab542657a76bc0578955471e76d0461cf7
7
+ data.tar.gz: 4a4c3c5d75c9cbebba0ccf314ad045f048cc0a3e3e8d53b707b948f4b13fd923fe028aaae441d2136b732690818ee342f565440617a7fbbe03d311197cbec727
@@ -596,7 +596,9 @@
596
596
  <xsl:call-template name="setWritingMode"/>
597
597
  <fo:block font-family="Arial" font-size="36pt" font-weight="bold" margin-top="6pt" letter-spacing="2pt"> <!-- Helvetica for letter-spacing working -->
598
598
  <fo:block>
599
- <xsl:value-of select="substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' ')"/>
599
+ <xsl:variable name="docidentifier_left_part" select="normalize-space(substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' '))"/>
600
+ <xsl:value-of select="$docidentifier_left_part"/>
601
+ <xsl:if test="$docidentifier_left_part = ''"><xsl:text>ITU-T</xsl:text></xsl:if>
600
602
  </fo:block>
601
603
  </fo:block>
602
604
  </fo:block-container>
@@ -917,9 +919,12 @@
917
919
  </xsl:call-template>
918
920
  <xsl:text> </xsl:text>
919
921
  </xsl:if>
920
- <xsl:value-of select="$doctypeTitle"/>
921
- <xsl:text>  </xsl:text>
922
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
922
+ <xsl:variable name="identifier" select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
923
+ <xsl:if test="$identifier != ''">
924
+ <xsl:value-of select="$doctypeTitle"/>
925
+ <xsl:text>  </xsl:text>
926
+ <xsl:value-of select="$identifier"/>
927
+ </xsl:if>
923
928
  </xsl:when>
924
929
  <xsl:when test="$doctype = 'implementers-guide'"/>
925
930
  <xsl:when test="$doctype = 'resolution'"/>
@@ -929,15 +934,22 @@
929
934
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement']"/>
930
935
  </xsl:when>
931
936
  <xsl:otherwise>
932
- <xsl:value-of select="$doctypeTitle"/>
933
- <xsl:text>  </xsl:text>
934
- <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
935
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
936
- <xsl:text>-</xsl:text>
937
+ <xsl:variable name="identifier">
938
+ <xsl:text>  </xsl:text>
939
+ <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
940
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
941
+ <xsl:text>-</xsl:text>
942
+ </xsl:if>
943
+ <xsl:if test="$doctype != 'recommendation'">
944
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
945
+ <xsl:text>  </xsl:text>
946
+ </xsl:if>
947
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
948
+ </xsl:variable>
949
+ <xsl:if test="normalize-space(translate($identifier, ' ', '')) != ''">
950
+ <xsl:value-of select="$doctypeTitle"/>
951
+ <xsl:value-of select="$identifier"/>
937
952
  </xsl:if>
938
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
939
- <xsl:text>  </xsl:text>
940
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
941
953
  </xsl:otherwise>
942
954
  </xsl:choose>
943
955
 
@@ -596,7 +596,9 @@
596
596
  <xsl:call-template name="setWritingMode"/>
597
597
  <fo:block font-family="Arial" font-size="36pt" font-weight="bold" margin-top="6pt" letter-spacing="2pt"> <!-- Helvetica for letter-spacing working -->
598
598
  <fo:block>
599
- <xsl:value-of select="substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' ')"/>
599
+ <xsl:variable name="docidentifier_left_part" select="normalize-space(substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' '))"/>
600
+ <xsl:value-of select="$docidentifier_left_part"/>
601
+ <xsl:if test="$docidentifier_left_part = ''"><xsl:text>ITU-T</xsl:text></xsl:if>
600
602
  </fo:block>
601
603
  </fo:block>
602
604
  </fo:block-container>
@@ -917,9 +919,12 @@
917
919
  </xsl:call-template>
918
920
  <xsl:text> </xsl:text>
919
921
  </xsl:if>
920
- <xsl:value-of select="$doctypeTitle"/>
921
- <xsl:text>  </xsl:text>
922
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
922
+ <xsl:variable name="identifier" select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
923
+ <xsl:if test="$identifier != ''">
924
+ <xsl:value-of select="$doctypeTitle"/>
925
+ <xsl:text>  </xsl:text>
926
+ <xsl:value-of select="$identifier"/>
927
+ </xsl:if>
923
928
  </xsl:when>
924
929
  <xsl:when test="$doctype = 'implementers-guide'"/>
925
930
  <xsl:when test="$doctype = 'resolution'"/>
@@ -929,15 +934,22 @@
929
934
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement']"/>
930
935
  </xsl:when>
931
936
  <xsl:otherwise>
932
- <xsl:value-of select="$doctypeTitle"/>
933
- <xsl:text>  </xsl:text>
934
- <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
935
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
936
- <xsl:text>-</xsl:text>
937
+ <xsl:variable name="identifier">
938
+ <xsl:text>  </xsl:text>
939
+ <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
940
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
941
+ <xsl:text>-</xsl:text>
942
+ </xsl:if>
943
+ <xsl:if test="$doctype != 'recommendation'">
944
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
945
+ <xsl:text>  </xsl:text>
946
+ </xsl:if>
947
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
948
+ </xsl:variable>
949
+ <xsl:if test="normalize-space(translate($identifier, ' ', '')) != ''">
950
+ <xsl:value-of select="$doctypeTitle"/>
951
+ <xsl:value-of select="$identifier"/>
937
952
  </xsl:if>
938
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
939
- <xsl:text>  </xsl:text>
940
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
941
953
  </xsl:otherwise>
942
954
  </xsl:choose>
943
955
 
@@ -596,7 +596,9 @@
596
596
  <xsl:call-template name="setWritingMode"/>
597
597
  <fo:block font-family="Arial" font-size="36pt" font-weight="bold" margin-top="6pt" letter-spacing="2pt"> <!-- Helvetica for letter-spacing working -->
598
598
  <fo:block>
599
- <xsl:value-of select="substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' ')"/>
599
+ <xsl:variable name="docidentifier_left_part" select="normalize-space(substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' '))"/>
600
+ <xsl:value-of select="$docidentifier_left_part"/>
601
+ <xsl:if test="$docidentifier_left_part = ''"><xsl:text>ITU-T</xsl:text></xsl:if>
600
602
  </fo:block>
601
603
  </fo:block>
602
604
  </fo:block-container>
@@ -917,9 +919,12 @@
917
919
  </xsl:call-template>
918
920
  <xsl:text> </xsl:text>
919
921
  </xsl:if>
920
- <xsl:value-of select="$doctypeTitle"/>
921
- <xsl:text>  </xsl:text>
922
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
922
+ <xsl:variable name="identifier" select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
923
+ <xsl:if test="$identifier != ''">
924
+ <xsl:value-of select="$doctypeTitle"/>
925
+ <xsl:text>  </xsl:text>
926
+ <xsl:value-of select="$identifier"/>
927
+ </xsl:if>
923
928
  </xsl:when>
924
929
  <xsl:when test="$doctype = 'implementers-guide'"/>
925
930
  <xsl:when test="$doctype = 'resolution'"/>
@@ -929,15 +934,22 @@
929
934
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement']"/>
930
935
  </xsl:when>
931
936
  <xsl:otherwise>
932
- <xsl:value-of select="$doctypeTitle"/>
933
- <xsl:text>  </xsl:text>
934
- <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
935
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
936
- <xsl:text>-</xsl:text>
937
+ <xsl:variable name="identifier">
938
+ <xsl:text>  </xsl:text>
939
+ <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
940
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
941
+ <xsl:text>-</xsl:text>
942
+ </xsl:if>
943
+ <xsl:if test="$doctype != 'recommendation'">
944
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
945
+ <xsl:text>  </xsl:text>
946
+ </xsl:if>
947
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
948
+ </xsl:variable>
949
+ <xsl:if test="normalize-space(translate($identifier, ' ', '')) != ''">
950
+ <xsl:value-of select="$doctypeTitle"/>
951
+ <xsl:value-of select="$identifier"/>
937
952
  </xsl:if>
938
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
939
- <xsl:text>  </xsl:text>
940
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
941
953
  </xsl:otherwise>
942
954
  </xsl:choose>
943
955
 
@@ -596,7 +596,9 @@
596
596
  <xsl:call-template name="setWritingMode"/>
597
597
  <fo:block font-family="Arial" font-size="36pt" font-weight="bold" margin-top="6pt" letter-spacing="2pt"> <!-- Helvetica for letter-spacing working -->
598
598
  <fo:block>
599
- <xsl:value-of select="substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' ')"/>
599
+ <xsl:variable name="docidentifier_left_part" select="normalize-space(substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' '))"/>
600
+ <xsl:value-of select="$docidentifier_left_part"/>
601
+ <xsl:if test="$docidentifier_left_part = ''"><xsl:text>ITU-T</xsl:text></xsl:if>
600
602
  </fo:block>
601
603
  </fo:block>
602
604
  </fo:block-container>
@@ -917,9 +919,12 @@
917
919
  </xsl:call-template>
918
920
  <xsl:text> </xsl:text>
919
921
  </xsl:if>
920
- <xsl:value-of select="$doctypeTitle"/>
921
- <xsl:text>  </xsl:text>
922
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
922
+ <xsl:variable name="identifier" select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
923
+ <xsl:if test="$identifier != ''">
924
+ <xsl:value-of select="$doctypeTitle"/>
925
+ <xsl:text>  </xsl:text>
926
+ <xsl:value-of select="$identifier"/>
927
+ </xsl:if>
923
928
  </xsl:when>
924
929
  <xsl:when test="$doctype = 'implementers-guide'"/>
925
930
  <xsl:when test="$doctype = 'resolution'"/>
@@ -929,15 +934,22 @@
929
934
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement']"/>
930
935
  </xsl:when>
931
936
  <xsl:otherwise>
932
- <xsl:value-of select="$doctypeTitle"/>
933
- <xsl:text>  </xsl:text>
934
- <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
935
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
936
- <xsl:text>-</xsl:text>
937
+ <xsl:variable name="identifier">
938
+ <xsl:text>  </xsl:text>
939
+ <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
940
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
941
+ <xsl:text>-</xsl:text>
942
+ </xsl:if>
943
+ <xsl:if test="$doctype != 'recommendation'">
944
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
945
+ <xsl:text>  </xsl:text>
946
+ </xsl:if>
947
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
948
+ </xsl:variable>
949
+ <xsl:if test="normalize-space(translate($identifier, ' ', '')) != ''">
950
+ <xsl:value-of select="$doctypeTitle"/>
951
+ <xsl:value-of select="$identifier"/>
937
952
  </xsl:if>
938
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
939
- <xsl:text>  </xsl:text>
940
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
941
953
  </xsl:otherwise>
942
954
  </xsl:choose>
943
955
 
@@ -596,7 +596,9 @@
596
596
  <xsl:call-template name="setWritingMode"/>
597
597
  <fo:block font-family="Arial" font-size="36pt" font-weight="bold" margin-top="6pt" letter-spacing="2pt"> <!-- Helvetica for letter-spacing working -->
598
598
  <fo:block>
599
- <xsl:value-of select="substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' ')"/>
599
+ <xsl:variable name="docidentifier_left_part" select="normalize-space(substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' '))"/>
600
+ <xsl:value-of select="$docidentifier_left_part"/>
601
+ <xsl:if test="$docidentifier_left_part = ''"><xsl:text>ITU-T</xsl:text></xsl:if>
600
602
  </fo:block>
601
603
  </fo:block>
602
604
  </fo:block-container>
@@ -917,9 +919,12 @@
917
919
  </xsl:call-template>
918
920
  <xsl:text> </xsl:text>
919
921
  </xsl:if>
920
- <xsl:value-of select="$doctypeTitle"/>
921
- <xsl:text>  </xsl:text>
922
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
922
+ <xsl:variable name="identifier" select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
923
+ <xsl:if test="$identifier != ''">
924
+ <xsl:value-of select="$doctypeTitle"/>
925
+ <xsl:text>  </xsl:text>
926
+ <xsl:value-of select="$identifier"/>
927
+ </xsl:if>
923
928
  </xsl:when>
924
929
  <xsl:when test="$doctype = 'implementers-guide'"/>
925
930
  <xsl:when test="$doctype = 'resolution'"/>
@@ -929,15 +934,22 @@
929
934
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement']"/>
930
935
  </xsl:when>
931
936
  <xsl:otherwise>
932
- <xsl:value-of select="$doctypeTitle"/>
933
- <xsl:text>  </xsl:text>
934
- <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
935
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
936
- <xsl:text>-</xsl:text>
937
+ <xsl:variable name="identifier">
938
+ <xsl:text>  </xsl:text>
939
+ <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
940
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
941
+ <xsl:text>-</xsl:text>
942
+ </xsl:if>
943
+ <xsl:if test="$doctype != 'recommendation'">
944
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
945
+ <xsl:text>  </xsl:text>
946
+ </xsl:if>
947
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
948
+ </xsl:variable>
949
+ <xsl:if test="normalize-space(translate($identifier, ' ', '')) != ''">
950
+ <xsl:value-of select="$doctypeTitle"/>
951
+ <xsl:value-of select="$identifier"/>
937
952
  </xsl:if>
938
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
939
- <xsl:text>  </xsl:text>
940
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
941
953
  </xsl:otherwise>
942
954
  </xsl:choose>
943
955
 
@@ -596,7 +596,9 @@
596
596
  <xsl:call-template name="setWritingMode"/>
597
597
  <fo:block font-family="Arial" font-size="36pt" font-weight="bold" margin-top="6pt" letter-spacing="2pt"> <!-- Helvetica for letter-spacing working -->
598
598
  <fo:block>
599
- <xsl:value-of select="substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' ')"/>
599
+ <xsl:variable name="docidentifier_left_part" select="normalize-space(substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' '))"/>
600
+ <xsl:value-of select="$docidentifier_left_part"/>
601
+ <xsl:if test="$docidentifier_left_part = ''"><xsl:text>ITU-T</xsl:text></xsl:if>
600
602
  </fo:block>
601
603
  </fo:block>
602
604
  </fo:block-container>
@@ -917,9 +919,12 @@
917
919
  </xsl:call-template>
918
920
  <xsl:text> </xsl:text>
919
921
  </xsl:if>
920
- <xsl:value-of select="$doctypeTitle"/>
921
- <xsl:text>  </xsl:text>
922
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
922
+ <xsl:variable name="identifier" select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
923
+ <xsl:if test="$identifier != ''">
924
+ <xsl:value-of select="$doctypeTitle"/>
925
+ <xsl:text>  </xsl:text>
926
+ <xsl:value-of select="$identifier"/>
927
+ </xsl:if>
923
928
  </xsl:when>
924
929
  <xsl:when test="$doctype = 'implementers-guide'"/>
925
930
  <xsl:when test="$doctype = 'resolution'"/>
@@ -929,15 +934,22 @@
929
934
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement']"/>
930
935
  </xsl:when>
931
936
  <xsl:otherwise>
932
- <xsl:value-of select="$doctypeTitle"/>
933
- <xsl:text>  </xsl:text>
934
- <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
935
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
936
- <xsl:text>-</xsl:text>
937
+ <xsl:variable name="identifier">
938
+ <xsl:text>  </xsl:text>
939
+ <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
940
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
941
+ <xsl:text>-</xsl:text>
942
+ </xsl:if>
943
+ <xsl:if test="$doctype != 'recommendation'">
944
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
945
+ <xsl:text>  </xsl:text>
946
+ </xsl:if>
947
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
948
+ </xsl:variable>
949
+ <xsl:if test="normalize-space(translate($identifier, ' ', '')) != ''">
950
+ <xsl:value-of select="$doctypeTitle"/>
951
+ <xsl:value-of select="$identifier"/>
937
952
  </xsl:if>
938
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
939
- <xsl:text>  </xsl:text>
940
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
941
953
  </xsl:otherwise>
942
954
  </xsl:choose>
943
955
 
@@ -596,7 +596,9 @@
596
596
  <xsl:call-template name="setWritingMode"/>
597
597
  <fo:block font-family="Arial" font-size="36pt" font-weight="bold" margin-top="6pt" letter-spacing="2pt"> <!-- Helvetica for letter-spacing working -->
598
598
  <fo:block>
599
- <xsl:value-of select="substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' ')"/>
599
+ <xsl:variable name="docidentifier_left_part" select="normalize-space(substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' '))"/>
600
+ <xsl:value-of select="$docidentifier_left_part"/>
601
+ <xsl:if test="$docidentifier_left_part = ''"><xsl:text>ITU-T</xsl:text></xsl:if>
600
602
  </fo:block>
601
603
  </fo:block>
602
604
  </fo:block-container>
@@ -917,9 +919,12 @@
917
919
  </xsl:call-template>
918
920
  <xsl:text> </xsl:text>
919
921
  </xsl:if>
920
- <xsl:value-of select="$doctypeTitle"/>
921
- <xsl:text>  </xsl:text>
922
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
922
+ <xsl:variable name="identifier" select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
923
+ <xsl:if test="$identifier != ''">
924
+ <xsl:value-of select="$doctypeTitle"/>
925
+ <xsl:text>  </xsl:text>
926
+ <xsl:value-of select="$identifier"/>
927
+ </xsl:if>
923
928
  </xsl:when>
924
929
  <xsl:when test="$doctype = 'implementers-guide'"/>
925
930
  <xsl:when test="$doctype = 'resolution'"/>
@@ -929,15 +934,22 @@
929
934
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement']"/>
930
935
  </xsl:when>
931
936
  <xsl:otherwise>
932
- <xsl:value-of select="$doctypeTitle"/>
933
- <xsl:text>  </xsl:text>
934
- <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
935
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
936
- <xsl:text>-</xsl:text>
937
+ <xsl:variable name="identifier">
938
+ <xsl:text>  </xsl:text>
939
+ <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
940
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
941
+ <xsl:text>-</xsl:text>
942
+ </xsl:if>
943
+ <xsl:if test="$doctype != 'recommendation'">
944
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
945
+ <xsl:text>  </xsl:text>
946
+ </xsl:if>
947
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
948
+ </xsl:variable>
949
+ <xsl:if test="normalize-space(translate($identifier, ' ', '')) != ''">
950
+ <xsl:value-of select="$doctypeTitle"/>
951
+ <xsl:value-of select="$identifier"/>
937
952
  </xsl:if>
938
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
939
- <xsl:text>  </xsl:text>
940
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
941
953
  </xsl:otherwise>
942
954
  </xsl:choose>
943
955
 
@@ -596,7 +596,9 @@
596
596
  <xsl:call-template name="setWritingMode"/>
597
597
  <fo:block font-family="Arial" font-size="36pt" font-weight="bold" margin-top="6pt" letter-spacing="2pt"> <!-- Helvetica for letter-spacing working -->
598
598
  <fo:block>
599
- <xsl:value-of select="substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' ')"/>
599
+ <xsl:variable name="docidentifier_left_part" select="normalize-space(substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' '))"/>
600
+ <xsl:value-of select="$docidentifier_left_part"/>
601
+ <xsl:if test="$docidentifier_left_part = ''"><xsl:text>ITU-T</xsl:text></xsl:if>
600
602
  </fo:block>
601
603
  </fo:block>
602
604
  </fo:block-container>
@@ -917,9 +919,12 @@
917
919
  </xsl:call-template>
918
920
  <xsl:text> </xsl:text>
919
921
  </xsl:if>
920
- <xsl:value-of select="$doctypeTitle"/>
921
- <xsl:text>  </xsl:text>
922
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
922
+ <xsl:variable name="identifier" select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
923
+ <xsl:if test="$identifier != ''">
924
+ <xsl:value-of select="$doctypeTitle"/>
925
+ <xsl:text>  </xsl:text>
926
+ <xsl:value-of select="$identifier"/>
927
+ </xsl:if>
923
928
  </xsl:when>
924
929
  <xsl:when test="$doctype = 'implementers-guide'"/>
925
930
  <xsl:when test="$doctype = 'resolution'"/>
@@ -929,15 +934,22 @@
929
934
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement']"/>
930
935
  </xsl:when>
931
936
  <xsl:otherwise>
932
- <xsl:value-of select="$doctypeTitle"/>
933
- <xsl:text>  </xsl:text>
934
- <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
935
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
936
- <xsl:text>-</xsl:text>
937
+ <xsl:variable name="identifier">
938
+ <xsl:text>  </xsl:text>
939
+ <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
940
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
941
+ <xsl:text>-</xsl:text>
942
+ </xsl:if>
943
+ <xsl:if test="$doctype != 'recommendation'">
944
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
945
+ <xsl:text>  </xsl:text>
946
+ </xsl:if>
947
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
948
+ </xsl:variable>
949
+ <xsl:if test="normalize-space(translate($identifier, ' ', '')) != ''">
950
+ <xsl:value-of select="$doctypeTitle"/>
951
+ <xsl:value-of select="$identifier"/>
937
952
  </xsl:if>
938
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
939
- <xsl:text>  </xsl:text>
940
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
941
953
  </xsl:otherwise>
942
954
  </xsl:choose>
943
955
 
@@ -596,7 +596,9 @@
596
596
  <xsl:call-template name="setWritingMode"/>
597
597
  <fo:block font-family="Arial" font-size="36pt" font-weight="bold" margin-top="6pt" letter-spacing="2pt"> <!-- Helvetica for letter-spacing working -->
598
598
  <fo:block>
599
- <xsl:value-of select="substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' ')"/>
599
+ <xsl:variable name="docidentifier_left_part" select="normalize-space(substring-before(/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU'], ' '))"/>
600
+ <xsl:value-of select="$docidentifier_left_part"/>
601
+ <xsl:if test="$docidentifier_left_part = ''"><xsl:text>ITU-T</xsl:text></xsl:if>
600
602
  </fo:block>
601
603
  </fo:block>
602
604
  </fo:block-container>
@@ -917,9 +919,12 @@
917
919
  </xsl:call-template>
918
920
  <xsl:text> </xsl:text>
919
921
  </xsl:if>
920
- <xsl:value-of select="$doctypeTitle"/>
921
- <xsl:text>  </xsl:text>
922
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
922
+ <xsl:variable name="identifier" select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type='ITU']"/>
923
+ <xsl:if test="$identifier != ''">
924
+ <xsl:value-of select="$doctypeTitle"/>
925
+ <xsl:text>  </xsl:text>
926
+ <xsl:value-of select="$identifier"/>
927
+ </xsl:if>
923
928
  </xsl:when>
924
929
  <xsl:when test="$doctype = 'implementers-guide'"/>
925
930
  <xsl:when test="$doctype = 'resolution'"/>
@@ -929,15 +934,22 @@
929
934
  <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement']"/>
930
935
  </xsl:when>
931
936
  <xsl:otherwise>
932
- <xsl:value-of select="$doctypeTitle"/>
933
- <xsl:text>  </xsl:text>
934
- <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
935
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
936
- <xsl:text>-</xsl:text>
937
+ <xsl:variable name="identifier">
938
+ <xsl:text>  </xsl:text>
939
+ <xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation">
940
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:contributor/itu:organization/itu:abbreviation"/>
941
+ <xsl:text>-</xsl:text>
942
+ </xsl:if>
943
+ <xsl:if test="$doctype != 'recommendation'">
944
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
945
+ <xsl:text>  </xsl:text>
946
+ </xsl:if>
947
+ <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
948
+ </xsl:variable>
949
+ <xsl:if test="normalize-space(translate($identifier, ' ', '')) != ''">
950
+ <xsl:value-of select="$doctypeTitle"/>
951
+ <xsl:value-of select="$identifier"/>
937
952
  </xsl:if>
938
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:bureau"/>
939
- <xsl:text>  </xsl:text>
940
- <xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
941
953
  </xsl:otherwise>
942
954
  </xsl:choose>
943
955
 
@@ -346,6 +346,8 @@
346
346
  <ref name="keyword"/>
347
347
  <ref name="xref"/>
348
348
  <ref name="hyperlink"/>
349
+ <ref name="index"/>
350
+ <ref name="index-xref"/>
349
351
  </choice>
350
352
  </oneOrMore>
351
353
  </element>
@@ -623,6 +625,8 @@
623
625
  <ref name="eref"/>
624
626
  <ref name="xref"/>
625
627
  <ref name="hyperlink"/>
628
+ <ref name="index"/>
629
+ <ref name="index-xref"/>
626
630
  </choice>
627
631
  </zeroOrMore>
628
632
  </element>
@@ -636,6 +640,8 @@
636
640
  <ref name="eref"/>
637
641
  <ref name="xref"/>
638
642
  <ref name="hyperlink"/>
643
+ <ref name="index"/>
644
+ <ref name="index-xref"/>
639
645
  </choice>
640
646
  </zeroOrMore>
641
647
  </element>
@@ -648,6 +654,8 @@
648
654
  <ref name="eref"/>
649
655
  <ref name="xref"/>
650
656
  <ref name="hyperlink"/>
657
+ <ref name="index"/>
658
+ <ref name="index-xref"/>
651
659
  </choice>
652
660
  </zeroOrMore>
653
661
  </element>
@@ -655,7 +663,11 @@
655
663
  <define name="keyword">
656
664
  <element name="keyword">
657
665
  <zeroOrMore>
658
- <ref name="PureTextElement"/>
666
+ <choice>
667
+ <ref name="PureTextElement"/>
668
+ <ref name="index"/>
669
+ <ref name="index-xref"/>
670
+ </choice>
659
671
  </zeroOrMore>
660
672
  </element>
661
673
  </define>
@@ -676,7 +688,11 @@
676
688
  <define name="strike">
677
689
  <element name="strike">
678
690
  <zeroOrMore>
679
- <ref name="PureTextElement"/>
691
+ <choice>
692
+ <ref name="PureTextElement"/>
693
+ <ref name="index"/>
694
+ <ref name="index-xref"/>
695
+ </choice>
680
696
  </zeroOrMore>
681
697
  </element>
682
698
  </define>
@@ -1283,7 +1283,7 @@
1283
1283
  <value>mergedInto</value>
1284
1284
  <value>splits</value>
1285
1285
  <value>splitInto</value>
1286
- <value>instance</value>
1286
+ <value>instanceOf</value>
1287
1287
  <value>hasInstance</value>
1288
1288
  <value>exemplarOf</value>
1289
1289
  <value>hasExemplar</value>
@@ -138,7 +138,9 @@ module Metanorma
138
138
  end
139
139
 
140
140
  def presentation_xml_converter(node)
141
- IsoDoc::ITU::PresentationXMLConvert.new(html_extract_attributes(node))
141
+ IsoDoc::ITU::PresentationXMLConvert
142
+ .new(html_extract_attributes(node)
143
+ .merge(output_formats: ::Metanorma::ITU::Processor.new.output_formats))
142
144
  end
143
145
 
144
146
  def html_converter(node)
@@ -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.4 -->
20
+ <!-- VERSION v1.2.6 -->
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">
@@ -485,6 +485,8 @@
485
485
  <choice>
486
486
  <text/>
487
487
  <ref name="callout"/>
488
+ <ref name="xref"/>
489
+ <ref name="eref"/>
488
490
  </choice>
489
491
  </oneOrMore>
490
492
  <zeroOrMore>
@@ -865,6 +867,7 @@
865
867
  <ref name="PureTextElement"/>
866
868
  <ref name="stem"/>
867
869
  <ref name="index"/>
870
+ <ref name="index-xref"/>
868
871
  <ref name="eref"/>
869
872
  <ref name="erefstack"/>
870
873
  <ref name="xref"/>
@@ -880,6 +883,7 @@
880
883
  <ref name="PureTextElement"/>
881
884
  <ref name="stem"/>
882
885
  <ref name="index"/>
886
+ <ref name="index-xref"/>
883
887
  <ref name="eref"/>
884
888
  <ref name="erefstack"/>
885
889
  <ref name="xref"/>
@@ -894,6 +898,7 @@
894
898
  <choice>
895
899
  <ref name="PureTextElement"/>
896
900
  <ref name="index"/>
901
+ <ref name="index-xref"/>
897
902
  <ref name="eref"/>
898
903
  <ref name="erefstack"/>
899
904
  <ref name="xref"/>
@@ -908,6 +913,7 @@
908
913
  <choice>
909
914
  <ref name="PureTextElement"/>
910
915
  <ref name="index"/>
916
+ <ref name="index-xref"/>
911
917
  </choice>
912
918
  </zeroOrMore>
913
919
  </element>
@@ -918,6 +924,7 @@
918
924
  <choice>
919
925
  <ref name="PureTextElement"/>
920
926
  <ref name="index"/>
927
+ <ref name="index-xref"/>
921
928
  </choice>
922
929
  </zeroOrMore>
923
930
  </element>
@@ -928,6 +935,7 @@
928
935
  <choice>
929
936
  <ref name="PureTextElement"/>
930
937
  <ref name="index"/>
938
+ <ref name="index-xref"/>
931
939
  </choice>
932
940
  </zeroOrMore>
933
941
  </element>
@@ -938,6 +946,7 @@
938
946
  <choice>
939
947
  <ref name="PureTextElement"/>
940
948
  <ref name="index"/>
949
+ <ref name="index-xref"/>
941
950
  </choice>
942
951
  </zeroOrMore>
943
952
  </element>
@@ -1004,6 +1013,14 @@
1004
1013
  </oneOrMore>
1005
1014
  </element>
1006
1015
  </define>
1016
+ <define name="BasicBlock" combine="choice">
1017
+ <ref name="columnbreak"/>
1018
+ </define>
1019
+ <define name="columnbreak">
1020
+ <element name="columnbreak">
1021
+ <empty/>
1022
+ </element>
1023
+ </define>
1007
1024
  <define name="MultilingualRenderingType">
1008
1025
  <choice>
1009
1026
  <value>common</value>
@@ -1047,6 +1064,8 @@
1047
1064
  <ref name="keyword"/>
1048
1065
  <ref name="xref"/>
1049
1066
  <ref name="hyperlink"/>
1067
+ <ref name="index"/>
1068
+ <ref name="index-xref"/>
1050
1069
  </choice>
1051
1070
  </element>
1052
1071
  </define>
@@ -1060,6 +1079,8 @@
1060
1079
  <ref name="keyword"/>
1061
1080
  <ref name="xref"/>
1062
1081
  <ref name="hyperlink"/>
1082
+ <ref name="index"/>
1083
+ <ref name="index-xref"/>
1063
1084
  </choice>
1064
1085
  </element>
1065
1086
  </define>
@@ -1126,6 +1147,8 @@
1126
1147
  <choice>
1127
1148
  <ref name="PureTextElement"/>
1128
1149
  <ref name="stem"/>
1150
+ <ref name="index"/>
1151
+ <ref name="index-xref"/>
1129
1152
  </choice>
1130
1153
  </zeroOrMore>
1131
1154
  </element>
@@ -1136,6 +1159,8 @@
1136
1159
  <choice>
1137
1160
  <ref name="PureTextElement"/>
1138
1161
  <ref name="stem"/>
1162
+ <ref name="index"/>
1163
+ <ref name="index-xref"/>
1139
1164
  </choice>
1140
1165
  </zeroOrMore>
1141
1166
  </element>
@@ -34,6 +34,7 @@ module Metanorma
34
34
  end
35
35
 
36
36
  def output(isodoc_node, inname, outname, format, options={})
37
+ options_preprocess(options)
37
38
  case format
38
39
  when :html
39
40
  IsoDoc::ITU::HtmlConvert.new(options).convert(inname, isodoc_node,
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module ITU
3
- VERSION = "2.3.2".freeze
3
+ VERSION = "2.3.3".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-itu
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.2
4
+ version: 2.3.3
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-09-11 00:00:00.000000000 Z
11
+ date: 2023-11-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-standoc