Commit graph

407 commits

Author SHA1 Message Date
fiddlosopher
ad7bb70cce Added --toc support to Markdown writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@658 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-09 01:14:35 +00:00
fiddlosopher
56efd6176f Added support for --toc to RTF writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@657 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-09 00:51:07 +00:00
fiddlosopher
489a2bb1d9 Moved isHeaderBlock from Text.Pandoc.Writers.HTML
to Text.Pandoc.Shared.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@656 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-09 00:50:14 +00:00
fiddlosopher
2d4a22d0be Regularized the scheme for unique header identifiers in HTML writer:
- punctuation is now all removed (except -)
 - spaces are turned into -
 - all lowercase
This scheme should be fairly predictable.
Updated tests accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@655 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08 17:33:03 +00:00
fiddlosopher
7f5638853b HTML writer changes:
+ change in scheme for construction of unique identifiers for headers:
  - all lowercase
  - spaces turn into -, not _
+ TOC items now have their own identifiers, starting with TOC-
+ when there is a TOC, headers link back to the corresponding TOC items,
  rather than the top of the TOC.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@653 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08 17:09:17 +00:00
fiddlosopher
c3fb1dd4ea Added --toc support to RST writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@652 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08 16:48:54 +00:00
fiddlosopher
369a57e339 Modified markdown2pdf to run pdflatex a second time if --toc was
specified; otherwise the table of contents won't appear.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@651 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08 16:40:07 +00:00
fiddlosopher
dfcae807b0 Man writer: Don't print .\" t at beginning unless we're
in --standalone mode.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@650 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08 03:54:07 +00:00
fiddlosopher
e58a55eb41 LaTeX writer:
+ Leave extra blank line after \maketitle
+ Insert \tableofcontents if --toc option was selected

Test suite:
+ extra blank line after \maketitle in writer.latex


git-svn-id: https://pandoc.googlecode.com/svn/trunk@649 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08 03:48:07 +00:00
fiddlosopher
608b22e9dd HTML writer: Slight change in code for generating unique
identifiers.  The numbers used after duplicate identifiers
are now separated from them by a hyphen:  Duplicate-1
rather than Duplicate1.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@648 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08 03:40:22 +00:00
fiddlosopher
e252fa300a Fixed bug in Notes ($$ instead of <>), which caused
note blocks to be indented.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@646 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08 03:38:54 +00:00
fiddlosopher
a414ec9d63 Adjusted copyright notices to 2006-7; use
real email address instead of lamely attempting
to obfuscate.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@640 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-07 22:51:55 +00:00
fiddlosopher
956deeda4b Haddock documentation for Text.Pandoc.Blocks.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@638 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-07 22:37:11 +00:00
fiddlosopher
3e6184763e Man writer: Use integral n measures instead of fractional i
measures.  Calculate on basis of a 70 character line, since
the default is 78 but the table will appear indented 8 spaces
in standard man output.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@637 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-07 22:18:46 +00:00
fiddlosopher
6f4017b8ea Put table of contents in its own div (id="toc").
git-svn-id: https://pandoc.googlecode.com/svn/trunk@635 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-07 21:49:46 +00:00
fiddlosopher
54a0e4c3b2 HTML writer modifications:
+ Added code to HTML Writer to generate a table of contents if the
  writerTableOfContents option is specified.  This is an unordered list
  with links to the headers.  It is constructed hierarchically, based on
  the order of the headers and their levels.
+ If a TOC is used, the headers become links back to the TOC.
+ Removed Toc from WriterState; instead, the TOC is generated at the top
  level, by the function tableOfContents.
+ Fixed a bug in uniqueIdentifiers which prevented it from handling more than
  one duplicate.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@634 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-07 19:08:11 +00:00
fiddlosopher
f2b16c2065 + Introduced writerIgnoreNotes option in WriterOptions. This is needed
for processing header blocks for a table of contents, since notes on
  headers should not appear in the TOC.  Set default in Main.hs.
+ Moved Element, headerAtLeast, and hierarchicalize from Docbook writer
  to Text.Pandoc.Shared.  This is because HTML writer now uses these in
  constructing a table of contents.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@633 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-07 19:04:10 +00:00
fiddlosopher
fdf31cd23d Added writerTableOfContents to WriterOptions, and added a
--table-of-contents/--toc command-line option to Main.hs.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@632 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-07 05:43:23 +00:00
fiddlosopher
5a0ce1bcac Changes to HTML writer to incorporate automatic identifiers for
headers and table of contents:
+ WriterState now includes a list of header identifiers and a table
  of contents in addition to notes.
+ The function uniqueIdentifiers creates a list of unique identifiers
  from a list of inline lists (e.g. headers).
+ This list is part of WriterState and gets consumed by blockToHtml
  each time a header is encountered.
+ Headers are now printed with unique identifiers based on their names,
  e.g. Shell_scripts for "# Shell scripts".  Fancy stuff like links,
  italics, etc. gets ignored.  A numerical index is added to the end if
  there is already an identifier by the same name, e.g. "Shell_scripts1".
+ Provision has been made for a table-of-contents block element, but this
  has not yet been added.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@630 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-07 03:52:10 +00:00
fiddlosopher
0a250edfde Minor comment change.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@629 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-07 03:05:06 +00:00
fiddlosopher
ad2c642713 Pandoc.hs: Export all definitions in Text.Pandoc.Definition,
rather than exporting the module.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@628 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-06 16:37:46 +00:00
fiddlosopher
f9c988e703 Fixed bug in Markdown reader: links in footnotes were not
being processed.  Solution:  three-stage parse.  First, get
all the reference keys and add information to state.  Next,
get all the notes and add information to state.  (Reference
keys may be needed at this stage.)  Finally, parse everything
else.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@625 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-06 06:46:31 +00:00
fiddlosopher
1ca8a731bc Added table support to RST writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@624 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-05 06:14:48 +00:00
fiddlosopher
09f0247fd8 Added table support to markdown writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@623 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-04 22:21:52 +00:00
fiddlosopher
8d776e1e42 Improvements/bug fixes to Text.Pandoc.Blocks
library.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@622 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-04 22:21:08 +00:00
fiddlosopher
1a8b32afd5 Added Text.Pandoc.Blocks module for prettyprinting of
text tables.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@620 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-04 18:53:12 +00:00
fiddlosopher
4fe56a8d18 Man writer:
- Added scheme for specifying manual section and additional
  headers:
  % PROGNAM | 1 | User Manual | Version 4.0
- Modified man page sources to include section 1


git-svn-id: https://pandoc.googlecode.com/svn/trunk@619 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-04 15:53:49 +00:00
fiddlosopher
d5c47c33ca Added table support to man writer (using the tbl preprocessor).
The writer state now includes a list of "preprocessor" codes.
If the document contains a table, "t" (for "tbl") is added to the list.
If this list is nonempty, the man page starts with
.\" <list>
which instructs man to run the file through the appropriate
preprocessor before processing with groff.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@618 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-04 03:14:43 +00:00
fiddlosopher
bd5f3876a4 Man writer: don't change - to \- (minus sign).
Leave them as hyphens.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@614 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-02 02:38:14 +00:00
fiddlosopher
2cb22a1f8a Man writer: better output for line break:
.PD 0     # set interparagraph space to 0
.P        # new paragraph
.PD       # reset interparagraph space to default.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@613 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-02 02:31:36 +00:00
fiddlosopher
f5a3d44494 Minor changes in Man writer:
- escape ' as \[aq], because ' can trigger groff commands.
- remove unneeded line breaks.
- use CR font in code blocks.
- use .P 0 for line breaks.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@612 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-02 02:23:05 +00:00
fiddlosopher
e6f67fcc57 Modified escaping in Man writer. Also changed
format of footnote references and authors list.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@608 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-01 23:23:36 +00:00
fiddlosopher
a669f641b5 Modified Main.hs and Pandoc.cabal to add man page
writer.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@607 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-06-30 22:43:14 +00:00
fiddlosopher
c726e83ce9 Added groff man writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@606 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-06-30 22:42:32 +00:00
fiddlosopher
4bf464ce4c Minor documentation changes to ASCIIMathML.hs template.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@602 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-06-17 16:12:23 +00:00
fiddlosopher
61024d93ed Require blankspace (but not multiple lines) between URL and
title in links and reference keys.  (Markdown reader.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@599 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-05-10 22:06:13 +00:00
fiddlosopher
f2c1777598 Fixed bug with indented blocks occurring in definition lists.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@598 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-05-10 22:05:25 +00:00
fiddlosopher
f9731108e8 Improved prettyprinting of definition lists.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@596 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-05-10 18:50:12 +00:00
fiddlosopher
5454c841a9 Added support for definition lists in Docbook writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@595 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-05-09 00:47:29 +00:00
fiddlosopher
71cf0a11b3 + Use new alignment parameter in title/author/date,
instead of hardcoded \qc.
+ Adjusted test suite to account for changes in RTF writer.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@594 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-05-09 00:44:56 +00:00
fiddlosopher
c6323b2c78 Changes to RTF writer:
+ Added support for definition lists.
+ Removed extra '\cell' in table output, which caused
  a blank column to the left.
+ Added support for captions in tables.
+ Added an 'alignment' parameter to RTF block writers.
+ Added support for column alignments in tables.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@593 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-05-03 14:46:37 +00:00
fiddlosopher
09fa7e6f63 Added support for definition lists to RST writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@592 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-05-03 14:44:28 +00:00
fiddlosopher
292d2bd38d Added support for definition lists to markdown
writer.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@591 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-05-03 14:44:04 +00:00
fiddlosopher
23841bdf77 Add -asxhtml flag to tidy in html2markdown. This will
perhaps help the parser.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@590 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-05-03 14:43:16 +00:00
fiddlosopher
cf081435ff Changed definition list syntax in markdown reader and simplified
the parsing code. A colon is now required before every block in a
definition. This fixes a problem with the old syntax, in which the last
block in the following was ambiguous between a regular paragraph in the
definition and a code block following the definition list:

term
:   definition

    is this code or more definition?



git-svn-id: https://pandoc.googlecode.com/svn/trunk@589 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-05-03 14:42:40 +00:00
fiddlosopher
485fa81559 Resolved issue #10: instead of adding "\n\n" to the
end of strings in Main, do it in readMarkdown and readRST.
(Note: the point of this is to ensure that a block at the
end of the file gets treated as if it has blank space after
it, which is generally what is wanted.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@588 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-04-22 04:38:05 +00:00
fiddlosopher
726685af1b Fixed bug in anyLine parser. Previously anyLine would parse an
empty string "".  But it should fail on an empty string, or we get an
error from its use inside "many" combinators.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@587 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-04-22 04:19:34 +00:00
fiddlosopher
7742301c09 Support for definition lists in LaTeX writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@586 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-04-21 21:38:19 +00:00
fiddlosopher
ffd7248af8 Fixed export declarations; removed unneeded import of
Pandoc.Shared.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@585 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-04-15 16:22:29 +00:00
fiddlosopher
e15fd3bf86 Moved escape and nullBlock parsers from ParserCombinators/Pandoc
to Pandoc/Shared.  Reason:  ParserCombinators/Pandoc is for
general-purpose parsers that don't require Pandoc.Definition.
Also removed some unnecessary imports from Pandoc/Shared.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@584 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-04-15 16:20:07 +00:00