aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-08-10Debian packaging changes:fiddlosopher3-10/+19
+ Updated README.Debian with information on the changes to markdown2pdf. + Made latex and zip required dependencies, since they are now required for 'odt' and 'pdf' targets of pandoc. + Fixed typo in warning message. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1396 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-10Removed markdown2pdf and all references to it.fiddlosopher15-283/+45
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1395 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-10Added Text.Pandoc.PDF module, 'pdf' as new output option.fiddlosopher4-160/+176
The module calls pdflatex to produce the PDF, and is basically shell scripting in haskell. But this is better than the existing markdown2pdf script, which is limited to POSIX. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1394 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-10Use 'bracket' to improve withTempDir Text.Pandoc.Shared.fiddlosopher2-5/+146
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1393 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-10Removed dependency on reference.odt from Makefile.fiddlosopher1-2/+1
This is handled now in Setup.hs. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1392 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09Removed no-longer-needed wrappers directory.fiddlosopher0-0/+0
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1391 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09Removed no-longer-needed templates directory.fiddlosopher0-0/+0
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1390 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09Moved more of the build process from Makefile to Setup.hs:fiddlosopher3-34/+132
+ tarball target now calls 'sdist' + Added to "Extra-source-files" and "Extra-tmp-files" in pandoc.cabal, so 'sdist' and 'clean' will work properly. + Makefile no longer generates man pages or reference.odt. + Setup.hs now generates man pages in a postbuild hook. + Added dependency-checking to Setup.hs, so it only rebuilds things that need rebuilding. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1389 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09Removed layout-cache and Configurations2 from odt-styles directory.fiddlosopher3-2/+2
They don't seem to be needed. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1388 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09Include shell scripts themselves in repo, rather than generating from wrappers.fiddlosopher7-89/+122
+ Removed wrappers directory + Removed wrappers Makefile target + Added hsmarkdown, html2markdown, and markdown2pdf git-svn-id: https://pandoc.googlecode.com/svn/trunk@1387 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09Added preconfigure hook to build reference.odt if missing.fiddlosopher1-6/+41
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1386 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09Rewrote test suite so it doesn't depend on perl or unix tools.fiddlosopher11-293/+577
+ Replaced old runtests.pl with a Haskell script RunTests.hs. + Added Diff.hs module to be used by RunTests.hs instead of unix 'diff'. + Added test hook to Setup.hs, so tests may be run from cabal. + Changed Makefile's 'test' target to run tests via cabal. + Removed old generate.sh. + Since we no longer have 'sed' to filter out raw HTML sections from the docbook writer test, or raw LaTeX sections from the context writer test, we now just include these sections. They can be taken out if it is necessary to process the files. + Updated latex and context writer tests to remove extra spaces after '\\item' + Added a markdown table reader test. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1385 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09Removed unneeded space after "\\item" in LaTeX and ConTeXt output.fiddlosopher2-2/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1384 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-08Added Text.Pandoc.UTF8 as a backup for when utf8-string is not present.fiddlosopher11-156/+191
+ Added Text.Pandoc.UTF8 + Changed flag name from utf8 to utf8-string + Changed CPP MACRO from _UTF8 to _UTF8STRING + Import IO functions from Text.Pandoc.UTF8 when utf8-string not available. + Removed utf8-string dependency from debian/control. + Removed pandoc.cabal.ghc66; we no longer support GHC 6.6 + Modified INSTALL instructions git-svn-id: https://pandoc.googlecode.com/svn/trunk@1383 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-06Small improvements to citation parsing in markdown reader.fiddlosopher1-4/+4
(Don't allow blank lines inside citations.) git-svn-id: https://pandoc.googlecode.com/svn/trunk@1382 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-05Allow parsing of multiline citations.fiddlosopher1-2/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1381 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-05Text/Pandoc/Biblio.hs - made getRefs point-free.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1380 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-05Mention ODT writer in pandoc.cabal.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1379 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-05Added padding to table cells in ODT.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1378 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-05Added opendocument writer tests.fiddlosopher4-1/+2034
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1377 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-04Added support for Cite to Markdown reader, and conditional support for ↵fiddlosopher7-16/+197
citeproc module. + The citeproc cabal configuration option sets the _CITEPROC macro, which conditionally includes code for handling citations. + Added Text.Pandoc.Biblio module. + Made highlighting option default to False. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1376 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-04Added Cite element to definition and writers.fiddlosopher11-8/+41
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1375 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-03Improved configuration options and CPP macros.fiddlosopher6-15/+36
+ Now all macros that serve as flags start with a single _. + Added message to '-v' output about UTF-8 support. + Made highlighting the default. If the highlighting-kate library is not present, cabal will deselect the option (unless it was explicitly set). + Add UTF8 support to test function in Text.Pandoc.Shared. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1374 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-03Added 'utf8' configuration flag to pandoc.cabal.fiddlosopher3-9/+25
This makes it possible to compile pandoc without utf8, using '-f-utf8' at configuration time. Utf-8 support is still the default. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1373 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-03Improvements to ODT writer (for windows compatibility):fiddlosopher1-18/+18
+ use Data.ByteString (not Data.ByteString.Char8, which writes in text mode) + use runProcess (with a working directory) instead of runCommand + only create Pictures directory if there are pictures git-svn-id: https://pandoc.googlecode.com/svn/trunk@1372 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-02INSTALL: Included instructions on installing utf8-string.fiddlosopher1-3/+8
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1371 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-02Replaced markdown2odt with pandoc in web demos.fiddlosopher1-2/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1370 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-02Added information about `odt` to README and pandoc(1) man page.fiddlosopher2-35/+50
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1369 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-02Improved template handling:fiddlosopher7-20/+63
+ Split template haskell functions into new module, Text.Pandoc.TH + Distinguish contentsOf and binaryContentsOf; the former uses text mode in Windows, while the latter uses binary mode git-svn-id: https://pandoc.googlecode.com/svn/trunk@1368 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Removed superfluous copyFile from Text/Pandoc/ODT.hs.fiddlosopher1-1/+0
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1367 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Fixes to make haddock work with template haskell:fiddlosopher4-3/+30
+ Added CPP, TemplateHaskell, FlexibleInstances to cabal file "Extensions" field + Added #ifndef __HADDOCK__ cpp declarations in the files using template haskell. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1366 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Removed FlexibleInstances Extension line from pandoc.cabal; it isn't neededfiddlosopher1-2/+0
because the relevant files have pragmas. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1365 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Use </> with contentsOf to ensure that paths are portable.fiddlosopher2-3/+4
Do not use hardcoded '/' characters! git-svn-id: https://pandoc.googlecode.com/svn/trunk@1364 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01ODT writer: Don't use pathname in invoking "zip", as that causes problems ↵fiddlosopher1-7/+5
in windows. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1363 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Added pragma to HTML writer to avoid deprecation warning for use of "start" ↵fiddlosopher1-0/+1
attribute. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1362 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Added pragma to Text/Pandoc/Shared.hs to get rid of "orphan instance" warnings.fiddlosopher1-0/+1
(These are caused by the Lift instance for ByteString.) git-svn-id: https://pandoc.googlecode.com/svn/trunk@1361 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Removed 'CPP' from Extension in pandoc.cabal.fiddlosopher1-1/+1
It is not needed (since the relevant files have a pragma anyway), and it causes problems on windows (Cabal thinks pandoc.cabal has changed every time configure is run). git-svn-id: https://pandoc.googlecode.com/svn/trunk@1360 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Don't use OverloadedStrings in ODT writer.fiddlosopher2-9/+4
Remove version dependency from bytestring. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1359 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Depend on bytestring-0.9.0.1 and provide a ByteString instance for IsString ↵fiddlosopher2-2/+8
manually, in Text/Pandoc/ODT.hs. Upgrading to 0.9.1.0 causes problems unless every package has been built with that version, so for now we stick with 0.9.0.1. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1358 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Simplified build process using template haskell.fiddlosopher29-121/+52
+ Text/Pandoc/ASCIIMathML.hs, Text/Pandoc/DefaultHeaders.hs, and Text/Pandoc/Writers/S5.hs are no longer built in Setup.hs from templates in the templates/ directory. + Instead, they use template haskell to read data at compile time from the relevant files in data/. + Setup.hs is back to the default simple configuration. + Removed old templates and Extra-Tmp-Files field from pandoc.cabal. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1357 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Use minimum-sized (blank) content.xml in odt-styles.fiddlosopher1-2/+17
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1356 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Use template haskell to store reference.odt as blob in pandoc.fiddlosopher3-7/+22
+ Added contentsOf to Text.Pandoc.Shared. + Use this to get contents of reference.odt at compile time in Text.Pandoc.ODT + Added bytestring and template-haskell dependencies to pandoc.cabal. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1355 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Makefile: build reference.odt before configure.fiddlosopher1-3/+3
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1354 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Added note on utf8-string dependency to INSTALL.fiddlosopher1-1/+5
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1353 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Added utf8-string library to depends in debian/control.fiddlosopher1-2/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1352 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01Added code for xml library (Text.XML.Light) to source tree,fiddlosopher8-4/+1116
since there is currently no debian package. Removed dependency on xml library. Added license to debian/copyright. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1351 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31Compatibility fixes for CPP, Cabal, and haddock:fiddlosopher5-12/+13
+ Use CPP in "Extensions" field in pandoc.cabal. + Removed use of backslash string continuations in source files. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1350 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31Removed superfluous binary and bytestring dependencies in pandoc.cabal.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1349 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31Setup.hs: Use simpleUserHooks rather than deprecated defaultUserHooks.fiddlosopher1-3/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1348 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31Use utf8-string's System.IO.UTF8 to replace Text.Pandoc.UTF8.fiddlosopher6-101/+18
+ removed Text/Pandoc/UTF8.hs + removed UTF8.hs notice from debian/copyright + adjusted main.hs, Text/Pandoc.hs, and Text/Pandoc/ODT.hs to use System.IO.UTF8 instead of Text.Pandoc.UTF8 + Added dependency on utf8-string to pandoc.cabal git-svn-id: https://pandoc.googlecode.com/svn/trunk@1347 788f1e2b-df1e-0410-8736-df70ead52e1b