metanorma-ogc 2.2.0 → 2.2.1

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/isodoc/ogc/ogc.abstract-specification-topic.xsl +15 -6
  3. data/lib/isodoc/ogc/ogc.best-practice.xsl +15 -6
  4. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +15 -6
  5. data/lib/isodoc/ogc/ogc.community-practice.xsl +15 -6
  6. data/lib/isodoc/ogc/ogc.community-standard.xsl +15 -6
  7. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +15 -6
  8. data/lib/isodoc/ogc/ogc.engineering-report.xsl +15 -6
  9. data/lib/isodoc/ogc/ogc.other.xsl +15 -6
  10. data/lib/isodoc/ogc/ogc.policy.xsl +15 -6
  11. data/lib/isodoc/ogc/ogc.reference-model.xsl +15 -6
  12. data/lib/isodoc/ogc/ogc.release-notes.xsl +15 -6
  13. data/lib/isodoc/ogc/ogc.standard.xsl +15 -6
  14. data/lib/isodoc/ogc/ogc.test-suite.xsl +15 -6
  15. data/lib/isodoc/ogc/ogc.user-guide.xsl +15 -6
  16. data/lib/isodoc/ogc/ogc.white-paper.xsl +15 -6
  17. data/lib/isodoc/ogc/presentation_xml_convert.rb +7 -12
  18. data/lib/isodoc/ogc/xref.rb +0 -125
  19. data/lib/metanorma/ogc/cleanup.rb +68 -97
  20. data/lib/metanorma/ogc/converter.rb +4 -0
  21. data/lib/metanorma/ogc/validate.rb +10 -9
  22. data/lib/metanorma/ogc/version.rb +1 -1
  23. data/lib/relaton/render/config.yml +27 -3
  24. data/metanorma-ogc.gemspec +2 -0
  25. metadata +30 -4
  26. data/lib/isodoc/ogc/reqt.rb +0 -215
  27. data/lib/isodoc/ogc/reqt_helper.rb +0 -83
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b1de0368b5432b1f4a1c680b3a46795f5186e0f3e6e08f5c579ebaefe62915e3
4
- data.tar.gz: ed61716a637c24acd42bc898cf90e40e681522e56122eb56583636b9d82d1d1b
3
+ metadata.gz: 90753d8edec30ec4c7b5be4a9ff9393ef1aaf64576b4b2a1b6790e20b049b571
4
+ data.tar.gz: a641975e74d070b22a75e5f881703195d4d28d32ae58436662d7b8887f2c0ee6
5
5
  SHA512:
6
- metadata.gz: 55c06830b687a4302f33863995a0b41e36c4cf31b4e9563535aa6a115c2416bf9e45d994f8a9cefd063d2e33c16de5baf37e94cc54662ea9d31ee3de8ae4bbc8
7
- data.tar.gz: 86f137aea0ee7a103ddfdf61ee01775362a81aeaf076185689e27bb0345d4ee6caeea61457dd455a82f6811142ccb5d3f7969d2645bf47302bc229431644830e
6
+ metadata.gz: bd386438528b7966e9e1236a8b1198287639c6c150a2ef894ed1c361c9f60c128eadb15be7888a166de7d4de2145ddc7d33ff0d894a531f387f61f1f54d868aa
7
+ data.tar.gz: 0c913f5326402b52cb1a33df542c18d4227e2ba0d9a206654b1a9d8f321ab2c4869a99b55e66c067466c069ff0b17fb3d716938b4ce7b16b551e2af89c37185f
data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl CHANGED
@@ -1944,6 +1944,9 @@
1944
1944
  <xsl:attribute-set name="import-style">
1945
1945
  </xsl:attribute-set>
1946
1946
 
1947
+ <xsl:attribute-set name="component-style">
1948
+ </xsl:attribute-set>
1949
+
1947
1950
  <xsl:attribute-set name="recommendation-style">
1948
1951
 
1949
1952
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -7902,41 +7905,47 @@
7902
7905
  </fo:block>
7903
7906
  </xsl:template>
7904
7907
 
7905
- <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
7908
+ <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']">
7906
7909
  <fo:block xsl:use-attribute-sets="inherit-style">
7907
7910
  <xsl:text>Dependency </xsl:text><xsl:apply-templates/>
7908
7911
  </fo:block>
7909
7912
  </xsl:template>
7910
7913
 
7911
- <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
7914
+ <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']">
7912
7915
  <fo:block xsl:use-attribute-sets="description-style">
7913
7916
  <xsl:apply-templates/>
7914
7917
  </fo:block>
7915
7918
  </xsl:template>
7916
7919
 
7917
- <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
7920
+ <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']">
7918
7921
  <fo:block xsl:use-attribute-sets="specification-style">
7919
7922
  <xsl:apply-templates/>
7920
7923
  </fo:block>
7921
7924
  </xsl:template>
7922
7925
 
7923
- <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
7926
+ <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']">
7924
7927
  <fo:block xsl:use-attribute-sets="measurement-target-style">
7925
7928
  <xsl:apply-templates/>
7926
7929
  </fo:block>
7927
7930
  </xsl:template>
7928
7931
 
7929
- <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
7932
+ <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']">
7930
7933
  <fo:block xsl:use-attribute-sets="verification-style">
7931
7934
  <xsl:apply-templates/>
7932
7935
  </fo:block>
7933
7936
  </xsl:template>
7934
7937
 
7935
- <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
7938
+ <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']">
7936
7939
  <fo:block xsl:use-attribute-sets="import-style">
7937
7940
  <xsl:apply-templates/>
7938
7941
  </fo:block>
7939
7942
  </xsl:template>
7943
+
7944
+ <xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]">
7945
+ <fo:block xsl:use-attribute-sets="component-style">
7946
+ <xsl:apply-templates/>
7947
+ </fo:block>
7948
+ </xsl:template>
7940
7949
  <!-- ========== -->
7941
7950
  <!-- END -->
7942
7951
  <!-- ========== -->
data/lib/isodoc/ogc/ogc.best-practice.xsl CHANGED
@@ -1944,6 +1944,9 @@
1944
1944
  <xsl:attribute-set name="import-style">
1945
1945
  </xsl:attribute-set>
1946
1946
 
1947
+ <xsl:attribute-set name="component-style">
1948
+ </xsl:attribute-set>
1949
+
1947
1950
  <xsl:attribute-set name="recommendation-style">
1948
1951
 
1949
1952
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -7902,41 +7905,47 @@
7902
7905
  </fo:block>
7903
7906
  </xsl:template>
7904
7907
 
7905
- <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
7908
+ <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']">
7906
7909
  <fo:block xsl:use-attribute-sets="inherit-style">
7907
7910
  <xsl:text>Dependency </xsl:text><xsl:apply-templates/>
7908
7911
  </fo:block>
7909
7912
  </xsl:template>
7910
7913
 
7911
- <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
7914
+ <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']">
7912
7915
  <fo:block xsl:use-attribute-sets="description-style">
7913
7916
  <xsl:apply-templates/>
7914
7917
  </fo:block>
7915
7918
  </xsl:template>
7916
7919
 
7917
- <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
7920
+ <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']">
7918
7921
  <fo:block xsl:use-attribute-sets="specification-style">
7919
7922
  <xsl:apply-templates/>
7920
7923
  </fo:block>
7921
7924
  </xsl:template>
7922
7925
 
7923
- <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
7926
+ <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']">
7924
7927
  <fo:block xsl:use-attribute-sets="measurement-target-style">
7925
7928
  <xsl:apply-templates/>
7926
7929
  </fo:block>
7927
7930
  </xsl:template>
7928
7931
 
7929
- <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
7932
+ <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']">
7930
7933
  <fo:block xsl:use-attribute-sets="verification-style">
7931
7934
  <xsl:apply-templates/>
7932
7935
  </fo:block>
7933
7936
  </xsl:template>
7934
7937
 
7935
- <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
7938
+ <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']">
7936
7939
  <fo:block xsl:use-attribute-sets="import-style">
7937
7940
  <xsl:apply-templates/>
7938
7941
  </fo:block>
7939
7942
  </xsl:template>
7943
+
7944
+ <xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]">
7945
+ <fo:block xsl:use-attribute-sets="component-style">
7946
+ <xsl:apply-templates/>
7947
+ </fo:block>
7948
+ </xsl:template>
7940
7949
  <!-- ========== -->
7941
7950
  <!-- END -->
7942
7951
  <!-- ========== -->
data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl CHANGED
@@ -1944,6 +1944,9 @@
1944
1944
  <xsl:attribute-set name="import-style">
1945
1945
  </xsl:attribute-set>
1946
1946
 
1947
+ <xsl:attribute-set name="component-style">
1948
+ </xsl:attribute-set>
1949
+
1947
1950
  <xsl:attribute-set name="recommendation-style">
1948
1951
 
1949
1952
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -7902,41 +7905,47 @@
7902
7905
  </fo:block>
7903
7906
  </xsl:template>
7904
7907
 
7905
- <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
7908
+ <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']">
7906
7909
  <fo:block xsl:use-attribute-sets="inherit-style">
7907
7910
  <xsl:text>Dependency </xsl:text><xsl:apply-templates/>
7908
7911
  </fo:block>
7909
7912
  </xsl:template>
7910
7913
 
7911
- <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
7914
+ <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']">
7912
7915
  <fo:block xsl:use-attribute-sets="description-style">
7913
7916
  <xsl:apply-templates/>
7914
7917
  </fo:block>
7915
7918
  </xsl:template>
7916
7919
 
7917
- <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
7920
+ <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']">
7918
7921
  <fo:block xsl:use-attribute-sets="specification-style">
7919
7922
  <xsl:apply-templates/>
7920
7923
  </fo:block>
7921
7924
  </xsl:template>
7922
7925
 
7923
- <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
7926
+ <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']">
7924
7927
  <fo:block xsl:use-attribute-sets="measurement-target-style">
7925
7928
  <xsl:apply-templates/>
7926
7929
  </fo:block>
7927
7930
  </xsl:template>
7928
7931
 
7929
- <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
7932
+ <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']">
7930
7933
  <fo:block xsl:use-attribute-sets="verification-style">
7931
7934
  <xsl:apply-templates/>
7932
7935
  </fo:block>
7933
7936
  </xsl:template>
7934
7937
 
7935
- <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
7938
+ <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']">
7936
7939
  <fo:block xsl:use-attribute-sets="import-style">
7937
7940
  <xsl:apply-templates/>
7938
7941
  </fo:block>
7939
7942
  </xsl:template>
7943
+
7944
+ <xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]">
7945
+ <fo:block xsl:use-attribute-sets="component-style">
7946
+ <xsl:apply-templates/>
7947
+ </fo:block>
7948
+ </xsl:template>
7940
7949
  <!-- ========== -->
7941
7950
  <!-- END -->
7942
7951
  <!-- ========== -->
data/lib/isodoc/ogc/ogc.community-practice.xsl CHANGED
@@ -1944,6 +1944,9 @@
1944
1944
  <xsl:attribute-set name="import-style">
1945
1945
  </xsl:attribute-set>
1946
1946
 
1947
+ <xsl:attribute-set name="component-style">
1948
+ </xsl:attribute-set>
1949
+
1947
1950
  <xsl:attribute-set name="recommendation-style">
1948
1951
 
1949
1952
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -7902,41 +7905,47 @@
7902
7905
  </fo:block>
7903
7906
  </xsl:template>
7904
7907
 
7905
- <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
7908
+ <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']">
7906
7909
  <fo:block xsl:use-attribute-sets="inherit-style">
7907
7910
  <xsl:text>Dependency </xsl:text><xsl:apply-templates/>
7908
7911
  </fo:block>
7909
7912
  </xsl:template>
7910
7913
 
7911
- <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
7914
+ <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']">
7912
7915
  <fo:block xsl:use-attribute-sets="description-style">
7913
7916
  <xsl:apply-templates/>
7914
7917
  </fo:block>
7915
7918
  </xsl:template>
7916
7919
 
7917
- <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
7920
+ <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']">
7918
7921
  <fo:block xsl:use-attribute-sets="specification-style">
7919
7922
  <xsl:apply-templates/>
7920
7923
  </fo:block>
7921
7924
  </xsl:template>
7922
7925
 
7923
- <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
7926
+ <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']">
7924
7927
  <fo:block xsl:use-attribute-sets="measurement-target-style">
7925
7928
  <xsl:apply-templates/>
7926
7929
  </fo:block>
7927
7930
  </xsl:template>
7928
7931
 
7929
- <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
7932
+ <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']">
7930
7933
  <fo:block xsl:use-attribute-sets="verification-style">
7931
7934
  <xsl:apply-templates/>
7932
7935
  </fo:block>
7933
7936
  </xsl:template>
7934
7937
 
7935
- <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
7938
+ <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']">
7936
7939
  <fo:block xsl:use-attribute-sets="import-style">
7937
7940
  <xsl:apply-templates/>
7938
7941
  </fo:block>
7939
7942
  </xsl:template>
7943
+
7944
+ <xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]">
7945
+ <fo:block xsl:use-attribute-sets="component-style">
7946
+ <xsl:apply-templates/>
7947
+ </fo:block>
7948
+ </xsl:template>
7940
7949
  <!-- ========== -->
7941
7950
  <!-- END -->
7942
7951
  <!-- ========== -->
data/lib/isodoc/ogc/ogc.community-standard.xsl CHANGED
@@ -1944,6 +1944,9 @@
1944
1944
  <xsl:attribute-set name="import-style">
1945
1945
  </xsl:attribute-set>
1946
1946
 
1947
+ <xsl:attribute-set name="component-style">
1948
+ </xsl:attribute-set>
1949
+
1947
1950
  <xsl:attribute-set name="recommendation-style">
1948
1951
 
1949
1952
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -7902,41 +7905,47 @@
7902
7905
  </fo:block>
7903
7906
  </xsl:template>
7904
7907
 
7905
- <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
7908
+ <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']">
7906
7909
  <fo:block xsl:use-attribute-sets="inherit-style">
7907
7910
  <xsl:text>Dependency </xsl:text><xsl:apply-templates/>
7908
7911
  </fo:block>
7909
7912
  </xsl:template>
7910
7913
 
7911
- <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
7914
+ <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']">
7912
7915
  <fo:block xsl:use-attribute-sets="description-style">
7913
7916
  <xsl:apply-templates/>
7914
7917
  </fo:block>
7915
7918
  </xsl:template>
7916
7919
 
7917
- <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
7920
+ <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']">
7918
7921
  <fo:block xsl:use-attribute-sets="specification-style">
7919
7922
  <xsl:apply-templates/>
7920
7923
  </fo:block>
7921
7924
  </xsl:template>
7922
7925
 
7923
- <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
7926
+ <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']">
7924
7927
  <fo:block xsl:use-attribute-sets="measurement-target-style">
7925
7928
  <xsl:apply-templates/>
7926
7929
  </fo:block>
7927
7930
  </xsl:template>
7928
7931
 
7929
- <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
7932
+ <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']">
7930
7933
  <fo:block xsl:use-attribute-sets="verification-style">
7931
7934
  <xsl:apply-templates/>
7932
7935
  </fo:block>
7933
7936
  </xsl:template>
7934
7937
 
7935
- <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
7938
+ <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']">
7936
7939
  <fo:block xsl:use-attribute-sets="import-style">
7937
7940
  <xsl:apply-templates/>
7938
7941
  </fo:block>
7939
7942
  </xsl:template>
7943
+
7944
+ <xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]">
7945
+ <fo:block xsl:use-attribute-sets="component-style">
7946
+ <xsl:apply-templates/>
7947
+ </fo:block>
7948
+ </xsl:template>
7940
7949
  <!-- ========== -->
7941
7950
  <!-- END -->
7942
7951
  <!-- ========== -->
data/lib/isodoc/ogc/ogc.discussion-paper.xsl CHANGED
@@ -1944,6 +1944,9 @@
1944
1944
  <xsl:attribute-set name="import-style">
1945
1945
  </xsl:attribute-set>
1946
1946
 
1947
+ <xsl:attribute-set name="component-style">
1948
+ </xsl:attribute-set>
1949
+
1947
1950
  <xsl:attribute-set name="recommendation-style">
1948
1951
 
1949
1952
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -7902,41 +7905,47 @@
7902
7905
  </fo:block>
7903
7906
  </xsl:template>
7904
7907
 
7905
- <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
7908
+ <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']">
7906
7909
  <fo:block xsl:use-attribute-sets="inherit-style">
7907
7910
  <xsl:text>Dependency </xsl:text><xsl:apply-templates/>
7908
7911
  </fo:block>
7909
7912
  </xsl:template>
7910
7913
 
7911
- <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
7914
+ <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']">
7912
7915
  <fo:block xsl:use-attribute-sets="description-style">
7913
7916
  <xsl:apply-templates/>
7914
7917
  </fo:block>
7915
7918
  </xsl:template>
7916
7919
 
7917
- <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
7920
+ <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']">
7918
7921
  <fo:block xsl:use-attribute-sets="specification-style">
7919
7922
  <xsl:apply-templates/>
7920
7923
  </fo:block>
7921
7924
  </xsl:template>
7922
7925
 
7923
- <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
7926
+ <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']">
7924
7927
  <fo:block xsl:use-attribute-sets="measurement-target-style">
7925
7928
  <xsl:apply-templates/>
7926
7929
  </fo:block>
7927
7930
  </xsl:template>
7928
7931
 
7929
- <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
7932
+ <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']">
7930
7933
  <fo:block xsl:use-attribute-sets="verification-style">
7931
7934
  <xsl:apply-templates/>
7932
7935
  </fo:block>
7933
7936
  </xsl:template>
7934
7937
 
7935
- <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
7938
+ <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']">
7936
7939
  <fo:block xsl:use-attribute-sets="import-style">
7937
7940
  <xsl:apply-templates/>
7938
7941
  </fo:block>
7939
7942
  </xsl:template>
7943
+
7944
+ <xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]">
7945
+ <fo:block xsl:use-attribute-sets="component-style">
7946
+ <xsl:apply-templates/>
7947
+ </fo:block>
7948
+ </xsl:template>
7940
7949
  <!-- ========== -->
7941
7950
  <!-- END -->
7942
7951
  <!-- ========== -->
data/lib/isodoc/ogc/ogc.engineering-report.xsl CHANGED
@@ -1944,6 +1944,9 @@
1944
1944
  <xsl:attribute-set name="import-style">
1945
1945
  </xsl:attribute-set>
1946
1946
 
1947
+ <xsl:attribute-set name="component-style">
1948
+ </xsl:attribute-set>
1949
+
1947
1950
  <xsl:attribute-set name="recommendation-style">
1948
1951
 
1949
1952
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -7902,41 +7905,47 @@
7902
7905
  </fo:block>
7903
7906
  </xsl:template>
7904
7907
 
7905
- <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
7908
+ <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']">
7906
7909
  <fo:block xsl:use-attribute-sets="inherit-style">
7907
7910
  <xsl:text>Dependency </xsl:text><xsl:apply-templates/>
7908
7911
  </fo:block>
7909
7912
  </xsl:template>
7910
7913
 
7911
- <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
7914
+ <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']">
7912
7915
  <fo:block xsl:use-attribute-sets="description-style">
7913
7916
  <xsl:apply-templates/>
7914
7917
  </fo:block>
7915
7918
  </xsl:template>
7916
7919
 
7917
- <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
7920
+ <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']">
7918
7921
  <fo:block xsl:use-attribute-sets="specification-style">
7919
7922
  <xsl:apply-templates/>
7920
7923
  </fo:block>
7921
7924
  </xsl:template>
7922
7925
 
7923
- <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
7926
+ <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']">
7924
7927
  <fo:block xsl:use-attribute-sets="measurement-target-style">
7925
7928
  <xsl:apply-templates/>
7926
7929
  </fo:block>
7927
7930
  </xsl:template>
7928
7931
 
7929
- <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
7932
+ <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']">
7930
7933
  <fo:block xsl:use-attribute-sets="verification-style">
7931
7934
  <xsl:apply-templates/>
7932
7935
  </fo:block>
7933
7936
  </xsl:template>
7934
7937
 
7935
- <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
7938
+ <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']">
7936
7939
  <fo:block xsl:use-attribute-sets="import-style">
7937
7940
  <xsl:apply-templates/>
7938
7941
  </fo:block>
7939
7942
  </xsl:template>
7943
+
7944
+ <xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]">
7945
+ <fo:block xsl:use-attribute-sets="component-style">
7946
+ <xsl:apply-templates/>
7947
+ </fo:block>
7948
+ </xsl:template>
7940
7949
  <!-- ========== -->
7941
7950
  <!-- END -->
7942
7951
  <!-- ========== -->
data/lib/isodoc/ogc/ogc.other.xsl CHANGED
@@ -1944,6 +1944,9 @@
1944
1944
  <xsl:attribute-set name="import-style">
1945
1945
  </xsl:attribute-set>
1946
1946
 
1947
+ <xsl:attribute-set name="component-style">
1948
+ </xsl:attribute-set>
1949
+
1947
1950
  <xsl:attribute-set name="recommendation-style">
1948
1951
 
1949
1952
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -7902,41 +7905,47 @@
7902
7905
  </fo:block>
7903
7906
  </xsl:template>
7904
7907
 
7905
- <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
7908
+ <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']">
7906
7909
  <fo:block xsl:use-attribute-sets="inherit-style">
7907
7910
  <xsl:text>Dependency </xsl:text><xsl:apply-templates/>
7908
7911
  </fo:block>
7909
7912
  </xsl:template>
7910
7913
 
7911
- <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
7914
+ <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']">
7912
7915
  <fo:block xsl:use-attribute-sets="description-style">
7913
7916
  <xsl:apply-templates/>
7914
7917
  </fo:block>
7915
7918
  </xsl:template>
7916
7919
 
7917
- <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
7920
+ <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']">
7918
7921
  <fo:block xsl:use-attribute-sets="specification-style">
7919
7922
  <xsl:apply-templates/>
7920
7923
  </fo:block>
7921
7924
  </xsl:template>
7922
7925
 
7923
- <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
7926
+ <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']">
7924
7927
  <fo:block xsl:use-attribute-sets="measurement-target-style">
7925
7928
  <xsl:apply-templates/>
7926
7929
  </fo:block>
7927
7930
  </xsl:template>
7928
7931
 
7929
- <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
7932
+ <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']">
7930
7933
  <fo:block xsl:use-attribute-sets="verification-style">
7931
7934
  <xsl:apply-templates/>
7932
7935
  </fo:block>
7933
7936
  </xsl:template>
7934
7937
 
7935
- <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
7938
+ <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']">
7936
7939
  <fo:block xsl:use-attribute-sets="import-style">
7937
7940
  <xsl:apply-templates/>
7938
7941
  </fo:block>
7939
7942
  </xsl:template>
7943
+
7944
+ <xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]">
7945
+ <fo:block xsl:use-attribute-sets="component-style">
7946
+ <xsl:apply-templates/>
7947
+ </fo:block>
7948
+ </xsl:template>
7940
7949
  <!-- ========== -->
7941
7950
  <!-- END -->
7942
7951
  <!-- ========== -->
data/lib/isodoc/ogc/ogc.policy.xsl CHANGED
@@ -1944,6 +1944,9 @@
1944
1944
  <xsl:attribute-set name="import-style">
1945
1945
  </xsl:attribute-set>
1946
1946
 
1947
+ <xsl:attribute-set name="component-style">
1948
+ </xsl:attribute-set>
1949
+
1947
1950
  <xsl:attribute-set name="recommendation-style">
1948
1951
 
1949
1952
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -7902,41 +7905,47 @@
7902
7905
  </fo:block>
7903
7906
  </xsl:template>
7904
7907
 
7905
- <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
7908
+ <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']">
7906
7909
  <fo:block xsl:use-attribute-sets="inherit-style">
7907
7910
  <xsl:text>Dependency </xsl:text><xsl:apply-templates/>
7908
7911
  </fo:block>
7909
7912
  </xsl:template>
7910
7913
 
7911
- <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
7914
+ <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']">
7912
7915
  <fo:block xsl:use-attribute-sets="description-style">
7913
7916
  <xsl:apply-templates/>
7914
7917
  </fo:block>
7915
7918
  </xsl:template>
7916
7919
 
7917
- <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
7920
+ <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']">
7918
7921
  <fo:block xsl:use-attribute-sets="specification-style">
7919
7922
  <xsl:apply-templates/>
7920
7923
  </fo:block>
7921
7924
  </xsl:template>
7922
7925
 
7923
- <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
7926
+ <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']">
7924
7927
  <fo:block xsl:use-attribute-sets="measurement-target-style">
7925
7928
  <xsl:apply-templates/>
7926
7929
  </fo:block>
7927
7930
  </xsl:template>
7928
7931
 
7929
- <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
7932
+ <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']">
7930
7933
  <fo:block xsl:use-attribute-sets="verification-style">
7931
7934
  <xsl:apply-templates/>
7932
7935
  </fo:block>
7933
7936
  </xsl:template>
7934
7937
 
7935
- <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
7938
+ <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']">
7936
7939
  <fo:block xsl:use-attribute-sets="import-style">
7937
7940
  <xsl:apply-templates/>
7938
7941
  </fo:block>
7939
7942
  </xsl:template>
7943
+
7944
+ <xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]">
7945
+ <fo:block xsl:use-attribute-sets="component-style">
7946
+ <xsl:apply-templates/>
7947
+ </fo:block>
7948
+ </xsl:template>
7940
7949
  <!-- ========== -->
7941
7950
  <!-- END -->
7942
7951
  <!-- ========== -->