emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* (unknown)
@ 2020-03-15 22:42 Arne Babenhauserheide
  2020-03-16  0:11 ` [PATCH] ox-html: escape & in license magnets Kyle Meyer
  0 siblings, 1 reply; 2+ messages in thread
From: Arne Babenhauserheide @ 2020-03-15 22:42 UTC (permalink / raw)
  To: Colin Baxter; +Cc: emacs-orgmode

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> <87d09dz92a.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.
---
 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
--- 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=\"text/javascript\">
-// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3-or-Later
+// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&amp;dn=gpl-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=\"text/javascript\" src=\"%SCRIPT_PATH\">
-// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3-or-Later
+// @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&amp;dn=gpl-3.0.txt GPL-v3-or-Later
 // @license-end
 </script>

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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-03-16  0:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-15 22:42 (unknown) Arne Babenhauserheide
2020-03-16  0:11 ` [PATCH] ox-html: escape & in license magnets Kyle Meyer

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).