metanorma-itu 1.2.8 → 1.2.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (27) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/itu/basicdoc.rng +32 -0
  3. data/lib/asciidoctor/itu/boilerplate.xml +3 -0
  4. data/lib/asciidoctor/itu/front.rb +19 -3
  5. data/lib/asciidoctor/itu/isodoc.rng +15 -0
  6. data/lib/asciidoctor/itu/validate.rb +1 -1
  7. data/lib/isodoc/itu/html/header.html +8 -16
  8. data/lib/isodoc/itu/html/html_itu_intro.html +4 -3
  9. data/lib/isodoc/itu/html/html_itu_titlepage.html +3 -0
  10. data/lib/isodoc/itu/html/htmlstyle.css +12 -0
  11. data/lib/isodoc/itu/html/htmlstyle.scss +1 -0
  12. data/lib/isodoc/itu/html/logo-sp.png +0 -0
  13. data/lib/isodoc/itu/html/word_itu_intro.html +11 -3
  14. data/lib/isodoc/itu/html/word_itu_titlepage.html +5 -1
  15. data/lib/isodoc/itu/html/word_itu_titlepage_sp.html +108 -0
  16. data/lib/isodoc/itu/i18n-en.yaml +28 -0
  17. data/lib/isodoc/itu/itu.recommendation-annex.xsl +65 -28
  18. data/lib/isodoc/itu/itu.recommendation.xsl +65 -28
  19. data/lib/isodoc/itu/itu.resolution.xsl +65 -28
  20. data/lib/isodoc/itu/itu.technical-paper.xsl +65 -28
  21. data/lib/isodoc/itu/itu.technical-report.xsl +65 -28
  22. data/lib/isodoc/itu/metadata.rb +16 -2
  23. data/lib/isodoc/itu/presentation_xml_convert.rb +52 -0
  24. data/lib/isodoc/itu/word_cleanup.rb +1 -0
  25. data/lib/isodoc/itu/word_convert.rb +9 -0
  26. data/lib/metanorma/itu/version.rb +1 -1
  27. metadata +4 -2
data/lib/isodoc/itu/i18n-en.yaml CHANGED
@@ -41,6 +41,20 @@ clause_empty:
41
41
  None.
42
42
  amendment: Amendment
43
43
  corrigendum: Corrigendum
44
+ table_of_contents: Table of Contents
45
+ page: Page
46
+ placedate: Geneva, %
47
+ annex_to_itu_ob: Annex to ITU Operational Bulletin
48
+ number_abbrev: No.
49
+ annex_to_itu_ob_abbrev: Annex to ITU OB %
50
+ international_telecommunication_union: International Telecommunication Union
51
+ position_on: (Position on %)
52
+ tsb: TSB
53
+ br: BR
54
+ bdt: BDT
55
+ tsb_full: Telecommunication<br/>Standardization Bureau<br/>of ITU
56
+ br_full: Radiocommunication Bureau<br/>of ITU
57
+ bdt_full: Telecommunication<br/>Development Bureau<br/>of ITU
44
58
  doctype_dict:
45
59
  recommendation: Recommendation
46
60
  recommendation-supplement: Recommendation Supplement
@@ -53,3 +67,17 @@ doctype_dict:
53
67
  technical-paper: Technical Paper
54
68
  technical-report: Technical Report
55
69
  joint-itu-iso-iec: Joint ITU/ISO/IEC
70
+ service-publication: Service Publication
71
+ doctype_abbrev:
72
+ recommendation: Rec.
73
+ recommendation-supplement: Rec.
74
+ recommendation-amendment: Rec.
75
+ recommendation-corrigendum: Rec.
76
+ recommendation-errata: Rec.
77
+ recommendation-annex: Rec.
78
+ focus-group: FG
79
+ implementers-guide: Imp.
80
+ technical-paper: TP
81
+ technical-report: TR
82
+ joint-itu-iso-iec: ITU/ISO/IEC
83
+ service-publication:
data/lib/isodoc/itu/itu.recommendation-annex.xsl CHANGED
@@ -891,13 +891,13 @@
891
891
  <!-- for Ordered Lists -->
892
892
  <xsl:choose>
893
893
  <xsl:when test="../@type = 'arabic'">
894
- <xsl:number format="a)"/>
894
+ <xsl:number format="a)" lang="en"/>
895
895
  </xsl:when>
896
896
  <xsl:when test="../@class = 'steps'">
897
897
  <xsl:number format="1)"/>
898
898
  </xsl:when>
899
899
  <xsl:when test="$level = 1">
900
- <xsl:number format="a)"/>
900
+ <xsl:number format="a)" lang="en"/>
901
901
  </xsl:when>
902
902
  <xsl:when test="$level = 2">
903
903
  <xsl:number format="i)"/>
@@ -2165,10 +2165,12 @@
2165
2165
 
2166
2166
 
2167
2167
  <xsl:variable name="colwidths">
2168
- <xsl:call-template name="calculate-column-widths">
2169
- <xsl:with-param name="cols-count" select="$cols-count"/>
2170
- <xsl:with-param name="table" select="$simple-table"/>
2171
- </xsl:call-template>
2168
+ <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
2169
+ <xsl:call-template name="calculate-column-widths">
2170
+ <xsl:with-param name="cols-count" select="$cols-count"/>
2171
+ <xsl:with-param name="table" select="$simple-table"/>
2172
+ </xsl:call-template>
2173
+ </xsl:if>
2172
2174
  </xsl:variable>
2173
2175
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
2174
2176
 
@@ -2247,16 +2249,25 @@
2247
2249
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
2248
2250
  </xsl:if>
2249
2251
 
2250
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
2251
- <xsl:choose>
2252
- <xsl:when test=". = 1 or . = 0">
2253
- <fo:table-column column-width="proportional-column-width(2)"/>
2254
- </xsl:when>
2255
- <xsl:otherwise>
2256
- <fo:table-column column-width="proportional-column-width({.})"/>
2257
- </xsl:otherwise>
2258
- </xsl:choose>
2259
- </xsl:for-each>
2252
+ <xsl:choose>
2253
+ <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
2254
+ <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
2255
+ <fo:table-column column-width="{@width}"/>
2256
+ </xsl:for-each>
2257
+ </xsl:when>
2258
+ <xsl:otherwise>
2259
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
2260
+ <xsl:choose>
2261
+ <xsl:when test=". = 1 or . = 0">
2262
+ <fo:table-column column-width="proportional-column-width(2)"/>
2263
+ </xsl:when>
2264
+ <xsl:otherwise>
2265
+ <fo:table-column column-width="proportional-column-width({.})"/>
2266
+ </xsl:otherwise>
2267
+ </xsl:choose>
2268
+ </xsl:for-each>
2269
+ </xsl:otherwise>
2270
+ </xsl:choose>
2260
2271
 
2261
2272
  <xsl:choose>
2262
2273
  <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
@@ -2269,10 +2280,12 @@
2269
2280
 
2270
2281
  </fo:table>
2271
2282
 
2283
+ <xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
2272
2284
  <xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
2273
2285
  <xsl:call-template name="insertTableFooterInSeparateTable">
2274
2286
  <xsl:with-param name="table_attributes" select="$table_attributes"/>
2275
2287
  <xsl:with-param name="colwidths" select="$colwidths"/>
2288
+ <xsl:with-param name="colgroup" select="$colgroup"/>
2276
2289
  </xsl:call-template>
2277
2290
  </xsl:for-each>
2278
2291
 
@@ -2530,12 +2543,22 @@
2530
2543
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
2531
2544
  <xsl:param name="table_attributes"/>
2532
2545
  <xsl:param name="colwidths"/>
2546
+ <xsl:param name="colgroup"/>
2533
2547
 
2534
2548
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
2535
2549
 
2536
2550
  <xsl:if test="$isNoteOrFnExist = 'true'">
2537
2551
 
2538
- <xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
2552
+ <xsl:variable name="cols-count">
2553
+ <xsl:choose>
2554
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
2555
+ <xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
2556
+ </xsl:when>
2557
+ <xsl:otherwise>
2558
+ <xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
2559
+ </xsl:otherwise>
2560
+ </xsl:choose>
2561
+ </xsl:variable>
2539
2562
 
2540
2563
  <fo:table keep-with-previous="always">
2541
2564
  <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
@@ -2553,16 +2576,25 @@
2553
2576
  </xsl:choose>
2554
2577
  </xsl:for-each>
2555
2578
 
2556
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
2557
- <xsl:choose>
2558
- <xsl:when test=". = 1 or . = 0">
2559
- <fo:table-column column-width="proportional-column-width(2)"/>
2560
- </xsl:when>
2561
- <xsl:otherwise>
2562
- <fo:table-column column-width="proportional-column-width({.})"/>
2563
- </xsl:otherwise>
2564
- </xsl:choose>
2565
- </xsl:for-each>
2579
+ <xsl:choose>
2580
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
2581
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
2582
+ <fo:table-column column-width="{@width}"/>
2583
+ </xsl:for-each>
2584
+ </xsl:when>
2585
+ <xsl:otherwise>
2586
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
2587
+ <xsl:choose>
2588
+ <xsl:when test=". = 1 or . = 0">
2589
+ <fo:table-column column-width="proportional-column-width(2)"/>
2590
+ </xsl:when>
2591
+ <xsl:otherwise>
2592
+ <fo:table-column column-width="proportional-column-width({.})"/>
2593
+ </xsl:otherwise>
2594
+ </xsl:choose>
2595
+ </xsl:for-each>
2596
+ </xsl:otherwise>
2597
+ </xsl:choose>
2566
2598
 
2567
2599
  <fo:table-body>
2568
2600
  <fo:table-row>
@@ -4787,7 +4819,8 @@
4787
4819
  <fo:table-column column-width="107mm"/>
4788
4820
  <fo:table-column column-width="15mm"/>
4789
4821
  <fo:table-body>
4790
- <fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
4822
+ <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
4823
+
4791
4824
  <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
4792
4825
  <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
4793
4826
  <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
@@ -4805,6 +4838,10 @@
4805
4838
  <fo:block><xsl:apply-templates/></fo:block>
4806
4839
  </fo:table-cell>
4807
4840
  </xsl:template><xsl:template name="processBibitem">
4841
+
4842
+
4843
+ <!-- end BIPM bibitem processing-->
4844
+
4808
4845
 
4809
4846
 
4810
4847
 
data/lib/isodoc/itu/itu.recommendation.xsl CHANGED
@@ -891,13 +891,13 @@
891
891
  <!-- for Ordered Lists -->
892
892
  <xsl:choose>
893
893
  <xsl:when test="../@type = 'arabic'">
894
- <xsl:number format="a)"/>
894
+ <xsl:number format="a)" lang="en"/>
895
895
  </xsl:when>
896
896
  <xsl:when test="../@class = 'steps'">
897
897
  <xsl:number format="1)"/>
898
898
  </xsl:when>
899
899
  <xsl:when test="$level = 1">
900
- <xsl:number format="a)"/>
900
+ <xsl:number format="a)" lang="en"/>
901
901
  </xsl:when>
902
902
  <xsl:when test="$level = 2">
903
903
  <xsl:number format="i)"/>
@@ -2165,10 +2165,12 @@
2165
2165
 
2166
2166
 
2167
2167
  <xsl:variable name="colwidths">
2168
- <xsl:call-template name="calculate-column-widths">
2169
- <xsl:with-param name="cols-count" select="$cols-count"/>
2170
- <xsl:with-param name="table" select="$simple-table"/>
2171
- </xsl:call-template>
2168
+ <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
2169
+ <xsl:call-template name="calculate-column-widths">
2170
+ <xsl:with-param name="cols-count" select="$cols-count"/>
2171
+ <xsl:with-param name="table" select="$simple-table"/>
2172
+ </xsl:call-template>
2173
+ </xsl:if>
2172
2174
  </xsl:variable>
2173
2175
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
2174
2176
 
@@ -2247,16 +2249,25 @@
2247
2249
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
2248
2250
  </xsl:if>
2249
2251
 
2250
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
2251
- <xsl:choose>
2252
- <xsl:when test=". = 1 or . = 0">
2253
- <fo:table-column column-width="proportional-column-width(2)"/>
2254
- </xsl:when>
2255
- <xsl:otherwise>
2256
- <fo:table-column column-width="proportional-column-width({.})"/>
2257
- </xsl:otherwise>
2258
- </xsl:choose>
2259
- </xsl:for-each>
2252
+ <xsl:choose>
2253
+ <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
2254
+ <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
2255
+ <fo:table-column column-width="{@width}"/>
2256
+ </xsl:for-each>
2257
+ </xsl:when>
2258
+ <xsl:otherwise>
2259
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
2260
+ <xsl:choose>
2261
+ <xsl:when test=". = 1 or . = 0">
2262
+ <fo:table-column column-width="proportional-column-width(2)"/>
2263
+ </xsl:when>
2264
+ <xsl:otherwise>
2265
+ <fo:table-column column-width="proportional-column-width({.})"/>
2266
+ </xsl:otherwise>
2267
+ </xsl:choose>
2268
+ </xsl:for-each>
2269
+ </xsl:otherwise>
2270
+ </xsl:choose>
2260
2271
 
2261
2272
  <xsl:choose>
2262
2273
  <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
@@ -2269,10 +2280,12 @@
2269
2280
 
2270
2281
  </fo:table>
2271
2282
 
2283
+ <xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
2272
2284
  <xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
2273
2285
  <xsl:call-template name="insertTableFooterInSeparateTable">
2274
2286
  <xsl:with-param name="table_attributes" select="$table_attributes"/>
2275
2287
  <xsl:with-param name="colwidths" select="$colwidths"/>
2288
+ <xsl:with-param name="colgroup" select="$colgroup"/>
2276
2289
  </xsl:call-template>
2277
2290
  </xsl:for-each>
2278
2291
 
@@ -2530,12 +2543,22 @@
2530
2543
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
2531
2544
  <xsl:param name="table_attributes"/>
2532
2545
  <xsl:param name="colwidths"/>
2546
+ <xsl:param name="colgroup"/>
2533
2547
 
2534
2548
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
2535
2549
 
2536
2550
  <xsl:if test="$isNoteOrFnExist = 'true'">
2537
2551
 
2538
- <xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
2552
+ <xsl:variable name="cols-count">
2553
+ <xsl:choose>
2554
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
2555
+ <xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
2556
+ </xsl:when>
2557
+ <xsl:otherwise>
2558
+ <xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
2559
+ </xsl:otherwise>
2560
+ </xsl:choose>
2561
+ </xsl:variable>
2539
2562
 
2540
2563
  <fo:table keep-with-previous="always">
2541
2564
  <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
@@ -2553,16 +2576,25 @@
2553
2576
  </xsl:choose>
2554
2577
  </xsl:for-each>
2555
2578
 
2556
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
2557
- <xsl:choose>
2558
- <xsl:when test=". = 1 or . = 0">
2559
- <fo:table-column column-width="proportional-column-width(2)"/>
2560
- </xsl:when>
2561
- <xsl:otherwise>
2562
- <fo:table-column column-width="proportional-column-width({.})"/>
2563
- </xsl:otherwise>
2564
- </xsl:choose>
2565
- </xsl:for-each>
2579
+ <xsl:choose>
2580
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
2581
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
2582
+ <fo:table-column column-width="{@width}"/>
2583
+ </xsl:for-each>
2584
+ </xsl:when>
2585
+ <xsl:otherwise>
2586
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
2587
+ <xsl:choose>
2588
+ <xsl:when test=". = 1 or . = 0">
2589
+ <fo:table-column column-width="proportional-column-width(2)"/>
2590
+ </xsl:when>
2591
+ <xsl:otherwise>
2592
+ <fo:table-column column-width="proportional-column-width({.})"/>
2593
+ </xsl:otherwise>
2594
+ </xsl:choose>
2595
+ </xsl:for-each>
2596
+ </xsl:otherwise>
2597
+ </xsl:choose>
2566
2598
 
2567
2599
  <fo:table-body>
2568
2600
  <fo:table-row>
@@ -4787,7 +4819,8 @@
4787
4819
  <fo:table-column column-width="107mm"/>
4788
4820
  <fo:table-column column-width="15mm"/>
4789
4821
  <fo:table-body>
4790
- <fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
4822
+ <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
4823
+
4791
4824
  <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
4792
4825
  <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
4793
4826
  <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
@@ -4805,6 +4838,10 @@
4805
4838
  <fo:block><xsl:apply-templates/></fo:block>
4806
4839
  </fo:table-cell>
4807
4840
  </xsl:template><xsl:template name="processBibitem">
4841
+
4842
+
4843
+ <!-- end BIPM bibitem processing-->
4844
+
4808
4845
 
4809
4846
 
4810
4847
 
data/lib/isodoc/itu/itu.resolution.xsl CHANGED
@@ -891,13 +891,13 @@
891
891
  <!-- for Ordered Lists -->
892
892
  <xsl:choose>
893
893
  <xsl:when test="../@type = 'arabic'">
894
- <xsl:number format="a)"/>
894
+ <xsl:number format="a)" lang="en"/>
895
895
  </xsl:when>
896
896
  <xsl:when test="../@class = 'steps'">
897
897
  <xsl:number format="1)"/>
898
898
  </xsl:when>
899
899
  <xsl:when test="$level = 1">
900
- <xsl:number format="a)"/>
900
+ <xsl:number format="a)" lang="en"/>
901
901
  </xsl:when>
902
902
  <xsl:when test="$level = 2">
903
903
  <xsl:number format="i)"/>
@@ -2165,10 +2165,12 @@
2165
2165
 
2166
2166
 
2167
2167
  <xsl:variable name="colwidths">
2168
- <xsl:call-template name="calculate-column-widths">
2169
- <xsl:with-param name="cols-count" select="$cols-count"/>
2170
- <xsl:with-param name="table" select="$simple-table"/>
2171
- </xsl:call-template>
2168
+ <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
2169
+ <xsl:call-template name="calculate-column-widths">
2170
+ <xsl:with-param name="cols-count" select="$cols-count"/>
2171
+ <xsl:with-param name="table" select="$simple-table"/>
2172
+ </xsl:call-template>
2173
+ </xsl:if>
2172
2174
  </xsl:variable>
2173
2175
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
2174
2176
 
@@ -2247,16 +2249,25 @@
2247
2249
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
2248
2250
  </xsl:if>
2249
2251
 
2250
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
2251
- <xsl:choose>
2252
- <xsl:when test=". = 1 or . = 0">
2253
- <fo:table-column column-width="proportional-column-width(2)"/>
2254
- </xsl:when>
2255
- <xsl:otherwise>
2256
- <fo:table-column column-width="proportional-column-width({.})"/>
2257
- </xsl:otherwise>
2258
- </xsl:choose>
2259
- </xsl:for-each>
2252
+ <xsl:choose>
2253
+ <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
2254
+ <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
2255
+ <fo:table-column column-width="{@width}"/>
2256
+ </xsl:for-each>
2257
+ </xsl:when>
2258
+ <xsl:otherwise>
2259
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
2260
+ <xsl:choose>
2261
+ <xsl:when test=". = 1 or . = 0">
2262
+ <fo:table-column column-width="proportional-column-width(2)"/>
2263
+ </xsl:when>
2264
+ <xsl:otherwise>
2265
+ <fo:table-column column-width="proportional-column-width({.})"/>
2266
+ </xsl:otherwise>
2267
+ </xsl:choose>
2268
+ </xsl:for-each>
2269
+ </xsl:otherwise>
2270
+ </xsl:choose>
2260
2271
 
2261
2272
  <xsl:choose>
2262
2273
  <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
@@ -2269,10 +2280,12 @@
2269
2280
 
2270
2281
  </fo:table>
2271
2282
 
2283
+ <xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
2272
2284
  <xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
2273
2285
  <xsl:call-template name="insertTableFooterInSeparateTable">
2274
2286
  <xsl:with-param name="table_attributes" select="$table_attributes"/>
2275
2287
  <xsl:with-param name="colwidths" select="$colwidths"/>
2288
+ <xsl:with-param name="colgroup" select="$colgroup"/>
2276
2289
  </xsl:call-template>
2277
2290
  </xsl:for-each>
2278
2291
 
@@ -2530,12 +2543,22 @@
2530
2543
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
2531
2544
  <xsl:param name="table_attributes"/>
2532
2545
  <xsl:param name="colwidths"/>
2546
+ <xsl:param name="colgroup"/>
2533
2547
 
2534
2548
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
2535
2549
 
2536
2550
  <xsl:if test="$isNoteOrFnExist = 'true'">
2537
2551
 
2538
- <xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
2552
+ <xsl:variable name="cols-count">
2553
+ <xsl:choose>
2554
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
2555
+ <xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
2556
+ </xsl:when>
2557
+ <xsl:otherwise>
2558
+ <xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
2559
+ </xsl:otherwise>
2560
+ </xsl:choose>
2561
+ </xsl:variable>
2539
2562
 
2540
2563
  <fo:table keep-with-previous="always">
2541
2564
  <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
@@ -2553,16 +2576,25 @@
2553
2576
  </xsl:choose>
2554
2577
  </xsl:for-each>
2555
2578
 
2556
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
2557
- <xsl:choose>
2558
- <xsl:when test=". = 1 or . = 0">
2559
- <fo:table-column column-width="proportional-column-width(2)"/>
2560
- </xsl:when>
2561
- <xsl:otherwise>
2562
- <fo:table-column column-width="proportional-column-width({.})"/>
2563
- </xsl:otherwise>
2564
- </xsl:choose>
2565
- </xsl:for-each>
2579
+ <xsl:choose>
2580
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
2581
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
2582
+ <fo:table-column column-width="{@width}"/>
2583
+ </xsl:for-each>
2584
+ </xsl:when>
2585
+ <xsl:otherwise>
2586
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
2587
+ <xsl:choose>
2588
+ <xsl:when test=". = 1 or . = 0">
2589
+ <fo:table-column column-width="proportional-column-width(2)"/>
2590
+ </xsl:when>
2591
+ <xsl:otherwise>
2592
+ <fo:table-column column-width="proportional-column-width({.})"/>
2593
+ </xsl:otherwise>
2594
+ </xsl:choose>
2595
+ </xsl:for-each>
2596
+ </xsl:otherwise>
2597
+ </xsl:choose>
2566
2598
 
2567
2599
  <fo:table-body>
2568
2600
  <fo:table-row>
@@ -4787,7 +4819,8 @@
4787
4819
  <fo:table-column column-width="107mm"/>
4788
4820
  <fo:table-column column-width="15mm"/>
4789
4821
  <fo:table-body>
4790
- <fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
4822
+ <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
4823
+
4791
4824
  <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
4792
4825
  <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
4793
4826
  <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
@@ -4805,6 +4838,10 @@
4805
4838
  <fo:block><xsl:apply-templates/></fo:block>
4806
4839
  </fo:table-cell>
4807
4840
  </xsl:template><xsl:template name="processBibitem">
4841
+
4842
+
4843
+ <!-- end BIPM bibitem processing-->
4844
+
4808
4845
 
4809
4846
 
4810
4847