Reason: pandoc may not yet have been installed, so the
templates may not be in the cabal data directory.
Resolves Issue #192.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1792 788f1e2b-df1e-0410-8736-df70ead52e1b
It is easier for releases if debian packaging is separate.
+ Removed debian directory and references to debian in Makefile and INSTALL.
+ Made COPYRIGHT and changelog standalone files rather than symlinks to
debian directory.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1422 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Added markdown2pdf.
+ Removed Text/Pandoc/PDF.hs.
+ Removed references to PDF writer from Main.hs.
+ Removed references to PDF writer from pandoc.cabal.
+ Added markdown2pdf.1 to list of man pages in Setup.hs.
+ Added markdown2pdf.1.md man page source.
+ Added reference to markdown2pdf(1) in pandoc man page.
+ Added markdown2pdf to WRAPPERS in Makefile.
+ Removed mention of pdf writer from README; added markdown2pdf.
+ Added remarks on markdown2pdf dependencies to README.Debian.
+ Added markdown2pdf to web/index.txt.in.
+ Use markdown2pdf for pdf web demos.
+ Put markdown2pdf back into debian control and rules.
+ Added markdown2pdf to macports Portfile.
+ Added markdown2pdf to freebsd package.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1415 788f1e2b-df1e-0410-8736-df70ead52e1b
+ 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
+ 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
+ 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
+ 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
- Added groff man to list of output formats in index.txt
- Added a demo of man page creation to demos page
git-svn-id: https://pandoc.googlecode.com/svn/trunk@617 788f1e2b-df1e-0410-8736-df70ead52e1b
using pandoc's man page writer. Removed man pages
from repository, added (.md) templates. Modified
Makefile to generate man pages as part of the build
process.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@609 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Include files built from templates in the distribution tarball,
so it can be built using Cabal and included in Hackage.
+ Remove unnecessary 'cabalize' step. We no longer build
Pandoc.cabal from a template.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@605 788f1e2b-df1e-0410-8736-df70ead52e1b
(This target is somewhat special as it should handle installing and
_registering_ the library in generic installations.) We can't rely on
'install-exec' to fix this bug (but we should depend on 'build-exec'
nevertheless), since the 'install-all' target already installs pandoc along
with the library files. Therefore we should install wrappers separately by
using a helper function which was specifically created to avoid code
duplication ('install-exec' target was also updated so as to use this
function).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@426 788f1e2b-df1e-0410-8736-df70ead52e1b
markdown test suites in the 'test' directory (subdirectories
beginning with 'MarkdownTest_') and run them all. This allows
us to have multiple test suites, e.g. for 1.0 and for a beta
version.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@414 788f1e2b-df1e-0410-8736-df70ead52e1b
all wrappers corresponding to src/wrappers/*.in. Now, it will only
build wrappers in WRAPPERS. This might be useful if we decide to
have 'hsmarkdown' be a wrapper on Windows and a symlink on unix.)
git-svn-id: https://pandoc.googlecode.com/svn/trunk@407 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Use 'hsmarkdown' instead of building 'pandoc-strict' (which was a hack,
and didn't work on Windows machines, anyway, due to the line ending problem)
+ Put top-level directory in path before running the test script, so that
hsmarkdown can find 'pandoc' even if it hasn't been installed.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@406 788f1e2b-df1e-0410-8736-df70ead52e1b
replacement for Markdown.pl. It calls pandoc with the options
'--from markdown --to html --strict' and disallows other options.
(Any command-line options will be interpreted as arguments.)
git-svn-id: https://pandoc.googlecode.com/svn/trunk@399 788f1e2b-df1e-0410-8736-df70ead52e1b
option to pandoc, which forces it to stay as close as possible
to official Markdown syntax.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@347 788f1e2b-df1e-0410-8736-df70ead52e1b
+ history.html -> changelog.html
+ demo.html -> examples.html
+ Added title to changelog.html
+ Removed header div on html pages
+ Changed widths in css
git-svn-id: https://pandoc.googlecode.com/svn/trunk@319 788f1e2b-df1e-0410-8736-df70ead52e1b
Cygwin, due to Windows' lack of true symbolic links).
+ Modified the wrappers to use 'pandoc' instead of the symlinks.
+ Modified the Makefile to remove all references to the symlinks.
+ Removed code from Main.hs that made pandoc's behavior depend on the
name of the calling program.
+ Added code to Main.hs that sets default reader and writer based on
extensions of input and output filenames (if provided). (Thanks to
roktas for the idea.)
+ Modified README and man pages accordingly.
+ Removed WINDOWS-README target from Makefile. It is no longer needed
now that we don't have the symlinks.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@295 788f1e2b-df1e-0410-8736-df70ead52e1b
- New win-pkg target to build Windows binary package.
- Changed name on OSX package.
- New RELNAME global variable contains release name, e.g. pandoc-0.3
- Mac dmg is now created in top-level directory, not ..
+ Updates to website:
- Changed download links to point to Google Code downloads area.
- Added section on Windows binary package.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@286 788f1e2b-df1e-0410-8736-df70ead52e1b
using "Simply expanded variables" and PROGS expands before EXECS. Put
PROGS after EXECS to fix this bug. As an alternative solution, we could
make PROGS -and possibly others- "recursively expanded" variables, but I
tend to avoid using that flavour of variables.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@283 788f1e2b-df1e-0410-8736-df70ead52e1b
Summary of main changes:
+ Added -o/--output and -d/--debug options to pandoc.
+ Modified pandoc to behave differently depending on the name
of the program. For example, if the program name is 'html2latex',
the default reader will be html and the default writer latex.
+ Removed most of the old wrappers, replacing them with symlinks
to pandoc.
+ Rewrote markdown2pdf and created a new wrapper web2markdown,
with the functionality of the old html2markdown script. These
new scripts exploit pandoc's -d option to avoid having to do
complex command-line parsing.
+ Revised man pages and documentation appropriately.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@279 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Corrected dependencies in Makefiles to ensure that templates
get filled when the relevant files are modified.
+ Changed template placeholders to @xxx@ instead of <xxx>,
for consistency with our practice with the Cabal template.
+ Changed default font for RTF writer (this had been changed earlier,
but in the target rather than the template!)
git-svn-id: https://pandoc.googlecode.com/svn/trunk@235 788f1e2b-df1e-0410-8736-df70ead52e1b
The authoritative version number is now in src/Main.hs, with no
duplication. (This seems a better solution than building Main.hs
from a template.)
git-svn-id: https://pandoc.googlecode.com/svn/trunk@182 788f1e2b-df1e-0410-8736-df70ead52e1b
6.6 Cabal builds executables in dist/build/$executable, older Cabal
versions use dist/build/src. To cope with this situation:
+ Revert to old code which determines executable paths dynamically.
+ Create symlinks to the compiled executables in top directory. Make sure
to not touch symlinks once they've been created.
+ As PROGS variable can now contain symlinks, determine the actual file
during installation.
+ Replace EXECNAMES with EXECS, as the former became a redundant name due
to these changes.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@104 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Use $(NAME) instead of hard-coded 'Pandoc' for package and dmg names
+ Create dmg in .. (like debs)
+ Modified website target to get dmg from ..
git-svn-id: https://pandoc.googlecode.com/svn/trunk@90 788f1e2b-df1e-0410-8736-df70ead52e1b
- removed hardcoded references to /usr/local
- added title
+ Minor changes to website build process.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@84 788f1e2b-df1e-0410-8736-df70ead52e1b
would end up with web_dest directory which would have to be removed
manually for further attempts. If this looked ugly; as an alternative
solution we could change 'website' target as follows:
website: $(web_dest)/index.html
$(web_dest)/index.html: ...
git-svn-id: https://pandoc.googlecode.com/svn/trunk@82 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Execute $(MAIN) in './' otherwise this would fail if $(MAIN) is not
available in PATH.
+ Make echo off during file checking.
+ Copy $(deb_main) from parent directory.
Changes for 'deb':
+ Calculate $(deb_main) the essential Debian package to install.
+ Place this target before website target.
+ 'deb' should be a PHONY target.
+ Make echo off during tool checking.
Changes for 'tarball':
+ Use all-lowercase $(THIS) instead of $(MAIN).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@81 788f1e2b-df1e-0410-8736-df70ead52e1b
