Commit graph

1100 commits

Author SHA1 Message Date
fiddlosopher
9d54611d87 Removed dependency on reference.odt from Makefile.
This is handled now in Setup.hs.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1392 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-10 00:13:51 +00:00
fiddlosopher
ee7a458796 Removed no-longer-needed wrappers directory.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1391 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09 23:52:27 +00:00
fiddlosopher
1c5e0d084d Removed no-longer-needed templates directory.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1390 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09 23:50:34 +00:00
fiddlosopher
28828979a6 Moved more of the build process from Makefile to Setup.hs:
+ 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-09 23:45:40 +00:00
fiddlosopher
e36ff78b5e Removed layout-cache and Configurations2 from odt-styles directory.
They don't seem to be needed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1388 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09 23:45:29 +00:00
fiddlosopher
2ba5ff9483 Include shell scripts themselves in repo, rather than generating from wrappers.
+ 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-09 23:45:14 +00:00
fiddlosopher
db729a08c8 Added preconfigure hook to build reference.odt if missing.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1386 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09 18:14:20 +00:00
fiddlosopher
5d3d2d79b3 Rewrote test suite so it doesn't depend on perl or unix tools.
+ 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-09 16:51:08 +00:00
fiddlosopher
f1914c21b7 Removed unneeded space after "\\item" in LaTeX and ConTeXt output.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1384 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09 16:50:46 +00:00
fiddlosopher
80715bd126 Added Text.Pandoc.UTF8 as a backup for when utf8-string is not present.
+ 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-08 00:11:58 +00:00
fiddlosopher
05b366a0b2 Small improvements to citation parsing in markdown reader.
(Don't allow blank lines inside citations.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1382 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-06 03:34:06 +00:00
fiddlosopher
abf2dc78ac Allow parsing of multiline citations.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1381 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-05 23:18:52 +00:00
fiddlosopher
81001fde56 Text/Pandoc/Biblio.hs - made getRefs point-free.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1380 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-05 23:18:42 +00:00
fiddlosopher
a560c0acc1 Mention ODT writer in pandoc.cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1379 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-05 23:10:04 +00:00
fiddlosopher
d5e691d04a Added padding to table cells in ODT.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1378 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-05 22:50:34 +00:00
fiddlosopher
de0ab263e7 Added opendocument writer tests.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1377 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-05 22:50:25 +00:00
fiddlosopher
1bfe1b84a8 Added support for Cite to Markdown reader, and conditional support for 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-04 03:15:34 +00:00
fiddlosopher
4719c78417 Added Cite element to definition and writers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1375 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-04 03:15:12 +00:00
fiddlosopher
6ff1e2a976 Improved configuration options and CPP macros.
+ 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-03 23:33:40 +00:00
fiddlosopher
ed4b003997 Added 'utf8' configuration flag to pandoc.cabal.
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-03 08:43:28 +00:00
fiddlosopher
b63d1c5e32 Improvements to ODT writer (for windows compatibility):
+ 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-03 08:43:12 +00:00
fiddlosopher
82fd635ac1 INSTALL: Included instructions on installing utf8-string.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1371 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-02 21:21:11 +00:00
fiddlosopher
bab1605378 Replaced markdown2odt with pandoc in web demos.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1370 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-02 18:55:09 +00:00
fiddlosopher
dfdf3311b7 Added information about odt to README and pandoc(1) man page.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1369 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-02 17:56:09 +00:00
fiddlosopher
1e2f2bc4f6 Improved template handling:
+ 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-02 17:22:55 +00:00
fiddlosopher
6a0004acba Removed superfluous copyFile from Text/Pandoc/ODT.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1367 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 23:49:35 +00:00
fiddlosopher
e371db97d7 Fixes to make haddock work with template haskell:
+ 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-01 23:29:55 +00:00
fiddlosopher
5c1c786d65 Removed FlexibleInstances Extension line from pandoc.cabal; it isn't needed
because the relevant files have pragmas.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1365 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 21:48:16 +00:00
fiddlosopher
44382a2e41 Use </> with contentsOf to ensure that paths are portable.
Do not use hardcoded '/' characters!


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1364 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 21:42:22 +00:00
fiddlosopher
0362298500 ODT writer: Don't use pathname in invoking "zip", as that causes problems in windows.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1363 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 21:01:09 +00:00
fiddlosopher
26253e475e Added pragma to HTML writer to avoid deprecation warning for use of "start" attribute.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1362 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 21:00:50 +00:00
fiddlosopher
aeda44c46a Added pragma to Text/Pandoc/Shared.hs to get rid of "orphan instance" warnings.
(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-01 21:00:30 +00:00
fiddlosopher
5383db206b Removed 'CPP' from Extension in pandoc.cabal.
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-01 21:00:18 +00:00
fiddlosopher
7b986acd72 Don't use OverloadedStrings in ODT writer.
Remove version dependency from bytestring.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1359 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 15:17:48 +00:00
fiddlosopher
31e261ca39 Depend on bytestring-0.9.0.1 and provide a ByteString instance for IsString 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-01 06:35:55 +00:00
fiddlosopher
ba32c2ec42 Simplified build process using template haskell.
+ 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-01 06:35:42 +00:00
fiddlosopher
04e09cf031 Use minimum-sized (blank) content.xml in odt-styles.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1356 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 06:34:32 +00:00
fiddlosopher
5abc79cff1 Use template haskell to store reference.odt as blob in pandoc.
+ 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-01 06:34:23 +00:00
fiddlosopher
c45833a392 Makefile: build reference.odt before configure.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1354 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 01:26:58 +00:00
fiddlosopher
bf6db927d8 Added note on utf8-string dependency to INSTALL.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1353 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 00:48:41 +00:00
fiddlosopher
17b4cb7ab7 Added utf8-string library to depends in debian/control.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1352 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 00:45:26 +00:00
fiddlosopher
0c6dd105b7 Added code for xml library (Text.XML.Light) to source tree,
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-08-01 00:45:07 +00:00
fiddlosopher
8440385f45 Compatibility fixes for CPP, Cabal, and haddock:
+ 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-31 23:55:27 +00:00
fiddlosopher
22846086c1 Removed superfluous binary and bytestring dependencies in pandoc.cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1349 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 23:55:12 +00:00
fiddlosopher
283c241f9c Setup.hs: Use simpleUserHooks rather than deprecated defaultUserHooks.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1348 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 23:16:49 +00:00
fiddlosopher
ebcebccc32 Use utf8-string's System.IO.UTF8 to replace Text.Pandoc.UTF8.
+ 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
2008-07-31 23:16:31 +00:00
fiddlosopher
774dc0776d Added 'library' and 'executable' configuration flags.
Cabal can now be told to build just the library or just the executable.
Updated INSTALL accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1346 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 23:16:12 +00:00
fiddlosopher
d072ad4b66 Added 'odt' output option to pandoc:
Not a writer, but a module that inserts the output of the OpenDocument
writer into an ODT archive.  This replaces markdown2odt.

+ Added odt output option to Main.hs.
+ Added default for .odt output file.
+ Changed defaults so that .xml and .sgml aren't automatically DocBook.
+ Added odt writer to Text.Pandoc exports.
+ Added Text.Pandoc.ODT and included in pandoc.cabal.
+ Added reference.odt as data-file in pandoc.cabal.
+ Handle picture links in OpenDocument files using xml library.
+ Removed markdown2odt and references from Makefile, README, man.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1345 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 23:16:02 +00:00
fiddlosopher
504a61a97b OpenDocument writer: don't print alt text with Image.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1344 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 23:15:37 +00:00
fiddlosopher
ab2844dc5b Fixed typo in pandoc.cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1343 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 07:57:32 +00:00