metanorma-ogc 2.4.2 → 2.4.6

Sign up to get free protection for your applications and to get access to all the features.
@@ -1138,7 +1138,7 @@
1138
1138
  </fo:list-item-label>
1139
1139
  <fo:list-item-body start-indent="body-start()">
1140
1140
  <fo:block>
1141
- <xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:admitted" mode="term_name"/>
1141
+ <xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:deprecates | ../ogc:admitted" mode="term_name"/>
1142
1142
  </fo:block>
1143
1143
  </fo:list-item-body>
1144
1144
  </fo:list-item>
@@ -1147,7 +1147,7 @@
1147
1147
  </fo:block>
1148
1148
  </xsl:template>
1149
1149
 
1150
- <xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" priority="2"/>
1150
+ <xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" priority="2"/>
1151
1151
 
1152
1152
  <!-- first preferred displays on the same line as term/name -->
1153
1153
  <xsl:template match="ogc:preferred[not(preceding-sibling::ogc:preferred)]" mode="term_name" priority="2">
@@ -1155,9 +1155,9 @@
1155
1155
  <fo:inline padding-right="2mm"> </fo:inline>
1156
1156
  </xsl:template>
1157
1157
 
1158
- <xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" mode="term_name">
1158
+ <xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" mode="term_name">
1159
1159
  <xsl:choose>
1160
- <xsl:when test="preceding-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
1160
+ <xsl:when test="preceding-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::admitted]">
1161
1161
  <fo:block space-before="6pt"><xsl:call-template name="displayTerm"/></fo:block> <!-- block wrapper -->
1162
1162
  </xsl:when>
1163
1163
  <xsl:otherwise><xsl:call-template name="displayTerm"/></xsl:otherwise>
@@ -1166,24 +1166,48 @@
1166
1166
 
1167
1167
  <xsl:template name="displayTerm">
1168
1168
  <fo:inline font-size="18pt" padding-right="3mm"><xsl:apply-templates/></fo:inline>
1169
- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1169
+ <!-- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1170
1170
  <xsl:variable name="kind" select="local-name()"/>
1171
1171
  <xsl:attribute name="background-color">
1172
1172
  <xsl:choose>
1173
1173
  <xsl:when test="$kind = 'preferred'">rgb(249, 235, 187)</xsl:when>
1174
1174
  <xsl:when test="$kind = 'deprecated'">rgb(237, 237, 238)</xsl:when>
1175
- <xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
1175
+ <xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
1176
1176
  </xsl:choose>
1177
1177
  </xsl:attribute>
1178
1178
  <xsl:call-template name="addLetterSpacing">
1179
1179
  <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($kind))"/>
1180
- </xsl:call-template>
1181
- </fo:inline>
1182
- <xsl:if test="following-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
1180
+ </xsl:call-template>
1181
+ </fo:inline> -->
1182
+ <xsl:if test="following-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::ogc:admitted]">
1183
1183
  <fo:inline padding-right="2mm"> </fo:inline>
1184
1184
  </xsl:if>
1185
1185
  </xsl:template>
1186
1186
 
1187
+ <xsl:template match="*[local-name() = 'span'][@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" mode="update_xml_step1" priority="2">
1188
+ <xsl:copy>
1189
+ <xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
1190
+ </xsl:copy>
1191
+ </xsl:template>
1192
+
1193
+ <xsl:template match="ogc:span[@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" priority="3">
1194
+ <fo:inline> </fo:inline>
1195
+ <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1196
+ <xsl:variable name="kind" select="@class"/>
1197
+ <xsl:variable name="label" select="text()"/>
1198
+ <xsl:attribute name="background-color">
1199
+ <xsl:choose>
1200
+ <xsl:when test="$kind = 'PreferredLabel' or $label = 'PREFERRED'">rgb(249, 235, 187)</xsl:when>
1201
+ <xsl:when test="$kind = 'DeprecatedLabel' or $label = 'DEPRECATED'">rgb(237, 237, 238)</xsl:when>
1202
+ <xsl:when test="$kind = 'AdmittedLabel' or $label = 'ADMITTED'">rgb(223, 236, 249)</xsl:when>
1203
+ </xsl:choose>
1204
+ </xsl:attribute>
1205
+ <xsl:call-template name="addLetterSpacing">
1206
+ <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($label))"/>
1207
+ </xsl:call-template>
1208
+ </fo:inline>
1209
+ </xsl:template>
1210
+
1187
1211
  <xsl:template match="*[local-name()='th']//text()[not(ancestor::ogc:fn)]" priority="2">
1188
1212
  <xsl:variable name="text">
1189
1213
  <xsl:call-template name="add-zero-spaces-java"/>
@@ -5919,8 +5943,17 @@
5919
5943
  <xsl:variable name="styles_">
5920
5944
  <xsl:for-each select="xalan:nodeset($styles__)/item">
5921
5945
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
5922
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5923
- <xsl:if test="$key = 'font-family' or $key = 'color'">
5946
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5947
+ <xsl:variable name="value">
5948
+ <xsl:choose>
5949
+ <!-- if font-size is digits only -->
5950
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
5951
+ <xsl:otherwise>
5952
+ <xsl:value-of select="$value_"/>
5953
+ </xsl:otherwise>
5954
+ </xsl:choose>
5955
+ </xsl:variable>
5956
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
5924
5957
  <style name="{$key}"><xsl:value-of select="$value"/></style>
5925
5958
  </xsl:if>
5926
5959
  </xsl:for-each>
@@ -1138,7 +1138,7 @@
1138
1138
  </fo:list-item-label>
1139
1139
  <fo:list-item-body start-indent="body-start()">
1140
1140
  <fo:block>
1141
- <xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:admitted" mode="term_name"/>
1141
+ <xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:deprecates | ../ogc:admitted" mode="term_name"/>
1142
1142
  </fo:block>
1143
1143
  </fo:list-item-body>
1144
1144
  </fo:list-item>
@@ -1147,7 +1147,7 @@
1147
1147
  </fo:block>
1148
1148
  </xsl:template>
1149
1149
 
1150
- <xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" priority="2"/>
1150
+ <xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" priority="2"/>
1151
1151
 
1152
1152
  <!-- first preferred displays on the same line as term/name -->
1153
1153
  <xsl:template match="ogc:preferred[not(preceding-sibling::ogc:preferred)]" mode="term_name" priority="2">
@@ -1155,9 +1155,9 @@
1155
1155
  <fo:inline padding-right="2mm"> </fo:inline>
1156
1156
  </xsl:template>
1157
1157
 
1158
- <xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" mode="term_name">
1158
+ <xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" mode="term_name">
1159
1159
  <xsl:choose>
1160
- <xsl:when test="preceding-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
1160
+ <xsl:when test="preceding-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::admitted]">
1161
1161
  <fo:block space-before="6pt"><xsl:call-template name="displayTerm"/></fo:block> <!-- block wrapper -->
1162
1162
  </xsl:when>
1163
1163
  <xsl:otherwise><xsl:call-template name="displayTerm"/></xsl:otherwise>
@@ -1166,24 +1166,48 @@
1166
1166
 
1167
1167
  <xsl:template name="displayTerm">
1168
1168
  <fo:inline font-size="18pt" padding-right="3mm"><xsl:apply-templates/></fo:inline>
1169
- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1169
+ <!-- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1170
1170
  <xsl:variable name="kind" select="local-name()"/>
1171
1171
  <xsl:attribute name="background-color">
1172
1172
  <xsl:choose>
1173
1173
  <xsl:when test="$kind = 'preferred'">rgb(249, 235, 187)</xsl:when>
1174
1174
  <xsl:when test="$kind = 'deprecated'">rgb(237, 237, 238)</xsl:when>
1175
- <xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
1175
+ <xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
1176
1176
  </xsl:choose>
1177
1177
  </xsl:attribute>
1178
1178
  <xsl:call-template name="addLetterSpacing">
1179
1179
  <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($kind))"/>
1180
- </xsl:call-template>
1181
- </fo:inline>
1182
- <xsl:if test="following-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
1180
+ </xsl:call-template>
1181
+ </fo:inline> -->
1182
+ <xsl:if test="following-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::ogc:admitted]">
1183
1183
  <fo:inline padding-right="2mm"> </fo:inline>
1184
1184
  </xsl:if>
1185
1185
  </xsl:template>
1186
1186
 
1187
+ <xsl:template match="*[local-name() = 'span'][@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" mode="update_xml_step1" priority="2">
1188
+ <xsl:copy>
1189
+ <xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
1190
+ </xsl:copy>
1191
+ </xsl:template>
1192
+
1193
+ <xsl:template match="ogc:span[@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" priority="3">
1194
+ <fo:inline> </fo:inline>
1195
+ <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1196
+ <xsl:variable name="kind" select="@class"/>
1197
+ <xsl:variable name="label" select="text()"/>
1198
+ <xsl:attribute name="background-color">
1199
+ <xsl:choose>
1200
+ <xsl:when test="$kind = 'PreferredLabel' or $label = 'PREFERRED'">rgb(249, 235, 187)</xsl:when>
1201
+ <xsl:when test="$kind = 'DeprecatedLabel' or $label = 'DEPRECATED'">rgb(237, 237, 238)</xsl:when>
1202
+ <xsl:when test="$kind = 'AdmittedLabel' or $label = 'ADMITTED'">rgb(223, 236, 249)</xsl:when>
1203
+ </xsl:choose>
1204
+ </xsl:attribute>
1205
+ <xsl:call-template name="addLetterSpacing">
1206
+ <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($label))"/>
1207
+ </xsl:call-template>
1208
+ </fo:inline>
1209
+ </xsl:template>
1210
+
1187
1211
  <xsl:template match="*[local-name()='th']//text()[not(ancestor::ogc:fn)]" priority="2">
1188
1212
  <xsl:variable name="text">
1189
1213
  <xsl:call-template name="add-zero-spaces-java"/>
@@ -5919,8 +5943,17 @@
5919
5943
  <xsl:variable name="styles_">
5920
5944
  <xsl:for-each select="xalan:nodeset($styles__)/item">
5921
5945
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
5922
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5923
- <xsl:if test="$key = 'font-family' or $key = 'color'">
5946
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5947
+ <xsl:variable name="value">
5948
+ <xsl:choose>
5949
+ <!-- if font-size is digits only -->
5950
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
5951
+ <xsl:otherwise>
5952
+ <xsl:value-of select="$value_"/>
5953
+ </xsl:otherwise>
5954
+ </xsl:choose>
5955
+ </xsl:variable>
5956
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
5924
5957
  <style name="{$key}"><xsl:value-of select="$value"/></style>
5925
5958
  </xsl:if>
5926
5959
  </xsl:for-each>
@@ -1138,7 +1138,7 @@
1138
1138
  </fo:list-item-label>
1139
1139
  <fo:list-item-body start-indent="body-start()">
1140
1140
  <fo:block>
1141
- <xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:admitted" mode="term_name"/>
1141
+ <xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:deprecates | ../ogc:admitted" mode="term_name"/>
1142
1142
  </fo:block>
1143
1143
  </fo:list-item-body>
1144
1144
  </fo:list-item>
@@ -1147,7 +1147,7 @@
1147
1147
  </fo:block>
1148
1148
  </xsl:template>
1149
1149
 
1150
- <xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" priority="2"/>
1150
+ <xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" priority="2"/>
1151
1151
 
1152
1152
  <!-- first preferred displays on the same line as term/name -->
1153
1153
  <xsl:template match="ogc:preferred[not(preceding-sibling::ogc:preferred)]" mode="term_name" priority="2">
@@ -1155,9 +1155,9 @@
1155
1155
  <fo:inline padding-right="2mm"> </fo:inline>
1156
1156
  </xsl:template>
1157
1157
 
1158
- <xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" mode="term_name">
1158
+ <xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" mode="term_name">
1159
1159
  <xsl:choose>
1160
- <xsl:when test="preceding-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
1160
+ <xsl:when test="preceding-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::admitted]">
1161
1161
  <fo:block space-before="6pt"><xsl:call-template name="displayTerm"/></fo:block> <!-- block wrapper -->
1162
1162
  </xsl:when>
1163
1163
  <xsl:otherwise><xsl:call-template name="displayTerm"/></xsl:otherwise>
@@ -1166,24 +1166,48 @@
1166
1166
 
1167
1167
  <xsl:template name="displayTerm">
1168
1168
  <fo:inline font-size="18pt" padding-right="3mm"><xsl:apply-templates/></fo:inline>
1169
- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1169
+ <!-- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1170
1170
  <xsl:variable name="kind" select="local-name()"/>
1171
1171
  <xsl:attribute name="background-color">
1172
1172
  <xsl:choose>
1173
1173
  <xsl:when test="$kind = 'preferred'">rgb(249, 235, 187)</xsl:when>
1174
1174
  <xsl:when test="$kind = 'deprecated'">rgb(237, 237, 238)</xsl:when>
1175
- <xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
1175
+ <xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
1176
1176
  </xsl:choose>
1177
1177
  </xsl:attribute>
1178
1178
  <xsl:call-template name="addLetterSpacing">
1179
1179
  <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($kind))"/>
1180
- </xsl:call-template>
1181
- </fo:inline>
1182
- <xsl:if test="following-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
1180
+ </xsl:call-template>
1181
+ </fo:inline> -->
1182
+ <xsl:if test="following-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::ogc:admitted]">
1183
1183
  <fo:inline padding-right="2mm"> </fo:inline>
1184
1184
  </xsl:if>
1185
1185
  </xsl:template>
1186
1186
 
1187
+ <xsl:template match="*[local-name() = 'span'][@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" mode="update_xml_step1" priority="2">
1188
+ <xsl:copy>
1189
+ <xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
1190
+ </xsl:copy>
1191
+ </xsl:template>
1192
+
1193
+ <xsl:template match="ogc:span[@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" priority="3">
1194
+ <fo:inline> </fo:inline>
1195
+ <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1196
+ <xsl:variable name="kind" select="@class"/>
1197
+ <xsl:variable name="label" select="text()"/>
1198
+ <xsl:attribute name="background-color">
1199
+ <xsl:choose>
1200
+ <xsl:when test="$kind = 'PreferredLabel' or $label = 'PREFERRED'">rgb(249, 235, 187)</xsl:when>
1201
+ <xsl:when test="$kind = 'DeprecatedLabel' or $label = 'DEPRECATED'">rgb(237, 237, 238)</xsl:when>
1202
+ <xsl:when test="$kind = 'AdmittedLabel' or $label = 'ADMITTED'">rgb(223, 236, 249)</xsl:when>
1203
+ </xsl:choose>
1204
+ </xsl:attribute>
1205
+ <xsl:call-template name="addLetterSpacing">
1206
+ <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($label))"/>
1207
+ </xsl:call-template>
1208
+ </fo:inline>
1209
+ </xsl:template>
1210
+
1187
1211
  <xsl:template match="*[local-name()='th']//text()[not(ancestor::ogc:fn)]" priority="2">
1188
1212
  <xsl:variable name="text">
1189
1213
  <xsl:call-template name="add-zero-spaces-java"/>
@@ -5919,8 +5943,17 @@
5919
5943
  <xsl:variable name="styles_">
5920
5944
  <xsl:for-each select="xalan:nodeset($styles__)/item">
5921
5945
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
5922
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5923
- <xsl:if test="$key = 'font-family' or $key = 'color'">
5946
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5947
+ <xsl:variable name="value">
5948
+ <xsl:choose>
5949
+ <!-- if font-size is digits only -->
5950
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
5951
+ <xsl:otherwise>
5952
+ <xsl:value-of select="$value_"/>
5953
+ </xsl:otherwise>
5954
+ </xsl:choose>
5955
+ </xsl:variable>
5956
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
5924
5957
  <style name="{$key}"><xsl:value-of select="$value"/></style>
5925
5958
  </xsl:if>
5926
5959
  </xsl:for-each>
@@ -1138,7 +1138,7 @@
1138
1138
  </fo:list-item-label>
1139
1139
  <fo:list-item-body start-indent="body-start()">
1140
1140
  <fo:block>
1141
- <xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:admitted" mode="term_name"/>
1141
+ <xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:deprecates | ../ogc:admitted" mode="term_name"/>
1142
1142
  </fo:block>
1143
1143
  </fo:list-item-body>
1144
1144
  </fo:list-item>
@@ -1147,7 +1147,7 @@
1147
1147
  </fo:block>
1148
1148
  </xsl:template>
1149
1149
 
1150
- <xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" priority="2"/>
1150
+ <xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" priority="2"/>
1151
1151
 
1152
1152
  <!-- first preferred displays on the same line as term/name -->
1153
1153
  <xsl:template match="ogc:preferred[not(preceding-sibling::ogc:preferred)]" mode="term_name" priority="2">
@@ -1155,9 +1155,9 @@
1155
1155
  <fo:inline padding-right="2mm"> </fo:inline>
1156
1156
  </xsl:template>
1157
1157
 
1158
- <xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" mode="term_name">
1158
+ <xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" mode="term_name">
1159
1159
  <xsl:choose>
1160
- <xsl:when test="preceding-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
1160
+ <xsl:when test="preceding-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::admitted]">
1161
1161
  <fo:block space-before="6pt"><xsl:call-template name="displayTerm"/></fo:block> <!-- block wrapper -->
1162
1162
  </xsl:when>
1163
1163
  <xsl:otherwise><xsl:call-template name="displayTerm"/></xsl:otherwise>
@@ -1166,24 +1166,48 @@
1166
1166
 
1167
1167
  <xsl:template name="displayTerm">
1168
1168
  <fo:inline font-size="18pt" padding-right="3mm"><xsl:apply-templates/></fo:inline>
1169
- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1169
+ <!-- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1170
1170
  <xsl:variable name="kind" select="local-name()"/>
1171
1171
  <xsl:attribute name="background-color">
1172
1172
  <xsl:choose>
1173
1173
  <xsl:when test="$kind = 'preferred'">rgb(249, 235, 187)</xsl:when>
1174
1174
  <xsl:when test="$kind = 'deprecated'">rgb(237, 237, 238)</xsl:when>
1175
- <xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
1175
+ <xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
1176
1176
  </xsl:choose>
1177
1177
  </xsl:attribute>
1178
1178
  <xsl:call-template name="addLetterSpacing">
1179
1179
  <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($kind))"/>
1180
- </xsl:call-template>
1181
- </fo:inline>
1182
- <xsl:if test="following-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
1180
+ </xsl:call-template>
1181
+ </fo:inline> -->
1182
+ <xsl:if test="following-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::ogc:admitted]">
1183
1183
  <fo:inline padding-right="2mm"> </fo:inline>
1184
1184
  </xsl:if>
1185
1185
  </xsl:template>
1186
1186
 
1187
+ <xsl:template match="*[local-name() = 'span'][@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" mode="update_xml_step1" priority="2">
1188
+ <xsl:copy>
1189
+ <xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
1190
+ </xsl:copy>
1191
+ </xsl:template>
1192
+
1193
+ <xsl:template match="ogc:span[@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" priority="3">
1194
+ <fo:inline> </fo:inline>
1195
+ <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1196
+ <xsl:variable name="kind" select="@class"/>
1197
+ <xsl:variable name="label" select="text()"/>
1198
+ <xsl:attribute name="background-color">
1199
+ <xsl:choose>
1200
+ <xsl:when test="$kind = 'PreferredLabel' or $label = 'PREFERRED'">rgb(249, 235, 187)</xsl:when>
1201
+ <xsl:when test="$kind = 'DeprecatedLabel' or $label = 'DEPRECATED'">rgb(237, 237, 238)</xsl:when>
1202
+ <xsl:when test="$kind = 'AdmittedLabel' or $label = 'ADMITTED'">rgb(223, 236, 249)</xsl:when>
1203
+ </xsl:choose>
1204
+ </xsl:attribute>
1205
+ <xsl:call-template name="addLetterSpacing">
1206
+ <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($label))"/>
1207
+ </xsl:call-template>
1208
+ </fo:inline>
1209
+ </xsl:template>
1210
+
1187
1211
  <xsl:template match="*[local-name()='th']//text()[not(ancestor::ogc:fn)]" priority="2">
1188
1212
  <xsl:variable name="text">
1189
1213
  <xsl:call-template name="add-zero-spaces-java"/>
@@ -5919,8 +5943,17 @@
5919
5943
  <xsl:variable name="styles_">
5920
5944
  <xsl:for-each select="xalan:nodeset($styles__)/item">
5921
5945
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
5922
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5923
- <xsl:if test="$key = 'font-family' or $key = 'color'">
5946
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5947
+ <xsl:variable name="value">
5948
+ <xsl:choose>
5949
+ <!-- if font-size is digits only -->
5950
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
5951
+ <xsl:otherwise>
5952
+ <xsl:value-of select="$value_"/>
5953
+ </xsl:otherwise>
5954
+ </xsl:choose>
5955
+ </xsl:variable>
5956
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
5924
5957
  <style name="{$key}"><xsl:value-of select="$value"/></style>
5925
5958
  </xsl:if>
5926
5959
  </xsl:for-each>
@@ -1138,7 +1138,7 @@
1138
1138
  </fo:list-item-label>
1139
1139
  <fo:list-item-body start-indent="body-start()">
1140
1140
  <fo:block>
1141
- <xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:admitted" mode="term_name"/>
1141
+ <xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:deprecates | ../ogc:admitted" mode="term_name"/>
1142
1142
  </fo:block>
1143
1143
  </fo:list-item-body>
1144
1144
  </fo:list-item>
@@ -1147,7 +1147,7 @@
1147
1147
  </fo:block>
1148
1148
  </xsl:template>
1149
1149
 
1150
- <xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" priority="2"/>
1150
+ <xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" priority="2"/>
1151
1151
 
1152
1152
  <!-- first preferred displays on the same line as term/name -->
1153
1153
  <xsl:template match="ogc:preferred[not(preceding-sibling::ogc:preferred)]" mode="term_name" priority="2">
@@ -1155,9 +1155,9 @@
1155
1155
  <fo:inline padding-right="2mm"> </fo:inline>
1156
1156
  </xsl:template>
1157
1157
 
1158
- <xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" mode="term_name">
1158
+ <xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" mode="term_name">
1159
1159
  <xsl:choose>
1160
- <xsl:when test="preceding-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
1160
+ <xsl:when test="preceding-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::admitted]">
1161
1161
  <fo:block space-before="6pt"><xsl:call-template name="displayTerm"/></fo:block> <!-- block wrapper -->
1162
1162
  </xsl:when>
1163
1163
  <xsl:otherwise><xsl:call-template name="displayTerm"/></xsl:otherwise>
@@ -1166,24 +1166,48 @@
1166
1166
 
1167
1167
  <xsl:template name="displayTerm">
1168
1168
  <fo:inline font-size="18pt" padding-right="3mm"><xsl:apply-templates/></fo:inline>
1169
- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1169
+ <!-- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1170
1170
  <xsl:variable name="kind" select="local-name()"/>
1171
1171
  <xsl:attribute name="background-color">
1172
1172
  <xsl:choose>
1173
1173
  <xsl:when test="$kind = 'preferred'">rgb(249, 235, 187)</xsl:when>
1174
1174
  <xsl:when test="$kind = 'deprecated'">rgb(237, 237, 238)</xsl:when>
1175
- <xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
1175
+ <xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
1176
1176
  </xsl:choose>
1177
1177
  </xsl:attribute>
1178
1178
  <xsl:call-template name="addLetterSpacing">
1179
1179
  <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($kind))"/>
1180
- </xsl:call-template>
1181
- </fo:inline>
1182
- <xsl:if test="following-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
1180
+ </xsl:call-template>
1181
+ </fo:inline> -->
1182
+ <xsl:if test="following-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::ogc:admitted]">
1183
1183
  <fo:inline padding-right="2mm"> </fo:inline>
1184
1184
  </xsl:if>
1185
1185
  </xsl:template>
1186
1186
 
1187
+ <xsl:template match="*[local-name() = 'span'][@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" mode="update_xml_step1" priority="2">
1188
+ <xsl:copy>
1189
+ <xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
1190
+ </xsl:copy>
1191
+ </xsl:template>
1192
+
1193
+ <xsl:template match="ogc:span[@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" priority="3">
1194
+ <fo:inline> </fo:inline>
1195
+ <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1196
+ <xsl:variable name="kind" select="@class"/>
1197
+ <xsl:variable name="label" select="text()"/>
1198
+ <xsl:attribute name="background-color">
1199
+ <xsl:choose>
1200
+ <xsl:when test="$kind = 'PreferredLabel' or $label = 'PREFERRED'">rgb(249, 235, 187)</xsl:when>
1201
+ <xsl:when test="$kind = 'DeprecatedLabel' or $label = 'DEPRECATED'">rgb(237, 237, 238)</xsl:when>
1202
+ <xsl:when test="$kind = 'AdmittedLabel' or $label = 'ADMITTED'">rgb(223, 236, 249)</xsl:when>
1203
+ </xsl:choose>
1204
+ </xsl:attribute>
1205
+ <xsl:call-template name="addLetterSpacing">
1206
+ <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($label))"/>
1207
+ </xsl:call-template>
1208
+ </fo:inline>
1209
+ </xsl:template>
1210
+
1187
1211
  <xsl:template match="*[local-name()='th']//text()[not(ancestor::ogc:fn)]" priority="2">
1188
1212
  <xsl:variable name="text">
1189
1213
  <xsl:call-template name="add-zero-spaces-java"/>
@@ -5919,8 +5943,17 @@
5919
5943
  <xsl:variable name="styles_">
5920
5944
  <xsl:for-each select="xalan:nodeset($styles__)/item">
5921
5945
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
5922
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5923
- <xsl:if test="$key = 'font-family' or $key = 'color'">
5946
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5947
+ <xsl:variable name="value">
5948
+ <xsl:choose>
5949
+ <!-- if font-size is digits only -->
5950
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
5951
+ <xsl:otherwise>
5952
+ <xsl:value-of select="$value_"/>
5953
+ </xsl:otherwise>
5954
+ </xsl:choose>
5955
+ </xsl:variable>
5956
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
5924
5957
  <style name="{$key}"><xsl:value-of select="$value"/></style>
5925
5958
  </xsl:if>
5926
5959
  </xsl:for-each>
@@ -1138,7 +1138,7 @@
1138
1138
  </fo:list-item-label>
1139
1139
  <fo:list-item-body start-indent="body-start()">
1140
1140
  <fo:block>
1141
- <xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:admitted" mode="term_name"/>
1141
+ <xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:deprecates | ../ogc:admitted" mode="term_name"/>
1142
1142
  </fo:block>
1143
1143
  </fo:list-item-body>
1144
1144
  </fo:list-item>
@@ -1147,7 +1147,7 @@
1147
1147
  </fo:block>
1148
1148
  </xsl:template>
1149
1149
 
1150
- <xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" priority="2"/>
1150
+ <xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" priority="2"/>
1151
1151
 
1152
1152
  <!-- first preferred displays on the same line as term/name -->
1153
1153
  <xsl:template match="ogc:preferred[not(preceding-sibling::ogc:preferred)]" mode="term_name" priority="2">
@@ -1155,9 +1155,9 @@
1155
1155
  <fo:inline padding-right="2mm"> </fo:inline>
1156
1156
  </xsl:template>
1157
1157
 
1158
- <xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" mode="term_name">
1158
+ <xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" mode="term_name">
1159
1159
  <xsl:choose>
1160
- <xsl:when test="preceding-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
1160
+ <xsl:when test="preceding-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::admitted]">
1161
1161
  <fo:block space-before="6pt"><xsl:call-template name="displayTerm"/></fo:block> <!-- block wrapper -->
1162
1162
  </xsl:when>
1163
1163
  <xsl:otherwise><xsl:call-template name="displayTerm"/></xsl:otherwise>
@@ -1166,24 +1166,48 @@
1166
1166
 
1167
1167
  <xsl:template name="displayTerm">
1168
1168
  <fo:inline font-size="18pt" padding-right="3mm"><xsl:apply-templates/></fo:inline>
1169
- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1169
+ <!-- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1170
1170
  <xsl:variable name="kind" select="local-name()"/>
1171
1171
  <xsl:attribute name="background-color">
1172
1172
  <xsl:choose>
1173
1173
  <xsl:when test="$kind = 'preferred'">rgb(249, 235, 187)</xsl:when>
1174
1174
  <xsl:when test="$kind = 'deprecated'">rgb(237, 237, 238)</xsl:when>
1175
- <xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
1175
+ <xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
1176
1176
  </xsl:choose>
1177
1177
  </xsl:attribute>
1178
1178
  <xsl:call-template name="addLetterSpacing">
1179
1179
  <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($kind))"/>
1180
- </xsl:call-template>
1181
- </fo:inline>
1182
- <xsl:if test="following-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
1180
+ </xsl:call-template>
1181
+ </fo:inline> -->
1182
+ <xsl:if test="following-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::ogc:admitted]">
1183
1183
  <fo:inline padding-right="2mm"> </fo:inline>
1184
1184
  </xsl:if>
1185
1185
  </xsl:template>
1186
1186
 
1187
+ <xsl:template match="*[local-name() = 'span'][@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" mode="update_xml_step1" priority="2">
1188
+ <xsl:copy>
1189
+ <xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
1190
+ </xsl:copy>
1191
+ </xsl:template>
1192
+
1193
+ <xsl:template match="ogc:span[@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" priority="3">
1194
+ <fo:inline> </fo:inline>
1195
+ <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
1196
+ <xsl:variable name="kind" select="@class"/>
1197
+ <xsl:variable name="label" select="text()"/>
1198
+ <xsl:attribute name="background-color">
1199
+ <xsl:choose>
1200
+ <xsl:when test="$kind = 'PreferredLabel' or $label = 'PREFERRED'">rgb(249, 235, 187)</xsl:when>
1201
+ <xsl:when test="$kind = 'DeprecatedLabel' or $label = 'DEPRECATED'">rgb(237, 237, 238)</xsl:when>
1202
+ <xsl:when test="$kind = 'AdmittedLabel' or $label = 'ADMITTED'">rgb(223, 236, 249)</xsl:when>
1203
+ </xsl:choose>
1204
+ </xsl:attribute>
1205
+ <xsl:call-template name="addLetterSpacing">
1206
+ <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($label))"/>
1207
+ </xsl:call-template>
1208
+ </fo:inline>
1209
+ </xsl:template>
1210
+
1187
1211
  <xsl:template match="*[local-name()='th']//text()[not(ancestor::ogc:fn)]" priority="2">
1188
1212
  <xsl:variable name="text">
1189
1213
  <xsl:call-template name="add-zero-spaces-java"/>
@@ -5919,8 +5943,17 @@
5919
5943
  <xsl:variable name="styles_">
5920
5944
  <xsl:for-each select="xalan:nodeset($styles__)/item">
5921
5945
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
5922
- <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5923
- <xsl:if test="$key = 'font-family' or $key = 'color'">
5946
+ <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5947
+ <xsl:variable name="value">
5948
+ <xsl:choose>
5949
+ <!-- if font-size is digits only -->
5950
+ <xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
5951
+ <xsl:otherwise>
5952
+ <xsl:value-of select="$value_"/>
5953
+ </xsl:otherwise>
5954
+ </xsl:choose>
5955
+ </xsl:variable>
5956
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
5924
5957
  <style name="{$key}"><xsl:value-of select="$value"/></style>
5925
5958
  </xsl:if>
5926
5959
  </xsl:for-each>