+ 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
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
Added man page.
Modified Makefile to create markdown2odt from template.
Modified Makefile to create reference.odt file from files in odt-styles.
Modified Makefile to install reference.odt into PACKAGEDATAPATH.
Modified macports Portfile.
Modified freebsd Makefile.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1259 788f1e2b-df1e-0410-8736-df70ead52e1b
Note that Cabal will automatically choose the ghc-pkg appropriate
for the compiler selected, so normally specifying GHC by itself
is sufficient.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1217 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Removed templates/Makefile and fillTemplates.pl.
+ Removed 'templates' Makefile target.
+ Added postConf hook to Setup.hs that fills the templates.
+ Use compressed javascripts for S5 and ASCIIMathML templates.
+ Revised test suite.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1216 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Changed BUILDCONF to point to dist/setup-config, not .setup-config.
This is where current versions of Cabal put it. 'make clean' works again!
+ Do not clean up CABAL_BKP, because it might need to be recovered for
a new build with a different GHC version.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1108 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Added $(BUILDCMD) target, so setup doesn't get compiled every time.
+ Removed (now circular) dependency of templates on ./templates.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1107 788f1e2b-df1e-0410-8736-df70ead52e1b
is copied to pandoc.cabal, and the old pandoc.cabal is copied to
pandoc.cabal.orig. Otherwise, pandoc.cabal is copied to pandoc.cabal.orig
but otherwise unmodified. This way, the Makefile will work properly
with either GHC 6.6 or 6.8.
+ The changes in debian/rules from r1066 have been reverted, since they
are no longer needed. Also, debian/rules has been converted to UTF-8.
+ INSTALL instructions have been updated accordingly.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1095 788f1e2b-df1e-0410-8736-df70ead52e1b
to support unusual ghc installations, for example:
GHC=/opt/ghc/bin/ghc GHC_PKG=/opt/ghc/bin/ghc-pkg make
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1081 788f1e2b-df1e-0410-8736-df70ead52e1b
+ pandoc.cabal now uses Cabal configurations and requires Cabal >=1.2.
+ An alternative pandoc.cabal.ghc66 is provided for those who have older
versions of Cabal.
+ Debian build process has been modified to use pandoc.cabal.ghc66,
as a temporary measure until GHC 6.8 gets into debian unstable.
+ INSTALL instructions have been updated.
+ Makefile has been updated to accommodate changes in pandoc.cabal.
+ pandoc.cabal.ghc68 has been removed, since the default version now
works with GHC 6.8.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1066 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Added library Text.Pandoc.Include, with a template haskell
function $(includeStrFrom fname) to include a file as a string
constant at compile time.
+ This removes the need for the 'templates' directory or Makefile
target. These have been removed.
+ The base source directory has been changed from src to .
+ A new 'data' directory has been added, containing the ASCIIMathML.js
script, writer headers, and S5 files.
+ The src/wrappers directory has been moved to 'wrappers'.
+ The Text.Pandoc.ASCIIMathML library is no longer needed, since
Text.Pandoc.Writers.HTML can use includeStrFrom to include the
ASCIIMathML.js code directly. It has been removed.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1063 788f1e2b-df1e-0410-8736-df70ead52e1b
- New variables to make use in debian/rules: DATADIR, DOCDIR. Cabal uses
$prefix/pandoc-$VERSION/doc for the documentation files, where as the
Debian package uses $prefix/doc/pandoc. We need these variables to resolve
the conflict.
debian/rules:
- Set and export DATADIR, DOCDIR which controls the installation of document
files at install-program target.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1045 788f1e2b-df1e-0410-8736-df70ead52e1b
- For generic installations, use $prefix/share/pandoc-$VERSION/doc directory
to put all the documentation files. This fixes the issue of having two
copies of the library documentation (one in $prefix/share/pandoc-doc, the
other is in $prefix/share/pandoc-$VERSION).
- Remove uninstall-lib-doc target and move the relevant code to uninstall-all
target. Add extra code to remove the html directory. These changes fix the
issue of leaving the library documentation in $prefix/share/pandoc-$VERSION
uninstalled.
- Remove the confusing NAME and THIS variables and create new variables: PKG
(same as THIS), and PKGID ($PKG-$VERSION = $THIS-$VERSION). Remove RELNAME
(which is equal to PKGID). All these changes simplified things a bit in
"Cabal constants" section and uninstall-all target.
- Remove some Cabal constants for the sake of simplicity and add a few new
ones: PKGDATAPATH and PKGDOCPATH. We at least need a PKGDOCPATH variable to
install DOCS, as Cabal doesn't provide a command for this target (hence,
install-doc). I wish to set this variable by using ghc-pkg (just like
libdir in install-all), but this seems a bit difficult to me, as there is no
docdir variable in .installed-pkg-config and we would have to resort to an
unclean hack which extracts docdir from haddock-dir.
- Keep all non-critical steps (i.e. rmdir) quiet to reduce noise.
- Ensure to use stderr for all messages.
- Avoid forking a subshell in $(web_dest).
- A few unrelated cosmetic changes.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1043 788f1e2b-df1e-0410-8736-df70ead52e1b
+ 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 (from Debian BTS).
+ Setup.hs: revert changes.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1005 788f1e2b-df1e-0410-8736-df70ead52e1b
them in INSTALL. osx packaging was not working well, because of
the binary's dependency on a dynamic library GMP. A MacPorts port
will be provided instead.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@905 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Added freebsd target to Makefile, which creates Makefile from
Makefile.in and creates distinfo.
+ Removed Makefile and distinfo from the repository.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@887 788f1e2b-df1e-0410-8736-df70ead52e1b
Mac OSX package, because the RTF tables don't render right
in Mac's preview app.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@790 788f1e2b-df1e-0410-8736-df70ead52e1b
Reason: In because in the process of making the debian package,
'var' gets overwritten with the local debian build directory as
DESTDIR. This will break future 'make uninstall's, which will
try to delete files from there instead of /usr/local (or wherever).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@735 788f1e2b-df1e-0410-8736-df70ead52e1b
with HackageDB, which likes the cabal file to have the same name
as the tarball. Modified references to Pandoc.cabal in INSTALL
and Makefile.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@631 788f1e2b-df1e-0410-8736-df70ead52e1b
