metanorma-ogc 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 (20) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/ogc/basicdoc.rng +32 -0
  3. data/lib/asciidoctor/ogc/isodoc.rng +15 -0
  4. data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +66 -29
  5. data/lib/isodoc/ogc/ogc.best-practice.xsl +66 -29
  6. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +66 -29
  7. data/lib/isodoc/ogc/ogc.community-practice.xsl +66 -29
  8. data/lib/isodoc/ogc/ogc.community-standard.xsl +66 -29
  9. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +66 -29
  10. data/lib/isodoc/ogc/ogc.engineering-report.xsl +66 -29
  11. data/lib/isodoc/ogc/ogc.other.xsl +66 -29
  12. data/lib/isodoc/ogc/ogc.policy.xsl +66 -29
  13. data/lib/isodoc/ogc/ogc.reference-model.xsl +66 -29
  14. data/lib/isodoc/ogc/ogc.release-notes.xsl +66 -29
  15. data/lib/isodoc/ogc/ogc.standard.xsl +66 -29
  16. data/lib/isodoc/ogc/ogc.test-suite.xsl +66 -29
  17. data/lib/isodoc/ogc/ogc.user-guide.xsl +66 -29
  18. data/lib/isodoc/ogc/ogc.white-paper.xsl +65 -28
  19. data/lib/metanorma/ogc/version.rb +1 -1
  20. metadata +2 -2
data/lib/isodoc/ogc/ogc.test-suite.xsl CHANGED
@@ -1069,13 +1069,13 @@
1069
1069
  <xsl:otherwise> <!-- for ordered lists -->
1070
1070
  <xsl:choose>
1071
1071
  <xsl:when test="../@type = 'arabic'">
1072
- <xsl:number format="a)"/>
1072
+ <xsl:number format="a)" lang="en"/>
1073
1073
  </xsl:when>
1074
1074
  <xsl:when test="../@type = 'alphabet'">
1075
1075
  <xsl:number format="1)"/>
1076
1076
  </xsl:when>
1077
1077
  <xsl:when test="../@type = 'alphabet_upper'">
1078
- <xsl:number format="A)"/>
1078
+ <xsl:number format="A)" lang="en"/>
1079
1079
  </xsl:when>
1080
1080
 
1081
1081
  <xsl:when test="../@type = 'roman'">
@@ -1328,7 +1328,7 @@
1328
1328
  <xsl:variable name="sectionNum">
1329
1329
  <xsl:choose>
1330
1330
  <xsl:when test="normalize-space($sectionNum_) = '' and local-name() = 'annex'">
1331
- <xsl:number format="A" count="ogc:annex"/>
1331
+ <xsl:number format="A" count="ogc:annex" lang="en"/>
1332
1332
  </xsl:when>
1333
1333
  <xsl:otherwise>
1334
1334
  <xsl:value-of select="$sectionNum_"/>
@@ -2086,10 +2086,12 @@
2086
2086
 
2087
2087
 
2088
2088
  <xsl:variable name="colwidths">
2089
- <xsl:call-template name="calculate-column-widths">
2090
- <xsl:with-param name="cols-count" select="$cols-count"/>
2091
- <xsl:with-param name="table" select="$simple-table"/>
2092
- </xsl:call-template>
2089
+ <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
2090
+ <xsl:call-template name="calculate-column-widths">
2091
+ <xsl:with-param name="cols-count" select="$cols-count"/>
2092
+ <xsl:with-param name="table" select="$simple-table"/>
2093
+ </xsl:call-template>
2094
+ </xsl:if>
2093
2095
  </xsl:variable>
2094
2096
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
2095
2097
 
@@ -2168,16 +2170,25 @@
2168
2170
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
2169
2171
  </xsl:if>
2170
2172
 
2171
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
2172
- <xsl:choose>
2173
- <xsl:when test=". = 1 or . = 0">
2174
- <fo:table-column column-width="proportional-column-width(2)"/>
2175
- </xsl:when>
2176
- <xsl:otherwise>
2177
- <fo:table-column column-width="proportional-column-width({.})"/>
2178
- </xsl:otherwise>
2179
- </xsl:choose>
2180
- </xsl:for-each>
2173
+ <xsl:choose>
2174
+ <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
2175
+ <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
2176
+ <fo:table-column column-width="{@width}"/>
2177
+ </xsl:for-each>
2178
+ </xsl:when>
2179
+ <xsl:otherwise>
2180
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
2181
+ <xsl:choose>
2182
+ <xsl:when test=". = 1 or . = 0">
2183
+ <fo:table-column column-width="proportional-column-width(2)"/>
2184
+ </xsl:when>
2185
+ <xsl:otherwise>
2186
+ <fo:table-column column-width="proportional-column-width({.})"/>
2187
+ </xsl:otherwise>
2188
+ </xsl:choose>
2189
+ </xsl:for-each>
2190
+ </xsl:otherwise>
2191
+ </xsl:choose>
2181
2192
 
2182
2193
  <xsl:choose>
2183
2194
  <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
@@ -2190,10 +2201,12 @@
2190
2201
 
2191
2202
  </fo:table>
2192
2203
 
2204
+ <xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
2193
2205
  <xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
2194
2206
  <xsl:call-template name="insertTableFooterInSeparateTable">
2195
2207
  <xsl:with-param name="table_attributes" select="$table_attributes"/>
2196
2208
  <xsl:with-param name="colwidths" select="$colwidths"/>
2209
+ <xsl:with-param name="colgroup" select="$colgroup"/>
2197
2210
  </xsl:call-template>
2198
2211
  </xsl:for-each>
2199
2212
 
@@ -2449,12 +2462,22 @@
2449
2462
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
2450
2463
  <xsl:param name="table_attributes"/>
2451
2464
  <xsl:param name="colwidths"/>
2465
+ <xsl:param name="colgroup"/>
2452
2466
 
2453
2467
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
2454
2468
 
2455
2469
  <xsl:if test="$isNoteOrFnExist = 'true'">
2456
2470
 
2457
- <xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
2471
+ <xsl:variable name="cols-count">
2472
+ <xsl:choose>
2473
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
2474
+ <xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
2475
+ </xsl:when>
2476
+ <xsl:otherwise>
2477
+ <xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
2478
+ </xsl:otherwise>
2479
+ </xsl:choose>
2480
+ </xsl:variable>
2458
2481
 
2459
2482
  <fo:table keep-with-previous="always">
2460
2483
  <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
@@ -2472,16 +2495,25 @@
2472
2495
  </xsl:choose>
2473
2496
  </xsl:for-each>
2474
2497
 
2475
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
2476
- <xsl:choose>
2477
- <xsl:when test=". = 1 or . = 0">
2478
- <fo:table-column column-width="proportional-column-width(2)"/>
2479
- </xsl:when>
2480
- <xsl:otherwise>
2481
- <fo:table-column column-width="proportional-column-width({.})"/>
2482
- </xsl:otherwise>
2483
- </xsl:choose>
2484
- </xsl:for-each>
2498
+ <xsl:choose>
2499
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
2500
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
2501
+ <fo:table-column column-width="{@width}"/>
2502
+ </xsl:for-each>
2503
+ </xsl:when>
2504
+ <xsl:otherwise>
2505
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
2506
+ <xsl:choose>
2507
+ <xsl:when test=". = 1 or . = 0">
2508
+ <fo:table-column column-width="proportional-column-width(2)"/>
2509
+ </xsl:when>
2510
+ <xsl:otherwise>
2511
+ <fo:table-column column-width="proportional-column-width({.})"/>
2512
+ </xsl:otherwise>
2513
+ </xsl:choose>
2514
+ </xsl:for-each>
2515
+ </xsl:otherwise>
2516
+ </xsl:choose>
2485
2517
 
2486
2518
  <fo:table-body>
2487
2519
  <fo:table-row>
@@ -4757,7 +4789,8 @@
4757
4789
  <fo:table-column column-width="107mm"/>
4758
4790
  <fo:table-column column-width="15mm"/>
4759
4791
  <fo:table-body>
4760
- <fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
4792
+ <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
4793
+
4761
4794
  <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
4762
4795
  <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
4763
4796
  <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
@@ -4776,6 +4809,10 @@
4776
4809
  </fo:table-cell>
4777
4810
  </xsl:template><xsl:template name="processBibitem">
4778
4811
 
4812
+
4813
+ <!-- end BIPM bibitem processing-->
4814
+
4815
+
4779
4816
  <!-- start OGC bibtem processing -->
4780
4817
  <xsl:choose>
4781
4818
  <xsl:when test="*[local-name() = 'formattedref']">
data/lib/isodoc/ogc/ogc.user-guide.xsl CHANGED
@@ -1069,13 +1069,13 @@
1069
1069
  <xsl:otherwise> <!-- for ordered lists -->
1070
1070
  <xsl:choose>
1071
1071
  <xsl:when test="../@type = 'arabic'">
1072
- <xsl:number format="a)"/>
1072
+ <xsl:number format="a)" lang="en"/>
1073
1073
  </xsl:when>
1074
1074
  <xsl:when test="../@type = 'alphabet'">
1075
1075
  <xsl:number format="1)"/>
1076
1076
  </xsl:when>
1077
1077
  <xsl:when test="../@type = 'alphabet_upper'">
1078
- <xsl:number format="A)"/>
1078
+ <xsl:number format="A)" lang="en"/>
1079
1079
  </xsl:when>
1080
1080
 
1081
1081
  <xsl:when test="../@type = 'roman'">
@@ -1328,7 +1328,7 @@
1328
1328
  <xsl:variable name="sectionNum">
1329
1329
  <xsl:choose>
1330
1330
  <xsl:when test="normalize-space($sectionNum_) = '' and local-name() = 'annex'">
1331
- <xsl:number format="A" count="ogc:annex"/>
1331
+ <xsl:number format="A" count="ogc:annex" lang="en"/>
1332
1332
  </xsl:when>
1333
1333
  <xsl:otherwise>
1334
1334
  <xsl:value-of select="$sectionNum_"/>
@@ -2086,10 +2086,12 @@
2086
2086
 
2087
2087
 
2088
2088
  <xsl:variable name="colwidths">
2089
- <xsl:call-template name="calculate-column-widths">
2090
- <xsl:with-param name="cols-count" select="$cols-count"/>
2091
- <xsl:with-param name="table" select="$simple-table"/>
2092
- </xsl:call-template>
2089
+ <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
2090
+ <xsl:call-template name="calculate-column-widths">
2091
+ <xsl:with-param name="cols-count" select="$cols-count"/>
2092
+ <xsl:with-param name="table" select="$simple-table"/>
2093
+ </xsl:call-template>
2094
+ </xsl:if>
2093
2095
  </xsl:variable>
2094
2096
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
2095
2097
 
@@ -2168,16 +2170,25 @@
2168
2170
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
2169
2171
  </xsl:if>
2170
2172
 
2171
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
2172
- <xsl:choose>
2173
- <xsl:when test=". = 1 or . = 0">
2174
- <fo:table-column column-width="proportional-column-width(2)"/>
2175
- </xsl:when>
2176
- <xsl:otherwise>
2177
- <fo:table-column column-width="proportional-column-width({.})"/>
2178
- </xsl:otherwise>
2179
- </xsl:choose>
2180
- </xsl:for-each>
2173
+ <xsl:choose>
2174
+ <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
2175
+ <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
2176
+ <fo:table-column column-width="{@width}"/>
2177
+ </xsl:for-each>
2178
+ </xsl:when>
2179
+ <xsl:otherwise>
2180
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
2181
+ <xsl:choose>
2182
+ <xsl:when test=". = 1 or . = 0">
2183
+ <fo:table-column column-width="proportional-column-width(2)"/>
2184
+ </xsl:when>
2185
+ <xsl:otherwise>
2186
+ <fo:table-column column-width="proportional-column-width({.})"/>
2187
+ </xsl:otherwise>
2188
+ </xsl:choose>
2189
+ </xsl:for-each>
2190
+ </xsl:otherwise>
2191
+ </xsl:choose>
2181
2192
 
2182
2193
  <xsl:choose>
2183
2194
  <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
@@ -2190,10 +2201,12 @@
2190
2201
 
2191
2202
  </fo:table>
2192
2203
 
2204
+ <xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
2193
2205
  <xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
2194
2206
  <xsl:call-template name="insertTableFooterInSeparateTable">
2195
2207
  <xsl:with-param name="table_attributes" select="$table_attributes"/>
2196
2208
  <xsl:with-param name="colwidths" select="$colwidths"/>
2209
+ <xsl:with-param name="colgroup" select="$colgroup"/>
2197
2210
  </xsl:call-template>
2198
2211
  </xsl:for-each>
2199
2212
 
@@ -2449,12 +2462,22 @@
2449
2462
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
2450
2463
  <xsl:param name="table_attributes"/>
2451
2464
  <xsl:param name="colwidths"/>
2465
+ <xsl:param name="colgroup"/>
2452
2466
 
2453
2467
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
2454
2468
 
2455
2469
  <xsl:if test="$isNoteOrFnExist = 'true'">
2456
2470
 
2457
- <xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
2471
+ <xsl:variable name="cols-count">
2472
+ <xsl:choose>
2473
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
2474
+ <xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
2475
+ </xsl:when>
2476
+ <xsl:otherwise>
2477
+ <xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
2478
+ </xsl:otherwise>
2479
+ </xsl:choose>
2480
+ </xsl:variable>
2458
2481
 
2459
2482
  <fo:table keep-with-previous="always">
2460
2483
  <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
@@ -2472,16 +2495,25 @@
2472
2495
  </xsl:choose>
2473
2496
  </xsl:for-each>
2474
2497
 
2475
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
2476
- <xsl:choose>
2477
- <xsl:when test=". = 1 or . = 0">
2478
- <fo:table-column column-width="proportional-column-width(2)"/>
2479
- </xsl:when>
2480
- <xsl:otherwise>
2481
- <fo:table-column column-width="proportional-column-width({.})"/>
2482
- </xsl:otherwise>
2483
- </xsl:choose>
2484
- </xsl:for-each>
2498
+ <xsl:choose>
2499
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
2500
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
2501
+ <fo:table-column column-width="{@width}"/>
2502
+ </xsl:for-each>
2503
+ </xsl:when>
2504
+ <xsl:otherwise>
2505
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
2506
+ <xsl:choose>
2507
+ <xsl:when test=". = 1 or . = 0">
2508
+ <fo:table-column column-width="proportional-column-width(2)"/>
2509
+ </xsl:when>
2510
+ <xsl:otherwise>
2511
+ <fo:table-column column-width="proportional-column-width({.})"/>
2512
+ </xsl:otherwise>
2513
+ </xsl:choose>
2514
+ </xsl:for-each>
2515
+ </xsl:otherwise>
2516
+ </xsl:choose>
2485
2517
 
2486
2518
  <fo:table-body>
2487
2519
  <fo:table-row>
@@ -4757,7 +4789,8 @@
4757
4789
  <fo:table-column column-width="107mm"/>
4758
4790
  <fo:table-column column-width="15mm"/>
4759
4791
  <fo:table-body>
4760
- <fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
4792
+ <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
4793
+
4761
4794
  <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
4762
4795
  <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
4763
4796
  <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
@@ -4776,6 +4809,10 @@
4776
4809
  </fo:table-cell>
4777
4810
  </xsl:template><xsl:template name="processBibitem">
4778
4811
 
4812
+
4813
+ <!-- end BIPM bibitem processing-->
4814
+
4815
+
4779
4816
  <!-- start OGC bibtem processing -->
4780
4817
  <xsl:choose>
4781
4818
  <xsl:when test="*[local-name() = 'formattedref']">
data/lib/isodoc/ogc/ogc.white-paper.xsl CHANGED
@@ -651,13 +651,13 @@
651
651
  <xsl:otherwise> <!-- for ordered lists -->
652
652
  <xsl:choose>
653
653
  <xsl:when test="../@type = 'arabic'">
654
- <xsl:number format="a)"/>
654
+ <xsl:number format="a)" lang="en"/>
655
655
  </xsl:when>
656
656
  <xsl:when test="../@type = 'alphabet'">
657
657
  <xsl:number format="1)"/>
658
658
  </xsl:when>
659
659
  <xsl:when test="../@type = 'alphabet_upper'">
660
- <xsl:number format="A)"/>
660
+ <xsl:number format="A)" lang="en"/>
661
661
  </xsl:when>
662
662
 
663
663
  <xsl:when test="../@type = 'roman'">
@@ -1493,10 +1493,12 @@
1493
1493
 
1494
1494
 
1495
1495
  <xsl:variable name="colwidths">
1496
- <xsl:call-template name="calculate-column-widths">
1497
- <xsl:with-param name="cols-count" select="$cols-count"/>
1498
- <xsl:with-param name="table" select="$simple-table"/>
1499
- </xsl:call-template>
1496
+ <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
1497
+ <xsl:call-template name="calculate-column-widths">
1498
+ <xsl:with-param name="cols-count" select="$cols-count"/>
1499
+ <xsl:with-param name="table" select="$simple-table"/>
1500
+ </xsl:call-template>
1501
+ </xsl:if>
1500
1502
  </xsl:variable>
1501
1503
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
1502
1504
 
@@ -1573,16 +1575,25 @@
1573
1575
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
1574
1576
  </xsl:if>
1575
1577
 
1576
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1577
- <xsl:choose>
1578
- <xsl:when test=". = 1 or . = 0">
1579
- <fo:table-column column-width="proportional-column-width(2)"/>
1580
- </xsl:when>
1581
- <xsl:otherwise>
1582
- <fo:table-column column-width="proportional-column-width({.})"/>
1583
- </xsl:otherwise>
1584
- </xsl:choose>
1585
- </xsl:for-each>
1578
+ <xsl:choose>
1579
+ <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
1580
+ <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
1581
+ <fo:table-column column-width="{@width}"/>
1582
+ </xsl:for-each>
1583
+ </xsl:when>
1584
+ <xsl:otherwise>
1585
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1586
+ <xsl:choose>
1587
+ <xsl:when test=". = 1 or . = 0">
1588
+ <fo:table-column column-width="proportional-column-width(2)"/>
1589
+ </xsl:when>
1590
+ <xsl:otherwise>
1591
+ <fo:table-column column-width="proportional-column-width({.})"/>
1592
+ </xsl:otherwise>
1593
+ </xsl:choose>
1594
+ </xsl:for-each>
1595
+ </xsl:otherwise>
1596
+ </xsl:choose>
1586
1597
 
1587
1598
  <xsl:choose>
1588
1599
  <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
@@ -1595,10 +1606,12 @@
1595
1606
 
1596
1607
  </fo:table>
1597
1608
 
1609
+ <xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
1598
1610
  <xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
1599
1611
  <xsl:call-template name="insertTableFooterInSeparateTable">
1600
1612
  <xsl:with-param name="table_attributes" select="$table_attributes"/>
1601
1613
  <xsl:with-param name="colwidths" select="$colwidths"/>
1614
+ <xsl:with-param name="colgroup" select="$colgroup"/>
1602
1615
  </xsl:call-template>
1603
1616
  </xsl:for-each>
1604
1617
 
@@ -1854,12 +1867,22 @@
1854
1867
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
1855
1868
  <xsl:param name="table_attributes"/>
1856
1869
  <xsl:param name="colwidths"/>
1870
+ <xsl:param name="colgroup"/>
1857
1871
 
1858
1872
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
1859
1873
 
1860
1874
  <xsl:if test="$isNoteOrFnExist = 'true'">
1861
1875
 
1862
- <xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
1876
+ <xsl:variable name="cols-count">
1877
+ <xsl:choose>
1878
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
1879
+ <xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
1880
+ </xsl:when>
1881
+ <xsl:otherwise>
1882
+ <xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
1883
+ </xsl:otherwise>
1884
+ </xsl:choose>
1885
+ </xsl:variable>
1863
1886
 
1864
1887
  <fo:table keep-with-previous="always">
1865
1888
  <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
@@ -1877,16 +1900,25 @@
1877
1900
  </xsl:choose>
1878
1901
  </xsl:for-each>
1879
1902
 
1880
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1881
- <xsl:choose>
1882
- <xsl:when test=". = 1 or . = 0">
1883
- <fo:table-column column-width="proportional-column-width(2)"/>
1884
- </xsl:when>
1885
- <xsl:otherwise>
1886
- <fo:table-column column-width="proportional-column-width({.})"/>
1887
- </xsl:otherwise>
1888
- </xsl:choose>
1889
- </xsl:for-each>
1903
+ <xsl:choose>
1904
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
1905
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
1906
+ <fo:table-column column-width="{@width}"/>
1907
+ </xsl:for-each>
1908
+ </xsl:when>
1909
+ <xsl:otherwise>
1910
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1911
+ <xsl:choose>
1912
+ <xsl:when test=". = 1 or . = 0">
1913
+ <fo:table-column column-width="proportional-column-width(2)"/>
1914
+ </xsl:when>
1915
+ <xsl:otherwise>
1916
+ <fo:table-column column-width="proportional-column-width({.})"/>
1917
+ </xsl:otherwise>
1918
+ </xsl:choose>
1919
+ </xsl:for-each>
1920
+ </xsl:otherwise>
1921
+ </xsl:choose>
1890
1922
 
1891
1923
  <fo:table-body>
1892
1924
  <fo:table-row>
@@ -4128,7 +4160,8 @@
4128
4160
  <fo:table-column column-width="107mm"/>
4129
4161
  <fo:table-column column-width="15mm"/>
4130
4162
  <fo:table-body>
4131
- <fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
4163
+ <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
4164
+
4132
4165
  <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
4133
4166
  <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
4134
4167
  <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
@@ -4147,6 +4180,10 @@
4147
4180
  </fo:table-cell>
4148
4181
  </xsl:template><xsl:template name="processBibitem">
4149
4182
 
4183
+
4184
+ <!-- end BIPM bibitem processing-->
4185
+
4186
+
4150
4187
  <!-- start OGC bibtem processing -->
4151
4188
  <xsl:choose>
4152
4189
  <xsl:when test="*[local-name() = 'formattedref']">