Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Commit graph

  • 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. fiddlosopher 2006-12-28 02:20:09 +00:00
  • a1539d9ab8 Added README-WINDOWS.html to windows package documentation. fiddlosopher 2006-12-24 23:11:27 +00:00
  • ff93d50142 + Added --strip-trailing-cr option to diff in runtests.pl, so that the test suite will work in Windows. + Converted some CR's to LF's in print.css and adjusted test suite accordingly. fiddlosopher 2006-12-24 22:58:29 +00:00
  • 618d2ff006 Changed default ASCIIMathML text color to black. fiddlosopher 2006-12-24 16:45:17 +00:00
  • 5dfab2cb48 + Updates to Makefile: - New win-pkg target to build Windows binary package. - Changed name on OSX package. - New RELNAME global variable contains release name, e.g. pandoc-0.3 - Mac dmg is now created in top-level directory, not .. + Updates to website: - Changed download links to point to Google Code downloads area. - Added section on Windows binary package. fiddlosopher 2006-12-24 02:32:01 +00:00
  • a923f22443 Add rst2markdown to dh_strip exclude list. roktas 2006-12-23 13:00:26 +00:00
  • 2deea0966a Pandoc package didn't contain 'pandoc' executable. This is because we're using "Simply expanded variables" and PROGS expands before EXECS. Put PROGS after EXECS to fix this bug. As an alternative solution, we could make PROGS -and possibly others- "recursively expanded" variables, but I tend to avoid using that flavour of variables. roktas 2006-12-23 12:37:31 +00:00
  • c113b24808 Fix the version of Debian packages, it should be "0.3" now. roktas 2006-12-23 10:12:09 +00:00
  • 7fe2018a46 Lintian complains as follows: roktas 2006-12-23 10:08:31 +00:00
  • 54a7700bcb Changed osx-pkg target in Makefile to refer to COPYRIGHT instead of (obsolete) LICENSE. fiddlosopher 2006-12-22 20:27:32 +00:00
  • 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. fiddlosopher 2006-12-22 20:16:03 +00:00
  • cfaf0c178c Removed README-WINDOWS. Instead, we'll have the Makefile tailor README to Windows (removing references to the wrappers, for example). fiddlosopher 2006-12-22 18:53:13 +00:00
  • 16708b174c Added README-WINDOWS with instructions to be included with the binary distribution of Pandoc. Still to be completed. Perhaps this should also be hidden in a subdirectory eventually. fiddlosopher 2006-12-22 18:13:29 +00:00
  • aa3853f274 Removed some stray characters (form feeds?) from COPYING. fiddlosopher 2006-12-22 17:48:46 +00:00
  • 129f259257 Added to COPYRIGHT a note that the source code is available from the website, and a link. This is necessary for GPL compliance in binary distributions (as far as I can see). fiddlosopher 2006-12-22 17:47:08 +00:00
  • aac442e761 Removed TODO. ToDo list now maintained on the Wiki at pandoc's Google Code site. (Also in the repository: wiki/ToDo.wiki.) fiddlosopher 2006-12-21 20:21:40 +00:00
  • d2105f6693 + Added regression tests with footnotes in quote blocks and lists. + This uncovered an existing bug in the RTF writer, which got indentation wrong on footnotes occuring in indented blocks like lists. Fixed this bug. fiddlosopher 2006-12-21 19:33:57 +00:00
  • 48b8267126 Fixed a serious bug in the Markdown reader (also affecting LaTeX and RST readers). The problem: these readers ran 'runParser' on processed chunks of text to handle embedded block lists in lists and quotation blocks. But then any changes made to the parser state in these chunks was lost, as the state is local to the parser. So, for example, footnotes didn't work in quotes or list items. fiddlosopher 2006-12-21 09:02:06 +00:00
  • 862471e417 Fixed two small haddock bugs. fiddlosopher 2006-12-21 08:30:08 +00:00
  • 11cd6e94e0 Added license text to top of source files. fiddlosopher 2006-12-20 20:54:23 +00:00
  • 70d291026d Changed 'stability' from 'provisional' to 'alpha'. fiddlosopher 2006-12-20 20:20:10 +00:00
  • 99ffb97d15 Added some extra fields to Pandoc.cabal.in. fiddlosopher 2006-12-20 19:53:56 +00:00
  • 1fded403c5 Changed 'status' in comment headers from 'unstable' to 'provisional' (which seems to be the term that is used in this context). fiddlosopher 2006-12-20 19:48:46 +00:00
  • b98edf2c74 Made javascript obfuscation of emails even more obfuscatory, by combining it with entity obfuscation. fiddlosopher 2006-12-20 18:16:07 +00:00
  • 19a81cb504 Put notice about the GPL on web page. fiddlosopher 2006-12-20 06:56:41 +00:00
  • dc9c6450f3 + Added module data for haddock. + Reformatted code consistently. fiddlosopher 2006-12-20 06:50:14 +00:00
  • 42d2983896 Obscured email addresses in documents that will be web-accessible. fiddlosopher 2006-12-20 03:56:36 +00:00
  • 62e2ee16cb Modified debian/copyright, and made COPYRIGHT in top level a symlink to it, to avoid duplication. fiddlosopher 2006-12-20 03:29:53 +00:00
  • 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. fiddlosopher 2006-12-20 03:23:00 +00:00
  • 48f64f64c9 Cleaned up TODO file. fiddlosopher 2006-12-20 00:52:37 +00:00
  • 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)'. fiddlosopher 2006-12-20 00:25:54 +00:00
  • 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. fiddlosopher 2006-12-19 23:46:07 +00:00
  • 34bb7a125e Fixed a minor mistake introduced in resolving conflicts from the merge. fiddlosopher 2006-12-19 23:17:53 +00:00
  • 661c7e7b1d Merged changes to footnotes branch r219-r240. fiddlosopher 2006-12-19 23:13:03 +00:00
  • 66da30cd78 Added 'clean' target to src/templates/Makefile, main Makefile's 'clean' calls it to clean out template-generated files. fiddlosopher 2006-12-19 22:20:58 +00:00
  • 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!) fiddlosopher 2006-12-19 22:00:41 +00:00
  • 206c59a386 Removed three files from the repository. These are generated from templates in src/templates, and so should not be in the repository. fiddlosopher 2006-12-19 21:35:14 +00:00
  • 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. fiddlosopher 2006-12-19 07:30:36 +00:00
  • a8bbd950e5 Changed '--smartypants' to '--smart' and adjusted documentation and symbols accordingly. fiddlosopher 2006-12-18 22:02:39 +00:00
  • cd4a035a75 + BUGS now contains a link to pandoc's issue tracker at Google Code. + Modified TODO. fiddlosopher 2006-12-17 21:09:26 +00:00
  • 75dbe3248e Removed a / in a comment that was causing haddock to fail. fiddlosopher 2006-12-17 18:41:26 +00:00
  • 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. fiddlosopher 2006-12-16 19:43:00 +00:00
  • 4ab3eb3003 + Small changes to Makefile for better handling of Windows executable. + Added windows executable to the website target. fiddlosopher 2006-12-16 19:11:49 +00:00
  • 19bad8253d Improvements to smart-quote regexs. Now we can better handle cases where latex commands or HTML entity references appear after quotes. fiddlosopher 2006-12-16 06:14:37 +00:00
  • 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. fiddlosopher 2006-12-16 05:05:02 +00:00
  • 61ec2c0d4a Bumped version to 0.3 after tagging 0.22. fiddlosopher 2006-12-13 23:14:55 +00:00
  • f6235d8c1d Changed version to 0.22 for tag creation. fiddlosopher 2006-12-13 23:12:38 +00:00
  • ba16d6ae47 Makefile now checks to see if we're running Cygwin/Windows; if we are, '.exe' extension is added to each executable in EXECS. fiddlosopher 2006-12-13 17:54:59 +00:00
  • 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. fiddlosopher 2006-12-13 17:42:14 +00:00
  • cc26d7cfed In cabalize, add '.exe' extension to executables if we're on Windows/Cygwin. fiddlosopher 2006-12-13 17:28:26 +00:00
  • 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.) fiddlosopher 2006-12-12 15:41:55 +00:00
  • 2d653dc1da Minor change: 'test 4' to 'test 3' in testwrapper.in. fiddlosopher 2006-12-12 07:58:57 +00:00
  • 2b9af0bbf1 + Documented website target in changelog. + Added list of ideas/projects to TODO. fiddlosopher 2006-12-12 07:55:50 +00:00
  • 36a3bb7274 Revised changelog to reflect changes since r105. fiddlosopher 2006-12-12 07:31:24 +00:00
  • 426cbadfef Merge changes in branches/wrappers into trunk. roktas 2006-12-12 07:04:09 +00:00
  • 6411ea7466 In HTML writer, include <title></title> even if title is null. fiddlosopher 2006-12-09 02:05:23 +00:00
  • 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 fiddlosopher 2006-11-27 06:51:03 +00:00
  • 7384774d83 Refactored LaTeX reader for clarity (added isArg function). fiddlosopher 2006-11-26 07:08:46 +00:00
  • 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. fiddlosopher 2006-11-26 07:01:37 +00:00
  • e417ceaa8d Modified INSTALL instructions to emphasize that GNU make is required, and that it goes by the name 'gmake' on some systems. fiddlosopher 2006-11-19 21:24:33 +00:00
  • 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. roktas 2006-11-16 02:37:25 +00:00
  • d5d81b0b53 Modified markdown2pdf to check that input file exists and is readable, and error exit if not. fiddlosopher 2006-11-15 04:47:44 +00:00
  • 8c888ea22c Fixed bug with 'shift' in html2markdown and markdown2pdf. fiddlosopher 2006-11-15 00:49:14 +00:00
  • 79fdbcea69 Remove ' -- ' prefix instead of '--' in passed-through options. fiddlosopher 2006-11-15 00:34:32 +00:00
  • 6fc88e95fc Changes to man files documenting the ' -- ' option. fiddlosopher 2006-11-14 07:06:14 +00:00
  • ae2a1c2ca1 Minor documentation changes (README). fiddlosopher 2006-11-14 01:43:55 +00:00
  • 66676b88db Better error messages in markdown2pdf: print only the latex errors, not the whole log file. fiddlosopher 2006-11-14 01:32:22 +00:00
  • 19486ee0e1 * Add PANDOC_OPTS support to 'markdown2pdf'. roktas 2006-11-13 16:34:07 +00:00
  • 5a66fa030d README changes: + Added documentation for '-- ' in shell scripts. + Added section on ucs.sty and LaTeX. fiddlosopher 2006-11-13 15:47:01 +00:00
  • 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.) fiddlosopher 2006-11-13 15:22:41 +00:00
  • 2763382dd8 Replace which(1) in all wrappers with 'pathfind', a POSIX-compliant shell function. Expand tabs to four spaces. roktas 2006-11-12 21:17:06 +00:00
  • 8e5f3e684c Fix a bug in 'uninstall-exec' target. roktas 2006-11-12 19:56:59 +00:00
  • 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. roktas 2006-11-12 12:11:25 +00:00
  • 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 fiddlosopher 2006-11-12 01:50:56 +00:00
  • 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 .. fiddlosopher 2006-11-12 00:24:50 +00:00
  • fa645eed39 Use compiled executables directly from their build directory, without copying them to the top directory. roktas 2006-11-11 10:35:10 +00:00
  • caf7e1ca0f Fix a serious bug in Makefile. 'make' should recompile when a source file has been modified. roktas 2006-11-10 10:55:18 +00:00
  • 82d7190a0c Fixed two small Haddock comment bugs in Shared.hs. fiddlosopher 2006-11-08 17:50:09 +00:00
  • 30814712b7 Changed first two paragraphs of index.txt to match README. fiddlosopher 2006-11-08 17:45:24 +00:00
  • 05c2566479 Remove signatures (and emails!) from changelog on web page. fiddlosopher 2006-11-08 17:36:27 +00:00
  • 30734c8d60 + Changes to osx/Welcome: - removed hardcoded references to /usr/local - added title + Minor changes to website build process. fiddlosopher 2006-11-08 17:27:49 +00:00
  • 30405f3764 Revisions to website target: + added link for OSX package + minor fixes fiddlosopher 2006-11-08 15:47:54 +00:00
  • 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: roktas 2006-11-08 10:56:05 +00:00
  • 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. roktas 2006-11-08 10:32:53 +00:00
  • da1cf6a392 Changed install.html to INSTALL.html in website; replaced a reference to README.html to INSTALL.html. fiddlosopher 2006-11-08 07:30:51 +00:00
  • 1c9c3acb89 Added target for creation of website. 'web' directory contains source files for website, which is created in 'web/pandoc'. fiddlosopher 2006-11-08 07:19:59 +00:00
  • fc08eb0298 Removed INSTALL.html from build-doc target. fiddlosopher 2006-11-07 16:30:23 +00:00
  • 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. roktas 2006-11-07 10:37:18 +00:00
  • 9159ebd3c1 Modified INSTALL instructions; require "make build-all" before "make install-all". fiddlosopher 2006-11-07 06:17:56 +00:00
  • afd92376d6 Attempt to fix a (long-standing) Makefile drawback which is documented in previous revisions as follows: roktas 2006-11-03 11:26:53 +00:00
  • 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. roktas 2006-11-03 07:08:47 +00:00
  • 7bbe87af99 Fix a bug in variable substitution. roktas 2006-11-03 06:15:13 +00:00
  • 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). roktas 2006-11-03 05:44:22 +00:00
  • 2d7043ba59 Remove some code comments from previous commit. roktas 2006-11-03 05:09:30 +00:00
  • 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. roktas 2006-11-02 14:32:57 +00:00
  • 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. roktas 2006-11-02 06:45:03 +00:00
  • 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. fiddlosopher 2006-11-02 03:47:23 +00:00
  • 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. fiddlosopher 2006-11-02 03:30:47 +00:00
  • dd297dda0a Changed version numbers to 0.3. fiddlosopher 2006-11-01 22:49:07 +00:00
  • 836ba8694d Created new changelog, made debian/changelog a symlink to changelog in top-level. fiddlosopher 2006-11-01 22:38:57 +00:00