summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xjournal.lisp22
-rw-r--r--macros.lisp14
2 files changed, 20 insertions, 16 deletions
diff --git a/journal.lisp b/journal.lisp
index 180517f..cb0f98d 100755
--- a/journal.lisp
+++ b/journal.lisp
@@ -127,7 +127,8 @@
(with-tag ("content" `(("type" "xhtml")
("xml:lang" "de")
("xml:base" ,(link-to :index :absolute t))))
- (with-tag ("div" '(("xmlns" "http://www.w3.org/1999/xhtml")))
+ (with-tag ("div" '(("xmlns" "http://www.w3.org/1999/xhtml")
+ ("xmlns:html" "http://www.w3.org/1999/xhtml")))
(xml-as-is
(with-yaclml-output-to-string
(<:as-html
@@ -186,7 +187,8 @@
(with-tag ("content" `(("type" "xhtml")
("xml:lang" "de")
("xml:base" ,(link-to :index :absolute t))))
- (with-tag ("div" '(("xmlns" "http://www.w3.org/1999/xhtml")))
+ (with-tag ("div" '(("xmlns" "http://www.w3.org/1999/xhtml")
+ ("xmlns:html" "http://www.w3.org/1999/xhtml")))
(xml-as-is (htmlise-entry journal-entry))))))))
#.(restore-sql-reader-syntax-state))
@@ -301,15 +303,15 @@
(format nil "~D&#160;Kommentar~:*~[e~;~:;e~]" (length comments)))))))
(when *full-entry-view*
- (<::article :class :journal-entry
+ (<::html\:article :class :journal-entry
(<:h1 (<:a :href (link-to :view :post-id id)
(<:as-is title)))
- (<::header :class :journal-entry-header
- (<::time :class :journal-entry-date
- :pubdate "pubdate"
- :datetime (format-date nil
- "%4yr%-%2mon%-%2day%T%2hr%:%2min%:%2sec%Z"
- posting-date)
+ (<::html\:header :class :journal-entry-header
+ (<::html\:time :class :journal-entry-date
+ :pubdate "pubdate"
+ :datetime (format-date nil
+ "%4yr%-%2mon%-%2day%T%2hr%:%2min%:%2sec%Z"
+ posting-date)
(<:as-html
(format-date nil "%@day-of-week%, den %day%.%mon%.%yr%, %hr%:%2min%."
posting-date)))
@@ -321,7 +323,7 @@
(<:as-is (if (equal type "html")
body
(journal-markup->html body))))
- (<::footer :class :journal-entry-footer
+ (<::html\:footer :class :journal-entry-footer
(<:form :class :journal-entry-delete-button-form
:style "display: inline;"
:method "post"
diff --git a/macros.lisp b/macros.lisp
index 651a085..3daccfc 100644
--- a/macros.lisp
+++ b/macros.lisp
@@ -32,18 +32,20 @@
(emit-open-tag "html" #+clisp `(("dir" . ,dir)
("lang" . ,lang)
("xml:lang" . ,lang)
- ("xmlns" . ,xmlns))
+ ("xmlns" . ,xmlns)
+ ("xmlns:html" . ,xmlns))
#-clisp `("dir" ,dir
"lang" ,lang
"xml:lang" ,lang
- "xmlns" ,xmlns))
+ "xmlns" ,xmlns
+ "xmlns:html" ,xmlns))
(emit-body body)
(emit-close-tag "html"))
-(yaclml::def-html-tag <::article :core :i18n :event)
-(yaclml::def-html-tag <::header :core :i18n :event)
-(yaclml::def-html-tag <::footer :core :i18n :event)
-(yaclml::def-html-tag <::time :core :i18n :event pubdate datetime)
+(yaclml::def-html-tag <::html\:article :core :i18n :event)
+(yaclml::def-html-tag <::html\:header :core :i18n :event)
+(yaclml::def-html-tag <::html\:footer :core :i18n :event)
+(yaclml::def-html-tag <::html\:time :core :i18n :event pubdate datetime)
(defmacro with-web-journal ((page-title &key canonical-uri) &body body)