Commit graph

9687 commits

Author SHA1 Message Date
fiddlosopher
6fc88e95fc Changes to man files documenting the ' -- ' option.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@100 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-14 07:06:14 +00:00
fiddlosopher
ae2a1c2ca1 Minor documentation changes (README).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@99 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-14 01:43:55 +00:00
fiddlosopher
66676b88db Better error messages in markdown2pdf: print only the latex errors,
not the whole log file.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@98 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-14 01:32:22 +00:00
roktas
19486ee0e1 * Add PANDOC_OPTS support to 'markdown2pdf'.
* Sanitize comand line handling a bit in all wrappers:
  + Correct delimiters syntax should be ' -- '.
  + Print warning for extra arguments which are ignored.
  + Instead of positional arguments use named variables whenever 
    appropriate.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@97 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-13 16:34:07 +00:00
fiddlosopher
5a66fa030d README changes:
+ Added documentation for '-- ' in shell scripts.
+ Added section on ucs.sty and LaTeX.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@96 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-13 15:47:01 +00:00
fiddlosopher
574290c92f Modified wrapper scripts to pass all command-line options after --
to pandoc.  These options override the environment variable PANDOC_OPTS,
if it is set.  (Note:  these changes don't include changes to the
documentation or man pages, or to markdown2pdf.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@95 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-13 15:22:41 +00:00
roktas
2763382dd8 Replace which(1) in all wrappers with 'pathfind', a POSIX-compliant shell
function.  Expand tabs to four spaces.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@94 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-12 21:17:06 +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
roktas
3ed8fc8784 Portability fixes and various cleanups in wrapper scripts:
+ Fix the tests at the header of wrappers.  which(1) doesn't behave as 
  expected on some systems.  We should only assume that it's pretty widely 
  available (for example, it's a builtin in csh) and we should only rely on 
  its exit code by ignoring its output.
+ Replace 'echo -n' with 'printf' as the latter is recommended.
+ In markdown2pdf script, '--suffix' and '--backup' options of mv(1) appear 
  to be GNU-ism.  Apply a workaround.
+ Wrap some long lines to fit in an 80-column screen.
+ Remove spaces at the line ends.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@92 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-12 12:11:25 +00:00
fiddlosopher
69e23af8e4 Made wrapper scripts sensitive to PANDOC_OPTS environment variable,
which may contain command-line options to be passed to pandoc.
+ Changed the scripts themselves, including $PANDOC_OPTS after 'pandoc'
+ Added ENVIRONMENT to man pages for wrappers
+ Formatting changes to man files
+ Added description of PANDOC_OPTS to README


git-svn-id: https://pandoc.googlecode.com/svn/trunk@91 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-12 01:50:56 +00:00
fiddlosopher
668a48534e Changes to OSX packaging:
+ 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
2006-11-12 00:24:50 +00:00
roktas
fa645eed39 Use compiled executables directly from their build directory, without
copying them to the top directory.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@89 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-11 10:35:10 +00:00
roktas
caf7e1ca0f Fix a serious bug in Makefile. 'make' should recompile when a source file
has been modified.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@88 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-10 10:55:18 +00:00
fiddlosopher
82d7190a0c Fixed two small Haddock comment bugs in Shared.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@87 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08 17:50:09 +00:00
fiddlosopher
30814712b7 Changed first two paragraphs of index.txt to match README.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@86 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08 17:45:24 +00:00
fiddlosopher
05c2566479 Remove signatures (and emails!) from changelog on web page.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@85 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08 17:36:27 +00:00
fiddlosopher
30734c8d60 + Changes to osx/Welcome:
- 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
2006-11-08 17:27:49 +00:00
fiddlosopher
30405f3764 Revisions to website target:
+ added link for OSX package
+ minor fixes


git-svn-id: https://pandoc.googlecode.com/svn/trunk@83 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08 15:47:54 +00:00
roktas
6c87b87835 Put all website commands into a subshell jail. If any command failed, we
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
2006-11-08 10:56:05 +00:00
roktas
cc14b53090 Changes for 'website':
+ 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
2006-11-08 10:32:53 +00:00
fiddlosopher
da1cf6a392 Changed install.html to INSTALL.html in website; replaced a reference
to README.html to INSTALL.html.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@80 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08 07:30:51 +00:00
fiddlosopher
1c9c3acb89 Added target for creation of website. 'web' directory contains
source files for website, which is created in 'web/pandoc'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@79 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08 07:19:59 +00:00
fiddlosopher
fc08eb0298 Removed INSTALL.html from build-doc target.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@78 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-07 16:30:23 +00:00
roktas
2b40ef5d03 Fixes from last review:
+ Add markdown2pdf to %.pdf dependencies.
+ Make build-all target explicitly depend on build-program, instead of 
  'all' which might be changed in future.
+ Add build-program to osx-pkg-prep for the sake of explicitness.
+ Generate INSTALL.html in build-doc.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@77 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-07 10:37:18 +00:00
fiddlosopher
9159ebd3c1 Modified INSTALL instructions; require "make build-all" before
"make install-all".


git-svn-id: https://pandoc.googlecode.com/svn/trunk@76 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-07 06:17:56 +00:00
roktas
afd92376d6 Attempt to fix a (long-standing) Makefile drawback which is documented in
previous revisions as follows:

    # XXX: Note that we don't handle PREFIX correctly at the install-* 
    # stages, i.e. any PREFIX given at the configuration time is lost, 
    # unless it is also supplied (via environment) at these stages.

With this (optional and experimental) hack, config time settings will 
become persistent.  Such persistency allows one to specify PREFIX and/or 
DESTDIR only once (at the first run).  That is, the below actions should 
work fine now:

    DESTDIR=/tmp/foo make
    make install

In previous code these variables need to be specified at each run.  For 
example:

    DESTDIR=/tmp/foo make
    DESTDIR=/tmp/foo make install

This change (as an ugly hack) is optional (and might be removed) as the 
user could always work around that issue with 'DESTDIR=/tmp/foo make 
install'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@75 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03 11:26:53 +00:00
roktas
fdfe8494ca Fix all the errors lintian(1) reported:
+ "SEE ALSO" sections of man files have paragraph fillings errors which   
  groff(1) complains ("cannot adjust line").  This is because .BR line in 
  "SEE ALSO" section is too long to break properly.  Fix all man pages.
  While on it, move all AUTHORS section to the end of the files, this 
  section should come last.
+ lintian(1) complains about the debian/changelog symlink:
    W: pandoc source: changelog-is-symlink
    N:
    N:   The file debian/changelog is a symlink instead of a regular file. This
    N:   is unnecessary and makes package checking and manipulation more
    N:   difficult. If the changelog should be available in the source package
    N:   under multiple names, make debian/changelog the real file and the
    N:   other names symlinks to it.
    N:
    N:   This problem may have prevented lintian from performing other checks,
    N:   leading to undetected changelog errors.
  Reverse the source and targets in symlink to fix this warning.  Now, the 
  Debian packages can be cleanly built.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@74 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03 07:08:47 +00:00
roktas
7bbe87af99 Fix a bug in variable substitution.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@73 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03 06:15:13 +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
roktas
2d7043ba59 Remove some code comments from previous commit.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@71 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03 05:09:30 +00:00
roktas
2066ec5d02 More sanitizations in Makefile (needs testing):
+ Remove a bogus DOCS assignment line.
+ Cabal recreates pandoc executable by unnecessarily linking Main.o with 
  library (it skips compiling *.hs files though).  Since pandoc's time 
  stamp is modified, it is  copied from buildir to top directory, and also 
  README.html is regenerated, each time a target which has a 'build' 
  prerequisite is invoked.  As a solution, now PHONY 'build' target depends 
  on BUILDDIR/.
+ "THIS" variable has a confusing semantics and it is abusingly used in 
  various targets.  We in fact need it to specify package sub directories 
  created during installation.  Clarify this meaning by moving it to path 
  variables section.
+ Create a new variable as MAIN which holds the main executable name.  
  Sorry for my obsession to avoid simply using a magic "pandoc" name. :-)
  Modify all targets which (abusingly) refers  to THIS and replace THIS 
  with MAIN.  Note that MAIN is derived from EXECS which in turn collects  
  all executable names from Executable stanzas in cabal file.
+ As EXECS may hold more than one executable name, update EXECS target to 
  reflect this semantic.
+ Rename BINS variable as PROGS and modify it so as to hold the names of 
  all executables required to be installed.  Remove bin_all local variable 
  as PROGS can be used for the same purpose instead.
+ Modify DOCS variable so as to hold the names of all documents required to 
  be installed.  Remove doc_all local variable as DOCS can be used for the 
  same purpose instead.
+ Remove DOCS target.  README.html is already generated when needed.
+ Remove build-exec redundant prerequisite from osx_dest target.  Make can 
  find its way.
+ Set MAIN as the prerequisite of 'test' and 'test-markdown' to make things 
  more clear.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@70 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-02 14:32:57 +00:00
roktas
2d2914ff1a Sanitize Makefile:
+ Move $(BINS) target to a new PHONY 'build-exec' target.  This should be 
  used in all (non-build type) targets which refer BINS.  Also, create a 
  new 'build-program' target for user's convenience.
+ Update all targets so as to use build-exec (instead of BINS).
+ Use an explicit global DOCS variable which lists buildable documents; 
  this makes our intention more clear.  Also, for the sake of consistency, 
  move BINS variable (which lists buildable executables) to a new section 
  and create a redundant (for the moment, at least) EXECS variable.
+ Move all buildable target files in install-* targets to the related 
  build-* targets.  This mostly involves document files (e.g. README.hmtl).
  As a result, we now have a new build target 'build-doc' which builds main 
  documents.  This modification provides a clean separation between build 
  and install type targets.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@69 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-02 06:45:03 +00:00
fiddlosopher
d3f52801c7 Make osx-dmg target depend on $(osx_dmg_name), so that if the
dmg file has already been built, it does not build it again.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@68 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-02 03:47:23 +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
fiddlosopher
dd297dda0a Changed version numbers to 0.3.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@66 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 22:49:07 +00:00
fiddlosopher
836ba8694d Created new changelog, made debian/changelog a symlink to changelog
in top-level.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@65 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 22:38:57 +00:00
fiddlosopher
5044c1ffad Removed check for presence of pandoc in uninstall-pandoc;
if uninstall-pandoc is present, that means Pandoc is installed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@64 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 15:54:11 +00:00
roktas
e478551382 Various changes in osx-* targets.
+ Exit 1 if permissions are not satisfied.
+ Make all targets PHONY.
+ Minor cosmetic fixes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@63 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 10:28:22 +00:00
fiddlosopher
b14874fe18 Added uninstall-pandoc script to Mac OS X package.
Added information about uninstalling to Welcome message.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@62 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 08:29:13 +00:00
fiddlosopher
7ccf149504 Added uninstall-pandoc script for Mac OS X package.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@61 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 08:20:17 +00:00
fiddlosopher
1f18bc8266 Changes to osx-pkg and osx-dmg targets.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@60 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 07:49:18 +00:00
fiddlosopher
c8bac7e00e Improved osx-dmg and osx-pkg targets in Makefile.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@59 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 07:16:58 +00:00
fiddlosopher
a4a2792dc1 Use iconv on output as well as input in wrapper scripts.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@58 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 06:33:47 +00:00
fiddlosopher
b8d960d1b9 Improved man files for pandoc and all wrappers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@57 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 06:32:52 +00:00
fiddlosopher
51536ca888 Renamed OSX-Welcome as Welcome.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@56 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 06:29:22 +00:00
fiddlosopher
4eec413b66 Remove files from top-level that have been moved to osx directory.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@55 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 06:28:40 +00:00
fiddlosopher
de7ea8576d Added osx directory for source files for Mac OS X package,
to reduce clutter at top level.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@54 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 06:27:47 +00:00
fiddlosopher
76bd231a70 + Improved man page for pandoc and markdown2pdf.
+ Changed README to recommend iconv on both input and output.
+ Added TODO items.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@53 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-01 04:32:00 +00:00
roktas
aeb250f28d Revert all changes related to automatic ChangeLog creation.
+ Remove ChangeLog and gnuify-changelog.pl
+ Remove 'package' target in Makefile.

Minor unrelated cosmetic changes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@52 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-31 18:40:47 +00:00
fiddlosopher
2d128f7349 Improvements to Mac OS X package build:
+ Add "pandoc" as bundle identifier to get rid of warning.
+ Remove old make_osx_pkg_dirs script, no longer needed because of
  make target.
+ Add OSX-Welcome, with information about adding /usr/local/bin
  to PATH.
+ Modify Makefile accordingly. 


git-svn-id: https://pandoc.googlecode.com/svn/trunk@51 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-31 17:19:25 +00:00