removed suggest of latex-texlive-extras in debian/control,
since we're not using examplep.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@830 788f1e2b-df1e-0410-8736-df70ead52e1b
of fancyvrb. examplep allows verbatim text in places where
fancyvrb does not, e.g. definition list terms, and provides
for line-breaking of verbatim text.
+ examplep code put in LaTeX header instead of being dynamically
included, since it is frequently used, and people may want to
customize the options.
+ documented dependency on examplep
+ added texlive-latex-extra as a "Suggested" package in debian/control
+ use examplep's \Q{} is now used instead of \verb: note that
\Q requires backslash- escaping symbols in its scope.
+ modified README so that the verbatim sections will look good at
shorter line lengths.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@807 788f1e2b-df1e-0410-8736-df70ead52e1b
'texlive-latex-recommended | tetex-extra' instead of
'texlive-latex-base | tetex-bin'. This brings in fancyvrb,
which is used in the default LaTeX header, and (at least
in texlive) unicode support.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@727 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Description updated with new features.
+ Suggest latex-ucs instead of tetex-bin. latex-ucs will bring in
either tetex-bin or texlive-latex-base, and will ensure that the
package required to use UTF-8 is present. Note: texlive
is now the preferred debian LaTeX package.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@693 788f1e2b-df1e-0410-8736-df70ead52e1b
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
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
+ 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
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
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
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
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
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
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
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
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
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
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
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
+ "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
