This is an automated email from the git hooks/post-receive script.
nckx pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new f145277 gnu: netsurf: Fix entity parsing.
f145277 is described below
commit f1452776ac65bd03454b1e715c44f7eded237ea0
Author: Eric Bavier <bav...@posteo.net>
AuthorDate: Mon Feb 3 23:06:09 2020 -0600
gnu: netsurf: Fix entity parsing.
Follow-up to commit 31afa654c58cd7aa8bd11a771fa6eabcd766d443.
* gnu/packages/web.scm (netsurf)[arguments]: In 'adjust-welcome' phase,
ensure
html entities are parsed and find their way back to the output.
Signed-off-by: Tobias Geerinckx-Rice <m...@tobias.gr>
---
gnu/packages/web.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index f6ae958..60fd5cf 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus
<rek...@elephly.net>
;;; Copyright © 2018 Raoul Jean Pierre Bonnal <ilpuccio.f...@gmail.com>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayi...@gmail.com>
-;;; Copyright © 2015, 2016, 2017, 2018, 2019 Eric Bavier
<bav...@member.fsf.org>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier
<bav...@posteo.net>
;;; Copyright © 2015 Eric Dvorsak <e...@dvorsak.fr>
;;; Copyright © 2016 Sou Bunnbu <iyzs...@gmail.com>
;;; Copyright © 2016 Jelle Licht <jli...@fsfe.org>
@@ -5075,12 +5075,19 @@ w3c webidl files and a binding configuration file.")
;; Leave the DOCTYPE header as is.
(display (read-line in 'concat) out)
(sxml->xml
- (let rec ((sxml (xml->sxml in)))
+ (let rec ((sxml (xml->sxml in
+ #:default-entity-handler
+ (lambda (port name)
+ (string-append "<ENTITY>"
+ (symbol->string
name)
+ "</ENTITY>")))))
;; We'd like to use sxml-match here, but it can't
;; match against generic tag symbols...
(match sxml
(`(div (@ (class "links")) . ,rest)
'())
+ (`(ENTITY ,ent)
+ `(*ENTITY* ,ent))
((x ...)
(map rec x))
(x x)))
