Commit graph

19 commits

Author SHA1 Message Date
fiddlosopher
4a841bfc54 Use template haskell to avoid the need for templates:
+ 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
2007-11-03 22:14:03 +00:00
fiddlosopher
ee46ee5fa9 Removed test for examplep in markdown2pdf.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@831 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 19:17:54 +00:00
fiddlosopher
b29f221cba Changed LaTeX writer to use the examplep package instead
of fancyvrb. examplep allows verbatim text in places where
fancyvrb does not, e.g. definition list terms, and provides
for line-breaking of verbatim text.
+ examplep code put in LaTeX header instead of being dynamically
  included, since it is frequently used, and people may want to
  customize the options.
+ documented dependency on examplep
+ added texlive-latex-extra as a "Suggested" package in debian/control
+ use examplep's \Q{} is now used instead of \verb:  note that 
  \Q requires backslash- escaping symbols in its scope.
+ modified README so that the verbatim sections will look good at
  shorter line lengths.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@807 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 01:10:04 +00:00
fiddlosopher
d016a997e6 markdown2pdf: Print a helpful message if ulem package is not found.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@771 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 20:14:20 +00:00
fiddlosopher
9e4c28d5f4 markdown2pdf.in: Test for --table-of-contents as
well as --toc.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@733 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-16 07:26:03 +00:00
fiddlosopher
369a57e339 Modified markdown2pdf to run pdflatex a second time if --toc was
specified; otherwise the table of contents won't appear.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@651 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08 16:40:07 +00:00
fiddlosopher
b25706e098 Cleaned up markdown2pdf.in. Note that bibtex does not return
an error condition when it gives warnings, so instead we grep
for warnings or error messages to see if we need to print the
log.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@476 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09 06:38:15 +00:00
fiddlosopher
8adb142720 Minor changes to markdown2pdf: removed an unnecessary '|| exit $?',
and made sure error output goes to stderr.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@475 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09 06:11:29 +00:00
fiddlosopher
be157f353d Changes to markdown2pdf.in:
+ Exit if pandoc fails (second time through) -- no need to store the log for this.
+ Run pdflatex up to three times, if needed to resolve references.  Also
  run bibtex as needed.
+ Minor reformatting.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@469 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09 04:10:24 +00:00
fiddlosopher
4814b0ae02 Minor cleanups in markdown2pdf.in.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@468 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09 02:07:48 +00:00
roktas
3d0ee324f3 + Export TEXINPUTS variable.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@460 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-08 21:54:10 +00:00
roktas
8b98ef22da Various fixes in markdown2pdf.
+ Add a trailing ':' to TEXTINPUTS as per the instruction in TeX FAQ:
    http://www.tex.ac.uk/cgi-bin/texfaq2html?label=graphicspath
  In the lack of it, pdflatex silently fails, for example, with the 
  following command: 'TEXINPUTS=/tmp markdown2pdf'
+ Put the origdir at the front for the correct directory search order.
+ pdflatex didn't create log file on one occasion (the above command) that 
  made sed commands failed.  Test the existence of log before filtering it.
+ A few non-essential changes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@459 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-08 21:50:58 +00:00
fiddlosopher
58697ebe78 Modified shell scripts to use new Pandoc --dump-args and
--ignore-args features.  This allows a simpler, cleaner design.

Make use of TEXINPUTS environment variable to ensure that
pdflatex will find images and other sources in the working
directory from which markdown2pdf is called.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@456 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-08 19:55:34 +00:00
roktas
856db32b85 Simplify regex.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@452 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-07 05:12:56 +00:00
roktas
52666e2301 + Revert previous commit which is wrong and insufficient on some parts.
+ Improve sed filter to extract the following error contexts:
  1. From a line starting with ! to the next blank line.
  2. From a line beginning "LaTeX Warning:" to the next blank line.
  3. From a line beginning "Error:" to the next blank line, or EOF.
+ Improve the error message headers (perhaps needs a proof reading).   
  Prepend the wrapper name to the error headers for easy spotting.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@451 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-07 05:09:07 +00:00
roktas
900e352f1c + Fix a nasty bug in markdown2pdf. It used to send the log file to
/dev/null!

+ Another problem is the sed filter which returns nothing with pdfeTeX 
  '3.141592-1.21a-2.2 (Web2C 7.5.4)' here.  As the first cut towards 
  fixing, use a somewhat heuristic approach: try to build a short log by 
  matching against a magic error stamp, dump the whole log if the previous 
  attempt failed.  Note that, there is still room to improve this code.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@450 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-07 03:17:40 +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
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
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