summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* + BUGS now contains a link to pandoc's issue tracker at Google Code.fiddlosopher2006-12-17
| | | | | | | + Modified TODO. git-svn-id: https://pandoc.googlecode.com/svn/trunk@216 788f1e2b-df1e-0410-8736-df70ead52e1b
* Removed a / in a comment that was causing haddock to fail.fiddlosopher2006-12-17
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@213 788f1e2b-df1e-0410-8736-df70ead52e1b
* Modified markdown reader to allow ordered list items to beginfiddlosopher2006-12-16
| | | | | | | | | 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
* + Small changes to Makefile for better handling of Windows executable.fiddlosopher2006-12-16
| | | | | | | + Added windows executable to the website target. git-svn-id: https://pandoc.googlecode.com/svn/trunk@210 788f1e2b-df1e-0410-8736-df70ead52e1b
* Improvements to smart-quote regexs. Now we can better handlefiddlosopher2006-12-16
| | | | | | | | 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
* Changed 'putStrLn' to 'putStr' in Main.hs, and modified somefiddlosopher2006-12-16
| | | | | | | | 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
* Bumped version to 0.3 after tagging 0.22.fiddlosopher2006-12-13
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@200 788f1e2b-df1e-0410-8736-df70ead52e1b
* Changed version to 0.22 for tag creation.fiddlosopher2006-12-13
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@198 788f1e2b-df1e-0410-8736-df70ead52e1b
* Makefile now checks to see if we're running Cygwin/Windows; if we are,fiddlosopher2006-12-13
| | | | | | | '.exe' extension is added to each executable in EXECS. git-svn-id: https://pandoc.googlecode.com/svn/trunk@192 788f1e2b-df1e-0410-8736-df70ead52e1b
* Reverted addition of .exe to Windows executables in cabalize.fiddlosopher2006-12-13
| | | | | | | | 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
* In cabalize, add '.exe' extension to executables if we're onfiddlosopher2006-12-13
| | | | | | | Windows/Cygwin. git-svn-id: https://pandoc.googlecode.com/svn/trunk@190 788f1e2b-df1e-0410-8736-df70ead52e1b
* Extract version number from src/Main.hs in cabalize and Makefile.fiddlosopher2006-12-12
| | | | | | | | | 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
* Minor change: 'test 4' to 'test 3' in testwrapper.in.fiddlosopher2006-12-12
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@180 788f1e2b-df1e-0410-8736-df70ead52e1b
* + Documented website target in changelog.fiddlosopher2006-12-12
| | | | | | | + Added list of ideas/projects to TODO. git-svn-id: https://pandoc.googlecode.com/svn/trunk@179 788f1e2b-df1e-0410-8736-df70ead52e1b
* Revised changelog to reflect changes since r105.fiddlosopher2006-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge changes in branches/wrappers into trunk.roktas2006-12-12
| | | | | | | | [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
* In HTML writer, include <title></title> even if title is null.fiddlosopher2006-12-09
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@171 788f1e2b-df1e-0410-8736-df70ead52e1b
* Minor improvements to LaTeX reader:fiddlosopher2006-11-27
| | | | | | | | | | | + 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
* Refactored LaTeX reader for clarity (added isArg function).fiddlosopher2006-11-26
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@138 788f1e2b-df1e-0410-8736-df70ead52e1b
* Pandoc bug fixes:fiddlosopher2006-11-26
| | | | | | | | | | | | | | | | | | | | | | + 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
* Modified INSTALL instructions to emphasize that GNU make is required,fiddlosopher2006-11-19
| | | | | | | 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
* Using hardcoded executable paths in Makefile doesn't work. While GHC roktas2006-11-16
| | | | | | | | | | | | | | | 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
* Modified markdown2pdf to check that input file exists and is readable,fiddlosopher2006-11-15
| | | | | | | and error exit if not. git-svn-id: https://pandoc.googlecode.com/svn/trunk@103 788f1e2b-df1e-0410-8736-df70ead52e1b
* Fixed bug with 'shift' in html2markdown and markdown2pdf.fiddlosopher2006-11-15
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@102 788f1e2b-df1e-0410-8736-df70ead52e1b
* Remove ' -- ' prefix instead of '--' in passed-through options.fiddlosopher2006-11-15
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@101 788f1e2b-df1e-0410-8736-df70ead52e1b
* Changes to man files documenting the ' -- ' option.fiddlosopher2006-11-14
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@100 788f1e2b-df1e-0410-8736-df70ead52e1b
* Minor documentation changes (README).fiddlosopher2006-11-14
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@99 788f1e2b-df1e-0410-8736-df70ead52e1b
* Better error messages in markdown2pdf: print only the latex errors,fiddlosopher2006-11-14
| | | | | | | not the whole log file. git-svn-id: https://pandoc.googlecode.com/svn/trunk@98 788f1e2b-df1e-0410-8736-df70ead52e1b
* * Add PANDOC_OPTS support to 'markdown2pdf'.roktas2006-11-13
| | | | | | | | | | | * 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
* README changes:fiddlosopher2006-11-13
| | | | | | | | + 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
* Modified wrapper scripts to pass all command-line options after -- fiddlosopher2006-11-13
| | | | | | | | | 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
* Replace which(1) in all wrappers with 'pathfind', a POSIX-compliant shell roktas2006-11-12
| | | | | | | function. Expand tabs to four spaces. git-svn-id: https://pandoc.googlecode.com/svn/trunk@94 788f1e2b-df1e-0410-8736-df70ead52e1b
* Fix a bug in 'uninstall-exec' target.roktas2006-11-12
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@93 788f1e2b-df1e-0410-8736-df70ead52e1b
* Portability fixes and various cleanups in wrapper scripts:roktas2006-11-12
| | | | | | | | | | | | | | | + 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
* Made wrapper scripts sensitive to PANDOC_OPTS environment variable,fiddlosopher2006-11-12
| | | | | | | | | | | 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
* Changes to OSX packaging:fiddlosopher2006-11-12
| | | | | | | | | + 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
* Use compiled executables directly from their build directory, without roktas2006-11-11
| | | | | | | copying them to the top directory. git-svn-id: https://pandoc.googlecode.com/svn/trunk@89 788f1e2b-df1e-0410-8736-df70ead52e1b
* Fix a serious bug in Makefile. 'make' should recompile when a source file roktas2006-11-10
| | | | | | | has been modified. git-svn-id: https://pandoc.googlecode.com/svn/trunk@88 788f1e2b-df1e-0410-8736-df70ead52e1b
* Fixed two small Haddock comment bugs in Shared.hs.fiddlosopher2006-11-08
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@87 788f1e2b-df1e-0410-8736-df70ead52e1b
* Changed first two paragraphs of index.txt to match README.fiddlosopher2006-11-08
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@86 788f1e2b-df1e-0410-8736-df70ead52e1b
* Remove signatures (and emails!) from changelog on web page.fiddlosopher2006-11-08
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@85 788f1e2b-df1e-0410-8736-df70ead52e1b
* + Changes to osx/Welcome:fiddlosopher2006-11-08
| | | | | | | | | - 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
* Revisions to website target:fiddlosopher2006-11-08
| | | | | | | | + added link for OSX package + minor fixes git-svn-id: https://pandoc.googlecode.com/svn/trunk@83 788f1e2b-df1e-0410-8736-df70ead52e1b
* Put all website commands into a subshell jail. If any command failed, we roktas2006-11-08
| | | | | | | | | | | | 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
* Changes for 'website':roktas2006-11-08
| | | | | | | | | | | | | | | | | | | + 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
* Changed install.html to INSTALL.html in website; replaced a referencefiddlosopher2006-11-08
| | | | | | | to README.html to INSTALL.html. git-svn-id: https://pandoc.googlecode.com/svn/trunk@80 788f1e2b-df1e-0410-8736-df70ead52e1b
* Added target for creation of website. 'web' directory containsfiddlosopher2006-11-08
| | | | | | | 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
* Removed INSTALL.html from build-doc target. fiddlosopher2006-11-07
| | | | git-svn-id: https://pandoc.googlecode.com/svn/trunk@78 788f1e2b-df1e-0410-8736-df70ead52e1b
* Fixes from last review:roktas2006-11-07
| | | | | | | | | | | + 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
* Modified INSTALL instructions; require "make build-all" beforefiddlosopher2006-11-07
| | | | | | | "make install-all". git-svn-id: https://pandoc.googlecode.com/svn/trunk@76 788f1e2b-df1e-0410-8736-df70ead52e1b