Commit graph

93 commits

Author SHA1 Message Date
fiddlosopher
56016a998d Use HTML version of README in OSX installer, instead
of plain text or RTF (since RTF tables don't work
well in OSX Preview).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@805 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-27 16:09:18 +00:00
fiddlosopher
64f9aee1ee Use README instead of README.rtf in Welcome page of
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
2007-07-23 23:13:43 +00:00
fiddlosopher
8d0fcce06a Backup 'var' before making deb and restore after.
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
2007-07-16 08:24:39 +00:00
fiddlosopher
9a96429a1a Revamped website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@699 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-14 06:28:09 +00:00
fiddlosopher
dfdcec77a3 Use smartquotes and table of contents in generating
README.html.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@673 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-11 07:28:12 +00:00
fiddlosopher
dc7102eec3 Use -S option in building man pages.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@643 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08 03:22:00 +00:00
fiddlosopher
98372ea277 Renamed Pandoc.cabal -> pandoc.cabal, for better compatibility
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
2007-07-07 05:25:44 +00:00
fiddlosopher
cd08eabd26 Changes to website:
- 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
2007-07-03 04:11:57 +00:00
fiddlosopher
6d6fafde16 Don't use -S option in processing man pages,
since the '--' in options will be read as an
En-dash.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@611 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-02 02:19:43 +00:00
fiddlosopher
5fbe057d27 Man pages are now generated from markdown templates,
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
2007-07-01 23:26:20 +00:00
fiddlosopher
3c46f8a600 Makefile changes:
+ 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
2007-06-17 16:20:50 +00:00
fiddlosopher
f99cedd236 Strip executable binaries before installing.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@551 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-02-27 07:16:20 +00:00
fiddlosopher
e0303dfc79 'cp -a' does not work in BSD. Replace with 'cp -R'.
Note that we don't want user and group to be preserved,
anyway.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@547 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-02-23 17:31:46 +00:00
fiddlosopher
9a2c653277 More website tweaks. Added demo of extra xsl configuration
and CSS in chunked xhtml produced from docbook.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@489 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-10 03:17:37 +00:00
fiddlosopher
3528c72d7e Minor changes to Makefile required by changes to website
build system.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@488 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-10 02:41:27 +00:00
fiddlosopher
c80f181137 Reorganized Makefile target - now uses a subsidiary Makefile
that can be run from the website directory for small changes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@485 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09 18:55:50 +00:00
fiddlosopher
11f1e77402 Change to Makefile to add features page to website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@467 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09 02:07:20 +00:00
roktas
06e6107f53 Fix the bug in 'install-all' target which does not install the wrappers.
(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
2007-01-05 10:16:15 +00:00
fiddlosopher
d4370154ff Nicer informational message in test-markdown target.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@420 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-05 01:20:18 +00:00
fiddlosopher
b6663c7e16 Changed test-markdown target in Makefile: Now it will find any
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
2007-01-04 17:23:30 +00:00
fiddlosopher
a8a0dd8766 Cleaned up and improved Makefile target for wrappers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@408 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-03 17:22:55 +00:00
fiddlosopher
d262d163ed Improved Makefile 'wrappers' target. (Previously, it would build
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
2007-01-03 17:10:26 +00:00
fiddlosopher
bd31474d98 Improved test-markdown target in Makefile:
+ 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
2007-01-02 21:30:07 +00:00
fiddlosopher
bcc608f3fd Fixed a bug in website generation, which only worked if 'pandoc'
and the wrappers had been installed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@402 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02 05:02:01 +00:00
fiddlosopher
5387ebd8db Added 'hsmarkdown' wrapper, designed to be used as a drop-in
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
2007-01-02 02:58:54 +00:00
fiddlosopher
b9a348338b Inserted a needed slash in the Makefile, after $(osx_pkg_name),
which is the name of a directory!


git-svn-id: https://pandoc.googlecode.com/svn/trunk@391 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-01 21:34:50 +00:00
fiddlosopher
4ea1b2bdc0 Merged 'strict' branch from r324. This adds a '--strict'
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
2006-12-30 22:51:49 +00:00
fiddlosopher
7cd9db048b Slight changes in website target:
+ 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
2006-12-29 22:51:05 +00:00
fiddlosopher
369b99513d Make wrappers executable in the top-level directory, in case people
want to try them in place without installing.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@316 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 21:41:09 +00:00
fiddlosopher
3c9fd01ad8 + Renamed web/demos.sh to mkdemos.sh
+ Added parameter for directory containing executables
+ Changed arithmetic statement for portability.
+ Modified Makefile accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@315 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 21:25:13 +00:00
fiddlosopher
3491420b53 + Changed 'web2markdown' to 'html2markdown'.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@309 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 18:50:13 +00:00
fiddlosopher
17837b343b Added two more demo cases to website. Put a footnote in
README for demonstration purposes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@302 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28 07:22:41 +00:00
fiddlosopher
2d253cadd3 Added a latex -> markdown case to demos.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@301 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28 06:58:04 +00:00
fiddlosopher
2933f9f5e7 Added another demo case, with header and footer and css.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@299 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28 06:48:16 +00:00
fiddlosopher
5468e76a7e Added "Demos" page to the website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@298 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28 06:40:21 +00:00
fiddlosopher
a1a30d69bd + Removed the convenience symlinks (which don't work on Windows under
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
2006-12-28 02:20:09 +00:00
fiddlosopher
a1539d9ab8 Added README-WINDOWS.html to windows package documentation.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@291 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-24 23:11:27 +00:00
fiddlosopher
5dfab2cb48 + Updates to Makefile:
- 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
2006-12-24 02:32:01 +00:00
roktas
2deea0966a Pandoc package didn't contain 'pandoc' executable. This is because we're
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
2006-12-23 12:37:31 +00:00
fiddlosopher
54a7700bcb Changed osx-pkg target in Makefile to refer to COPYRIGHT
instead of (obsolete) LICENSE.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@280 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22 20:27:32 +00:00
fiddlosopher
d829c4820a Merged changes from branches/wrappers since r177.
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
2006-12-22 20:16:03 +00:00
fiddlosopher
aac442e761 Removed TODO. ToDo list now maintained on the Wiki at pandoc's
Google Code site.  (Also in the repository:  wiki/ToDo.wiki.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@266 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-21 20:21:40 +00:00
fiddlosopher
66da30cd78 Added 'clean' target to src/templates/Makefile, main
Makefile's 'clean' calls it to clean out template-generated
files.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@237 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 22:20:58 +00:00
fiddlosopher
31a956b655 Changes to build process relating to r234.
+ 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
2006-12-19 22:00:41 +00:00
fiddlosopher
4ab3eb3003 + Small changes to Makefile for better handling of Windows executable.
+ Added windows executable to the website target.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@210 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-16 19:11:49 +00:00
fiddlosopher
ba16d6ae47 Makefile now checks to see if we're running Cygwin/Windows; if we are,
'.exe' extension is added to each executable in EXECS.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@192 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-13 17:54:59 +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
426cbadfef Merge changes in branches/wrappers into trunk.
[in trunk] svn merge -r105:HEAD \
        https://pandoc.googlecode.com/svn/branches/wrappers


git-svn-id: https://pandoc.googlecode.com/svn/trunk@177 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-12 07:04:09 +00:00
roktas
83077346a1 Using hardcoded executable paths in Makefile doesn't work. While GHC
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
2006-11-16 02:37:25 +00:00
roktas
8e5f3e684c Fix a bug in 'uninstall-exec' target.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@93 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-12 19:56:59 +00:00