aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-12-22Merged changes from branches/wrappers since r177.fiddlosopher27-796/+710
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-22Removed README-WINDOWS. Instead, we'll have the Makefilefiddlosopher1-34/+0
tailor README to Windows (removing references to the wrappers, for example). git-svn-id: https://pandoc.googlecode.com/svn/trunk@277 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22Added README-WINDOWS with instructions to be included withfiddlosopher1-0/+34
the binary distribution of Pandoc. Still to be completed. Perhaps this should also be hidden in a subdirectory eventually. git-svn-id: https://pandoc.googlecode.com/svn/trunk@275 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22Removed some stray characters (form feeds?) from COPYING.fiddlosopher1-5/+5
git-svn-id: https://pandoc.googlecode.com/svn/trunk@274 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22Added to COPYRIGHT a note that the source code is available from thefiddlosopher1-0/+4
website, and a link. This is necessary for GPL compliance in binary distributions (as far as I can see). git-svn-id: https://pandoc.googlecode.com/svn/trunk@273 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-21Removed TODO. ToDo list now maintained on the Wiki at pandoc'sfiddlosopher2-41/+1
Google Code site. (Also in the repository: wiki/ToDo.wiki.) git-svn-id: https://pandoc.googlecode.com/svn/trunk@266 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-21+ Added regression tests with footnotes in quote blocks and lists.fiddlosopher10-3/+85
+ This uncovered an existing bug in the RTF writer, which got indentation wrong on footnotes occuring in indented blocks like lists. Fixed this bug. git-svn-id: https://pandoc.googlecode.com/svn/trunk@263 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-21Fixed a serious bug in the Markdown reader (also affecting LaTeXfiddlosopher4-42/+36
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. The fix: instead of calling runParser on some raw text, use setInput to make it the input, then parse it, then use setInput to restore the input to what it was before. This is shorter and more elegant, and it fixes the problem. 'BlockQuoteContext' was also eliminated from ParserContext, as it isn't used anywhere. git-svn-id: https://pandoc.googlecode.com/svn/trunk@261 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-21Fixed two small haddock bugs.fiddlosopher2-2/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@260 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20Added license text to top of source files.fiddlosopher14-0/+252
git-svn-id: https://pandoc.googlecode.com/svn/trunk@258 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20Changed 'stability' from 'provisional' to 'alpha'.fiddlosopher15-15/+15
git-svn-id: https://pandoc.googlecode.com/svn/trunk@257 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20Added some extra fields to Pandoc.cabal.in.fiddlosopher1-0/+4
git-svn-id: https://pandoc.googlecode.com/svn/trunk@256 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20Changed 'status' in comment headers from 'unstable' to 'provisional'fiddlosopher14-14/+14
(which seems to be the term that is used in this context). git-svn-id: https://pandoc.googlecode.com/svn/trunk@255 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20Made javascript obfuscation of emails even more obfuscatory,fiddlosopher3-14/+51
by combining it with entity obfuscation. git-svn-id: https://pandoc.googlecode.com/svn/trunk@254 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20Put notice about the GPL on web page.fiddlosopher1-1/+3
git-svn-id: https://pandoc.googlecode.com/svn/trunk@253 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20+ Added module data for haddock.fiddlosopher15-1266/+1571
+ Reformatted code consistently. git-svn-id: https://pandoc.googlecode.com/svn/trunk@252 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20Obscured email addresses in documents that will be web-accessible.fiddlosopher3-4/+4
git-svn-id: https://pandoc.googlecode.com/svn/trunk@251 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20Modified debian/copyright, and made COPYRIGHT in top levelfiddlosopher2-90/+29
a symlink to it, to avoid duplication. git-svn-id: https://pandoc.googlecode.com/svn/trunk@250 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20Removed LICENSE, replacing it with COPYING (text of GPL)fiddlosopher4-39/+382
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-20Cleaned up TODO file.fiddlosopher1-27/+13
git-svn-id: https://pandoc.googlecode.com/svn/trunk@248 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20Modified the HTML writer to add invisible anchors to each sectionfiddlosopher8-6/+108
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-19+ Replaced 'comparing' combinator in markdown reader with 'compare'.fiddlosopher4-9/+14
'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-19Fixed a minor mistake introduced in resolving conflicts from thefiddlosopher1-1/+0
merge. git-svn-id: https://pandoc.googlecode.com/svn/trunk@243 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19Merged changes to footnotes branch r219-r240.fiddlosopher17-108/+181
git-svn-id: https://pandoc.googlecode.com/svn/trunk@241 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19Added 'clean' target to src/templates/Makefile, mainfiddlosopher2-0/+5
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-19Changes to build process relating to r234.fiddlosopher7-31/+30
+ 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-19Removed three files from the repository. These are generatedfiddlosopher3-136/+0
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-19Changed footnote syntax to conform to the de facto standardfiddlosopher12-80/+92
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-18Changed '--smartypants' to '--smart' and adjusted documentationfiddlosopher4-12/+12
and symbols accordingly. git-svn-id: https://pandoc.googlecode.com/svn/trunk@224 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-17+ BUGS now contains a link to pandoc's issue tracker at Google Code.fiddlosopher2-21/+18
+ Modified TODO. git-svn-id: https://pandoc.googlecode.com/svn/trunk@216 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-17Removed a / in a comment that was causing haddock to fail.fiddlosopher1-6/+6
git-svn-id: https://pandoc.googlecode.com/svn/trunk@213 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-16Modified markdown reader to allow ordered list items to beginfiddlosopher2-3/+32
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+ Small changes to Makefile for better handling of Windows executable.fiddlosopher2-8/+21
+ Added windows executable to the website target. git-svn-id: https://pandoc.googlecode.com/svn/trunk@210 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-16Improvements to smart-quote regexs. Now we can better handlefiddlosopher3-12/+21
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-16Changed 'putStrLn' to 'putStr' in Main.hs, and modified somefiddlosopher18-65/+25
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-13Bumped version to 0.3 after tagging 0.22.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@200 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-13Changed version to 0.22 for tag creation.fiddlosopher2-4/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@198 788f1e2b-df1e-0410-8736-df70ead52e1b
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 04:11:30 +0000