From 760c3ec098a96bd044a7423d3ced16f83f27e7fa Mon Sep 17 00:00:00 2001
From: Carsten Dominik <carsten.dominik@gmail.com>
Date: Wed, 3 Dec 2008 23:55:10 +0100
Subject: [PATCH] Implement new quoting for CDATA elements.

It seems that CSS and Java-script stuff should be quoted in a very
strange way in order to make sure that the resulting file functions
correct in current browsers *and* validates against various XHTML and
XML standards.  To be honest, the quoting technique seem really
strange, but Sebastian Rose argues, that this is the way to handle
this issue.
---
 lisp/ChangeLog     | 5 +++++
 lisp/org-exp.el    | 4 ++--
 lisp/org-jsinfo.el | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 64c7a1101..30a252544 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2008-12-03  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-exp.el (org-export-html-style-default): Implement new
+	quoting.
+
+	* org-jsinfo.el (org-infojs-template): Implement new quoting.
+
 	* org-w3m.el (w3m-minor-mode-hook): Also add the special copy
 	command to the `w3m-minor-mode-map'.
 
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 417acc2be..b95f33c11 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -524,7 +524,7 @@ Org-mode file."
 
 (defconst org-export-html-style-default
 "<style type=\"text/css\">
-/* <![CDATA[ */
+ <!--/*--><![CDATA[/*><!--*/
   html { font-family: Times, serif; font-size: 12pt; }
   .title  { text-align: center; }
   .todo   { color: red; }
@@ -551,7 +551,7 @@ Org-mode file."
                                white-space:nowrap; }
   .org-info-js_search-highlight {background-color:#ffff00; color:#000000;
                                  font-weight:bold; }
-/* ]]> */
+  /*]]>*/-->
 </style>"
   "The default style specification for exported HTML files.
 Please use the variables `org-export-html-style' and
diff --git a/lisp/org-jsinfo.el b/lisp/org-jsinfo.el
index 53d70ed46..2888b7948 100644
--- a/lisp/org-jsinfo.el
+++ b/lisp/org-jsinfo.el
@@ -106,10 +106,10 @@ means to use the maximum value consistent with other options."
 (defcustom org-infojs-template
   "<script type=\"text/javascript\" src=\"%SCRIPT_PATH\"></script>
 <script type=\"text/javascript\" >
-/* <![CDATA[ */
+<!--/*--><![CDATA[/*><!--*/
 %MANAGER_OPTIONS
 org_html_manager.setup();  // activate after the parameterd are set
-/* ]]> */
+/*]]>*/-->
 </script>"
   "The template for the export style additions when org-info.js is used.
 Option settings will replace the %MANAGER-OPTIONS cookie."