diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ TESTDIR := tests BUILDDIR := dist BUILDCONF := .setup-config -BUILDCMD := runhaskell Setup.hs +BUILDCMD := ./setup BUILDVARS := vars CONFIGURE := configure @@ -118,9 +118,10 @@ @$(generate-shell-script) .PHONY: configure -cleanup_files+=$(BUILDDIR) $(BUILDCONF) $(BUILDVARS) +cleanup_files+=Setup.hi Setup.o $(BUILDCMD) $(BUILDVARS) configure: $(BUILDCONF) templates $(BUILDCONF): $(CABAL) + ghc -package Cabal Setup.hs -o $(BUILDCMD) $(BUILDCMD) configure --prefix=$(PREFIX) # Make configuration time settings persistent (definitely a hack). @echo "PREFIX?=$(PREFIX)" >$(BUILDVARS) diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,28 @@ +pandoc (0.44) unstable; urgency=low + + [ John MacFarlane ] + + * Fixed bug in HTML writer: when --toc was used, anchors were put around + headers, which is invalid XHTML (block content within inline element). + Now the anchors are put inside the header tags. Resolves Issue #23. + + * Added xmlns attribute to html element in html writer tests. + This attribute is added by more recent versions of the + xhtml library (>= 3000), and is required for valid XHTML. + + [ Recai Oktaş ] + + * On configure, compile 'Setup.hs' to 'setup' and use 'setup' as the build + command instead of 'runhaskell', which, on some platforms (such as s390, + alpha, m68k), throws the following error: + + runhaskell Setup.hs configure --prefix=/usr + ghc-6.6.1: not built for interactive use + + This causes a serious FTBFS bug. Closes: #440668. + + -- Recai Oktaş Mon, 03 Sep 2007 18:24:02 +0300 + pandoc (0.43) unstable; urgency=low [ John MacFarlane ] diff --git a/pandoc.cabal b/pandoc.cabal --- a/pandoc.cabal +++ b/pandoc.cabal @@ -1,5 +1,5 @@ Name: pandoc -Version: 0.43 +Version: 0.44 License: GPL License-File: COPYING Copyright: (c) 2006-2007 John MacFarlane diff --git a/src/Main.hs b/src/Main.hs --- a/src/Main.hs +++ b/src/Main.hs @@ -43,7 +43,7 @@ import Control.Monad ( (>>=) ) version :: String -version = "0.43" +version = "0.44" copyrightMessage :: String copyrightMessage = "\nCopyright (C) 2006-7 John MacFarlane\n\ diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -274,17 +274,17 @@ let attribs = if writerStrictMarkdown opts && not (writerTableOfContents opts) then [] else [identifier id] - let headerHtml = case level of - 1 -> h1 contents ! attribs - 2 -> h2 contents ! attribs - 3 -> h3 contents ! attribs - 4 -> h4 contents ! attribs - 5 -> h5 contents ! attribs - 6 -> h6 contents ! attribs - _ -> paragraph contents ! attribs - return $ if writerTableOfContents opts - then anchor ! [href ("#TOC-" ++ id)] $ headerHtml - else headerHtml + let contents' = if writerTableOfContents opts + then anchor ! [href ("#TOC-" ++ id)] $ contents + else contents + return $ case level of + 1 -> h1 contents' ! attribs + 2 -> h2 contents' ! attribs + 3 -> h3 contents' ! attribs + 4 -> h4 contents' ! attribs + 5 -> h5 contents' ! attribs + 6 -> h6 contents' ! attribs + _ -> paragraph contents' ! attribs blockToHtml opts (BulletList lst) = do contents <- mapM (blockListToHtml opts) lst let attribs = if writerIncremental opts diff --git a/tests/s5.basic.html b/tests/s5.basic.html --- a/tests/s5.basic.html +++ b/tests/s5.basic.html @@ -1,5 +1,5 @@ -My S5 Document -My S5 Document -My S5 Document -Pandoc Test Suite