Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
3590 commits 2 branches 0 tags 65 MiB
Commit graph

634 commits

Author SHA1 Message Date
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
John MacFarlane
87aaa7e719 Use ANSI color to point to diffs in test output. 
ConTeXt writer bullet list test set to break as an example.
 2011-01-22 14:58:32 -08:00
John MacFarlane
91cc03b131 Tests.Helpers: Added file quasiquoter. 
This allows you to take expected test output from a file.
 2011-01-22 13:54:12 -08:00
John MacFarlane
1fd5e3bcff Tests.Arbitrary: Let strings include any character. 2011-01-22 13:40:29 -08:00
John MacFarlane
5a1abbe7ac Fixed -Wall error in imports. 2011-01-22 13:40:18 -08:00
John MacFarlane
c801f4f621 Put dashed lines around diff results in Old test. 2011-01-22 13:39:59 -08:00
John MacFarlane
373d05601a Added native writer tests. 2011-01-22 12:37:19 -08:00
John MacFarlane
209b300d6a Added 'property' in Tests.Helpers & some quickcheck tests. 2011-01-22 12:18:59 -08:00
John MacFarlane
d86d9260df Tests.Arbitrary: Added instances for Inlines, Blocks. 2011-01-22 12:18:23 -08:00
John MacFarlane
8dcc67a993 ConTeXt writer: Don't add cr at end of inline footnote. 2011-01-22 12:17:39 -08:00
John MacFarlane
15250859c3 Improved test framework. 
Now there is a uniform interface for reader and writer tests.
Also added a quasiquoter, for multiline strings.
 2011-01-22 10:50:15 -08:00
John MacFarlane
b3c1a89cdf Merge branch 'master' of github.com:jgm/pandoc 2011-01-21 19:55:24 -08:00
John MacFarlane
654c39a7d2 latex template: move special treatment of \sout. 
It needs to be inside the if(strikeout) condition, after
the ulem package is imported; otherwise we try to renewcommand{\sout} when
\sout isn't yet defined.
 2011-01-21 19:24:00 -08:00
John MacFarlane
d43dbc83f2 More informative output on writer test failure. 2011-01-21 11:02:59 -08:00
John MacFarlane
d0726920db Added Tests.Writers.ConTeXt and helpers for writer tests. 2011-01-21 10:23:41 -08:00
John MacFarlane
5c35be1362 Make sure native output ends in newline with --standalone. 2011-01-21 09:58:23 -08:00
John MacFarlane
e5e2b0f9ab Fixed the two test cases that were intentionally set to fail. 2011-01-20 22:38:16 -08:00
John MacFarlane
52b6e38425 Updated tests for new native format. 2011-01-20 22:36:40 -08:00
John MacFarlane
9a739e30bf Fixed problem with strikout in LaTeX headers with hyperref. 
Added a command to the latex template to disable \sout inside
pdf strings.  Thanks to Joost Kremers for the fix.
 2011-01-19 11:43:30 -08:00
John MacFarlane
933cdaf4c8 Show Haskell-readable version of input string in test failure. 2011-01-19 09:44:53 -08:00
John MacFarlane
831889bebc Unit tests: On failure, print the input string. 2011-01-19 09:38:14 -08:00
John MacFarlane
608d5bc753 Added normalize in latex reader tests. 2011-01-18 23:37:54 -08:00
John MacFarlane
0502c0fd28 Revamped tests with new =: and =?> operators + builder. 
Left in a couple failing tests for demonstration purposes.
 2011-01-18 23:34:34 -08:00
John MacFarlane
0cfafdec64 Replaced --no-citeproc with --natbib in tests. 2011-01-16 11:19:52 -08:00
John MacFarlane
a0e19ba8aa Merge branch 'tests' 2011-01-15 09:25:01 -08:00
John MacFarlane
18231a8232 Fixed lhs tests for new position of <title> after <meta>s. 2011-01-15 08:22:41 -08:00
John MacFarlane
9305114b9f LaTeX writer: Escape strings in \href{..}. 
Previously strings weren't escaped, so %5D would be interpreted
as a LaTeX comment!
 2011-01-14 18:59:50 -08:00
John MacFarlane
dc93073804 Minor code cleanup. 2011-01-14 18:09:16 -08:00
John MacFarlane
0222f367b1 Keep Tests.Arbitrary but remove quickcheck tests for now. 
Remove Tests.Shared.
Remove dependency on QuickCheck.
 2011-01-14 18:01:57 -08:00
John MacFarlane
09e9a86db9 Merge branch 'master' of github.com:jgm/pandoc into tests 2011-01-14 14:46:48 -08:00
John MacFarlane
81403b8d80 LateX writer: In nonsimple tables, put cells in \parbox. 
Otherwise we can get problems with linebreaks, and cell spacing
isn't right.

Thanks to Jef Allbright for pointing out the problem.
 2011-01-14 14:45:04 -08:00
John MacFarlane
d41c17a2d5 Added quickcheck tests for normalize in Shared. 2011-01-14 00:30:36 -08:00
John MacFarlane
b3fb541d01 Added Tests/Arbitrary.hs, with Arbitrary instances. 2011-01-13 22:31:04 -08:00
John MacFarlane
10747b7797 Fixed bug in markdown-citations.mhra.txt expected test output. 
This failing test was a test suite bug, not a pandoc or citeproc bug.
 2011-01-13 14:50:00 -08:00
John MacFarlane
75e8ab25ef Adjusted source to 80-column limit. 2011-01-13 11:11:55 -08:00
John MacFarlane
4ccd30fe3e Moved Tests.Shared -> Tests.Helpers. 
Tests.Shared would be the natural place to put tests for functions
in Text.Pandoc.Shared.
 2011-01-13 10:59:44 -08:00
John MacFarlane
99c361d2b4 Fixed bug in markdown-citations.mhra.txt expected test output. 
This failing test was a test suite bug, not a pandoc or citeproc bug.
 2011-01-13 10:58:58 -08:00
Nathan Gass
2dadb67b25 Generalized latexTestWithState to readerTestWithState. 2011-01-12 19:32:26 +01:00
Nathan Gass
daf5444e24 Merge branch 'tests' of github.com:xabbu42/pandoc into tests 2011-01-12 19:13:15 +01:00
Nathan Gass
e61348dc11 Reordered test files. 2011-01-12 19:12:54 +01:00
John MacFarlane
e9f1de639d test diff output: put +/- at beginning of line. 2011-01-12 09:59:06 -08:00
John MacFarlane
3ebfcd0cea Added line numbers to diff output in tests. 2011-01-12 08:29:13 -08:00
John MacFarlane
a2f562719d Updated lhs tests for new positioning of <title>. 2011-01-12 08:17:38 -08:00
John MacFarlane
5da2d1e66c Merge branch 'master' into tests 2011-01-12 08:13:11 -08:00
Nathan Gass
ff74c51b53 Remove some accidentally commited functions. Fixed a type and alignment. 2011-01-12 14:44:32 +01:00
Nathan Gass
ec4deb2532 Added some basic testing infrastructure and some latex reader tests. 2011-01-12 14:16:35 +01:00
Nathan Gass
4f6099f350 Started implementing splitted test suite. 
Moved old tests into Old.hs and added new simple test-pandoc.hs for
loading and grouping together tests from different files. Later
commits will add more testfiles to the suite with more modular tests.
 2011-01-12 13:11:08 +01:00
John MacFarlane
cf5e8a824f test-pandoc: Improved header for diff output. 2011-01-12 11:36:02 +01:00
John MacFarlane
530e3edc0f test-pandoc: More informative diff output on test failure. 
Now the test suite tells you the exact command that was run,
and the file containing the expected output.
 2011-01-12 11:35:49 +01:00
John MacFarlane
046c9c7d3b test-pandoc: Relocated --columns=80 to just where it's needed. 
We only need it for certain table tests, because of the relative
alignments.
 2011-01-12 11:35:44 +01:00
John MacFarlane
51d9d8b674 test-pandoc: Fixed + and - in diff output, which were reversed. 2011-01-12 11:35:40 +01:00
John MacFarlane
715e33705f test-pandoc: More diff-like diffs in case of test failure. 2011-01-12 11:35:34 +01:00
John MacFarlane
eb1d014859 Improvements to test suite. 
+ You can now specify glob patterns after 'cabal test';
  e.g. 'cabal test latex' will only run the latex tests.

+ Instead of detecting highlighting support in Setup.hs,
  we now detect it in test-pandoc, by looking to see if
  'languages' is null.

+ We now verify the lhs readers against the lhs-test.native,
  normalizing with 'normalize'.  This makes more sense than
  verifying against HTML, which also brings in the HTML writer.

+ Added lhsn-test.nohl.{html,html+lhs}, so we can do the lhs
  tests whether or not highlighting has been installed.
 2011-01-12 11:35:10 +01:00
John MacFarlane
91510a109f Improvements to --html5 support: 
+ <nav> for TOC, <figure> for figures, type attribute in <ol>.
+ Don't add math javascript in html5.
+ Use style attributes instead of deprecated width, align.
+ html template: move <title> after <meta>.
  Note: charset needs to be declared before title.
+ slidy and s5 templates: move <title> after <meta>.
+ html template: Added link to html5 shim for IE.
+ Make --html5 have an effect only for 'html' writer (not s5, slidy, epub).
 2011-01-11 23:15:30 -08:00
Nathan Gass
3bc0a55af0 Removed outdated comments. 2011-01-11 22:37:41 +01:00
Nathan Gass
e8fa72c6a7 Moved test-pandoc.hs to tests directory. 2011-01-11 21:49:49 +01:00
John MacFarlane
d891b2c29d LaTeX reader: Support simple tables. 2011-01-07 10:15:48 -08:00
John MacFarlane
93c3e27731 pandoc: Add newline to output unless standalone. 
This avoids output that does not end with a newline, which
is inconvenient when working with many tools.

Updated tests accordingly.
 2011-01-06 21:05:28 -08:00
John MacFarlane
71bedab81c LHS test changes for new wrapping & highlighting-kate version. 2011-01-06 21:04:57 -08:00
John MacFarlane
9ff560036e Fixed lhs-test.markdown for new wrapping. 2011-01-06 16:53:44 -08:00
John MacFarlane
303ce8a9e5 LaTeX reader: allow spaces btw \\begin or \\end and {. 2011-01-06 09:34:24 -08:00
John MacFarlane
3e61333af0 Fixed regression in markdown reader. 
'(_hi_)' was being parsed with literal underscores (no emphasis).
The fix:  the 'str' parser now only parses alphanumerics and
embedded underscores.  All other symbols are handled by the
'symbol' parser.  This has a slight effect on the AST, since
you'll get [Str "hi",Str ":"] insntead of [Str "hi:"].  But there
should not be a visible effect in any of the writers.

Thanks to gwern for pointing out the regression.
 2011-01-01 22:46:30 -08:00
John MacFarlane
904050fa36 New HTML reader using tagsoup as a lexer. 
* The new reader is faster and more accurate.

* API changes for Text.Pandoc.Readers.HTML:
   - removed rawHtmlBlock, anyHtmlBlockTag, anyHtmlInlineTag,
     anyHtmlTag, anyHtmlEndTag, htmlEndTag, extractTagType,
     htmlBlockElement, htmlComment
   - added htmlTag, htmlInBalanced, isInlineTag, isBlockTag, isTextTag

* tagsoup is a new dependency.

* Text.Pandoc.Parsing: Generalized type on readWith.

* Benchmark.hs: Added length calculation to force full evaluation.

* Updated HTML reader tests.

* Updated markdown and textile readers to use the functions from
  the HTML reader.

* Note: The markdown reader now correctly handles some cases it did not
  before. For example:

    <hr/>

  is reproduced without adding a space.

    <script>
      a = '<b>';
    </script>

  is parsed correctly.
 2010-12-30 13:55:40 -08:00
John MacFarlane
4bfe140ed1 Made --smart work with HTML reader. 
It did not work before, because - and quotes were gobbled
up by the str parser.
 2010-12-22 17:05:17 -08:00
John MacFarlane
8e9c490b0a Texinfo writer: Updated to use Pretty. 2010-12-22 11:43:43 -08:00
John MacFarlane
fd07db16e9 Man writer: updated to use Pretty. 2010-12-22 00:22:13 -08:00
John MacFarlane
c904024944 OpenDocument writer: Updated to use Pretty. 2010-12-21 16:59:17 -08:00
John MacFarlane
ebdbb06f94 Docbook writer: Updated to use Pretty. 2010-12-21 16:45:43 -08:00
John MacFarlane
78cea94f45 Markdown writer: use \ for newline instead of two spaces at eol. 
(Unless --strict.)
 2010-12-20 19:36:40 -08:00
John MacFarlane
2587543457 ConTeXt writer: Updated to use Text.Pandoc.Pretty. 2010-12-20 19:36:35 -08:00
John MacFarlane
71bc3789a3 Fixed markdown-citations.ieee.txt. 2010-12-19 12:43:25 -08:00
John MacFarlane
9fd45aaa2d Fixed markdown-citations.txt. 2010-12-19 12:42:32 -08:00
John MacFarlane
9210b7ef69 Fixed biblatex/natbib citation writer tests. 2010-12-19 12:41:27 -08:00
John MacFarlane
99a58e51f5 LaTeX writer: Modified to use Pretty. 
Improved footnote formatting, removed spurious blank lines.
 2010-12-19 10:14:12 -08:00
John MacFarlane
89bf312765 LaTeX writer: Use \paragraph, \subparagraph for level 4,5 headers. 2010-12-18 15:05:21 -08:00
John MacFarlane
543aa28c38 Added new prettyprinting module. 
* Added Text.Pandoc.Pretty.
  This is better suited for pandoc than the 'pretty' package.
  One advantage is that we now get proper wrapping; Emph [Inline]
  is no longer treated as a big unwrappable unit. Previously
  we only got breaks for spaces at the "outer level." We can also
  more easily avoid doubled blank lines.  Performance is
  significantly better as well.

* Removed Text.Pandoc.Blocks.
  Text.Pandoc.Pretty allows you to define blocks and concatenate
  them.

* Modified markdown, RST, org readers to use Text.Pandoc.Pretty
  instead of Text.PrettyPrint.HughesPJ.

* Text.Pandoc.Shared:  Added writerColumns to WriterOptions.

* Markdown, RST, Org writers now break text at writerColumns.

* Added --columns command-line option, which sets stColumns
  and writerColumns.

* Table parsing:  If the size of the header > stColumns,
  use the header size as 100% for purposes of calculating
  relative widths of columns.
 2010-12-17 13:39:17 -08:00
John MacFarlane
605648cbbf Added 'tests' Cabal flag. 
+ This ensures that test-pandoc gets built.
+ 'cabal test' now runs this.
+ The old tests/RunTests.hs has been removed, and
  src/test-pandoc.hs added.
 2010-12-15 17:54:51 -08:00
Nathan Gass
a312d2a8ae Use top-level header at end as bibliography title for natbib and biblatex output. 2010-12-15 10:21:56 -08:00
Nathan Gass
8f60176511 Remove punctuation at start of suffix for natbib and biblatex output. 
This is necessary as the latex citation commands include there own
punctuation, which resulted in doubled commas for markdown documents
where citeproc output works correctly.
 2010-12-15 10:21:53 -08:00
Nathan Gass
53cb199bab Added normalize funcion to latex citation tests. 
This is necessary because converting from markdown to latex correctly
changes hyphens to en-dashes and some spaces to non-breaking spaces.
Converting back to markdown does not undo this changes, and so the
tests have to undo them.
 2010-12-14 19:41:22 -08:00
Nathan Gass
34d30efc5c Added citation tests. 
Added tests for latex  citation writer and reader,
markdown citation writer and additional markup in citations.
 2010-12-14 18:38:40 -08:00
Nathan Gass
c2d3796439 Added support for latex cite commands in latex reader. 2010-12-13 20:48:19 -08:00
Nathan Gass
e8679c04c7 Disabled colored boxes around cites in latex template. 2010-12-13 20:43:17 -08:00
John MacFarlane
71e0557e61 Markdown reader: Fixed regression in reference key parser. 
* The recent change allowing spaces and newlines in the URL
  caused problems when reference keys are stacked up without
  blank lines between. This is now fixed.
* Added test.
 2010-12-13 20:03:12 -08:00
John MacFarlane
17d48cf4af Markdown reader: Allow linebreaks in URLs (treat as spaces). 
Also, a string of consecutive spaces or tabs is now parsed
as a single space. If you have multiple spaces in your URL,
use %20%20.
 2010-12-10 12:14:51 -08:00
paul.rivier
bb609a85e3 textile redcloth definition lists 2010-12-09 09:25:46 -08:00
John MacFarlane
88a40685b8 Textile reader: better treatment of acronyms. 
We now parse PBS(Public Broadcasting System) as if it were
"PBS (Public Broadcasting System)".
 2010-12-09 08:52:09 -08:00
John MacFarlane
9ead748cc9 RST reader: Added footnote suppport. 
Resolves issue #258.

Note that there are some differences in how docutils and
pandoc treat footnotes.  Currently pandoc ignores the numeral
or symbol used in the note; footnotes are put in an auto-numbered
ordered list.
 2010-12-08 08:39:50 -08:00
John MacFarlane
f02080b62d Textile reader: Implemented footnotes. 2010-12-08 00:44:46 -08:00
John MacFarlane
200ea33641 Made --smart work with RST reader. 2010-12-07 21:49:10 -08:00
John MacFarlane
ace3b80f1e Smart punctuation: don't alllow ellipses containing spaces. 
Previously we allowed '. . .', ' . . . ', etc.  This caused
too many complications, and removed author's flexibility in
combining ellipses with spaces and periods.
 2010-12-07 20:08:14 -08:00
John MacFarlane
50ca61ef49 Moved smartPunctuation from Markdown to Parsing. 
+ Parameterized smartPunctuation on an inline parser.
+ Handle smartPunctuation in Textile reader.
 2010-12-07 19:03:08 -08:00
John MacFarlane
f917b46500 Textile reader: implemented acronyms, (tm), (r), (c). 2010-12-07 18:28:36 -08:00
John MacFarlane
67445e7685 Fixed bugs in ieee.csl (Andrea Rossato). 2010-12-07 08:28:18 -08:00
John MacFarlane
5f283e4d47 Updated ieee citation test for punctuation-in-quote. 2010-12-07 08:14:26 -08:00
John MacFarlane
7864f30717 Markdown reader: handle curly quotes better. 
Previously, curly quotes were just parsed literally, leading
to problems in some output formats.  Now they are parsed as
Quoted inlines, if --smart is specified.

Resolves Issue #270.
 2010-12-06 20:36:58 -08:00
John MacFarlane
5a4609584c Fix regression: markdown references should be case-insensitive. 
This broke when we added the Key type.  We had assumed that
the custom case-insensitive Ord instance would ensure case-insensitive
matching, but that is not how Data.Map works.

* Added a test case for case-insensitivity in markdown-reader-more
* Removed old refsMatch from Text.Pandoc.Parsing module;
* hid the 'Key' constructor;
* dropped the custom Ord and Eq instances, deriving instead;
* added fromKey and toKey to convert between Keys and Inline lists;
* toKey ensures that keys are case-insensitive, since this is the
  only way the API provides to construct a Key.

Resolves Issue #272.
 2010-12-05 19:27:00 -08:00
Puneeth Chaganti
4d48abcb12 Added tests. 
+ Added tables.org and writer.org to tests.
    + Added org.template to templates.
    + Changed RunTests.hs as required.
    + Minor changes to Org writer.
 2010-12-04 23:49:53 +05:30
John MacFarlane
357b965b44 Merge branch 'citeproc' into master. 
Conflicts:
	src/Text/Pandoc/Definition.hs
 2010-12-03 23:43:47 -08:00
John MacFarlane
d4e512776d Textile reader: added hrule parser. 2010-12-03 23:10:52 -08:00
John MacFarlane
0356ad4de6 Textile reader: drop leading, trailing newline in pre block. 
This is consistent with how the other readers work.
 2010-12-03 23:10:52 -08:00
John MacFarlane
968748dec1 Textile reader: updated test suite to include raw HTML. 2010-12-03 23:10:52 -08:00
John MacFarlane
f415e9e119 Textile reader: parse raw by default. 
It's part of the textile spec to allow raw HTML,
just as with markdown.
-R is no longer needed in test suite.
 2010-12-03 23:10:52 -08:00
paul.rivier
c3866f3c66 punctuation handling, and more html-specific handling 2010-12-03 23:10:52 -08:00
Paul Rivier
d724c6b568 html inlines and html blocks handling in textile reader 2010-12-03 23:10:51 -08:00
Paul Rivier
fa0866886b textile reader now ignores html/css attributes 2010-12-03 23:10:51 -08:00
Paul Rivier
593b4f6c94 fix autolink by promoting it in the parser list, fix table parabreak 2010-12-03 23:10:51 -08:00
Paul Rivier
a7da0672dc more support for Textile reader (explicit links, images), tests and cabal entries 2010-12-03 23:10:51 -08:00
John MacFarlane
68d38db194 Revamped tests, using markdown output instead of HTML. 
This is easier to inspect.
 2010-11-28 10:03:05 -08:00
John MacFarlane
61b16116ce Citation tests: removed spurious double-spaces. 2010-11-28 08:12:32 -08:00
John MacFarlane
b2e9f64984 Updated citation tests to use en-dash between ranges. 2010-11-28 08:10:01 -08:00
John MacFarlane
b10e82c9fa Fixed spacing bug for reference-style citations. 2010-11-28 07:55:33 -08:00
John MacFarlane
e2e107cbed Fixed spacing in ieee citation test. 
(Test now fails pending citeproc update.)
 2010-11-27 19:20:06 -08:00
John MacFarlane
f64983f879 Merge branch 'master' into citeproc 2010-11-27 14:58:23 -08:00
John MacFarlane
e9cfbd5adc OpenDocument writer: don't print raw TeX. 2010-11-27 14:57:48 -08:00
John MacFarlane
8f1aed168b Removed extra line break from citation test output. 2010-11-27 11:27:52 -08:00
John MacFarlane
54397a9e99 Merge branch 'master' into citeproc 2010-11-27 10:58:05 -08:00
John MacFarlane
1ffbb59823 Minor adjustment in textile test suite. 2010-11-27 10:56:46 -08:00
John MacFarlane
c989bf028f Merge branch 'textile' 
Conflicts:
	README
	man/man1/pandoc.1.md
	pandoc.cabal
 2010-11-27 10:52:44 -08:00
John MacFarlane
71c9316a59 Use [] for superscripts and subscripts in textile writer. 2010-11-27 10:44:58 -08:00
John MacFarlane
cae3f8edba Fixed spacing problems in textile nested lists. 2010-11-27 10:44:35 -08:00