Commit graph

74 commits

Author SHA1 Message Date
fiddlosopher
1ea1665955 Updated debian/changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1042 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-06 16:23:15 +00:00
fiddlosopher
3fef30c48c Added libghc6-network-dev, libghc6-xhtml-dev, and libghc6-mtl-dev as
dependencies for libghc6-pandoc-dev.  Addresses Debian Bug #445235.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1040 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-04 23:47:33 +00:00
fiddlosopher
85f655c8cb Changed pandoc home page to http://johnmacfarlane.net/pandoc/.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1014 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-13 17:26:01 +00:00
fiddlosopher
4088ef9d36 Updated debian/changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1007 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 18:17:05 +00:00
roktas
1142c88727 * The previous fix was wrong. Apply a proper fix and cross the fingers. :-)
+ On configure, compile 'Setup.hs' to 'setup' and use 'setup' as the build
    command instead of 'runhaskell', which, on some platforms (such as s390,
    alpha, m68k), throws the following error:
    	runhaskell Setup.hs configure --prefix=/usr
	ghc-6.6.1: not built for interactive use
    This causes a serious FTBFS bug.  Closes: #440668 (from Debian BTS).
  + Setup.hs: revert changes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1005 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 16:57:17 +00:00
roktas
b13e696c93 * Urgent fix to address the following issue:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440668
  The below link of a similar bug explains things a bit more:
	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=431843#22


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1004 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 15:31:47 +00:00
roktas
6a71ea1481 * debian/changelog: add signature
git-svn-id: https://pandoc.googlecode.com/svn/trunk@991 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 12:44:42 +00:00
fiddlosopher
4ddb156f4e Updated debian/changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@989 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 05:31:43 +00:00
fiddlosopher
76d462c1cd Simplify autolink parsing code, using Network.URI to test for
URIs.  Added dependency on network library to debian/control
and pandoc.cabal.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@982 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-01 17:22:22 +00:00
roktas
f08af7723f * changelog: make sure to close pandoc's ITP bug.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@917 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26 19:49:31 +00:00
fiddlosopher
52cef7f795 Updated changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@907 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26 16:04:58 +00:00
fiddlosopher
670ea953d5 Updated debian/changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@902 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26 05:57:57 +00:00
roktas
b5d225c7a6 + debian/control: add XS-Vcs-{Svn,Browser} fields
+ debian/changelog: adjust the author line for the package upload


git-svn-id: https://pandoc.googlecode.com/svn/trunk@871 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-19 20:40:50 +00:00
fiddlosopher
0d5f40fc85 Added signature on changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@866 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-19 16:04:03 +00:00
fiddlosopher
fca9a9f1ac Modified debian/changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@865 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-19 15:59:21 +00:00
fiddlosopher
9b878ec2a9 Brought debian/changelog up to date.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@847 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15 17:31:17 +00:00
fiddlosopher
d738ba10c6 Updated debian/changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@836 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15 06:39:06 +00:00
fiddlosopher
1e4f05d2bd Removed references to examplep package in documentation, and
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
2007-07-28 19:16:58 +00:00
fiddlosopher
b29f221cba Changed LaTeX writer to use the examplep package instead
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
2007-07-28 01:10:04 +00:00
fiddlosopher
b603c135e6 Brought changelog up to date.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@804 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-26 03:50:10 +00:00
fiddlosopher
00b69e4657 Updated copyright date and debian changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@801 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-26 02:42:45 +00:00
fiddlosopher
bad26d5e2a Updated changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@785 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-23 02:15:02 +00:00
fiddlosopher
9e70c6f641 Updated copyright date in debian/copyright.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@784 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-23 02:14:42 +00:00
fiddlosopher
9fdf2b27be Changed destination in changelog to 'unstable', because
lintian complains about 'UNRELEASED'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@736 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-16 08:25:47 +00:00
fiddlosopher
0cba4f2c95 Brought debian/changelog up to date.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@734 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-16 07:28:45 +00:00
fiddlosopher
54dd46c07c debian/control: For pandoc package, suggest
'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
2007-07-15 17:27:11 +00:00
fiddlosopher
836f893cfc Updated package descriptions in debian/control to mention ConTeXt writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@718 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-15 03:01:13 +00:00
roktas
8477f14113 Minor modification in debian/control:
+ Suggest 'texlive-latex-base | tetex-bin' as per the suggestion of Debian
  TeX Task force:
	http://pkg-tetex.alioth.debian.org/mapping-texlive.html#general
+ As for the 'latex-ucs', it dates from those days of teTeX which didn't
  support UTF-8 and it will probably become obsolete some day.  Hence, we
  shouldn't rely on it.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@695 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-13 17:49:36 +00:00
fiddlosopher
22537d95d1 Changes to debian/control:
+ 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
2007-07-13 06:57:44 +00:00
roktas
cfd9ff7381 Adjust Debian package dependencies:
+ add libghc6-mtl-dev
+ remove version condition from libghc6-xhtml-dev


git-svn-id: https://pandoc.googlecode.com/svn/trunk@601 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-05-26 11:45:15 +00:00
fiddlosopher
23df0ed176 Extensive changes stemming from a rethinking of the Pandoc data
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-04-10 01:56:50 +00:00
fiddlosopher
e9d66b8ed8 Modified changelog: note on defaultWriterOptions.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@546 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-02-21 01:23:11 +00:00
fiddlosopher
90390b65f4 Modified changelog to incorporate changes since the 0.3 release.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@544 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-02-20 01:21:42 +00:00
roktas
b4f3eb53f1 Fix debian/changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@494 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-15 22:50:29 +00:00
fiddlosopher
60989d0637 Added support for tables in markdown reader and in LaTeX,
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-15 19:52:42 +00:00
fiddlosopher
3ae8476db0 Formatting changes in debian/changelog, and added note about
backslash escaping changes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@462 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09 00:03:31 +00:00
fiddlosopher
9a37ee459c Documentation changes corresponding to r456.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@457 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-08 21:16:18 +00:00
fiddlosopher
5dda65b5dc Changes to Pandoc's options to facilitate wrapper scripts:
+ 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-08 08:11:08 +00:00
fiddlosopher
233148f963 Fixed bug in Markdown reader's handling of underscores and other
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-06 20:47:00 +00:00
fiddlosopher
bb8478e4e2 Merged changes from 'quotes' branch since r431. Smart typography
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-06 09:54:58 +00:00
roktas
46f0c05150 Change the author order in debian/changelog to reflect the order of
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-05 07:54:29 +00:00
roktas
74ef307c0b Update signature in debian/changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@424 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-05 07:42:25 +00:00
roktas
c9f72f4c39 Setup executable permissions on some files.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@423 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-05 07:39:32 +00:00
fiddlosopher
030d94e1c3 Refactored SGML escaping functions and "in tag" functions to
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 22:52:16 +00:00
fiddlosopher
99959b68e9 + Improved text wrapping algorithm in markdown, docbook, and RST writers.
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-04 01:04:56 +00:00
fiddlosopher
e4880319e6 Modified HTML reader to skip a newline following a <br> tag.
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-03 20:52:12 +00:00
fiddlosopher
339fcbbb46 Added fuller package descriptions to debian/control.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@401 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02 04:23:39 +00:00
fiddlosopher
5387ebd8db Added 'hsmarkdown' wrapper, designed to be used as a drop-in
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-02 02:58:54 +00:00
fiddlosopher
b4160380d8 Documented change of 'HtmlEntities' to 'Entities' in changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@396 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02 00:41:41 +00:00
fiddlosopher
ae869a092a Changed description in debian/control to include docbook writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@392 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-01 21:49:52 +00:00