aboutsummaryrefslogtreecommitdiff
path: root/debian
AgeCommit message (Collapse)AuthorFilesLines
2007-04-10Extensive changes stemming from a rethinking of the Pandoc datafiddlosopher1-1/+1
structure. Key and Note blocks have been removed. Link and image URLs are now stored directly in Link and Image inlines, and note blocks are stored in Note inlines. This requires changes in both parsers and writers. Markdown and RST parsers need to extract data from key and note blocks and insert them into the relevant inline elements. Other parsers can be simplified, since there is no longer any need to construct separate key and note blocks. Markdown, RST, and HTML writers need to construct lists of notes; Markdown and RST writers need to construct lists of link references (when the --reference-links option is specified); and the RST writer needs to construct a list of image substitution references. All writers have been rewritten to use the State monad when state is required. This rewrite yields a small speed boost and considerably cleaner code. * Text/Pandoc/Definition.hs: + blocks: removed Key and Note + inlines: removed NoteRef, added Note + modified Target: there is no longer a 'Ref' target; all targets are explicit URL, title pairs * Text/Pandoc/Shared.hs: + Added 'Reference', 'isNoteBlock', 'isKeyBlock', 'isLineClump', used in some of the readers. + Removed 'generateReference', 'keyTable', 'replaceReferenceLinks', 'replaceRefLinksBlockList', along with some auxiliary functions used only by them. These are no longer needed, since reference links are resolved in the Markdown and RST readers. + Moved 'inTags', 'selfClosingTag', 'inTagsSimple', and 'inTagsIndented' to the Docbook writer, since that is now the only module that uses them. + Changed name of 'escapeSGMLString' to 'escapeStringForXML' + Added KeyTable and NoteTable types + Removed fields from ParserState; 'stateKeyBlocks', 'stateKeysUsed', 'stateNoteBlocks', 'stateNoteIdentifiers', 'stateInlineLinks'. Added 'stateKeys' and 'stateNotes'. + Added clause for Note to 'prettyBlock'. + Added 'writerNotes', 'writerReferenceLinks' fields to WriterOptions. * Text/Pandoc/Entities.hs: Renamed 'escapeSGMLChar' and 'escapeSGMLString' to 'escapeCharForXML' and 'escapeStringForXML' * Text/ParserCombinators/Pandoc.hs: Added lineClump parser: parses a raw line block up to and including following blank lines. * Main.hs: Replaced --inline-links with --reference-links. * README: + Documented --reference-links and removed description of --inline-links. + Added note that footnotes may occur anywhere in the document, but must be at the outer level, not embedded in block elements. * man/man1/pandoc.1, man/man1/html2markdown.1: Removed --inline-links option, added --reference-links option * Markdown and RST readers: + Rewrote to fit new Pandoc definition. Since there are no longer Note or Key blocks, all note and key blocks are parsed on a first pass through the document. Once tables of notes and keys have been constructed, the remaining parts of the document are reassembled and parsed. + Refactored link parsers. * LaTeX and HTML readers: Rewrote to fit new Pandoc definition. Since there are no longer Note or Key blocks, notes and references can be parsed in a single pass through the document. * RST, Markdown, and HTML writers: Rewrote using state monad new Pandoc and definition. State is used to hold lists of references footnotes to and be printed at the end of the document. * RTF and LaTeX writers: Rewrote using new Pandoc definition. (Because of the different treatment of footnotes, the "notes" parameter is no longer needed in the block and inline conversion functions.) * Docbook writer: + Moved the functions 'attributeList', 'inTags', 'selfClosingTag', 'inTagsSimple', 'inTagsIndented' from Text/Pandoc/Shared, since they are now used only by the Docbook writer. + Rewrote using new Pandoc definition. (Because of the different treatment of footnotes, the "notes" parameter is no longer needed in the block and inline conversion functions.) * Updated test suite * Throughout: old haskell98 module names replaced by hierarchical module names, e.g. List by Data.List. * debian/control: Include libghc6-xhtml-dev instead of libghc6-html-dev in "Build-Depends." * cabalize: + Remove haskell98 from BASE_DEPENDS (since now the new hierarchical module names are being used throughout) + Added mtl to BASE_DEPENDS (needed for state monad) + Removed html from GHC66_DEPENDS (not needed since xhtml is now used) git-svn-id: https://pandoc.googlecode.com/svn/trunk@580 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-02-21Modified changelog: note on defaultWriterOptions.fiddlosopher1-1/+3
git-svn-id: https://pandoc.googlecode.com/svn/trunk@546 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-02-20Modified changelog to incorporate changes since the 0.3 release.fiddlosopher1-4/+115
git-svn-id: https://pandoc.googlecode.com/svn/trunk@544 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-15Fix debian/changelog.roktas1-1/+3
git-svn-id: https://pandoc.googlecode.com/svn/trunk@494 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-15Added support for tables in markdown reader and in LaTeX,fiddlosopher1-0/+8
DocBook, and HTML writers. The syntax is documented in README. Tests have been added to the test suite. git-svn-id: https://pandoc.googlecode.com/svn/trunk@493 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09Formatting changes in debian/changelog, and added note aboutfiddlosopher1-15/+23
backslash escaping changes. git-svn-id: https://pandoc.googlecode.com/svn/trunk@462 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-08Documentation changes corresponding to r456.fiddlosopher1-3/+0
git-svn-id: https://pandoc.googlecode.com/svn/trunk@457 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-08Changes to Pandoc's options to facilitate wrapper scripts:fiddlosopher1-6/+1
+ removed -d/--debug option + added --dump-args option, which prints the name of the output file (or '-' for STDOUT) and all the command-line arguments (excluding Pandoc options and their arguments), one per line, then exits. Note that special wrapper options will be treated as arguments if they follow '--' at the end of the command line. Thus, pandoc --dump-args -o foo.html foo.txt -- -e latin1 will print the following to STDOUT: foo.html foo.txt -e latin1 + added --ignore-args option, which causes Pandoc to ignore all (non-option) arguments, including any special options that occur after '--' at the end of the command line. + '-' now means STDIN as the name of an input file, STDOUT as the name of an output file. So, pandoc -o - - will take input from STDIN and print output to STDOUT. Note that if multiple '-o' options are specified on the same line, the last one takes precedence. So, in a script, pandoc "$@" -o - will guarantee output to STDOUT, even if the '-o' option was used. + documented these changes in man pages, README, and changelog. git-svn-id: https://pandoc.googlecode.com/svn/trunk@454 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-06Fixed bug in Markdown reader's handling of underscores and otherfiddlosopher1-4/+9
inline formatting markers inside reference labels: for example, in '[A_B]: /url/a_b', the material between underscores was being parsed as emphasized inlines. git-svn-id: https://pandoc.googlecode.com/svn/trunk@442 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-06Merged changes from 'quotes' branch since r431. Smart typographyfiddlosopher1-3/+9
is now handled in the Markdown and LaTeX readers, rather than in the writers. The HTML writer has been rewritten to use the prettyprinting library. git-svn-id: https://pandoc.googlecode.com/svn/trunk@436 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-05Change the author order in debian/changelog to reflect the order of roktas1-26/+26
importance. Changes in pandoc itself are more important than those in the build system. git-svn-id: https://pandoc.googlecode.com/svn/trunk@425 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-05Update signature in debian/changelog.roktas1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@424 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-05Setup executable permissions on some files.roktas1-0/+0
git-svn-id: https://pandoc.googlecode.com/svn/trunk@423 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-04Refactored SGML escaping functions and "in tag" functions tofiddlosopher1-0/+2
Text/Shared/Pandoc. (escapeSGML, stringToSGML, inTag, inTagSimple, inTagIndented, selfClosingTag) These can be used by both the HTML and Docbook writers. git-svn-id: https://pandoc.googlecode.com/svn/trunk@417 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-04+ Improved text wrapping algorithm in markdown, docbook, and RST writers.fiddlosopher1-1/+6
LineBreaks no longer cause ugly wrapping in Markdown output. + Replaced splitBySpace with the more general, polymorphic function splitBy (in Text/Pandoc/Shared). git-svn-id: https://pandoc.googlecode.com/svn/trunk@411 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-03Modified HTML reader to skip a newline following a <br> tag.fiddlosopher1-0/+3
Otherwise the newline will be treated as a space at the beginning of the next line. git-svn-id: https://pandoc.googlecode.com/svn/trunk@410 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02Added fuller package descriptions to debian/control.fiddlosopher1-3/+48
git-svn-id: https://pandoc.googlecode.com/svn/trunk@401 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02Added 'hsmarkdown' wrapper, designed to be used as a drop-infiddlosopher1-0/+3
replacement for Markdown.pl. It calls pandoc with the options '--from markdown --to html --strict' and disallows other options. (Any command-line options will be interpreted as arguments.) git-svn-id: https://pandoc.googlecode.com/svn/trunk@399 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02Documented change of 'HtmlEntities' to 'Entities' in changelog.fiddlosopher1-0/+3
git-svn-id: https://pandoc.googlecode.com/svn/trunk@396 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-01Changed description in debian/control to include docbook writer.fiddlosopher1-6/+6
git-svn-id: https://pandoc.googlecode.com/svn/trunk@392 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-01Modified changelog to bring up to date.fiddlosopher1-0/+4
git-svn-id: https://pandoc.googlecode.com/svn/trunk@390 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-01Merged changes from docbook branch since r363.fiddlosopher1-0/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@386 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-30Updates to changelog for --strict option and other changesfiddlosopher1-0/+7
from the last revision. git-svn-id: https://pandoc.googlecode.com/svn/trunk@348 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29Minor changes to changelog.fiddlosopher1-38/+51
git-svn-id: https://pandoc.googlecode.com/svn/trunk@312 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29Modified changelog to bring up to date.fiddlosopher1-44/+107
git-svn-id: https://pandoc.googlecode.com/svn/trunk@311 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-23Add rst2markdown to dh_strip exclude list.roktas1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@284 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-23Fix the version of Debian packages, it should be "0.3" now.roktas1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@282 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-23Lintian complains as follows:roktas1-1/+2
E: pandoc-doc: copyright-should-refer-to-common-license-file-for-gpl N: N: The string "GNU General Public License" or "GPL" appears in the N: copyright file for this package, but the copyright file does not N: reference /usr/share/common-licenses as the location of the GPL on N: Debian systems. N: N: Refer to Policy Manual, section 12.5 for details. Add a short note to copyright file just to make lintian happy (which is probably not the most elegant solution). git-svn-id: https://pandoc.googlecode.com/svn/trunk@281 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22Merged changes from branches/wrappers since r177.fiddlosopher1-0/+2
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-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-20Obscured email addresses in documents that will be web-accessible.fiddlosopher1-1/+1
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 levelfiddlosopher1-13/+28
a symlink to it, to avoid duplication. git-svn-id: https://pandoc.googlecode.com/svn/trunk@250 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-13Changed version to 0.22 for tag creation.fiddlosopher1-3/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@198 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-12+ Documented website target in changelog.fiddlosopher1-0/+2
+ 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-11-03Fix all the errors lintian(1) reported:roktas1-1/+60
+ "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-01Created new changelog, made debian/changelog a symlink to changelogfiddlosopher1-25/+1
in top-level. git-svn-id: https://pandoc.googlecode.com/svn/trunk@65 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-29Remove 'install-lib', it causes too much trouble which needs to be dealed roktas1-1/+1
in ugly ways. + Now, we have 'install-program' and 'install-all' targets. The former installs only program and user documents, while the latter installs everything: program, user documents, library files and library documents. + Behaviour of 'install' target hasn't changed, it calls 'install-program'. + Update README accordingly. + Implement missing uninstall-* targets (including 'uninstall-all' and 'uninstall-program' for the new targets). + Call 'install-program' in debian/rules explicitly to prevent confusions. git-svn-id: https://pandoc.googlecode.com/svn/trunk@33 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-28+ Changed debian/copyright to reflect new website location.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@30 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-28Merge trunk with ghc66-branch.roktas5-10/+25
git-svn-id: https://pandoc.googlecode.com/svn/trunk@28 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-27Modified package descriptions in debian/control.fiddlosopher1-13/+16
git-svn-id: https://pandoc.googlecode.com/svn/trunk@13 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-27Give full download URL in debian/copyright.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@12 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-27Fixed jgm's email address in debian changelog.fiddlosopher1-2/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@11 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-10-17initial importfiddlosopher8-0/+250
git-svn-id: https://pandoc.googlecode.com/svn/trunk@2 788f1e2b-df1e-0410-8736-df70ead52e1b