Support titlecase "Java", "Perl", and "IDL" as values for the

language attribute on classsynopsis, etc. (instead of just
lowercase "java", "perl", and "idl"). Also support "c++" and "C++"
(instead of just "cpp").

Affects HTML, FO, and manpages output. Closes bug 1552332. Thanks
to "Brian A. Vanderburg II".

diff --git a/xsl/fo/synop.xsl b/xsl/fo/synop.xsl
index 98472371fb43723f79c5a50b288b174a35ced5ec..98f6f57ffd0f4f5b6c3fd69a606d16314335fca5 100644 (file)
--- a/xsl/fo/synop.xsl
+++ b/xsl/fo/synop.xsl
@@ -287,16 +287,16 @@
   -->
 
   <xsl:choose>
-    <xsl:when test="$language='java'">
+    <xsl:when test="$language='java' or $language='Java'">
       <xsl:apply-templates select="." mode="java"/>
     </xsl:when>
-    <xsl:when test="$language='perl'">
+    <xsl:when test="$language='perl' or $language='Perl'">
       <xsl:apply-templates select="." mode="perl"/>
     </xsl:when>
-    <xsl:when test="$language='idl'">
+    <xsl:when test="$language='idl' or $language='IDL'">
       <xsl:apply-templates select="." mode="idl"/>
     </xsl:when>
-    <xsl:when test="$language='cpp'">
+    <xsl:when test="$language='cpp' or $language='c++' or $language='C++'">
       <xsl:apply-templates select="." mode="cpp"/>
     </xsl:when>
     <xsl:otherwise>

diff --git a/xsl/html/synop.xsl b/xsl/html/synop.xsl
index 62e2e90a0520f371b6b6f351288c3e0ac87fc371..a48f2c28eb522ccc7bcfce19e018629d234d47db 100644 (file)
--- a/xsl/html/synop.xsl
+++ b/xsl/html/synop.xsl
@@ -737,16 +737,16 @@ paramdef      ::= (#PCDATA|type|replaceable|parameter|funcparams)*
   </xsl:param>
 
   <xsl:choose>
-    <xsl:when test="$language='java'">
+    <xsl:when test="$language='java' or $language='Java'">
       <xsl:apply-templates select="." mode="java"/>
     </xsl:when>
-    <xsl:when test="$language='perl'">
+    <xsl:when test="$language='perl' or $language='Perl'">
       <xsl:apply-templates select="." mode="perl"/>
     </xsl:when>
-    <xsl:when test="$language='idl'">
+    <xsl:when test="$language='idl or $language='IDL''">
       <xsl:apply-templates select="." mode="idl"/>
     </xsl:when>
-    <xsl:when test="$language='cpp'">
+    <xsl:when test="$language='cpp' or $language='c++' or $language='C++'">
       <xsl:apply-templates select="." mode="cpp"/>
     </xsl:when>
     <xsl:otherwise>