Commit graph

9 commits

Author SHA1 Message Date
fiddlosopher
59065c103f Modified HTML writer to use the Text.XHtml library. This results
in cleaner, faster code, and it makes it easier to use Pandoc in
other projects, like wikis, that use Text.XHtml.  Two functions
are now provided, writeHtml and writeHtmlString:  the former outputs
an Html structure, the latter a rendered string.  The S5 writer is
also changed, in parallel ways (writeS5, writeS5String).  The Html
header is now written programmatically, so it has been removed from
the 'headers' directory.  The S5 header is still needed, but the
doctype and some of the meta declarations have been removed, since
they are written programatically.  The INSTALL file and cabalize
have been updated to reflect the new dependency on the xhtml package.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@549 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-02-26 19:08:10 +00:00
fiddlosopher
00fff7d940 Reverted addition of .exe to Windows executables in cabalize.
It seems that Cabal does not expect these extensions.  Better
to handle this in the Makefile.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@191 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-13 17:42:14 +00:00
fiddlosopher
cc26d7cfed In cabalize, add '.exe' extension to executables if we're on
Windows/Cygwin.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@190 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-13 17:28:26 +00:00
fiddlosopher
1fdafb5204 Extract version number from src/Main.hs in cabalize and Makefile.
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
2006-12-12 15:41:55 +00:00
roktas
24e56f38c6 Older Cabal versions have no '--destdir' option. Detect the availability
of this option and fallback to '--copy-prefix' (which is now deprecated, as 
of GHC 6.6).

Add a short comment to cabalize.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@72 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03 05:44:22 +00:00
fiddlosopher
309a15010c Changes related to osx packaging:
+ Simplified osx-dmg target, which need not be built as root.
+ Made osx-pkg and osx-pkg-prep non-.PHONY, plus a few other minor
  changes to make the dependencies work correctly.
+ Removed \< from the sed regex in cabalize; this is not support in
  BSD sed.
+ Changed path information in osx/Welcome and message in uninstall-pandoc.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@67 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-02 03:30:47 +00:00
roktas
bbae8ad31f Really fix cabal version detection.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@43 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-30 08:18:00 +00:00
roktas
fe92360ea2 * cabalize: fix cabal version detection by using a bloody hack.
* Makefile:
  + Make 'uninstall-all' depends on 'uninstall-exec'.
  + Make the default target 'all' depends on $(BINS).  Now, invoking
    a plain 'make' builds and creates pandoc in the top directory.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@39 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-30 05:40:41 +00:00
roktas
156be8b17a Merge trunk with ghc66-branch.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@28 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-28 15:13:18 +00:00