Commit graph

754 commits

Author SHA1 Message Date
John MacFarlane
f76478bcb9 RST reader: Support :target: on .. image:: blocks.
Still not supported on substitution definitions.
2012-09-26 22:22:14 -07:00
John MacFarlane
6ad7ac1239 Removed need for utf8-string package.
* Depend on text.
* Expose Text.Pandoc.UTF8.
* Text.Pandoc.UTF8 now exports toString, fromString,
  toStringLazy, fromStringLazy.
* These are used instead of the old utf8-string functions.
2012-09-25 19:54:21 -07:00
John MacFarlane
4ab30f3cea Texinfo writer: Fixed internal cross-references.
Now we insert anchors after each header, and use @ref
instead of @uref for links.

Commas are now escaped as @comma{} only when needed; previously
all commas were escaped.  (This change is needed, in part, because @ref
commands must be followed by a real comma or period.)

Also insert a blank line in from of @verbatim environments.
2012-09-24 19:13:34 -07:00
John MacFarlane
22bd34fa33 Markdown reader: Fixed link parser to avoid exponential slowdowns.
Previously the parser would hang on input like this:

    [[[[[[[[[[[[[[[[[[hi

We fixed this by making the link parser parser characters
between balanced brackets (skipping brackets in inline code spans),
then parsing the result as an inline list.

One change is that

    [hi *there]* bud](/url)

is now no longer parsed as a link.  But in this respect pandoc behaved
differently from most other implementations anyway, so that seems okay.
All current tests pass.  Added test for this case.

Closes #620.
2012-09-22 14:05:09 -07:00
John MacFarlane
1038606036 LaTeX reader: Added a 'try' in rawLaTeXBlock.
This allows the markdown reader to treat '\begin' (not followed
by an argument) as a raw string rather than erroring out when
it doesn't find a '{'.

Closes #622.
2012-09-22 13:00:59 -07:00
John MacFarlane
93c35cbf14 Tests.Old: Set TMP to ".".
Otherwise TMP is unset and, on Windows, C:\Windows is used by default,
leading to permission violations.
2012-09-21 20:34:27 -07:00
John MacFarlane
e1be934dc2 LaTeX writer: Don't rely on the enumerate package.
Instead, use standard LaTeX commands to change numbering style.
2012-09-16 22:24:55 -07:00
John MacFarlane
1e2b20f8bc LaTeX writer: Properly escape strings inside \url{}.
Closes #576.
2012-09-16 11:20:53 -07:00
John MacFarlane
9f89269941 Merge pull request #596 from dlax/rst-fieldlists
improvements to rst reader for field lists
2012-09-16 10:19:42 -07:00
John MacFarlane
fc31bf27f5 MediaWiki reader: Allow table in table cell. 2012-09-15 21:06:55 -07:00
John MacFarlane
d9e34ce34d LaTeX writer: don't escape _ in url. 2012-09-15 20:43:36 -07:00
John MacFarlane
fc4ae15337 LaTeX writer: Don't use \endhead with longtable.
It causes the heading to be a different size form the body,
sometimes.
2012-09-15 20:40:48 -07:00
John MacFarlane
a71ac7cde7 Revised latex writer tests to use longtable. 2012-09-15 17:57:22 -04:00
John MacFarlane
64b0378f5d MediaWiki reader: Added test case for templates in list item. 2012-09-15 16:29:52 -04:00
John MacFarlane
2bc32bcb04 MediaWiki reader: Added test for ref. 2012-09-15 16:28:25 -04:00
John MacFarlane
0a2fb202fb MediaWiki reader: Interpret width attribute on table columns. 2012-09-15 15:04:11 -04:00
John MacFarlane
26fb63e294 MediaWiki reader: Got alignments working.
They only work on headers, because pandoc forces same
alignment for all cells in a column.
2012-09-15 14:20:50 -04:00
John MacFarlane
eca9eeab6b MediaWiki reader: Misc fixes, put category links at end. 2012-09-15 13:50:02 -04:00
John MacFarlane
9a54a949c7 MediaWiki reader: Parse styles after '{|' table start. 2012-09-15 00:23:24 -04:00
John MacFarlane
152ddfb232 MediaWiki reader: Added test for multi-paragraph cells. 2012-09-14 23:31:55 -04:00
John MacFarlane
ce509be57a MediaWiki reader: Table improvements, added simple table tests. 2012-09-14 10:55:16 -04:00
John MacFarlane
46be934994 MediaWiki reader: Images. 2012-09-13 18:16:25 -07:00
John MacFarlane
a0d7b3f37b MediaWiki reader: internal links. 2012-09-13 17:06:09 -07:00
John MacFarlane
fc2f7a4942 MediaWiki reader: Implemented basic internal links.
Including word-ending links and the "pipe trick."
2012-09-13 16:55:08 -07:00
John MacFarlane
5620848ef9 MediaWiki reader: Added tests for external mailto link. 2012-09-13 15:28:11 -07:00
John MacFarlane
017095f690 MediaWiki reader: Implemented numbered external links. 2012-09-13 15:24:05 -07:00
John MacFarlane
81bec8558c MediaWiki reader: Support HTML lists. 2012-09-13 14:47:11 -07:00
John MacFarlane
3fe6ea4c41 MediaWiki reader: Handle templates, variables as raw mediawiki.
Also check for column 1 in preformatted text.
2012-09-13 12:03:54 -07:00
John MacFarlane
5104c2190b MediaWiki reader: preformatted blocks and tests. 2012-09-12 22:44:11 -07:00
John MacFarlane
b703c76540 MediaWiki reader: Support <math> tag. 2012-09-12 19:57:34 -07:00
John MacFarlane
def768cd1f Added tests for mediawiki lists. 2012-09-12 19:48:11 -07:00
John MacFarlane
a76c6df826 More mediawiki reader tests. 2012-09-12 19:35:06 -07:00
John MacFarlane
b19aee4e1e Added some tests for mediawiki reader. 2012-09-12 19:15:34 -07:00
John MacFarlane
3d361b2101 Added basic mediawiki reader.
Text.Pandoc.Readers.MediaWiki module,
tests/mediawiki-reader.{txt,native}.
2012-09-12 09:05:10 -07:00
John MacFarlane
bad3c88cb6 HTML writer: Improve line breaks with <dd> tags.
We now put a newline between `</dd>` and `<dd>` when
there are multiple definitions.
2012-09-12 08:45:03 -07:00
John MacFarlane
3e8e20b4f5 Fixed spacing in context writer test. 2012-09-08 12:13:36 -07:00
John MacFarlane
7d0438897b LaTeX reader: Support obeylines environment.
Closes #604.
2012-09-06 16:27:01 -07:00
John MacFarlane
e2cc9e7ca1 LaTeX reader: Use curly quotes for bare straight quotes. 2012-09-06 16:02:56 -07:00
John MacFarlane
c9d1d97a28 Fixed footnotes bug in textile.
This affected notes occuring before punctuation, e.g.
`foo[1].`.

Closes #518.
2012-09-06 10:38:56 -07:00
Denis Laxalde
cdefeb9445 Fix RST reader for field lists items with body beginning after a new line 2012-08-29 20:47:49 +02:00
John MacFarlane
b21363f1d5 Added (failing) test case for #518. 2012-08-25 22:11:31 -07:00
John MacFarlane
5d3b295568 Man writer: Escape - as \-.
Unescaped -'s become hyphens, while \-'s are left as ascii
minus signs.  That is preferable for use with command-line
options.

See  http://lintian.debian.org/tags/hyphen-used-as-minus-sign.html.
Thanks to Andrea Bolognani for bringing the issue to our
attention.
2012-08-18 10:29:15 -07:00
John MacFarlane
dfa4b76630 Changes to literate haskell options.
- Removed writerLiterateHaskell from WriterOptions.
- Removed readerLiterateHaskell from ReaderOptions.
- Added Ext_literate_haskell to Extensions.  Test for this
  instead of the above.
- Removed failUnlessLHS from Shared.

Note:  At this point, +lhs and .lhs extension no longer has any effect.
Need to fix.
2012-08-08 23:18:19 -07:00
John MacFarlane
fadc7b0d87 Major rewrite of markdown reader.
* Use Builder's Inlines/Blocks instead of lists.

* Return values in the reader monad, which are then
  run (at the end of parsing) against the final
  parser state.  This allows links, notes, and
  example numbers to be resolved without a second
  parser pass.

* An effect of using Builder is that everything is
  normalized automatically.

* New exports from Text.Pandoc.Parsing:
  widthsFromIndices, NoteTable', KeyTable', Key', toKey',
  withQuoteContext, singleQuoteStart, singleQuoteEnd, doubleQuoteStart,
  doubleQuoteEnd, ellipses, apostrophe, dash

* Updated opendocument tests.

* Don't derive Show for ParserState.

* Benchmarks:  markdown reader takes 82% of the time it took before.
  Markdown writer takes 92% of the time (here the speedup is probably
  due to the fact that everything is normalized by default).
2012-08-01 21:45:40 -07:00
John MacFarlane
00dc1e715e Moved WriterOptions and associated types Shared -> Options. 2012-07-26 22:59:56 -07:00
John MacFarlane
acbb4a5e46 Integrated test suite with cabal.
To run tests, configure with --enable-tests, then 'cabal test'.
You can specify particular tests using --test-options='-t markdown'.

No output is shown unless tests fail.  In the future, we can move
to the detailed-1.0 interface.
2012-07-26 09:43:27 -07:00
John MacFarlane
45e4c123a4 Moved tests to tests/, modified cabal file so lib isn't recompiled. 2012-07-26 08:37:36 -07:00
John MacFarlane
d2cc56a46a Revised code for pipe tables.
* All tables now require at least one body row.
* Renamed from 'extra' to 'pipe' tables.
* Moved functions from Parsing to Readers.Markdown.
* Cleaned up code; revised to parse in one pass rather than
  parsing a raw string, splitting it, and parsing the components.
* Allow pipe tables without pipes on the ends (as PHP Markdown Extra
  does).
2012-07-22 22:09:15 -07:00
John MacFarlane
5a704ecc6e Renamed tests/markdown-tables -> tests/extra-tables.
Added to cabal file.
2012-07-22 19:28:56 -07:00
John MacFarlane
511f5e891d Merge pull request #510 from mytskine/markdown-extra
Markdown extra tables [part of the multi-markdown syntax for tables]
2012-07-22 18:40:18 -07:00
John MacFarlane
1d19400572 Removed fb2.math-webtex.fb2 tests.
Test suite should not require net access to run.
2012-07-22 11:15:59 -07:00
Sergey Astanin
436a585c3b FB2: support images embedded as data URIs + tests. 2012-07-22 11:13:14 -07:00
Sergey Astanin
a9429e951c Test suite for FB2 writer. 2012-07-22 11:13:14 -07:00
John MacFarlane
26748da6d4 Don't recognize inline-markup starts inside words.
For example, "2*2 = 4*1" should not contain an emphasized
section.  Added test case for "Literal symbols".  Closes #569.
2012-07-16 10:58:44 -07:00
John MacFarlane
f68b05e74b Textile reader: properly handle links with surrounding brackets.
Square brackets need to be used when the link isn't surrounded by
spaces or punctuation, or when the URL ending may be ambiguous.

Closes #564.
2012-07-13 14:01:56 -07:00
John MacFarlane
7da913dbd7 ConTeXt writer: don't escape &,^,<,>.
Simplified escapes for `}` and `{` to `\{` and `\}`.

Thanks to Aditya Mahajan.
2012-06-27 15:05:13 -07:00
John MacFarlane
d320c2eac5 MediaWiki writer: Avoid extra blank lines after sublists.
Thanks to Gavin Beatty.
2012-06-27 14:46:46 -07:00
John MacFarlane
e9f6366af7 Don't escape _ as \letterunderscore{} in ConTeXt. 2012-06-26 19:50:52 -07:00
John MacFarlane
a08650a603 Updated tests for changes in LaTeX template. 2012-06-08 11:00:27 -07:00
John MacFarlane
3982aaaed6 Updated tests for changes in LaTeX changes. 2012-06-05 22:25:54 -07:00
John MacFarlane
337735ae32 Updated tests for changes in latex template. 2012-06-05 11:52:57 -07:00
John MacFarlane
927b5997d8 Added failing tests for note beginning with a citation.
See issue #531.
2012-06-03 19:26:36 -07:00
John MacFarlane
9ab5b00221 Updated test suite. 2012-06-03 11:08:57 -07:00
paul.rivier
75cba828b5 Textile reader: fix for <notextile> and ==.
Closes #517.
2012-05-29 17:40:55 -07:00
John MacFarlane
87f6256e4a Added (failing) tests for textual citations in footnotes. 2012-05-23 13:36:36 -07:00
John MacFarlane
4991852edb Markdown writer: Improved definition lists.
* Use `:` form instead of `~`, for better compatibility with other
  markdown implementations.

* Don't wrap the term, because it breaks definition lists.
2012-05-16 13:07:58 -07:00
John MacFarlane
4e35c67c23 LaTeX writer: More consistent interblock spacing. 2012-05-14 07:04:47 -07:00
John MacFarlane
87de361cdc DocBook reader: More improvements, passes tests. 2012-05-09 10:34:37 -07:00
John MacFarlane
fb62e0937c DocBook reader: More test improvements. 2012-05-08 23:53:55 -07:00
John MacFarlane
2e07fb623d DocBook reader tests - further refinements. 2012-05-08 23:39:01 -07:00
John MacFarlane
4f8c536de0 DocBook reader: More improvements, more tests pass. 2012-05-08 23:25:34 -07:00
John MacFarlane
8ba8a720ed DocBook reader: Improved def lists with multiple defs. 2012-05-08 22:18:24 -07:00
John MacFarlane
f1869a05fd Improved docbook reader tests. 2012-05-08 21:44:33 -07:00
John MacFarlane
c20c139255 Added docbook reader tests (still failing). 2012-05-08 20:26:39 -07:00
John MacFarlane
9961dc274a Improved spacing around LaTeX block environments.
verbatim, itemize, description, enumerate.
2012-04-30 09:26:15 -07:00
John MacFarlane
8201257b5c LaTeX writer: Fixed spacing in quote environments.
Closes #502.  Previously you'd get:

~~~
hi

\begin{quote}
hi

\end{quote}
hi
~~~

Now we get:

~~~
hi

\begin{quote}
hi
\end{quote}

hi
~~~
2012-04-30 07:46:38 -07:00
John MacFarlane
9820a78b15 Updated latex writer tests for new template. 2012-04-28 12:23:00 -07:00
John MacFarlane
4b77def061 Merge pull request #485 from paul-r-ml/master
Textile reader update
2012-04-27 15:00:02 -07:00
paul.rivier
7b111542c0 textile reader improvements : better conformance to RedCloth Textile inlines 2012-04-24 15:56:59 +02:00
John MacFarlane
869ff43442 LaTeX writer: Use fixltx2e package to provide '\textsubscript'. 2012-04-21 09:59:36 -07:00
paul.rivier
411d54ce98 Textile reader quick clean-up and added support for LaTeX blocks and inlines. 2012-04-17 13:14:05 +02:00
John MacFarlane
7495d970b7 Mardkown writer: escape < and $. 2012-04-15 11:03:52 -07:00
John MacFarlane
998c0c6ad0 Updated texinfo test to reflect template change. 2012-04-06 16:54:39 -07:00
John MacFarlane
f25dcacedf LaTeX writer: don't use eurosym package unless document has a €. 2012-04-03 18:49:05 -07:00
John MacFarlane
7bc4dc37b2 Added PDF metadata (title,author) in LaTeX standalone + PDF output.
Closes #459.
2012-03-25 12:10:43 -07:00
Greg Maslov
4a1ba8ce49 Oops! Forgot to munch whitespace / ignore body after directive. 2012-03-25 05:03:35 -04:00
Greg Maslov
618dc294f9 Add parsing support for the rST default-role directive. 2012-03-24 21:48:54 -04:00
John MacFarlane
9352750cb2 RST writer: Better handling of inline formatting.
* `hi*there*hi` now gets rendered properly as `hi\ *there*\ hi`
* Unnecessary '\ ' are avoided around :math:, :sub:, :sup:
* Implemented most of the rules in
  http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#inline-markup-recognition-rules,
  though some unnecessary '\ ' may be inserted when unicode quotes
  are used.
2012-03-24 15:53:57 -07:00
John MacFarlane
2894df7b76 Added test for one column table in LaTeX. 2012-03-19 08:29:19 -07:00
John MacFarlane
60fb915351 Use {} around ctable caption. Closes #445. 2012-03-12 11:06:49 -07:00
John MacFarlane
95b0f28831 Updated tests for euro-related template changes. 2012-03-07 13:29:03 -08:00
John MacFarlane
210d186f9c Updated tests for context template changes. 2012-03-03 08:38:40 -08:00
John MacFarlane
8a218dc0d5 Fixed LaTeX writer tests for last patch. 2012-03-03 06:34:38 -08:00
François Gannaz
661c6c12e9 Added tests for markdown-extra tables
A few simple tests for the tables as php-markdown defines them.
Only tables whose lines begin with a "|" are tested.
2012-02-21 21:59:09 +01:00
John MacFarlane
f59e33dd1a LaTeX reader: Add ", " to suffix...
if it doesn't start w space or punctuation.  Otherwise we
get no space between the year and the suffix in author-date styles.
2012-02-10 21:48:42 -08:00
John MacFarlane
df3f3ddb6e LaTeX reader: use raw latex as fallback for Cites.
This way you can still get the raw latex back, even if you don't
process with citeproc.  Previously, cites were not visible at all
unless you specified --biblio on the command line and converted
them using citeproc, or used --natbib or --biblatex.
2012-02-06 12:42:12 -08:00
John MacFarlane
be8bddcaf3 Improvements to LaTeX reader:
* Handle \ps
* Ignore ignorable commands in a uniform way.
* Handle \P
* handleIncludes skips \verb commands.
2012-02-04 22:28:16 -08:00
John MacFarlane
75485c2f11 Complete rewrite of LaTeX reader.
* The new reader is more robust, accurate, and extensible.
  It is still quite incomplete, but it should be easier
  now to add features.

* Text.Pandoc.Parsing: Added withRaw combinator.

* Markdown reader: do escapedChar before raw latex inline.
  Otherwise we capture commands like \{.

* Fixed latex citation tests for new citeproc.

* Handle \include{} commands in latex.
  This is done in pandoc.hs, not the (pure) latex reader.
  But the reader exports the needed function, handleIncludes.

* Moved err and warn from pandoc.hs to Shared.

* Fixed tests - raw tex should sometimes have trailing space.

* Updated lhs-test for highlighting-kate changes.
2012-02-04 09:56:43 -08:00
John MacFarlane
d4c2f02e08 Updated citation tests with en-dashes. 2012-01-30 10:03:01 -08:00
John MacFarlane
3a0b3df007 Put date in YYYY-MM-DD format if possible for HTML, docx metadata.
Added normalizeDate to Text.Pandoc.Shared.
2012-01-28 15:54:34 -08:00
John MacFarlane
663cfc2fbd Docbook writer: Use sect1, sect2, etc. instead of section. 2012-01-27 11:32:02 -08:00
John MacFarlane
3a8afc119a Depend on highlighting-kate 0.5.
This uses styleToCss instead of styleToHtml.
2012-01-25 11:29:42 -08:00
John MacFarlane
ba81cda7f1 Added Docx writer.
* New module `Text.Pandoc.Docx`.
* New output format `docx`.
* Added reference.docx.
* New option `--reference-docx`.

The writer includes support for highlighted code blocks
and math (which is converted from TeX to OMML using
texmath's new OMML module).
2012-01-19 12:10:49 -08:00
John MacFarlane
83bb1de3f5 Improved citation tests. 2012-01-13 00:02:38 -08:00
John MacFarlane
5b7c209373 Markdown reader: Fix parsing of consecutive lists.
Pandoc previously behaved like Markdown.pl for consecutive
lists of different styles. Thus, the following would be parsed
as a single ordered list, rather than an ordered list followed
by an unordered list:

    1. one
    2. two

    - one
    - two

This patch makes pandoc behave more sensibly, parsing this as
two lists.  Any change in list type (ordered/unordered) or in
list number style will trigger a new list. Thus, the following
will also be parsed as two lists:

    1. one
    2. two

    a. one
    b. two

Since we regard this as a bug in Markdown.pl, and not something
anyone would ever rely on, we do not preserve the old behavior
even when `--strict` is selected.
2012-01-02 17:04:59 -08:00
John MacFarlane
da8425598a New treatment of dashes in --smart mode.
* `---` is always em-dash, `--` is always en-dash.
* pandoc no longer tries to guess when `-` should be en-dash.
* A new option, `--old-dashes`, is provided for legacy documents.

Rationale: The rules for en-dash are too complex and
language-dependent for a guesser to work reliably.  This
change gives users greater control.  The alternative of
using unicode isn't very good, since unicode em- and en-
dashes are barely distinguishable in a monospace font.
2012-01-01 13:48:28 -08:00
John MacFarlane
3cf60c7306 Support for math in RST reader and writer.
Inline math uses the :math:`...` construct.

Display math uses

  .. math:: ...

or if multilin

  .. math::

     ...

These seem to be supported now by rst2latex.py.
2011-12-31 11:40:47 -08:00
John MacFarlane
661d0646d0 Updated context tests. 2011-12-30 18:22:09 -08:00
John MacFarlane
3f981022a6 Updated latex tests. 2011-12-30 16:28:33 -08:00
John MacFarlane
83680430b3 Updated ConTeXt tests. 2011-12-30 13:05:04 -08:00
John MacFarlane
a4f719abcf Unicode reference ID in biblio test. 2011-12-29 23:11:25 -08:00
John MacFarlane
6c7bffb544 Updated tests for changes to HTML note back references. 2011-12-29 22:11:14 -08:00
John MacFarlane
ea39a607ed Added 'beamer' as an output format.
Beamer output uses the default LaTeX template, with some
customizations via variables.

Added `writerBeamer` to `WriterOptions`.

Added `--beamer` option to `markdown2pdf`.
2011-12-29 13:26:04 -08:00
John MacFarlane
012405e8c3 Preserve attributes in highlighted HTML.
The container element will have the classes, id, and
key-value attributes you specified in the delimited code
block.

Previously these were stripped off.
2011-12-28 22:04:38 -08:00
John MacFarlane
3122959064 Highlighting: Add language as class name.
This restores behavior of 1.8.2.1. Adjusted tests.
2011-12-27 22:24:31 -08:00
John MacFarlane
70b4ec95e4 Updated tests. 2011-12-27 18:08:06 -08:00
John MacFarlane
a579e2c892 Replaced Apostrophe, Ellipses, EmDash, EnDash w/ unicode strings. 2011-12-27 15:45:34 -08:00
John MacFarlane
fca95bf43c Removed highlighting flag. Highlighting support is now standard. 2011-12-22 13:24:43 -08:00
John MacFarlane
1cefff6319 Updated s5 tests. 2011-12-20 11:37:32 -08:00
John MacFarlane
bfa5ca01bc HTML writer: Use <del> for strikeout. 2011-12-18 11:08:04 -08:00
John MacFarlane
8306f6e9c6 Added blank comment after directives in rst template.
Closes #321.
2011-12-04 22:54:47 -08:00
John MacFarlane
bdec07bac9 Shared: Removed unescapeURI, modified escapeURI.
escapeURI now only escapes space characters, leaving unicode characters
as they are, instead of converting them to octets and URL-encoding them,
as before.  This gives more readable URIs.  User agents now do the
percent-encoding themselves.

URIs are no longer unescaped at all on conversion to markdown, asciidoc,
rst, org.

Closes #349.
2011-12-02 19:39:30 -08:00
John MacFarlane
c6456ef8a4 Fixed test for style type meta in highlighted html+lhs. 2011-12-02 19:10:31 -08:00
John MacFarlane
c8333b5d1b Made author/date more consistent in HTML templates.
Authors are now h2, date h3. (Instead of h3/h4, as in the past.)
2011-12-01 18:57:41 -08:00
John MacFarlane
4d5ddbce8b Mardkown writer tests: Use setext headers for levels 1-2. 2011-11-24 11:14:45 -08:00
John MacFarlane
1b6d0f2e1d Changed paths in s5 tests. 2011-11-24 11:13:14 -08:00
John MacFarlane
bea0fdf6e6 AsciiDoc: Don't use Roman numerals in ordered lists.
AsiiDoc doesn't support them.
2011-11-18 21:26:25 -08:00
John MacFarlane
1561d51cc5 Renamed to AsciiDoc. Fixed display math and escapes.
AsciiDoc does not seem to have consistent escaping rules.
2011-11-18 21:09:49 -08:00
John MacFarlane
c552aa24cf Merge branch 'asciidoc' 2011-11-18 19:53:56 -08:00
John MacFarlane
679e94e53d Updated tests for correct col width. 2011-11-18 19:50:45 -08:00
John MacFarlane
4c122be58a Updated asciidoc test.
The test output still contains some mistakes.
2011-11-18 19:46:12 -08:00
John MacFarlane
43c6c1d845 Updated ieee.csl and mhra.csl in test directory. 2011-11-18 13:41:40 -08:00
John MacFarlane
5ba1e92440 Updated chicago-author-date.csl.
The old version did not work properly for edited volumes
with no author.
2011-11-18 13:36:27 -08:00
John MacFarlane
f6a0e75389 Supported tables in asciidoc, added table tests. 2011-11-18 13:19:22 -08:00
John MacFarlane
fc1c17b174 Added an asciidoc writer (partial).
Still TODO:

- documentation in README
- add default.asciidoc to templates/
- lists
- tables
- proper escaping
- footnotes with blank lines - print separately at end?
  currently they are just ignored.
- fix header (date gives weird result on pandoc README)
2011-11-16 19:14:55 -08:00
John MacFarlane
1da1d4ec24 Updated writer tests for new version of texmath. 2011-11-12 13:25:02 -08:00
John MacFarlane
d74e8d14a5 Markdown citations: don't strip off initial space in locator.
Previously `[@item1 and nowhere else]` yielded the locator ", and nowhere
else", or, with the new citeproc-hs, "and nowhere else".
Now it yields " and nowhere else".
2011-11-09 13:18:01 -08:00
John MacFarlane
6a51897f33 Fixed markdown-citations.ieee.txt to use em-dashes for citation ranges.
This is a new feature in citeproc-hs.
2011-11-09 12:57:47 -08:00
John MacFarlane
821286a6f3 Update templates to use Content-Style-Type meta tag.
Closes #337.
2011-11-08 11:54:10 -08:00
John MacFarlane
c335b6cbd8 HTML slides: only add id to div/section if --section-divs selected. 2011-10-02 23:19:03 -07:00
John MacFarlane
072df3f5dd Simplified slide creation in HTML writer.
A horizontal rule now gets transformed into an empty H1 header
before 'hierarchicalize' is called.

If the document that does not begin with an H1 header, an
empty one is provided.

This avoids the need for kludgy raw HTML.

Also, the 'titleslide' class is added to any section containing
just a title:

----

----
2011-10-02 11:49:56 -07:00
John MacFarlane
2c15a876d8 Updated to use revised context template. 2011-08-25 09:39:20 -07:00
John MacFarlane
24095e0615 ConTeXt writer: Changed 'descr' to 'description', fixed alignment. 2011-08-20 15:30:57 -07:00
John MacFarlane
55b3d0f7c3 Fixed ConTeXt writer tests. 2011-08-18 19:29:22 -07:00
John MacFarlane
15eb713e5d Fixed opendocument writer test. 2011-08-18 12:15:55 -07:00
John MacFarlane
cbd0314b1b Changes to tests for new latex templates. 2011-07-30 17:02:49 -07:00
John MacFarlane
44e2dc68ac Updated lhs tests with CDATA. 2011-07-29 20:14:11 -07:00
John MacFarlane
a3327835be Docbook writer: Use programlisting for code blocks.
Instead of screen, as before.
2011-07-24 23:36:30 -07:00
John MacFarlane
07c7cd1945 Docbook writer: Use CALS tables (instead of XHTML tables).
Reason:  Some older docbook software does not work with XHTML
tables.

Closes #77.
2011-07-24 23:24:03 -07:00
John MacFarlane
3162adbd9b HTML writer: Removed English title on footnote back links.
This is incongruous in non-English documents.
2011-07-24 16:24:27 -07:00
John MacFarlane
cb6123a2db Updated s5 tests. 2011-07-24 09:17:06 -07:00
John MacFarlane
12110f3282 HTML writer: Display author and date after title. 2011-07-23 11:26:11 -07:00
John MacFarlane
856f1d2b42 Use different hyperref options for xetex.
This fixes problems with unicode bookmarks on xetex.
Thanks to CircleCode.
2011-07-23 09:54:42 -07:00
John MacFarlane
0defa07c27 LaTeX writer: New template. 2011-07-23 09:44:36 -07:00
John MacFarlane
d611568237 Updated tests for new latex templates. 2011-07-22 13:56:04 -07:00
John MacFarlane
0cf2a631e8 LaTeX writer: Use \texttt and escapes instead of \verb!..!.
\verb is simply too fragile; it doesn't work inside command
arguments.
2011-07-22 12:19:34 -07:00
John MacFarlane
6c029621ed LaTeX reader & writer: Use \and to separate authors.
Closes #279.
2011-07-21 10:09:51 -07:00
John MacFarlane
71736869bb ConTeXt writer: Made \start/stoptyping flush with margin.
This prevents extra blank lines.
2011-07-19 16:29:33 -07:00
John MacFarlane
8fd3d0bdbb LaTeX writer: make verbatim environments flush to avoid extra space.
The indented `\end{verbatim}` was causing an extra blank line in
the output.

Closes #277.
2011-07-19 16:25:01 -07:00
John MacFarlane
b5da7adfb8 Un-URI-escape image filenames in LaTeX, ConTeXt, RTF, Texinfo.
Also do this when copying image files into EPUBs and ODTs.

Closes #263.
2011-07-16 14:19:45 -07:00
John MacFarlane
dd59cd2341 HTML reader: treat Plain as Para when needed.
For example, in

    Just a few glitches remaining.
    <ul><li> In this situation, one loses the list.
    </ul>
    And in this, the preformatting.
   <pre>Preformatted text not starting with its own blank line.
   </pre>

Thansk to Dirk Laurie for noticing the issue.
2011-07-16 09:42:16 -07:00
John MacFarlane
b30afc2009 Merge pull request #273 from qerub/master
Textile reader: Make it possible to have colons after links.
2011-07-11 08:31:29 -07:00
John MacFarlane
b5411c06aa Improved LaTeX tables.
* Use ctable package, which allows footnotes and
  provides additional options.
* Made cell alignments work in multiline tables.
* Closes #272.
2011-07-10 12:33:45 -07:00
Christoffer Sawicki
8fa4e8bff1 Textile reader: Make it possible to have colons after links. 2011-07-10 16:30:14 +02:00
John MacFarlane
cfaa9acd18 Fixed Slidy/S5 output to allow --section-divs.
This is also a cleaner way of inserting the slide divs.
Resolves Issue #296.
2011-04-16 12:16:24 -07:00
John MacFarlane
6beba76f61 Changed uri parser so it doesn't include trailing punctuation.
So, in RST, 'http://google.com.' should be parsed as a link
to 'http://google.com' followed by a period.

The parser is smart enough to recognize balanced parentheses,
as often occur in wikipedia links: 'http://foo.bar/baz_(bam)'.

Also added ()s to RST specialChars, so '(http://google.com)'
will be parsed as a link in parens.

Added test cases.

Resolves Issue #291.
2011-03-18 11:30:20 -07:00
John MacFarlane
d1304e8356 OpenDocument writer: Use "First paragraph" style after most non-para blocks.
(Not just headers, as in the last patch.)
Patch from Andrea Rossato, slightly modified by JM.
2011-03-16 12:35:32 -07:00
John MacFarlane
e24ce1c11d OpenDocument: Use special style for 1st para after heading.
"First paragraph" as opposed to "Text body."  This allows
users to specify e.g. that only paragraphs after the first
paragraph of a section are to be indented.

Thanks to Andrea Rossato for the patch.
Closes github Issue #20.
2011-03-12 13:38:04 -08:00
John MacFarlane
21bd73ddaf Fixed lhs-test.nohl tests.
A previous commit accidentally overwrote them with highlighted tests.
2011-03-04 11:11:01 -08:00
John MacFarlane
84bf846503 LaTeX writer: Changed figure defaults to htbp.
This prevents "too many unprocessed floats."  Resolves
Issue #285.
2011-02-11 19:03:46 -08:00
John MacFarlane
bdf23d3a5d Improved HTML table output (line breaks). 2011-02-04 23:35:10 -08:00
John MacFarlane
bb89fd9959 Updated tests. 2011-02-04 23:09:51 -08:00
John MacFarlane
ce4f9a3787 HTML writer: Spacing adjustments for Plain and RawHtml blocks. 2011-02-04 21:05:48 -08:00
John MacFarlane
90647a56f6 Updated tests for new HTML format.
Verified against old tests using tidy and diff.
2011-02-04 20:38:08 -08:00
John MacFarlane
9f28acba9d Fixed highlighting for inline code.
highlightHtml in Highlighting now has a boolean argument that
selects between inline and block content.

Revised tests for new highlighting-kate.
2011-01-29 16:04:07 -08:00
John MacFarlane
570d8ff08c Moved tests to src. 2011-01-29 11:24:16 -08:00
John MacFarlane
0833daff4a Added Tests.Shared with normalize round-trip tests. 2011-01-29 10:03:24 -08:00
John MacFarlane
18089a44f5 Tests.Arbitrary: don't allow empty list items. 2011-01-29 10:02:12 -08:00
John MacFarlane
e9899b9ab8 Removed intentionally failing test in ConTeXt writer tests. 2011-01-29 09:04:05 -08:00
John MacFarlane
d8c9b0c6f7 Added biblatex citation tests to Tests.Readers.LaTeX.
Removed old biblatex-citations.latex.
2011-01-29 09:01:30 -08:00
John MacFarlane
7961208aaf Added natbib citation tests to Tests.Readers.LaTeX.
Removed old tests/natbib-citations.latex.
2011-01-29 08:47:00 -08:00
John MacFarlane
382564ed9e RTF writer: Embed images when possible.
* Resolves Issue #275.
* PNG and JPEG supported.
* Export rtfEmbedImage.
2011-01-28 08:42:04 -08:00
John MacFarlane
0acf774011 Added Tests.Readers.Markdown. 2011-01-26 22:09:09 -08:00
John MacFarlane
f8dca6ccbc Add support for attributes in inline Code.
Additional related changes:

* URLs in Code in autolinks now use class "url".
* Require highlighting-kate 0.2.8.2, which omits the final <br/> tag,
  essential for inline code.
2011-01-26 20:44:25 -08:00
John MacFarlane
703c421c9e RST reader: Improved field lists.
Field lists now work properly with block content.
(Thanks to Lachlan Musicman for pointing out the bug.)

In addition, definition list items are now always Para instead
of Plain -- which matches behavior of rst2xml.py.

Finally, in image blocks, the alt attribute is parsed properly
and used for the alt, not also the title.
2011-01-26 17:23:57 -08:00
John MacFarlane
066cbbad76 Added RST reader tests. 2011-01-26 17:23:56 -08:00
John MacFarlane
c5384a33c0 Updates for compiling with ghc 7.
We now use a CPP trick to have compatible quasiquotes that
work in both GHC 6.12 and 7.
2011-01-26 17:23:56 -08:00
John MacFarlane
932fc12840 Updated tests. 2011-01-26 17:23:56 -08:00
John MacFarlane
eb26fa6f54 Distinguish latex & context environments; blank line after in writers. 2011-01-26 17:23:56 -08:00
John MacFarlane
bd43c0f4c9 Bumped version to 1.8; depend on pandoc-types 1.8.
The old TeX, HtmlInline and RawHtml elements have been removed
and replaced by generic RawInline and RawBlock elements.

All modules updated to use the new raw elements.
2011-01-26 17:22:53 -08:00
John MacFarlane
5bee388914 Updated textile tests. 2011-01-23 10:18:53 -08:00
John MacFarlane
65a015e74b Added needed space after .bc and .bq.
Otherwise these can trap a </dd>, for example.

Better solution to try next: rewrite using Pretty.
2011-01-23 10:08:11 -08:00
John MacFarlane
16d4366431 Textile writer: Don't escape code in bc. block. 2011-01-23 09:44:28 -08:00
John MacFarlane
38013de857 Textile writer: Don't HTML-escape between @'s. 2011-01-23 09:12:50 -08:00
John MacFarlane
628a1ef815 Textile reader: Fixed bug (swallowed p at beginning of paragraph).
The problem was a missing 'try' in the maybeExplicitBlock parser.
Test case, a paragraph beginning with 'p', has been added.
2011-01-23 08:59:35 -08:00
John MacFarlane
7234a79104 Textile writer: Use <pre> instead of bc.. for code with blank lines.
This has fewer interaction effects.
2011-01-23 08:49:55 -08:00
John MacFarlane
1d683be414 Textile reader: Support <tt> for inline code. 2011-01-23 00:25:05 -08:00
John MacFarlane
50d08ec2c3 Textile reader: Added code blocks with bc. 2011-01-23 00:05:35 -08:00
John MacFarlane
b9356fcc7e Removed deliberate error in LaTeX reader tests. 2011-01-22 16:01:14 -08:00
John MacFarlane
2bea4e3729 Reorganized tests.
The native writer test needs to run before others that depend on it.
2011-01-22 15:54:24 -08:00