metanorma-ogc 1.2.0 → 1.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/ogc/boilerplate.xml +3 -3
  3. data/lib/asciidoctor/ogc/front.rb +7 -19
  4. data/lib/isodoc/ogc/biblio.rb +33 -4
  5. data/lib/isodoc/ogc/html/header_wp.html +210 -0
  6. data/lib/isodoc/ogc/html/logo.png +0 -0
  7. data/lib/isodoc/ogc/html/ogc.css +6 -3
  8. data/lib/isodoc/ogc/html/ogc.scss +4 -2
  9. data/lib/isodoc/ogc/html/ogc_wp.css +758 -0
  10. data/lib/isodoc/ogc/html/ogc_wp.scss +724 -0
  11. data/lib/isodoc/ogc/html/word_ogc_intro_wp.html +14 -0
  12. data/lib/isodoc/ogc/html/word_ogc_titlepage_wp.html +175 -0
  13. data/lib/isodoc/ogc/html/wordstyle.css +8 -8
  14. data/lib/isodoc/ogc/html/wordstyle.scss +8 -8
  15. data/lib/isodoc/ogc/html/wordstyle_wp.css +1181 -0
  16. data/lib/isodoc/ogc/html/wordstyle_wp.scss +1093 -0
  17. data/lib/isodoc/ogc/init.rb +9 -0
  18. data/lib/isodoc/ogc/metadata.rb +30 -27
  19. data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +235 -47
  20. data/lib/isodoc/ogc/ogc.best-practice.xsl +235 -47
  21. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +235 -47
  22. data/lib/isodoc/ogc/ogc.community-practice.xsl +235 -47
  23. data/lib/isodoc/ogc/ogc.community-standard.xsl +235 -47
  24. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +235 -47
  25. data/lib/isodoc/ogc/ogc.engineering-report.xsl +235 -47
  26. data/lib/isodoc/ogc/ogc.other.xsl +235 -47
  27. data/lib/isodoc/ogc/ogc.policy.xsl +235 -47
  28. data/lib/isodoc/ogc/ogc.reference-model.xsl +235 -47
  29. data/lib/isodoc/ogc/ogc.release-notes.xsl +235 -47
  30. data/lib/isodoc/ogc/ogc.standard.xsl +235 -47
  31. data/lib/isodoc/ogc/ogc.test-suite.xsl +235 -47
  32. data/lib/isodoc/ogc/ogc.user-guide.xsl +235 -47
  33. data/lib/isodoc/ogc/ogc.white-paper.xsl +233 -32
  34. data/lib/isodoc/ogc/word_convert.rb +20 -3
  35. data/lib/isodoc/ogc/xref.rb +20 -13
  36. data/lib/metanorma/ogc/version.rb +1 -1
  37. metadata +10 -2
data/lib/isodoc/ogc/ogc.white-paper.xsl CHANGED
@@ -21,6 +21,7 @@
21
21
  </xsl:attribute-set>
22
22
 
23
23
  <xsl:attribute-set name="title-depth1-style" use-attribute-sets="title-toc-style">
24
+ <xsl:attribute name="font-family">Lato</xsl:attribute>
24
25
  <xsl:attribute name="color">rgb(59, 56, 56)</xsl:attribute>
25
26
  <xsl:attribute name="margin-top">18pt</xsl:attribute>
26
27
  <xsl:attribute name="margin-bottom">18pt</xsl:attribute>
@@ -28,6 +29,7 @@
28
29
  </xsl:attribute-set>
29
30
 
30
31
  <xsl:attribute-set name="title-depth2-style">
32
+ <xsl:attribute name="font-family">Lato</xsl:attribute>
31
33
  <xsl:attribute name="font-size">18pt</xsl:attribute>
32
34
  <xsl:attribute name="color">rgb(21, 43, 77)</xsl:attribute>
33
35
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -37,6 +39,7 @@
37
39
  </xsl:attribute-set>
38
40
 
39
41
  <xsl:attribute-set name="title-depth3-style">
42
+ <xsl:attribute name="font-family">Lato</xsl:attribute>
40
43
  <xsl:attribute name="font-size">12pt</xsl:attribute>
41
44
  <xsl:attribute name="font-weight">bold</xsl:attribute>
42
45
  <xsl:attribute name="color">rgb(21, 43, 77)</xsl:attribute>
@@ -51,26 +54,32 @@
51
54
  <xsl:variable name="contents">
52
55
  <contents>
53
56
 
54
- <!-- Abstract, Keywords, Preface, Submitting Organizations, Submitters -->
57
+ <!-- Abstract, Keywords, Preface, Submitting Organizations, Submitters -->
58
+ <!-- <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/*" mode="contents"/> -->
59
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:abstract" mode="contents"/>
60
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[@type = 'keyword']" mode="contents"/>
61
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:foreword" mode="contents"/>
62
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:introduction" mode="contents"/>
63
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[@type = 'submitting_orgs']" mode="contents"/>
64
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:submitters" mode="contents"/>
65
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[not(@type = 'submitting_orgs') and not(@type = 'keyword')]" mode="contents"/>
66
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:acknowledgements" mode="contents"/>
55
67
 
56
- <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/*" mode="contents"/>
57
68
 
58
- <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:clause[@id='_scope']" mode="contents"/>
59
-
60
- <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:clause[@id='conformance' or @id='_conformance']" mode="contents"/>
61
-
69
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:clause[@type='scope']" mode="contents"/>
70
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:clause[@type='conformance']" mode="contents"/>
62
71
  <!-- Normative references -->
63
- <xsl:apply-templates select="/ogc:ogc-standard/ogc:bibliography/ogc:references[@id = '_normative_references' or @id = '_references' or @id = 'references']" mode="contents"/>
64
-
72
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:bibliography/ogc:references[@normative='true']" mode="contents"/>
65
73
  <!-- Terms and definitions -->
66
74
  <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:terms" mode="contents"/>
75
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:definitions" mode="contents"/>
67
76
 
68
- <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/*[local-name() != 'terms' and not(@id='_scope') and not(@id='conformance') and not(@id='_conformance')]" mode="contents"/>
77
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:clause[not(@type='scope') and not(@type='conformance')]" mode="contents"/>
69
78
 
70
79
  <xsl:apply-templates select="/ogc:ogc-standard/ogc:annex" mode="contents"/>
71
80
 
72
81
  <!-- Bibliography -->
73
- <xsl:apply-templates select="/ogc:ogc-standard/ogc:bibliography/ogc:references[@id != '_normative_references' and @id != '_references' and @id != 'references']" mode="contents"/> <!-- [position() &gt; 1] -->
82
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:bibliography/ogc:references[not(@normative='true')]" mode="contents"/>
74
83
 
75
84
 
76
85
  </contents>
@@ -111,7 +120,7 @@
111
120
  </fo:block-container>
112
121
  </fo:block-container>
113
122
 
114
- <fo:block font-size="14pt" font-style="italic" margin-top="6pt" color="rgb(21, 43, 77)">
123
+ <fo:block font-family="Lato Light" font-size="14pt" font-style="italic" margin-top="6pt" color="rgb(21, 43, 77)">
115
124
  <xsl:text>Additional context, inspirational quote, etc. fits into this subheading area</xsl:text>
116
125
  </fo:block>
117
126
 
@@ -154,7 +163,7 @@
154
163
 
155
164
  <fo:block break-after="page"/>
156
165
 
157
- <fo:block-container line-height="1.08">
166
+ <fo:block-container line-height="1.08" font-family="Lato">
158
167
  <fo:block xsl:use-attribute-sets="title-toc-style">
159
168
  <xsl:text>Table of Contents</xsl:text>
160
169
  </fo:block>
@@ -193,7 +202,25 @@
193
202
 
194
203
 
195
204
  <!-- Abstract, Keywords, Preface, Submitting Organizations, Submitters -->
196
- <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/*" mode="preface"/>
205
+ <!-- <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/*" mode="preface"/> -->
206
+ <xsl:if test="/ogc:ogc-standard/ogc:preface/ogc:abstract">
207
+ <fo:block break-after="page"/>
208
+ </xsl:if>
209
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:abstract"/>
210
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[@type = 'keyword']"/>
211
+ <xsl:if test="/ogc:ogc-standard/ogc:preface/ogc:foreword">
212
+ <fo:block break-after="page"/>
213
+ </xsl:if>
214
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:foreword"/>
215
+ <xsl:if test="/ogc:ogc-standard/ogc:preface/ogc:introduction">
216
+ <fo:block break-after="page"/>
217
+ </xsl:if>
218
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:introduction"/>
219
+
220
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[@type = 'submitting_orgs']"/>
221
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:submitters"/>
222
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[not(@type = 'submitting_orgs') and not(@type = 'keyword')]"/>
223
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:acknowledgements"/>
197
224
 
198
225
  </fo:flow>
199
226
  </fo:page-sequence>
@@ -208,22 +235,23 @@
208
235
 
209
236
  <fo:block line-height="125%">
210
237
 
211
- <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:clause[@id='_scope']"/>
238
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:clause[@type='scope']"/>
212
239
 
213
- <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:clause[@id='conformance' or @id='_conformance']"/>
240
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:clause[@type='conformance']"/>
214
241
 
215
242
  <!-- Normative references -->
216
- <xsl:apply-templates select="/ogc:ogc-standard/ogc:bibliography/ogc:references[@id = '_normative_references' or @id = '_references' or @id = 'references']"/>
243
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:bibliography/ogc:references[@normative='true']"/>
217
244
 
218
245
  <!-- Terms and definitions -->
219
- <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:terms"/>
246
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:terms"/>
247
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:definitions"/>
220
248
 
221
- <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/*[local-name() != 'terms' and not(@id='_scope') and not(@id='conformance') and not(@id='_conformance')]"/>
249
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:sections/ogc:clause[not(@type='scope') and not(@type='conformance')]"/>
222
250
 
223
251
  <xsl:apply-templates select="/ogc:ogc-standard/ogc:annex"/>
224
252
 
225
253
  <!-- Bibliography -->
226
- <xsl:apply-templates select="/ogc:ogc-standard/ogc:bibliography/ogc:references[@id != '_normative_references' and @id != '_references' and @id != 'references']"/> <!-- [position() &gt; 1] -->
254
+ <xsl:apply-templates select="/ogc:ogc-standard/ogc:bibliography/ogc:references[not(@normative='true')]"/>
227
255
 
228
256
  </fo:block>
229
257
  </fo:flow>
@@ -307,7 +335,7 @@
307
335
  </xsl:template>
308
336
 
309
337
  <xsl:template match="ogc:license-statement//ogc:title">
310
- <fo:block text-align="center" font-weight="bold" margin-top="4pt">
338
+ <fo:block font-family="Lato" text-align="center" font-weight="bold" margin-top="4pt">
311
339
  <xsl:apply-templates/>
312
340
  </fo:block>
313
341
  </xsl:template>
@@ -340,7 +368,7 @@
340
368
  </xsl:template>
341
369
 
342
370
  <xsl:template match="ogc:copyright-statement//ogc:title | ogc:legal-statement//ogc:title">
343
- <fo:block text-align="center" font-weight="bold">
371
+ <fo:block font-family="Lato" text-align="center" font-weight="bold">
344
372
  <xsl:apply-templates/>
345
373
  </fo:block>
346
374
  </xsl:template>
@@ -410,7 +438,7 @@
410
438
  </fo:inline>
411
439
  </xsl:when>
412
440
  <xsl:otherwise>
413
- <fo:inline>
441
+ <fo:inline font-family="Lato">
414
442
  <xsl:apply-templates/>
415
443
  </fo:inline>
416
444
  </xsl:otherwise>
@@ -434,7 +462,7 @@
434
462
  </fo:block>
435
463
  </xsl:when>
436
464
  <xsl:otherwise>
437
- <fo:block>
465
+ <fo:block font-family="Lato">
438
466
  <xsl:apply-templates/>
439
467
  </fo:block>
440
468
  </xsl:otherwise>
@@ -691,7 +719,7 @@
691
719
 
692
720
 
693
721
  <!-- [position() &gt; 1] -->
694
- <xsl:template match="ogc:references[@id != '_normative_references' and @id != '_references' and @id != 'references']">
722
+ <xsl:template match="ogc:references[not(@normative='true')]">
695
723
  <fo:block break-after="page"/>
696
724
  <fo:block id="{@id}" line-height="120%">
697
725
  <xsl:apply-templates/>
@@ -706,7 +734,7 @@
706
734
 
707
735
  <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
708
736
  <!-- <xsl:template match="ogc:references[@id = '_bibliography']/ogc:bibitem"> [position() &gt; 1] -->
709
- <xsl:template match="ogc:references[@id != '_normative_references' and @id != '_references' and @id != 'references']/ogc:bibitem">
737
+ <xsl:template match="ogc:references[not(@normative='true')]/ogc:bibitem">
710
738
  <fo:list-block id="{@id}" margin-bottom="12pt" provisional-distance-between-starts="12mm">
711
739
  <fo:list-item>
712
740
  <fo:list-item-label end-indent="label-end()">
@@ -779,10 +807,10 @@
779
807
  </xsl:template>
780
808
 
781
809
  <!-- <xsl:template match="ogc:references[@id = '_bibliography']/ogc:bibitem" mode="contents"/> [position() &gt; 1] -->
782
- <xsl:template match="ogc:references[@id != '_normative_references' and @id != '_references' and @id != 'references']/ogc:bibitem" mode="contents"/>
810
+ <xsl:template match="ogc:references[not(@normative='true')]/ogc:bibitem" mode="contents"/>
783
811
 
784
812
  <!-- <xsl:template match="ogc:references[@id = '_bibliography']/ogc:bibitem/ogc:title"> [position() &gt; 1]-->
785
- <xsl:template match="ogc:references[@id != '_normative_references' and @id != '_references' and @id != 'references']/ogc:bibitem/ogc:title">
813
+ <xsl:template match="ogc:references[not(@normative='true')]/ogc:bibitem/ogc:title">
786
814
  <fo:inline font-style="italic">
787
815
  <xsl:apply-templates/>
788
816
  </fo:inline>
@@ -1112,6 +1140,7 @@
1112
1140
  </xsl:attribute-set><xsl:attribute-set name="example-body-style">
1113
1141
 
1114
1142
 
1143
+
1115
1144
  </xsl:attribute-set><xsl:attribute-set name="example-name-style">
1116
1145
 
1117
1146
 
@@ -1133,6 +1162,8 @@
1133
1162
 
1134
1163
 
1135
1164
 
1165
+
1166
+
1136
1167
 
1137
1168
 
1138
1169
  </xsl:attribute-set><xsl:attribute-set name="example-p-style">
@@ -1149,6 +1180,8 @@
1149
1180
 
1150
1181
 
1151
1182
 
1183
+
1184
+
1152
1185
  </xsl:attribute-set><xsl:attribute-set name="termexample-name-style">
1153
1186
 
1154
1187
  <xsl:attribute name="padding-right">10mm</xsl:attribute>
@@ -1177,6 +1210,7 @@
1177
1210
 
1178
1211
 
1179
1212
 
1213
+
1180
1214
  </xsl:attribute-set><xsl:attribute-set name="appendix-style">
1181
1215
 
1182
1216
  <xsl:attribute name="font-size">12pt</xsl:attribute>
@@ -1327,7 +1361,7 @@
1327
1361
 
1328
1362
 
1329
1363
 
1330
-
1364
+
1331
1365
  </xsl:attribute-set><xsl:attribute-set name="formula-style">
1332
1366
 
1333
1367
  </xsl:attribute-set><xsl:attribute-set name="image-style">
@@ -1377,7 +1411,43 @@
1377
1411
  <xsl:attribute name="space-after">6pt</xsl:attribute>
1378
1412
 
1379
1413
 
1380
- </xsl:attribute-set><xsl:template match="text()">
1414
+ </xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
1415
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
1416
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
1417
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
1418
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
1419
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
1420
+ </xsl:template><xsl:template name="processMainSectionsDefault_Contents">
1421
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>
1422
+
1423
+ <!-- Normative references -->
1424
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']" mode="contents"/>
1425
+ <!-- Terms and definitions -->
1426
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] | /*/*[local-name()='sections']/*[local-name()='definitions'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]" mode="contents"/>
1427
+ <!-- Another main sections -->
1428
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope') and not(local-name() = 'clause' and .//*[local-name()='terms']) and not(local-name() = 'clause' and .//*[local-name()='definitions'])]" mode="contents"/>
1429
+ <xsl:apply-templates select="/*/*[local-name()='annex']" mode="contents"/>
1430
+ <!-- Bibliography -->
1431
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]" mode="contents"/>
1432
+ </xsl:template><xsl:template name="processPrefaceSectionsDefault">
1433
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
1434
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
1435
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
1436
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
1437
+ <xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
1438
+ </xsl:template><xsl:template name="processMainSectionsDefault">
1439
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
1440
+
1441
+ <!-- Normative references -->
1442
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"/>
1443
+ <!-- Terms and definitions -->
1444
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] | /*/*[local-name()='sections']/*[local-name()='definitions'] | /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]"/>
1445
+ <!-- Another main sections -->
1446
+ <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope') and not(local-name() = 'clause' and .//*[local-name()='terms']) and not(local-name() = 'clause' and .//*[local-name()='definitions'])]"/>
1447
+ <xsl:apply-templates select="/*/*[local-name()='annex']"/>
1448
+ <!-- Bibliography -->
1449
+ <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/>
1450
+ </xsl:template><xsl:template match="text()">
1381
1451
  <xsl:value-of select="."/>
1382
1452
  </xsl:template><xsl:template match="*[local-name()='br']">
1383
1453
  <xsl:value-of select="$linebreak"/>
@@ -1458,6 +1528,7 @@
1458
1528
 
1459
1529
 
1460
1530
 
1531
+
1461
1532
  <fo:table id="{@id}" table-layout="fixed" width="100%" margin-left="{$margin-left}mm" margin-right="{$margin-left}mm" table-omit-footer-at-break="true">
1462
1533
 
1463
1534
 
@@ -1475,6 +1546,7 @@
1475
1546
 
1476
1547
 
1477
1548
 
1549
+
1478
1550
  <xsl:for-each select="xalan:nodeset($colwidths)//column">
1479
1551
  <xsl:choose>
1480
1552
  <xsl:when test=". = 1 or . = 0">
@@ -1727,6 +1799,14 @@
1727
1799
  </fo:table-row>
1728
1800
  </xsl:template><xsl:template match="*[local-name()='th']">
1729
1801
  <fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center">
1802
+ <xsl:attribute name="text-align">
1803
+ <xsl:choose>
1804
+ <xsl:when test="@align">
1805
+ <xsl:value-of select="@align"/>
1806
+ </xsl:when>
1807
+ <xsl:otherwise>center</xsl:otherwise>
1808
+ </xsl:choose>
1809
+ </xsl:attribute>
1730
1810
 
1731
1811
 
1732
1812
 
@@ -1741,6 +1821,7 @@
1741
1821
 
1742
1822
 
1743
1823
 
1824
+
1744
1825
  <xsl:if test="@colspan">
1745
1826
  <xsl:attribute name="number-columns-spanned">
1746
1827
  <xsl:value-of select="@colspan"/>
@@ -1757,6 +1838,14 @@
1757
1838
  </fo:table-cell>
1758
1839
  </xsl:template><xsl:template match="*[local-name()='td']">
1759
1840
  <fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
1841
+ <xsl:attribute name="text-align">
1842
+ <xsl:choose>
1843
+ <xsl:when test="@align">
1844
+ <xsl:value-of select="@align"/>
1845
+ </xsl:when>
1846
+ <xsl:otherwise>left</xsl:otherwise>
1847
+ </xsl:choose>
1848
+ </xsl:attribute>
1760
1849
 
1761
1850
 
1762
1851
 
@@ -2984,6 +3073,117 @@
2984
3073
  <fo:block xsl:use-attribute-sets="recommendation-label-style">
2985
3074
  <xsl:apply-templates/>
2986
3075
  </fo:block>
3076
+ </xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
3077
+ <fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
3078
+ <fo:block-container margin-left="0mm" margin-right="0mm">
3079
+ <fo:table id="{@id}" table-layout="fixed" width="100%" border="0pt solid black">
3080
+ <xsl:variable name="simple-table">
3081
+ <xsl:call-template name="getSimpleTable"/>
3082
+ </xsl:variable>
3083
+ <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
3084
+ <xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])">
3085
+ <fo:table-column column-width="35mm"/>
3086
+ <fo:table-column column-width="115mm"/>
3087
+ </xsl:if>
3088
+ <xsl:apply-templates mode="requirement"/>
3089
+ </fo:table>
3090
+ <!-- fn processing -->
3091
+ <xsl:if test=".//*[local-name() = 'fn']">
3092
+ <xsl:for-each select="*[local-name() = 'tbody']">
3093
+ <fo:block font-size="90%" border-bottom="1.pt solid black">
3094
+ <xsl:call-template name="fn_display"/>
3095
+ </fo:block>
3096
+ </xsl:for-each>
3097
+ </xsl:if>
3098
+ </fo:block-container>
3099
+ </fo:block-container>
3100
+ </xsl:template><xsl:template match="*[local-name()='thead']" mode="requirement">
3101
+ <fo:table-header>
3102
+ <xsl:apply-templates mode="requirement"/>
3103
+ </fo:table-header>
3104
+ </xsl:template><xsl:template match="*[local-name()='tbody']" mode="requirement">
3105
+ <fo:table-body>
3106
+ <xsl:apply-templates mode="requirement"/>
3107
+ </fo:table-body>
3108
+ </xsl:template><xsl:template match="*[local-name()='tr']" mode="requirement">
3109
+ <fo:table-row>
3110
+ <xsl:apply-templates mode="requirement"/>
3111
+ </fo:table-row>
3112
+ </xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
3113
+ <fo:table-cell text-align="{@align}">
3114
+ <xsl:attribute name="text-align">
3115
+ <xsl:choose>
3116
+ <xsl:when test="@align">
3117
+ <xsl:value-of select="@align"/>
3118
+ </xsl:when>
3119
+ <xsl:otherwise>center</xsl:otherwise>
3120
+ </xsl:choose>
3121
+ </xsl:attribute>
3122
+ <xsl:if test="@colspan">
3123
+ <xsl:attribute name="number-columns-spanned">
3124
+ <xsl:value-of select="@colspan"/>
3125
+ </xsl:attribute>
3126
+ </xsl:if>
3127
+ <xsl:if test="@rowspan">
3128
+ <xsl:attribute name="number-rows-spanned">
3129
+ <xsl:value-of select="@rowspan"/>
3130
+ </xsl:attribute>
3131
+ </xsl:if>
3132
+
3133
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
3134
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
3135
+ <xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute>
3136
+ </xsl:if>
3137
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'">
3138
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
3139
+ <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
3140
+ </xsl:if>
3141
+
3142
+ <fo:block>
3143
+ <xsl:apply-templates/>
3144
+ </fo:block>
3145
+ </fo:table-cell>
3146
+ </xsl:template><xsl:template match="*[local-name()='td']" mode="requirement">
3147
+ <fo:table-cell text-align="{@align}">
3148
+ <xsl:attribute name="text-align">
3149
+ <xsl:choose>
3150
+ <xsl:when test="@align">
3151
+ <xsl:value-of select="@align"/>
3152
+ </xsl:when>
3153
+ <xsl:otherwise>left</xsl:otherwise>
3154
+ </xsl:choose>
3155
+ </xsl:attribute>
3156
+ <xsl:if test="@colspan">
3157
+ <xsl:attribute name="number-columns-spanned">
3158
+ <xsl:value-of select="@colspan"/>
3159
+ </xsl:attribute>
3160
+ </xsl:if>
3161
+ <xsl:if test="@rowspan">
3162
+ <xsl:attribute name="number-rows-spanned">
3163
+ <xsl:value-of select="@rowspan"/>
3164
+ </xsl:attribute>
3165
+ </xsl:if>
3166
+
3167
+ <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
3168
+ <xsl:attribute name="padding-left">0.5mm</xsl:attribute>
3169
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
3170
+ <xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])"> <!-- 2nd line and below -->
3171
+ <xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
3172
+ </xsl:if>
3173
+ </xsl:if>
3174
+
3175
+ <fo:block>
3176
+ <xsl:apply-templates/>
3177
+ </fo:block>
3178
+ </fo:table-cell>
3179
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
3180
+ <fo:block font-size="11pt" font-weight="bold" text-align="center" margin-bottom="4pt">
3181
+ <xsl:apply-templates/>
3182
+ </fo:block>
3183
+ </xsl:template><xsl:template match="*[local-name() = 'p'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
3184
+ <fo:block margin-bottom="10pt">
3185
+ <xsl:apply-templates/>
3186
+ </fo:block>
2987
3187
  </xsl:template><xsl:template match="*[local-name() = 'termexample']">
2988
3188
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
2989
3189
  <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -3245,7 +3445,7 @@
3245
3445
 
3246
3446
 
3247
3447
 
3248
- <xsl:variable name="pos"><xsl:number count="ogc:sections/ogc:clause[not(@id='_scope') and not(@id='conformance') and not(@id='_conformance')]"/></xsl:variable> <!-- | ogc:sections/ogc:terms -->
3448
+ <xsl:variable name="pos"><xsl:number count="ogc:sections/ogc:clause[not(@type='scope') and not(@type='conformance')]"/></xsl:variable> <!-- | ogc:sections/ogc:terms -->
3249
3449
  <xsl:if test="$pos &gt;= 2">
3250
3450
  <xsl:attribute name="space-before">18pt</xsl:attribute>
3251
3451
  </xsl:if>
@@ -3273,7 +3473,7 @@
3273
3473
  <fo:block id="{@id}">
3274
3474
  <xsl:apply-templates/>
3275
3475
  </fo:block>
3276
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@id = '_normative_references' or @id = '_references']">
3476
+ </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
3277
3477
 
3278
3478
  <fo:block id="{@id}">
3279
3479
  <xsl:apply-templates/>
@@ -3525,7 +3725,8 @@
3525
3725
 
3526
3726
 
3527
3727
 
3528
-
3728
+
3729
+
3529
3730
  </xsl:variable>
3530
3731
  <xsl:if test="$documentNS != $XSLNS">
3531
3732
  <xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>