diff --git a/BUGS b/BUGS new file mode 100644 --- /dev/null +++ b/BUGS @@ -0,0 +1,2 @@ +To view a list of known bugs, or to enter a bug report, please use +Pandoc's issue tracker: diff --git a/INSTALL b/INSTALL --- a/INSTALL +++ b/INSTALL @@ -270,7 +270,15 @@ Since pandoc depends on GHC, the process may take a long time. Note that the version of pandoc in MacPorts may not be the most recent. +To get the most recent version, you can use `cabal-install`: + sudo port install hs-cabal + cabal install pandoc --user # optionally: -fciteproc -fhighlighting + +This will install the `pandoc` executable into `~/.cabal/bin`. This method +will not install the wrapper scripts or man pages; if you want those, follow +the instructions above for compiling from source. + Installing the Windows binary ============================= @@ -313,8 +321,11 @@ Installing pandoc on Arch linux =============================== -Abhishek Dasgupta has created a binary package for `pandoc` in the -Arch linux repository. Arch users can install `pandoc` by typing +There are two `pandoc` packages in the Arch AUR repositories, +`pandoc` (contributed by Abhishek Dasgupta) and `haskell-pandoc` +(contributed by Dons Stewart). `haskell-pandoc` is more up-to-date, +but does not install the man pages or wrapper scripts. pacman -Sy pandoc + pacman -Sy haskell-pandoc diff --git a/Main.hs b/Main.hs --- a/Main.hs +++ b/Main.hs @@ -50,7 +50,7 @@ #endif copyrightMessage :: String -copyrightMessage = "\nCopyright (C) 2006-7 John MacFarlane\n" ++ +copyrightMessage = "\nCopyright (C) 2006-8 John MacFarlane\n" ++ "Web: http://johnmacfarlane.net/pandoc\n" ++ "This is free software; see the source for copying conditions. There is no\n" ++ "warranty, not even for merchantability or fitness for a particular purpose." @@ -69,14 +69,18 @@ #endif if null languages then "\n" - else "\nCompiled with syntax highlighting support for:\n" ++ - (unlines $ map unwords $ chunk 5 $ map (\s -> s ++ replicate (15 - length s) ' ') languages) + else "\nCompiled with syntax highlighting support for:\n" ++ wrapWords 78 languages --- | Splits a list into groups of at most n. -chunk :: Int -> [a] -> [[a]] -chunk size lst = - let (next, rest) = splitAt size lst - in if null rest then [next] else next : chunk size rest +-- | Converts a list of strings into a single string with the items printed as +-- comma separated words in lines with a maximum line length. +wrapWords :: Int -> [String] -> String +wrapWords c = wrap' c c where + wrap' _ _ [] = "" + wrap' cols remaining (x:xs) = if remaining == cols + then x ++ wrap' cols (remaining - length x) xs + else if (length x + 1) > remaining + then ",\n" ++ x ++ wrap' cols (cols - length x) xs + else ", " ++ x ++ wrap' cols (remaining - (length x + 2)) xs -- | Association list of formats and readers. readers :: [(String, ParserState -> String -> Pandoc)] @@ -252,6 +256,12 @@ (fromMaybe "/cgi-bin/mimetex.cgi" arg)}) "URL") "" -- "Use mimetex for HTML math" + + , Option "" ["jsmath"] + (OptArg + (\arg opt -> return opt { optHTMLMathMethod = JsMath arg}) + "URL") + "" -- "Use jsMath for HTML math" , Option "" ["gladtex"] (NoArg diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ BUILDCONF := $(BUILDDIR)/setup-config BUILDVARS := vars CONFIGURE := configure -ODTSTYLES := odt-styles #------------------------------------------------------------------------------- # Cabal constants diff --git a/README b/README --- a/README +++ b/README @@ -328,19 +328,28 @@ no *url* is provided, the contents of the script will be inserted directly; this provides portability at the price of efficiency. If you plan to use math on several pages, it is much better to link to - a copy of `LaTeXMathML.js`, which can be cached. (See `--gladtex` - and `--mimetex` for alternative ways of dealing with math in HTML.) + a copy of `LaTeXMathML.js`, which can be cached. (See `--jsmath`, + `--gladtex`, and `--mimetex` for alternative ways of dealing with + math in HTML.) +`--jsmath`*=[url]* +: causes `pandoc` to use the [jsMath] script to display + TeX math in HTML or S5. The *url* should point to the jsMath load + script (e.g. `jsMath/easy/load.js`). If it is provided, a link to it + will be included in the header of standalone HTML documents. + (See `--latexmathml`, `--mimetex`, and `--gladtex` for alternative + ways of dealing with math in HTML.) + `--gladtex`*[=url]* : causes TeX formulas to be enclosed in `` tags in HTML or S5 output. This output can then be processed by [gladTeX] to produce links to - images with the typeset formulas. (See `--latexmathml` and + images with the typeset formulas. (See `--latexmathml`, `--jsmath`, and `--mimetex` for alternative ways of dealing with math in HTML.) `--mimetex`*[=url]* : causes TeX formulas to be replaced by `` tags linking to the [mimeTeX] CGI script, which will produce images with the typeset - formulas. (See `--latexmathml` and `--mimetex` for alternative + formulas. (See `--latexmathml`, `--jsmath`, and `--gladtex` for alternative ways of dealing with math in HTML.) `-i` or `--incremental` @@ -397,6 +406,7 @@ [Smartypants]: http://daringfireball.net/projects/smartypants/ [LaTeXMathML]: http://math.etsu.edu/LaTeXMathML/ +[jsMath]: http://www.math.union.edu/~dpvc/jsmath/ [gladTeX]: http://www.math.uio.no/~martingu/gladtex/index.html [mimeTeX]: http://www.forkosh.com/mimetex.html @@ -924,18 +934,24 @@ styled differently from the surrounding text if needed. 2. If the `--latexmathml` option is used, TeX math will be displayed - between $ characters, as in LaTeX, and the [LaTeXMathML] script will - be used to render it as formulas. (This trick does not work in all - browsers, but it works in Firefox. In browsers that do not support - LaTeXMathML, TeX math will appear verbatim between $ characters.) + between $ or $$ characters and put in `` tags with class `LaTeX`. + The [LaTeXMathML] script will be used to render it as formulas. + (This trick does not work in all browsers, but it works in Firefox. + In browsers that do not support LaTeXMathML, TeX math will appear + verbatim between $ characters.) -3. If the `--mimetex` option is used, the [mimeTeX] CGI script will +3. If the `--jsmath` option is used, TeX math will be put inside + `` tags (for inline math) or `
` tags (for display math) + with class `math`. The [jsMath] script will be used to render + it. + +4. If the `--mimetex` option is used, the [mimeTeX] CGI script will be called to generate images for each TeX formula. This should work in all browsers. The `--mimetex` option takes an optional URL as argument. If no URL is specified, it will be assumed that the mimeTeX CGI script is at `/cgi-bin/mimetex.cgi`. -4. If the `--gladtex` option is used, TeX formulas will be enclosed +5. If the `--gladtex` option is used, TeX formulas will be enclosed in `` tags in the HTML output. The resulting `htex` file may then be processed by [gladTeX], which will produce image files for each formula and an `html` file with links to these images. So, the diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -1,6 +1,7 @@ import Distribution.Simple import Distribution.PackageDescription ( emptyHookedBuildInfo ) import Control.Exception ( bracket_ ) +import Control.Monad ( unless ) import System.Process ( runCommand, runProcess, waitForProcess ) import System.FilePath ( (), (<.>) ) import System.Directory @@ -10,19 +11,18 @@ import System.IO.Error ( isDoesNotExistError ) import Data.Maybe ( fromJust, isNothing, catMaybes ) -main = defaultMainWithHooks $ - simpleUserHooks { runTests = runTestSuite - , postBuild = makeManPages } +main = do + defaultMainWithHooks $ simpleUserHooks { runTests = runTestSuite + , postBuild = makeManPages } + exitWith ExitSuccess -- | Run test suite. runTestSuite _ _ _ _ = do - inDirectory "tests" $ runCommand "runhaskell -i.. RunTests.hs" >>= waitForProcess - return () + inDirectory "tests" $ runCommand "runhaskell -i.. RunTests.hs" >>= waitForProcess >>= exitWith -- | Build man pages from markdown sources in man/man1/. makeManPages _ _ _ _ = do - mapM makeManPage ["pandoc.1", "hsmarkdown.1", "html2markdown.1", "markdown2pdf.1"] - return () + mapM_ makeManPage ["pandoc.1", "hsmarkdown.1", "html2markdown.1", "markdown2pdf.1"] -- | Build a man page from markdown source in man/man1. makeManPage manpage = do @@ -31,14 +31,13 @@ let page = manDir manpage let source = manDir manpage <.> "md" modifiedDeps <- modifiedDependencies page [source] - if null modifiedDeps - then return () - else do - ec <- runProcess pandoc ["-s", "-S", "-r", "markdown", "-w", "man", "-o", page, source] - Nothing Nothing Nothing Nothing (Just stderr) >>= waitForProcess - case ec of - ExitSuccess -> putStrLn $ "Created " ++ manDir manpage - _ -> error $ "Error creating " ++ manDir manpage + unless (null modifiedDeps) $ do + ec <- runProcess pandoc ["-s", "-S", "-r", "markdown", "-w", "man", "-o", page, source] + Nothing Nothing Nothing Nothing (Just stderr) >>= waitForProcess + case ec of + ExitSuccess -> putStrLn $ "Created " ++ manDir manpage + _ -> do putStrLn $ "Error creating " ++ manDir manpage + exitWith ec -- | Returns a list of 'dependencies' that have been modified after 'file'. modifiedDependencies :: FilePath -> [FilePath] -> IO [FilePath] diff --git a/Text/Pandoc.hs b/Text/Pandoc.hs --- a/Text/Pandoc.hs +++ b/Text/Pandoc.hs @@ -111,4 +111,4 @@ -- | Version number of pandoc library. pandocVersion :: String -pandocVersion = "1.0.0.1" +pandocVersion = "1.1" diff --git a/Text/Pandoc/ODT.hs b/Text/Pandoc/ODT.hs --- a/Text/Pandoc/ODT.hs +++ b/Text/Pandoc/ODT.hs @@ -46,7 +46,7 @@ -> String -- ^ OpenDocument XML contents. -> IO () saveOpenDocumentAsODT destinationODTPath sourceDirRelative xml = do - let refArchive = read $(makeZip "odt-styles") + let refArchive = read $(makeZip $ "data" "odt-styles") -- handle pictures let (newContents, pics) = case runParser pPictures [] "OpenDocument XML contents" xml of diff --git a/Text/Pandoc/Readers/HTML.hs b/Text/Pandoc/Readers/HTML.hs --- a/Text/Pandoc/Readers/HTML.hs +++ b/Text/Pandoc/Readers/HTML.hs @@ -136,16 +136,16 @@ -- | Returns @True@ if the specified URI is potentially a security risk. unsanitaryURI :: String -> Bool unsanitaryURI u = - let safeURISchemes = [ "", "http", "https", "ftp", "mailto", "file", - "telnet", "gopher", "aaa", "aaas", "acap", "cap", "cid", - "crid", "dav", "dict", "dns", "fax", "go", "h323", "im", - "imap", "ldap", "mid", "news", "nfs", "nntp", "pop", - "pres", "sip", "sips", "snmp", "tel", "urn", "wais", - "xmpp", "z39.50r", "z39.50s", "aim", "callto", "cvs", - "ed2k", "feed", "fish", "gg", "irc", "ircs", "lastfm", - "ldaps", "magnet", "mms", "msnim", "notes", "rsync", - "secondlife", "skype", "ssh", "sftp", "smb", "sms", - "snews", "webcal", "ymsgr"] + let safeURISchemes = [ "", "http:", "https:", "ftp:", "mailto:", "file:", + "telnet:", "gopher:", "aaa:", "aaas:", "acap:", "cap:", "cid:", + "crid:", "dav:", "dict:", "dns:", "fax:", "go:", "h323:", "im:", + "imap:", "ldap:", "mid:", "news:", "nfs:", "nntp:", "pop:", + "pres:", "sip:", "sips:", "snmp:", "tel:", "urn:", "wais:", + "xmpp:", "z39.50r:", "z39.50s:", "aim:", "callto:", "cvs:", + "ed2k:", "feed:", "fish:", "gg:", "irc:", "ircs:", "lastfm:", + "ldaps:", "magnet:", "mms:", "msnim:", "notes:", "rsync:", + "secondlife:", "skype:", "ssh:", "sftp:", "smb:", "sms:", + "snews:", "webcal:", "ymsgr:"] in case parseURIReference u of Just p -> (map toLower $ uriScheme p) `notElem` safeURISchemes Nothing -> True @@ -320,9 +320,21 @@ rawHtmlBlock :: GenParser Char ParserState Block rawHtmlBlock = try $ do - body <- htmlBlockElement <|> anyHtmlBlockTag + body <- htmlBlockElement <|> rawVerbatimBlock <|> anyHtmlBlockTag state <- getState if stateParseRaw state then return (RawHtml body) else return Null + +-- This is a block whose contents should be passed through verbatim, not interpreted. +rawVerbatimBlock :: GenParser Char ParserState [Char] +rawVerbatimBlock = try $ do + start <- anyHtmlBlockTag + let tagtype = extractTagType start + if tagtype `elem` ["pre"] + then do + contents <- many (notFollowedBy' (htmlEndTag tagtype) >> anyChar) + end <- htmlEndTag tagtype + return $ start ++ contents ++ end + else fail "Not a verbatim block" -- We don't want to parse or as raw HTML, since these -- are handled in parseHtml. diff --git a/Text/Pandoc/Readers/Markdown.hs b/Text/Pandoc/Readers/Markdown.hs --- a/Text/Pandoc/Readers/Markdown.hs +++ b/Text/Pandoc/Readers/Markdown.hs @@ -188,12 +188,13 @@ lab <- reference char ':' skipSpaces >> optional newline >> skipSpaces >> notFollowedBy (char '[') - src <- (char '<' >> many (noneOf "> \n\t") >>~ char '>') - <|> many (noneOf " \n\t") + let sourceURL excludes = many $ + optional (char '\\') >> (noneOf (' ':excludes) <|> (notFollowedBy' referenceTitle >> char ' ')) + src <- try (char '<' >> sourceURL ">\t\n" >>~ char '>') <|> sourceURL "\t\n" tit <- option "" referenceTitle blanklines endPos <- getPosition - let newkey = (lab, (removeTrailingSpace src, tit)) + let newkey = (lab, (intercalate "%20" $ words $ removeTrailingSpace src, tit)) st <- getState let oldkeys = stateKeys st updateState $ \s -> s { stateKeys = newkey : oldkeys } @@ -313,7 +314,7 @@ skipSpaces start <- oneOf hruleChars count 2 (skipSpaces >> char start) - skipMany (skipSpaces >> char start) + skipMany (oneOf spaceChars <|> char start) newline optional blanklines return HorizontalRule @@ -1060,14 +1061,13 @@ source' :: GenParser Char st (String, [Char]) source' = do skipSpaces - src <- try (char '<' >> - many (optional (char '\\') >> noneOf "> \t\n") >>~ - char '>') - <|> many (optional (char '\\') >> noneOf " \t\n") + let sourceURL excludes = many $ + optional (char '\\') >> (noneOf (' ':excludes) <|> (notFollowedBy' linkTitle >> char ' ')) + src <- try (char '<' >> sourceURL ">\t\n" >>~ char '>') <|> sourceURL "\t\n" tit <- option "" linkTitle skipSpaces eof - return (removeTrailingSpace src, tit) + return (intercalate "%20" $ words $ removeTrailingSpace src, tit) linkTitle :: GenParser Char st String linkTitle = try $ do diff --git a/Text/Pandoc/Readers/RST.hs b/Text/Pandoc/Readers/RST.hs --- a/Text/Pandoc/Readers/RST.hs +++ b/Text/Pandoc/Readers/RST.hs @@ -367,6 +367,8 @@ definitionListItem :: GenParser Char ParserState ([Inline], [Block]) definitionListItem = try $ do + -- avoid capturing a directive or comment + notFollowedBy (try $ char '.' >> char '.') term <- many1Till inline endline raw <- indentedBlock -- parse the extracted block, which may contain various block elements: @@ -464,11 +466,10 @@ unknownDirective :: GenParser Char st Block unknownDirective = try $ do - string ".. " + string ".." + notFollowedBy (noneOf " \t\n") manyTill anyChar newline - many (string " :" >> many1 (noneOf "\n:") >> char ':' >> - many1 (noneOf "\n") >> newline) - optional blanklines + many $ blanklines <|> (oneOf " \t" >> manyTill anyChar newline) return Null -- diff --git a/Text/Pandoc/Shared.hs b/Text/Pandoc/Shared.hs --- a/Text/Pandoc/Shared.hs +++ b/Text/Pandoc/Shared.hs @@ -243,13 +243,22 @@ if null rest then return firstpartWrapped else do let (note:rest') = rest - restWrapped <- if null rest' - then return empty - else wrappedTeX includePercent listWriter rest' + let (rest1, rest2) = break (== Space) rest' + -- rest1 is whatever comes between the note and a Space. + -- if the note is followed directly by a Space, rest1 is null. + -- rest1 is printed after the note but before the line break, + -- to avoid spurious blank space the note and immediately + -- following punctuation. + rest1Out <- if null rest1 + then return empty + else listWriter rest1 + rest2Wrapped <- if null rest2 + then return empty + else wrappedTeX includePercent listWriter (tail rest2) noteText <- listWriter [note] - return $ firstpartWrapped <> - (if includePercent then PP.char '%' else empty) $$ - noteText $$ restWrapped + return $ (firstpartWrapped <> if includePercent then PP.char '%' else empty) $$ + (noteText <> rest1Out) $$ + rest2Wrapped -- | Wrap inlines if the text wrap option is selected, specialized -- for LaTeX and ConTeXt. @@ -815,22 +824,21 @@ compactify items = let final = last items others = init items - in case final of - [Para a] -> if any containsPara others - then items - else others ++ [[Plain a]] - _ -> items + in case last final of + Para a -> if all endsWithPlain others && not (null final) + then others ++ [init final ++ [Plain a]] + else items + _ -> items -containsPara :: [Block] -> Bool -containsPara [] = False -containsPara ((Para _):_) = True -containsPara ((BulletList items):rest) = any containsPara items || - containsPara rest -containsPara ((OrderedList _ items):rest) = any containsPara items || - containsPara rest -containsPara ((DefinitionList items):rest) = any containsPara (map snd items) || - containsPara rest -containsPara (_:rest) = containsPara rest +endsWithPlain :: [Block] -> Bool +endsWithPlain [] = False +endsWithPlain blocks = + case last blocks of + Plain _ -> True + (BulletList (x:xs)) -> endsWithPlain $ last (x:xs) + (OrderedList _ (x:xs)) -> endsWithPlain $ last (x:xs) + (DefinitionList (x:xs)) -> endsWithPlain $ last $ map snd (x:xs) + _ -> False -- | Data structure for defining hierarchical Pandoc documents data Element = Blk Block @@ -862,6 +870,7 @@ data HTMLMathMethod = PlainMath | LaTeXMathML (Maybe String) -- url of LaTeXMathML.js + | JsMath (Maybe String) -- url of jsMath load script | GladTeX | MimeTeX String -- url of mimetex.cgi deriving (Show, Read, Eq) diff --git a/Text/Pandoc/Writers/HTML.hs b/Text/Pandoc/Writers/HTML.hs --- a/Text/Pandoc/Writers/HTML.hs +++ b/Text/Pandoc/Writers/HTML.hs @@ -129,6 +129,10 @@ script ! [src url, thetype "text/javascript"] $ noHtml + JsMath (Just url) -> + script ! + [src url, thetype "text/javascript"] $ + noHtml _ -> noHtml else noHtml head' = header $ metadata +++ math +++ css +++ @@ -375,7 +379,7 @@ else inlineListToHtml opts capt >>= return . caption colHeads <- colHeadsToHtml opts alignStrings widths headers - rows'' <- mapM (tableRowToHtml opts alignStrings) rows' + rows'' <- zipWithM (tableRowToHtml opts alignStrings) (cycle ["odd", "even"]) rows' return $ table $ captionDoc +++ colHeads +++ rows'' colHeadsToHtml :: WriterOptions @@ -387,7 +391,7 @@ heads <- sequence $ zipWith3 (\alignment columnwidth item -> tableItemToHtml opts th alignment columnwidth item) alignStrings widths headers - return $ tr $ toHtmlFromList heads + return $ tr ! [theclass "header"] $ toHtmlFromList heads alignmentToString :: Alignment -> [Char] alignmentToString alignment = case alignment of @@ -398,11 +402,12 @@ tableRowToHtml :: WriterOptions -> [[Char]] + -> String -> [[Block]] -> State WriterState Html -tableRowToHtml opts aligns columns = +tableRowToHtml opts aligns rowclass columns = (sequence $ zipWith3 (tableItemToHtml opts td) aligns (repeat 0) columns) >>= - return . tr . toHtmlFromList + return . (tr ! [theclass rowclass]) . toHtmlFromList tableItemToHtml :: WriterOptions -> (Html -> Html) @@ -459,9 +464,17 @@ modify (\st -> st {stMath = True}) >> (case writerHTMLMathMethod opts of LaTeXMathML _ -> + -- putting LaTeXMathML in container with class "LaTeX" prevents + -- non-math elements on the page from being treated as math by + -- the javascript + return $ thespan ! [theclass "LaTeX"] $ + if t == InlineMath + then primHtml ("$" ++ str ++ "$") + else primHtml ("$$" ++ str ++ "$$") + JsMath _ -> return $ if t == InlineMath - then primHtml ("$" ++ str ++ "$") - else primHtml ("$$" ++ str ++ "$$") + then thespan ! [theclass "math"] $ primHtml str + else thediv ! [theclass "math"] $ primHtml str MimeTeX url -> return $ image ! [src (url ++ "?" ++ str), alt str, title str] diff --git a/Text/Pandoc/Writers/OpenDocument.hs b/Text/Pandoc/Writers/OpenDocument.hs --- a/Text/Pandoc/Writers/OpenDocument.hs +++ b/Text/Pandoc/Writers/OpenDocument.hs @@ -298,7 +298,7 @@ | OrderedList a b <- bs = orderedList a b | Table c a w h r <- bs = table c a w h r | Null <- bs = return empty - | HorizontalRule <- bs = return empty + | HorizontalRule <- bs = return $ selfClosingTag "text:p" [ ("text:style-name", "Horizontal_20_Line") ] | otherwise = return empty where defList b = do setInDefinitionList True diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,85 @@ +pandoc (1.1) + + [ John MacFarlane ] + + * Main.hs: + + + Changed date on copyright message in Main.hs. + + Have the '-v' option print syntax highlighting languages + separated by commas, and wrapped in lines, instead of in five + columns as before. + + * Added --jsmath option. Resolves Issue #68. + + + Added --jsmath option to Main.hs + + Added JsMath to HTMLMathMethod in Text.Pandoc.Shared. + + Handle math appropriately in HTML writer when JsMath selected. + + Documented the option in README and man page. + + * Text.Pandoc.Shared: Changed compactify to use a better heuristic + for tight and loose lists. Final Para is changed to Plain if all + other list items *end* with a Plain block. Addresses Issue #99. + + * HTML reader: + + + Added colons to protocols in unsanitaryURI. Closes Issue #88. + + HTML reader: Don't interpret contents of 
 blocks as markdown.
+      Added rawVerbatimBlock parser.  Resolves Issue #94.
+
+  * Markdown reader:
+  
+    + Allow URLs with spaces in them in links and references, but escape
+      them as "%20".
+    + Allow blank space at the end of horizontal rules.
+
+  * RST reader: Modified 'unknownDirective' parser to handle comment
+    blocks correctly, and added tests for comment blocks. Resolves Issue
+    #86. Closes Debian Bug #500662.
+
+  * HTML writer:
+
+    + Include classes on tr elements in HTML output:
+      "header", "odd", "even".  This allows tables to be styled with
+      lines in alternating colors.  Resolves Issue #91.
+    + Enclose all LaTeXMathML bits in .
+      This prevents parts of the document that are not math from being
+      interpreted as math by LaTeXMathML.js.
+
+  * OpenDocument and ODT writers:  Added support for HorizontalRule elements,
+    which were formerly ignored.  Resolves Issue #95.
+
+  * Text.Pandoc.Shared:  Modified wrappedTeX to eliminate the line break
+    between a footnote and immediately following nonspace characters in
+    LaTeX and ConTeXt output. (This gets interpreted as a space, which
+    is not desired in cases like "text^[note]---".)  Resolves Issue #93.
+
+  * Windows installer: Don't require admin privileges to run
+    installer.  Modified pandoc-setup.iss, and changed modpath.iss to
+    modify HKCU path if user lacks admin privileges.  Also fixed case
+    where oldpath is empty (previously this led to the new path
+    beginning with a semicolon).
+
+  * Updated INSTALL instructions for Arch packages and OS X install using
+    cabal-install.
+
+  * Removed the (now unneeded) debian directory.
+    Removed empty Codec and System directories.
+
+  * Moved odt-styles/ to data/.  Removed unneeded variable in Makefile.
+
+  * Modified Setup.hs so that the "test" target returns an error status
+    when tests fail, and "build" returns a success status if
+    the build succeeds.  Resolves Issue #100.
+
+  * Added BUGS to files in tarball.
+
+
+pandoc (1.0.0.1)
+
+  [ John MacFarlane ]
+
+  * Removed spurious reference to pdf output format from pandoc(1) man page.
+
 pandoc (1.0)
 
   [ Andrea Rossato ]
diff --git a/data/odt-styles/META-INF/manifest.xml b/data/odt-styles/META-INF/manifest.xml
new file mode 100644
--- /dev/null
+++ b/data/odt-styles/META-INF/manifest.xml
@@ -0,0 +1,22 @@
+
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
diff --git a/data/odt-styles/Thumbnails/thumbnail.png b/data/odt-styles/Thumbnails/thumbnail.png
new file mode 100644
Binary files /dev/null and b/data/odt-styles/Thumbnails/thumbnail.png differ
diff --git a/data/odt-styles/meta.xml b/data/odt-styles/meta.xml
new file mode 100644
--- /dev/null
+++ b/data/odt-styles/meta.xml
@@ -0,0 +1,1 @@
+
diff --git a/data/odt-styles/mimetype b/data/odt-styles/mimetype
new file mode 100644
--- /dev/null
+++ b/data/odt-styles/mimetype
@@ -0,0 +1,1 @@
+application/vnd.oasis.opendocument.text
diff --git a/data/odt-styles/settings.xml b/data/odt-styles/settings.xml
new file mode 100644
--- /dev/null
+++ b/data/odt-styles/settings.xml
@@ -0,0 +1,2 @@
+
+40640-10582569315242truefalseview2893654975-10584064024633558800100falsetruefalsefalse1truefalse0falsetruefalsefalsetruetruetruetruefalse0falsetruetruetruetruefalsefalsefalsetruefalsefalsefalsefalsefalsetruefalsefalsetruefalsefalsefalsetruetrue0falsefalsehigh-resolutionfalsetruetruefalsefalse
diff --git a/data/odt-styles/styles.xml b/data/odt-styles/styles.xml
new file mode 100644
--- /dev/null
+++ b/data/odt-styles/styles.xml
@@ -0,0 +1,2 @@
+
+1 
diff --git a/man/man1/pandoc.1.md b/man/man1/pandoc.1.md
--- a/man/man1/pandoc.1.md
+++ b/man/man1/pandoc.1.md
@@ -112,6 +112,11 @@
     provide a *URL*. If no *URL* is provided, the contents of the
     script will be inserted directly into the HTML header.
 
+\--jsmath=*URL*
+:   Use jsMath to display embedded TeX math in HTML output.
+    The *URL* should point to the jsMath load script; if provided,
+    it will be linked to in the header of standalone HTML documents.
+
 \--gladtex
 :   Enclose TeX math in `` tags in HTML output.  These can then
     be processed by gladTeX to produce links to images of the typeset
diff --git a/odt-styles/META-INF/manifest.xml b/odt-styles/META-INF/manifest.xml
deleted file mode 100644
--- a/odt-styles/META-INF/manifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
diff --git a/odt-styles/Thumbnails/thumbnail.png b/odt-styles/Thumbnails/thumbnail.png
deleted file mode 100644
Binary files a/odt-styles/Thumbnails/thumbnail.png and /dev/null differ
diff --git a/odt-styles/meta.xml b/odt-styles/meta.xml
deleted file mode 100644
--- a/odt-styles/meta.xml
+++ /dev/null
@@ -1,1 +0,0 @@
-
diff --git a/odt-styles/mimetype b/odt-styles/mimetype
deleted file mode 100644
--- a/odt-styles/mimetype
+++ /dev/null
@@ -1,1 +0,0 @@
-application/vnd.oasis.opendocument.text
diff --git a/odt-styles/settings.xml b/odt-styles/settings.xml
deleted file mode 100644
--- a/odt-styles/settings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-40640-10582569315242truefalseview2893654975-10584064024633558800100falsetruefalsefalse1truefalse0falsetruefalsefalsetruetruetruetruefalse0falsetruetruetruetruefalsefalsefalsetruefalsefalsefalsefalsefalsetruefalsefalsetruefalsefalsefalsetruetrue0falsefalsehigh-resolutionfalsetruetruefalsefalse
diff --git a/odt-styles/styles.xml b/odt-styles/styles.xml
deleted file mode 100644
--- a/odt-styles/styles.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-1 
diff --git a/pandoc.cabal b/pandoc.cabal
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,5 +1,5 @@
 Name:            pandoc
-Version:         1.0.0.1
+Version:         1.1
 Cabal-Version:   >= 1.2
 Build-Type:      Custom
 License:         GPL
@@ -36,7 +36,7 @@
                  only adding a reader or writer.
 Extra-Source-Files:
                  -- documentation
-                 README, INSTALL, COPYRIGHT, changelog,
+                 README, INSTALL, COPYRIGHT, BUGS, changelog,
                  -- sources for man pages
                  man/man1/pandoc.1.md, man/man1/markdown2pdf.1.md,
                  man/man1/html2markdown.1.md, man/man1/hsmarkdown.1.md,
@@ -64,12 +64,12 @@
                  data/ui/default/outline.css,
                  data/ui/default/print.css,
                  -- data for ODT writer
-                 odt-styles/meta.xml,
-                 odt-styles/settings.xml,
-                 odt-styles/META-INF/manifest.xml,
-                 odt-styles/Thumbnails/thumbnail.png,
-                 odt-styles/styles.xml,
-                 odt-styles/mimetype,
+                 data/odt-styles/meta.xml,
+                 data/odt-styles/settings.xml,
+                 data/odt-styles/META-INF/manifest.xml,
+                 data/odt-styles/Thumbnails/thumbnail.png,
+                 data/odt-styles/styles.xml,
+                 data/odt-styles/mimetype,
                  -- tests
                  tests/bodybg.gif,
                  tests/writer.latex,
diff --git a/tests/markdown-reader-more.native b/tests/markdown-reader-more.native
--- a/tests/markdown-reader-more.native
+++ b/tests/markdown-reader-more.native
@@ -4,5 +4,11 @@
 , Para [Link [Str "foo"] ("/url",""),Space,Str "and",Space,Link [Str "bar"] ("/url","title")]
 , Header 2 [Str "Raw",Space,Str "ConTeXt",Space,Str "environments"]
 , Para [TeX "\\placeformula",Space,TeX "\\startformula\n   L_{1} = L_{2}\n   \\stopformula"]
-, Para [TeX "\\start[a2]\n\\start[a2]\n\\stop[a2]\n\\stop[a2]"] ]
+, Para [TeX "\\start[a2]\n\\start[a2]\n\\stop[a2]\n\\stop[a2]"]
+, Header 2 [Str "URLs",Space,Str "with",Space,Str "spaces"]
+, Para [Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("bar%20baz","title")]
+, Para [Link [Str "baz"] ("/foo%20foo",""),Space,Link [Str "bam"] ("/foo%20fee",""),Space,Link [Str "bork"] ("/foo/zee%20zob","title")]
+, Header 2 [Str "Horizontal",Space,Str "rules",Space,Str "with",Space,Str "spaces",Space,Str "at",Space,Str "end"]
+, HorizontalRule
+, HorizontalRule ]
 
diff --git a/tests/markdown-reader-more.txt b/tests/markdown-reader-more.txt
--- a/tests/markdown-reader-more.txt
+++ b/tests/markdown-reader-more.txt
@@ -22,3 +22,22 @@
 \stop[a2]
 \stop[a2]
 
+## URLs with spaces
+
+[foo](/bar and baz)
+[foo](/bar and baz )
+[foo]( /bar  and  baz  )
+[foo](bar baz  "title" )
+
+[baz][] [bam][] [bork][]
+
+[baz]: /foo foo
+[bam]:  /foo fee   
+[bork]:  /foo/zee zob   (title)
+
+## Horizontal rules with spaces at end
+
+* * * * *  
+
+-- - -- -- -  
+
diff --git a/tests/rst-reader.native b/tests/rst-reader.native
--- a/tests/rst-reader.native
+++ b/tests/rst-reader.native
@@ -230,5 +230,9 @@
 , Para [Str "From",Space,Str "\"Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune\"",Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902)",Str ":"]
 , Plain [Image [Str "image"] ("lalune.jpg","")]
 , Plain [Image [Str "Voyage dans la Lune"] ("lalune.jpg","Voyage dans la Lune")]
-, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image [Str "movie"] ("movie.jpg",""),Space,Str "icon."] ]
+, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image [Str "movie"] ("movie.jpg",""),Space,Str "icon."]
+, Header 1 [Str "Comments"]
+, Para [Str "First",Space,Str "paragraph"]
+, Para [Str "Another",Space,Str "paragraph"]
+, Para [Str "A",Space,Str "third",Space,Str "paragraph"] ]
 
diff --git a/tests/rst-reader.rst b/tests/rst-reader.rst
--- a/tests/rst-reader.rst
+++ b/tests/rst-reader.rst
@@ -402,3 +402,29 @@
 Here is a movie |movie| icon.
 
 .. |movie| image:: movie.jpg
+
+Comments
+========
+
+First paragraph
+
+.. comment
+
+..
+    Comment block, should not appear in output
+    as defined by reStructuredText
+
+Another paragraph
+
+..
+    Another comment block.
+
+    This one spans several
+    text elements.
+
+    It doesn't end until
+    indentation is restored to the
+    preceding level.
+
+A third paragraph
+
diff --git a/tests/s5.fancy.html b/tests/s5.fancy.html
--- a/tests/s5.fancy.html
+++ b/tests/s5.fancy.html
@@ -515,7 +515,9 @@
     >Math
  • $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
    • $\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$
diff --git a/tests/tables.html b/tests/tables.html --- a/tests/tables.html +++ b/tests/tables.html @@ -3,7 +3,7 @@ >
Demonstration of simple table syntax.
RightDefault
1212
123123
1

Simple table without caption:

RightDefault
1212
123123
1
Demonstration of simple table syntax.
RightDefault
1212
123123
1
Here's the caption. It may span multiple lines.
Centered HeaderDefault aligned
FirstExample of a row that spans multiple lines.
Second

Multiline table without caption:

Centered HeaderDefault aligned
FirstExample of a row that spans multiple lines.
SecondThis is a set of tests for pandoc. Most of them are adapted from John Gruber’s markdown test suite. + Headers Level 2 with an @@ -897,6 +898,7 @@ Level 2 with no blank line + Paragraphs Here’s a regular paragraph. @@ -908,6 +910,7 @@ bullet. * criminey. There should be a hard line breakhere. + Block Quotes E-mail style: @@ -932,6 +935,7 @@ quote: 2 > 1. And a following paragraph. + Code Blocks Code: @@ -946,6 +950,7 @@ this code block is indented by two tabs These should not be escaped: \$ \\ \> \[ \{ + Lists Unordered Asterisks tight: @@ -1231,6 +1236,7 @@ item: M.A. 2007 B. Williams + Definition Lists Tight using spaces: @@ -1300,6 +1306,7 @@ Code: <hr /> Hr’s: + Inline Markup This is @@ -1338,6 +1345,7 @@ These should not be superscripts or subscripts, because of the unescaped spaces: a^b c^d, a~b c~d. + Smart quotes, ellipses, dashes @@ -1361,6 +1369,7 @@ Dashes between numbers: 5–7, 255–66, 1987–1999. Ellipses…and…and…. + LaTeX @@ -1411,6 +1420,7 @@ Dog & 2 \\ Cat & 1 \\ \hline \end{tabular} + Special Characters Here is some @@ -1455,6 +1465,7 @@ Bang: ! Plus: + Minus: - + Links Explicit Just a @@ -1523,6 +1534,7 @@ here: <http://example.com/> or here: <http://example.com/> + Images From “Voyage dans la Lune” by Georges Melies @@ -1531,6 +1543,7 @@ Here is a movie icon. + Footnotes Here is a footnote reference,1