Commit graph

109 commits

Author SHA1 Message Date
fiddlosopher
aea6f6802b Removed support for "box-style" block quotes in markdown.
This adds unneeded complexity and makes pandoc diverge further
than necessary from other markdown extensions.
Brought documentation, tests, and debian/changelog up to date.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1141 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-08 19:32:18 +00:00
fiddlosopher
6cfe6c250a Adjusted test suite for footnote changes in LaTeX and ConTeXt writers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1138 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-04 04:14:27 +00:00
fiddlosopher
f8a257589b Updated test suite -- no italics for digits.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1133 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-02 08:35:24 +00:00
fiddlosopher
c15dfb2cf9 Updated HTML and S5 writer tests for new span tags in math.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1131 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-02 02:58:07 +00:00
fiddlosopher
d1832da9e1 Added Text.Pandoc.Readers.TeXMath and changed default handling of math.
+ Text.Pandoc.Readers.TeXMath exports readTeXMath, which reads raw TeX
  math and outputs a string of pandoc inlines that tries to render it
  as far as possible, lapsing into literal TeX when needed.
+ Added Text.Pandoc.Readers.TeXMath to pandoc.cabal + ghc66 version.
+ Modified writers so that readTeXMath is used for default HTMl output
  in HTML, S5, RTF, Docbook.
+ Updated README with information about how math is rendered in all formats.
+ Updated test suite.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1129 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-02 00:36:32 +00:00
fiddlosopher
ac133dcba0 Updated tests with new way of displaying math in HTML (with no enclosing $'s).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1126 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-01 03:11:59 +00:00
fiddlosopher
7ddd01eb3a Modified s5 fancy test to include new ASCIIMathML.js.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1122 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-01 03:11:38 +00:00
fiddlosopher
b008e5d347 Modified writer tests for new Math and TeX output.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1119 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:37 +00:00
fiddlosopher
132186e6b0 Revised s5.native test with Math block.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1117 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:23 +00:00
fiddlosopher
55b31b708e Fixed small error in testsuite.native.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1116 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:20 +00:00
fiddlosopher
dc42600081 Changed tests to use new Math block element.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1111 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:04 +00:00
fiddlosopher
f957c6ef32 Changes to testsuite for new \useURL in context writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1088 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-22 18:16:39 +00:00
fiddlosopher
f4a1fa4b8d More improvements to ConTeXt writer:
+ writer options are now in state, so they don't have to be passed as
  a parameter
+ state also keeps track of ordered list level, so the right default
  numbering scheme can be used
+ extra blank line after \stopitemize
+ removed definitions of ltxenum and ltxitem from the preamble
+ both kinds of lists are now generated using \start-stopitemize, with
  appropriate options
+ in the case of bulleted lists, no options need be specified, because
  defaults are given in the preamble
+ test suite updated accordingly


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1084 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-18 01:24:43 +00:00
fiddlosopher
5fa78695bc ConTeXt writer:
+ Don't use \(sub)+subject if header level > 5.
+ Modified tests to conform to new treatment of level 4 and 5 headers.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1083 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-17 23:34:16 +00:00
fiddlosopher
09b57fcf9c Adjusted formatting of LaTeX and ConTeXt footnotes:
- in ConTeXt, % is not needed at end of line before note, since
  space is gobbled.
- beginning of footnote indented four spaces.
- this required an additional parameter in wrappedTeX and
  wrapTeXIfNeeded, in Text.Pandoc.Shared.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1080 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-17 18:42:11 +00:00
fiddlosopher
a487bbb5a9 Updated tests for changes in LaTeX and ConTeXt writers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1073 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-15 03:21:10 +00:00
fiddlosopher
fe684764e6 Reverted back to state as of r1062. The template haskell changes
are more trouble than they're worth.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1064 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03 23:27:58 +00:00
fiddlosopher
4a841bfc54 Use template haskell to avoid the need for templates:
+ Added library Text.Pandoc.Include, with a template haskell
  function $(includeStrFrom fname) to include a file as a string
  constant at compile time.
+ This removes the need for the 'templates' directory or Makefile
  target.  These have been removed.
+ The base source directory has been changed from src to .
+ A new 'data' directory has been added, containing the ASCIIMathML.js
  script, writer headers, and S5 files.
+ The src/wrappers directory has been moved to 'wrappers'.
+ The Text.Pandoc.ASCIIMathML library is no longer needed, since
  Text.Pandoc.Writers.HTML can use includeStrFrom to include the
  ASCIIMathML.js code directly.  It has been removed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1063 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03 22:14:03 +00:00
fiddlosopher
40fa01765b Cleaned up LaTeX footnotes:
+ Footnotes start on a separate line.  A comment % is used
  at the end of the previous line to prevent unwanted spaces.
  This makes footnotes easier to see, delete, and move around.
+ The final } now only appears on a separate line if it needs to
  (i.e. if the note ends with a Verbatim environment).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1061 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-01 17:32:59 +00:00
fiddlosopher
8144c54f82 Improvements to RST reader:
+ Allow field lists to be indented.
+ Parse the contents of field lists instead of treating them as
  raw strings.
+ Represent field lists as definition lists rather than blockquotes.
+ Fixed bug in which metadata would be overridden if the document
  contained more than one field list.
+ Parse fields associated with ..image: blocks, and use the 'alt'
  field, if present, for image alt text and title.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1050 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-13 21:39:17 +00:00
fiddlosopher
ad9603231f Fixed bug in RST reader: previously, code blocks had to be
indented a full tabstop, but RST allows any amount of indentation.
Resolves Issue #27.

+ removed 'variable' parameter from indentedBlock function in
  RST reader, as it is no longer needed
+ updated test suite
+ updated changelog


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1046 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-11 05:50:28 +00:00
fiddlosopher
f8eac5b377 Markdown writer: Don't print title attribute if title is empty.
(This differs from the behavior of Markdown.pl, and agrees with PHP
Markdown.  But John Gruber has indicated that he prefers this behavior.)
Adjusted test suite accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1026 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-18 01:35:50 +00:00
fiddlosopher
9cadf53621 + Fixed bug in RST writer's handling of ordered lists. Previously,
list items with multiple lines would not always line up with single-line
  list items.  Now, list items are nested the length of the list marker + 1.
  This looks better and ensures that list items all line up.  (Note that
  list markers are padded to the length of the longest list marker in the
  series.)
+ Use 3-space indent for unordered lists.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1013 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-10 23:44:21 +00:00
fiddlosopher
2ea3e94957 Added xmlns attribute to html element in html writer tests.
This attribute is added by more recent versions of the
xhtml library, including the one that comes with GHC 6.6.1.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1003 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 03:02:01 +00:00
fiddlosopher
f6043ef7bf Added separate latex reader and native reader tests;
removed round-trip tests.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@986 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-01 20:54:39 +00:00
fiddlosopher
7ff2706838 Removed extra blank lines at end of LaTeX writer tests.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@966 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-30 22:49:41 +00:00
fiddlosopher
18f150c020 Modified latex writer tests for new latex writer using prettyprinter.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@963 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-30 20:34:24 +00:00
fiddlosopher
902d6c7115 Fixed bug in LaTeX writer: autolinks would not cause
'\usepackage{url}' to be put in the document header.
Also, changes to state in enumerated list items would be
overwritten.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@947 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 00:03:45 +00:00
fiddlosopher
f609755cb6 Fixed bug in LaTeX writer. When a footnote ends with a Verbatim
environment, the close } of the footnote needs to occur on the same
line or an error occurs.  Fixed by adding a newline before the close }
in every footnote.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@897 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 18:17:01 +00:00
fiddlosopher
3de1f19b43 Removed incorrect "{}" around style information in
HTML tables.  Adjusted test suite accordingly.  Column
widths now work properly in HTML.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@882 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-23 23:20:54 +00:00
fiddlosopher
f11360f50e Added new rule for enhanced markdown ordered lists: if the list marker
is a capital letter followed by a period (including a single-letter
capital roman numeral), then it must be followed by at least two spaces.
The point of this is to avoid accidentally treating people's initials as
list markers: a paragraph may begin:

    B. Russell was an English philosopher.

and this shouldn't be treated as a list.

Modified Markdown reader and README documentation.
Added a test case.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@880 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-23 04:25:09 +00:00
fiddlosopher
e48f046aa0 + Fixed bug in markdown ordered list parsing. The problem was
that anyOrderedListStart did not check for a space following the
  ordered list marker. So, 'A.B. 2007' would be parsed as a list item,
  then fail because of the lack of space after 'A.' (required by
  orderedListStart). Resolves Issue #22.
+ Fixed a similar problem in RST reader.
+ Added regression test.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@861 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-18 15:26:29 +00:00
fiddlosopher
e814a3f6d2 Major change in the way ordered lists are handled:
+ The changes are documented in README, under Lists.
+ The OrderedList block element now stores information
  about list number style, list number delimiter, and
  starting number.
+ The readers parse this information, when possible.
+ The writers use this information to style ordered
  lists.
+ Test suites have been changed accordingly.

Motivation:  It's often useful to start lists with
numbers other than 1, and to have control over the
style of the list.

Added to Text.Pandoc.Shared:
+ camelCaseToHyphenated
+ toRomanNumeral
+ anyOrderedListMarker
+ orderedListMarker
+ orderedListMarkers

Added to Text.Pandoc.ParserCombinators:
+ charsInBalanced'
+ withHorizDisplacement
+ romanNumeral

RST writer:
+ Force blank line before lists, so that sublists will be handled
  correctly.

LaTeX reader:
+ Fixed bug in parsing of footnotes containing multiple paragraphs,
  introduced by use of charsInBalanced.  Fix: use charsInBalanced'
  instead.

LaTeX header:
+ use mathletters option in ucs package, so that basic unicode Greek
  letters will work properly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@834 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-08 02:43:15 +00:00
fiddlosopher
271c3f987e Use \url{} for autolinks in LaTeX writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@832 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-03 22:14:32 +00:00
fiddlosopher
de72aea6b4 Brought test suite up to date.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@828 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 19:15:30 +00:00
fiddlosopher
0928f650b1 Updated testsuite.native - autolinks should have the
URL in Code, not Str.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@812 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 02:42:14 +00:00
fiddlosopher
06208f4e25 LaTeX writer tests updated,
+ for new handling of verbatim environments
+ for change from textwidth to columnwidth in table output
  (so that tables look right in columnar output)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@811 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 02:32:28 +00:00
fiddlosopher
4283ce3662 Use ` as default character for \verb in LaTeX output.
If ` is in the content to be escaped, another symbol
will be used as before.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@806 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-27 22:52:11 +00:00
fiddlosopher
453dc53457 Fixes in LaTeX writer:
+ put \VerbatimFootnotes right before \title block, to avoid
  bad interactions.
+ added deVerb in description list.
+ removed \texttt{} from deVerb, because it cannot go in description
  lists.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@802 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-26 03:15:35 +00:00
fiddlosopher
831fe2c6cf Modified fancy s5 test in light of asciiMathML changes.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@798 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-26 02:17:30 +00:00
fiddlosopher
6a6b1a5842 Added support for definition lists to RST reader.
Added a relevant test to the test suite.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@782 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-23 01:35:03 +00:00
fiddlosopher
f69d9efc83 Added definition list support to HTML reader.
Added a test for definition lists to the html-reader test suite.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@781 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-23 01:21:21 +00:00
fiddlosopher
c1c30a7664 Updated RST reader test.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@778 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 21:32:26 +00:00
fiddlosopher
c9e89e1793 Updated test suite for writers, adding tests for
strikeout, superscript, subscript.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@766 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 18:49:23 +00:00
fiddlosopher
437ad4089e Updated latex writer test because of new system for
writing the preamble.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@761 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 16:30:29 +00:00
fiddlosopher
e80e2ee077 Fixed newline issue at end of man page writer test.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@760 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 16:27:52 +00:00
fiddlosopher
808ff29d19 Changed /hfil/break to /crlf in ConTeXt writer test suite.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@759 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 16:19:59 +00:00
fiddlosopher
9f38f9d039 Man writer:
+ Make sure to include "" if no section is specified
  in a man page TH line.
+ Updated man writer tests.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@758 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 16:17:20 +00:00
fiddlosopher
c14082cab2 Modified the test of a link containing an underscore in
both the label and the URL.  The underscore must be
backslash-escaped.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@730 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-15 23:54:02 +00:00
fiddlosopher
ad0d4bf41e Changes to ConTeXt test suite.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@726 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-15 17:04:37 +00:00