From 3310bc385bef96535fa4fa27cc8aae3e22e7c988 Mon Sep 17 00:00:00 2001
From: Peter Bernard West <pbwest@apache.org>
Date: Tue, 8 Jul 2003 11:47:12 +0000
Subject: [PATCH] Modified Id keyword in CDATA to prevent expansion in xsl
 file.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@196647 13f79535-47bb-0310-9956-ffa450edef68
---
 src/codegen/font-file.xsl | 10 +++++-----
 src/codegen/xml-lang.xsl  | 27 +++++++++++++--------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/codegen/font-file.xsl b/src/codegen/font-file.xsl
index bf78baac3..22bbbe558 100644
--- a/src/codegen/font-file.xsl
+++ b/src/codegen/font-file.xsl
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <xsl:output method="text"/>
-    <xsl:variable name="licence"><![CDATA[/*
- * $Id$
+  <!-- $Id$ -->
+  <xsl:variable name="licence"><![CDATA[/*
+ * $Id]]><![CDATA[$
  * ============================================================================
  *                    The Apache Software License, Version 1.1
  * ============================================================================
@@ -57,7 +56,8 @@
  * Automatically generated by font-file.xsl.  DO NOT EDIT!
  *!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  */]]> 
-    </xsl:variable>
+</xsl:variable>
+<xsl:output method="text"/>
 <!-- This file writes the class files for the fonts (Courier.java,
      Helvetica.java etc.).  It uses the information in the font
      description files (Courier.xml, Helvetica.xml) to do this.  In these
diff --git a/src/codegen/xml-lang.xsl b/src/codegen/xml-lang.xsl
index e04062fa0..0442838ef 100644
--- a/src/codegen/xml-lang.xsl
+++ b/src/codegen/xml-lang.xsl
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="text" encoding="iso-8859-1"/>
-
-    <xsl:variable name="licence"><![CDATA[/*
- * $Id$
+  <!-- $Id$ -->
+  <xsl:variable name="licence"><![CDATA[/*
+ * $Id]]><![CDATA[$
  * ============================================================================
  *                    The Apache Software License, Version 1.1
  * ============================================================================
@@ -57,16 +56,16 @@
  * Automatically generated from xml-lang.xml by xml-lang.xsl.  DO NOT EDIT!
  *!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  */]]> 
-    </xsl:variable>
-      <!--
-           This XSL file is used to generate the file
-           org/apache/fop/datatypes/CountryLanguageScript.java
-           from the input file
-           xml-lang.xml
-           found in the conf directory.
-           -->
-      <xsl:template match="xml-lang">
-        <xsl:value-of select="$licence"/>
+</xsl:variable>
+<!--
+     This XSL file is used to generate the file
+     org/apache/fop/datatypes/CountryLanguageScript.java
+     from the input file
+     xml-lang.xml
+     found in the conf directory. -->
+<xsl:output method="text" encoding="iso-8859-1"/>
+<xsl:template match="xml-lang">
+  <xsl:value-of select="$licence"/>
   <xsl:variable name="languages">
     <xsl:value-of select="count(./languagecodes/language)"/>
   </xsl:variable>
-- 
2.39.5