Commit graph

275 commits

Author SHA1 Message Date
fiddlosopher
42d2983896 Obscured email addresses in documents that will be web-accessible.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@251 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 03:56:36 +00:00
fiddlosopher
62e2ee16cb Modified debian/copyright, and made COPYRIGHT in top level
a symlink to it, to avoid duplication.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@250 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 03:29:53 +00:00
fiddlosopher
cda0a6d584 Removed LICENSE, replacing it with COPYING (text of GPL)
and COPYRIGHT (including copyright information and licenses
for other packages used).  Modified Pandoc.cabal.in and
README accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@249 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 03:23:00 +00:00
fiddlosopher
48f64f64c9 Cleaned up TODO file.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@248 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 00:52:37 +00:00
fiddlosopher
5cf769b1cd Modified the HTML writer to add invisible anchors to each section
heading.  The anchors are derived form the text of the section
heading as described in README.  This makes it easy to insert
links that jump from one part of a document to another:
for example, '[back to the Introduction](#Introduction)'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@246 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 00:25:54 +00:00
fiddlosopher
c1ebe94e40 + Replaced 'comparing' combinator in markdown reader with 'compare'.
'comparing' is from Data.Ord, which is not available in GHC 6.4.
+ Added line break after </li> in HTML footnote output, for easier
  inspection of the source.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@245 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 23:46:07 +00:00
fiddlosopher
34bb7a125e Fixed a minor mistake introduced in resolving conflicts from the
merge.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@243 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 23:17:53 +00:00
fiddlosopher
661c7e7b1d Merged changes to footnotes branch r219-r240.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@241 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 23:13:03 +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
206c59a386 Removed three files from the repository. These are generated
from templates in src/templates, and so should not be in the
repository.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@234 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 21:35:14 +00:00
fiddlosopher
3a6296acae Changed footnote syntax to conform to the de facto standard
for markdown footnotes.  References are now like this[^1]
rather than like this^(1).  There are corresponding changes
in the footnotes themselves.  See the updated README for
more details.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@230 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 07:30:36 +00:00
fiddlosopher
a8bbd950e5 Changed '--smartypants' to '--smart' and adjusted documentation
and symbols accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@224 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-18 22:02:39 +00:00
fiddlosopher
cd4a035a75 + BUGS now contains a link to pandoc's issue tracker at Google Code.
+ Modified TODO.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@216 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-17 21:09:26 +00:00
fiddlosopher
75dbe3248e Removed a / in a comment that was causing haddock to fail.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@213 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-17 18:41:26 +00:00
fiddlosopher
7c319e55ff Modified markdown reader to allow ordered list items to begin
with (single) letters, as well as numbers.  The list item marker
may now be terminated either by '.' or by ')'.  These extensions
to standard markdown are documented in README.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@211 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-16 19:43:00 +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
19bad8253d Improvements to smart-quote regexs. Now we can better handle
cases where latex commands or HTML entity references appear
after quotes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@202 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-16 06:14:37 +00:00
fiddlosopher
fe66a90a2a Changed 'putStrLn' to 'putStr' in Main.hs, and modified some
of the readers to make spacing at end of output more consistent.
Modified tests accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@201 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-16 05:05:02 +00:00
fiddlosopher
61ec2c0d4a Bumped version to 0.3 after tagging 0.22.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@200 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-13 23:14:55 +00:00
fiddlosopher
f6235d8c1d Changed version to 0.22 for tag creation.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@198 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-13 23:12:38 +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
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
fiddlosopher
2d653dc1da Minor change: 'test 4' to 'test 3' in testwrapper.in.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@180 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-12 07:58:57 +00:00
fiddlosopher
2b9af0bbf1 + Documented website target in changelog.
+ Added list of ideas/projects to TODO.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@179 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-12 07:55:50 +00:00
fiddlosopher
36a3bb7274 Revised changelog to reflect changes since r105.
Included below is a summary of changes committed in the merge of
the wrappers branch (r177):

Refactored wrappers, with the following aims:

+ New command line convention, as follows:
 1st form: input files specified
    <wrapper> [wrapper_arg...] input_files... [pandoc_option...]
 2nd form: using STDIN, no input file is specified
        <wrapper> [wrapper_arg...] -- [pandoc_option...]
 3rd form: input files specified, optional --
    <wrapper> [wrapper_arg...] input_files... -- [pandoc_option...]

  - All wrappers except 'html2markdown' and 'latex2markdown' should
    accept multiple filenames.
  - Use getopts shell builtin for portable option parsing.

+ Remove code duplication and provide consistency across
  command line interface.

+ Allow white space in filenames, especially suitable for Mac OSX users

+ Improve html2markdown's web grabber code, making it more robust,
  configurable and verbose.

  - new function 'grab_url_with' as the wrapper to web grabbers.
  - 'grab_url_with' can report errors if the grabber fails.
  - new command line option 'n' to avoid automatic web grabbing.
  - new command line option 'g' which explicitly selects a grabber and 
    optionally specifies new options for the selected grabber.  Possible 
    use cases:
        # Just use curl.
        html2markdown -g 'curl'

        # Use wget by setting timeout to 10 seconds and limit retries to 2.
        html2markdown -g 'wget --timeout=10 --tries=2'

+ Add code to html2markdown that tries to determine the character 
  encoding of an HTML file, by parsing the "Content-type" meta tag.

  - if the encoding can't be determined, then if the content is local,
    the local encoding is used; if it comes from a URL, UTF-8 is used 
    by default.
  - if input is from stdin, don't try to determine character
    encoding.
  - add a new option '-e' to specify encoding.

+ Better warning messages:

  - print warning if iconv not available
  - in markdown2latex, print only relevant parts of log when pdflatex
    returns an error condition
  - in markdown2latex, when 'ucs.sty' is not found, print message
    telling where to find the 'unicode' package.

+ Remove PANDOC_OPTS environment variable functionality.  It is
  no longer necessary, now that pandoc options may be specified on
  the command line.

+ Add tests for wrappers' processing of command line arguments:

  - new file 'testwrapper.in' to test the parsing code under 'bash',
    'dash', 'ksh' and 'zsh' in POSIX mode.
  - new makefile target 'test-wrappers' to run 'testwrapper'

+ Document changes in revisions to wrapper syntax in README and man pages.



git-svn-id: https://pandoc.googlecode.com/svn/trunk@178 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-12 07:31:24 +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
fiddlosopher
6411ea7466 In HTML writer, include <title></title> even if title is null.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@171 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-09 02:05:23 +00:00
fiddlosopher
6536e64128 Minor improvements to LaTeX reader:
+ added nullBlock to preamble parsing, so we can handle unusual
  things like pure TeX
+ modified escapedChar to allow a \ at the end of line to count
  as escaped whitespace
+ treat "thanks" commands as footnotes


git-svn-id: https://pandoc.googlecode.com/svn/trunk@146 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-27 06:51:03 +00:00
fiddlosopher
7384774d83 Refactored LaTeX reader for clarity (added isArg function).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@138 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-26 07:08:46 +00:00
fiddlosopher
986c1f9dee Pandoc bug fixes:
+ LaTeX reader did not parse metadata correctly.  Now the title,
  author, and date are parsed correctly, and everything else in
  the preamble is skipped.
+ Simplified parsing of LaTeX command arguments and options.  
  The function commandArgs now returns a list of arguments OR
  options (in whatever order they appear).  The brackets are
  included, and a new stripFirstAndLast function is provided
  to strip them off when needed.  This fixes a problem in dealing
  with \newcommand, etc.
+ Added a "try" before "parser" in definition of notFollowedBy'
  combinator.  Adjusted the code using this combinator accordingly.
+ Changed handling of code blocks.  Previously, some readers allowed
  trailing newlines, while others stripped them.  Now, all readers
  strip trailing newlines in code blocks; writers insert a newline
  at the end of code blocks as needed.
+ Changed test suite to reflect these changes. 


git-svn-id: https://pandoc.googlecode.com/svn/trunk@137 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-26 07:01:37 +00:00
fiddlosopher
e417ceaa8d Modified INSTALL instructions to emphasize that GNU make is required,
and that it goes by the name 'gmake' on some systems.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@114 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-19 21:24:33 +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
fiddlosopher
d5d81b0b53 Modified markdown2pdf to check that input file exists and is readable,
and error exit if not.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@103 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-15 04:47:44 +00:00
fiddlosopher
8c888ea22c Fixed bug with 'shift' in html2markdown and markdown2pdf.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@102 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-15 00:49:14 +00:00
fiddlosopher
79fdbcea69 Remove ' -- ' prefix instead of '--' in passed-through options.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@101 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-15 00:34:32 +00:00
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