From 3a7c4a562510115f1d2ebb386a6f4e0ff9f42cc7 Mon Sep 17 00:00:00 2001
From: Ludovic Court`es
Date: Mon, 24 Jul 2006 11:53:19 +0000
Subject: Lout engine: Fixed handling of `:keywords' for `document'.

* src/guile/skribilo/engine/lout.scm (lout-pdf-docinfo): Check whether
  the `:keywords' is `#f' and use an empty list if so.

* src/guile/skribilo/engine/html.scm (&html-generic-document): Don't fill
  `options' for HEAD.

git-archimport-id: lcourtes@laas.fr--2005-libre/skribilo--devo--1.2--patch-30
---
 src/guile/skribilo/engine/html.scm | 2 --
 src/guile/skribilo/engine/lout.scm | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/guile')

diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm
index 843f099..c290189 100644
--- a/src/guile/skribilo/engine/html.scm
+++ b/src/guile/skribilo/engine/html.scm
@@ -1209,8 +1209,6 @@
 		   (markup '&html-head)
 		   (ident (string-append id "-head"))
 		   (class (markup-class n))
-                   (options (the-options (list :keywords
-                                               (markup-option n :keywords))))
 		   (parent n)
 		   (body (list header meta))))
 	  (ftnote (new markup
diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm
index 7922de2..cb7c6fa 100644
--- a/src/guile/skribilo/engine/lout.scm
+++ b/src/guile/skribilo/engine/lout.scm
@@ -814,7 +814,8 @@
 		       t
 		       (markup-option doc :title))))
 	 (keywords (or (engine-custom engine 'pdf-keywords)
-                       (map ast->string (markup-option doc :keywords))))
+                       (map ast->string
+                            (or (markup-option doc :keywords) '()))))
 	 (extra-fields (engine-custom engine 'pdf-extra-info)))
 
     (string-append "[ "
-- 
cgit v1.2.3