aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-12-13Makefile now checks to see if we're running Cygwin/Windows; if we are,fiddlosopher1-1/+4
'.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-13Reverted addition of .exe to Windows executables in cabalize.fiddlosopher1-5/+1
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-13In cabalize, add '.exe' extension to executables if we're onfiddlosopher1-1/+5
Windows/Cygwin. git-svn-id: https://pandoc.googlecode.com/svn/trunk@190 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-12Extract version number from src/Main.hs in cabalize and Makefile.fiddlosopher3-4/+7
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-12Minor change: 'test 4' to 'test 3' in testwrapper.in.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@180 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-12+ Documented website target in changelog.fiddlosopher2-0/+88
+ Added list of ideas/projects to TODO. git-svn-id: https://pandoc.googlecode.com/svn/trunk@179 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-12Revised changelog to reflect changes since r105.fiddlosopher1-4/+60
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-12Merge changes in branches/wrappers into trunk.roktas25-466/+735
[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-09In HTML writer, include <title></title> even if title is null.fiddlosopher1-4/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@171 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-27Minor improvements to LaTeX reader:fiddlosopher1-3/+9
+ 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-26Refactored LaTeX reader for clarity (added isArg function).fiddlosopher1-1/+5
git-svn-id: https://pandoc.googlecode.com/svn/trunk@138 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-26Pandoc bug fixes:fiddlosopher14-108/+110
+ 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-19Modified INSTALL instructions to emphasize that GNU make is required,fiddlosopher1-1/+5
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-16Using hardcoded executable paths in Makefile doesn't work. While GHC roktas1-5/+15
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-15Modified markdown2pdf to check that input file exists and is readable,fiddlosopher1-0/+5
and error exit if not. git-svn-id: https://pandoc.googlecode.com/svn/trunk@103 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-15Fixed bug with 'shift' in html2markdown and markdown2pdf.fiddlosopher2-4/+4
git-svn-id: https://pandoc.googlecode.com/svn/trunk@102 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-15Remove ' -- ' prefix instead of '--' in passed-through options.fiddlosopher5-5/+5
git-svn-id: https://pandoc.googlecode.com/svn/trunk@101 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-14Changes to man files documenting the ' -- ' option.fiddlosopher5-5/+66
git-svn-id: https://pandoc.googlecode.com/svn/trunk@100 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-14Minor documentation changes (README).fiddlosopher1-5/+7
git-svn-id: https://pandoc.googlecode.com/svn/trunk@99 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-14Better error messages in markdown2pdf: print only the latex errors,fiddlosopher1-1/+1
not the whole log file. git-svn-id: https://pandoc.googlecode.com/svn/trunk@98 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-13* Add PANDOC_OPTS support to 'markdown2pdf'.roktas5-18/+38
* 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-13README changes:fiddlosopher1-1/+25
+ 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-13Modified wrapper scripts to pass all command-line options after -- fiddlosopher4-3/+32
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-12Replace which(1) in all wrappers with 'pathfind', a POSIX-compliant shell roktas5-37/+102
function. Expand tabs to four spaces. git-svn-id: https://pandoc.googlecode.com/svn/trunk@94 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-12Fix a bug in 'uninstall-exec' target.roktas1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@93 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-12Portability fixes and various cleanups in wrapper scripts:roktas5-40/+55
+ 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-12Made wrapper scripts sensitive to PANDOC_OPTS environment variable,fiddlosopher12-119/+86
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-12Changes to OSX packaging:fiddlosopher1-11/+11
+ 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-11Use compiled executables directly from their build directory, without roktas1-19/+15
copying them to the top directory. git-svn-id: https://pandoc.googlecode.com/svn/trunk@89 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-10Fix a serious bug in Makefile. 'make' should recompile when a source file roktas1-4/+3
has been modified. git-svn-id: https://pandoc.googlecode.com/svn/trunk@88 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08Fixed two small Haddock comment bugs in Shared.hs.fiddlosopher1-2/+4
git-svn-id: https://pandoc.googlecode.com/svn/trunk@87 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08Changed first two paragraphs of index.txt to match README.fiddlosopher1-3/+3
git-svn-id: https://pandoc.googlecode.com/svn/trunk@86 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08Remove signatures (and emails!) from changelog on web page.fiddlosopher1-1/+3
git-svn-id: https://pandoc.googlecode.com/svn/trunk@85 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08+ Changes to osx/Welcome:fiddlosopher3-11/+19
- 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-08Revisions to website target:fiddlosopher2-3/+11
+ added link for OSX package + minor fixes git-svn-id: https://pandoc.googlecode.com/svn/trunk@83 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08Put all website commands into a subshell jail. If any command failed, we roktas1-12/+14
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-08Changes for 'website':roktas1-24/+34
+ 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-08Changed install.html to INSTALL.html in website; replaced a referencefiddlosopher2-2/+2
to README.html to INSTALL.html. git-svn-id: https://pandoc.googlecode.com/svn/trunk@80 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-08Added target for creation of website. 'web' directory containsfiddlosopher7-0/+325
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-07Removed INSTALL.html from build-doc target. fiddlosopher1-2/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@78 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-07Fixes from last review:roktas1-5/+5
+ 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-07Modified INSTALL instructions; require "make build-all" beforefiddlosopher1-18/+17
"make install-all". git-svn-id: https://pandoc.googlecode.com/svn/trunk@76 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03Attempt to fix a (long-standing) Makefile drawback which is documented in roktas1-11/+18
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-03Fix all the errors lintian(1) reported:roktas8-75/+100
+ "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-03Fix a bug in variable substitution.roktas1-2/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@73 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-03Older Cabal versions have no '--destdir' option. Detect the availability roktas2-1/+8
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-03Remove some code comments from previous commit.roktas1-2/+4
git-svn-id: https://pandoc.googlecode.com/svn/trunk@71 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-11-02More sanitizations in Makefile (needs testing):roktas1-31/+31
+ 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-02Sanitize Makefile:roktas1-14/+31
+ 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-02Make osx-dmg target depend on $(osx_dmg_name), so that if thefiddlosopher1-1/+2
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 05:38:52 +0000