From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Babenhauserheide <arne_bab@web.de>
Subject: (unknown)
Date: Sun, 15 Mar 2020 23:42:19 +0100
Message-ID: <87sgi91bqs.fsf@web.de>
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane-mx.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:39887)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <arne_bab@web.de>) id 1jDbxi-0003j4-DO
 for emacs-orgmode@gnu.org; Sun, 15 Mar 2020 18:42:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <arne_bab@web.de>) id 1jDbxh-0004bD-Ar
 for emacs-orgmode@gnu.org; Sun, 15 Mar 2020 18:42:26 -0400
Received: from mout.web.de ([212.227.15.4]:38871)
 by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <arne_bab@web.de>) id 1jDbxh-0004Xm-1i
 for emacs-orgmode@gnu.org; Sun, 15 Mar 2020 18:42:25 -0400
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
 <mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
 <mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane-mx.org@gnu.org
Sender: "Emacs-orgmode"
 <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane-mx.org@gnu.org>
To: Colin Baxter <m43cap@yandex.com>
Cc: emacs-orgmode@gnu.org

Subject: [PATCH] ox-html: escape & in license magnets
In-Reply-To: <87d09dz92a.fsf@yandex.com>
Date: Sun, 15 Mar 2020 23:36:37 +0100
References: <87eett7bql.fsf@yandex.com> <871rpt9zc4.fsf@kyleam.com> <87d09=
dz92a.fsf@yandex.com>
References: <87d09dz92a.fsf@yandex.com>
User-agent: mu4e 1.2.0; emacs 26.3
* lisp/ox-html (org-html-scripts): & escaped as &amp;
* lisp/ox-html (org-html-infojs-template): & escaped as &amp;

This fixes xhtml validation while still being recognized by LibreJS as
valid license.
=2D--
 lisp/ox-html.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 9a1dd44b5..5c2b766e9 100644
=2D-- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -232,7 +232,7 @@ property on the headline itself.")

 (defconst org-html-scripts
   "<script type=3D\"text/javascript\">
-// @license magnet:?xt=3Durn:btih:1f739d935676111cfff4b4693e3816e66479705=
0&dn=3Dgpl-3.0.txt GPL-v3-or-Later
+// @license magnet:?xt=3Durn:btih:1f739d935676111cfff4b4693e3816e66479705=
0&amp;dn=3Dgpl-3.0.txt GPL-v3-or-Later
 <!--/*--><![CDATA[/*><!--*/
      function CodeHighlightOn(elem, id)
      {
@@ -510,12 +510,12 @@ means to use the maximum value consistent with other=
 options."

 (defcustom org-html-infojs-template
   "<script type=3D\"text/javascript\" src=3D\"%SCRIPT_PATH\">
-// @license magnet:?xt=3Durn:btih:1f739d935676111cfff4b4693e3816e66479705=
0&dn=3Dgpl-3.0.txt GPL-v3-or-Later
+// @license magnet:?xt=3Durn:btih:1f739d935676111cfff4b4693e3816e66479705=
0&amp;dn=3Dgpl-3.0.txt GPL-v3-or-Later
 // @license-end
 </script>

 <script type=3D\"text/javascript\">
-// @license magnet:?xt=3Durn:btih:1f739d935676111cfff4b4693e3816e66479705=
0&dn=3Dgpl-3.0.txt GPL-v3-or-Later
+// @license magnet:?xt=3Durn:btih:1f739d935676111cfff4b4693e3816e66479705=
0&amp;dn=3Dgpl-3.0.txt GPL-v3-or-Later
 <!--/*--><![CDATA[/*><!--*/
 %MANAGER_OPTIONS
 org_html_manager.setup();  // activate after the parameters are set
=2D-
2.25.1