Commit graph

879 commits

Author SHA1 Message Date
fiddlosopher
e37df6db69 Fixed bug in the markdown reader: HTML preceding a code block
could cause it to be parsed as a paragraph.  (The problem is that
the HTML parser used to eat all blank space after an HTML block,
including the indentation of the code block.)  Resolves Issue #39.
+ In Text.Pandoc.Readers.HTML, removed parsing of following space
  from rawHtmlBlock.
+ In Text.Pandoc.Readers.Markdown, modified rawHtmlBlocks so that
  indentation is eaten *only* on the first line after the HTML
  block.  This means that in
  <div>
       foo
  <div>
  the foo won't be treated as a code block, but in
  <div>

      foo

  </div>
  it will.  This seems the right approach for least suprise.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1164 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-31 01:02:44 +00:00
fiddlosopher
ad5cbb78d0 HTML reader: Finished fixing Issue #40.
Contents of script tags were still being treated as markdown when
the script tags were parsed as inline.  Fixed by moving "script"
from the list of tags that can be either block or inline to the
list of block tags.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1163 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-31 00:45:54 +00:00
fiddlosopher
d989a78b3b HTML reader: Don't interpret contents of style tags as markdown.
Resolves Issue #40.
+ Added htmlStyle, analagous to htmlScript.
+ Use htmlStyle in htmlBlockElement and rawHtmlInline.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1162 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-31 00:05:03 +00:00
fiddlosopher
6e1a652429 Fixed bug in HTML reader: it was looking for <IT> tag, not <I>.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1161 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-30 02:21:01 +00:00
fiddlosopher
6c1f9c8e39 Made LaTeX reader properly recognize --parse-raw in rawLaTeXInline.
Updated LaTeX reader test to use --parse-raw.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1160 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-30 02:07:55 +00:00
fiddlosopher
a465c4f659 Changed handling of titles in HTML writer so you don't get "titleprefix - "
followed by nothing.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1159 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-29 21:11:33 +00:00
fiddlosopher
5e65598b9e Use wrappers around Doc elements to ensure proper spacing in ConTeXt writer.
Each block element is wrapped with either Pad or Reg.  Pad'ed elements are
guaranteed to have a blank line in between.  Updated ConTeXt tests.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1158 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-29 09:31:45 +00:00
fiddlosopher
f74dda27b6 Markdown reader: Make 'block' conditional on strictness state,
instead of using failIfStrict in block parsers. Use a different
ordering of parsers in strict mode: raw HTML block before paragraph.
This recovers performance that was lost in strict mode with r1154.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1157 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-29 06:30:12 +00:00
fiddlosopher
05cbdf04fd Markdown: better handling of parentheses in URLs and quotation marks in titles.
+ source parser first tries to parse URL with balanced parentheses;
  if that doesn't work, it tries to parse everything beginning with
  '(' and ending with ')'.
+ source parser now uses an auxiliary function source'.
+ linkTitle parser simplified and improved, under assumption that it
  will be called in context of source'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1156 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-24 04:22:41 +00:00
fiddlosopher
ee6f06ec05 Modified markdown reader to disallow links within links. (Resolves Issue #35.)
+ Replaced inlinesInBalanced with inlinesInBalancedBrackets, which instead
  of hard-coding the inline parser takes an inline parser as a parameter.
+ Modified reference and inlineNote to use inlinesInBalancedBrackets.
+ Removed unneeded inlineString function.
+ Added inlineNonLink parser, which is now used in the definition of
  reference.
+ Added inlineParsers list and redefined inline and inlineNonLink parsers
  in terms of it.
+ Added failIfLink parser.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1155 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-24 04:22:31 +00:00
fiddlosopher
97992e6f7b Improved handling of raw HTML in Markdown reader. (Resolves Issue #36.)
Tags that can be either block or inline (e.g. <ins>) should be treated
as block when appropriate and as inline when appropriate.  Thus, for
example,
  <ins>hi</ins>
should be treated as a paragraph with inline <ins> tags, while
  <ins>

  hi

  </ins>
should be treated as a paragraph within <ins> tags.
+ Moved htmlBlock after para in list of block parsers.  This ensures
  that tags that can be either block or inline get parsed as inline
  when appropriate.
+ Modified rawHtmlInline' so that block elements aren't treated as inline.
+ Modified para parser so that paragraphs containing only HTML tags and
  blank space are not allowed.  Treat these as raw HTML blocks instead.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1154 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-24 04:22:20 +00:00
fiddlosopher
dad8e16330 Changed failure message in anyHtmlBlockTag (minor change).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1153 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-24 04:22:08 +00:00
fiddlosopher
6802d287cf Modified rawHtmlBlock in HTML reader so it parses </html> and </body> tags.
This allows these tags to be handled correctly in Markdown.
HTML reader now uses rawHtmlBlock', which excludes </html> and </body>,
since these are handled in parseHtml.  (Resolves Issue #38.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1152 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-23 03:46:12 +00:00
fiddlosopher
fbecb49790 Modified 'source' parser in Markdown reader to allow backslash escapes in URLs.
So, for example, [my](/url\(1\)) yields a link to /url(1).  Resolves Issue #34.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1151 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-21 22:31:20 +00:00
fiddlosopher
48f2cc5600 Modified rules for HTML header identifiers to ensure legal identifiers.
+ Modified htmlListToIdentifier and uniqueIdentifier in HTML writer
  to ensure that identifiers begin with an alphabetic character.
+ The new rules are described in README.
+ Resolves Issue #33.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1150 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-21 19:25:54 +00:00
fiddlosopher
0681d1d3e7 Fixed handling of email addresses in markdown and reStructuredText.
Consolidated uri and email address parsers.  (Resolves Issue #37.)
+ New emailAddress and uri parsers in Text.Pandoc.Shared.
  uri parser uses parseURI from Network.URI.  emailAddress
  parser properly handles email addresses with periods in them.
+ Removed uri and emailAddress parsers from Text.Pandoc.Readers.RST.
+ Removed uri and emailAddress parsers from Text.Pandoc.Readers.Markdown.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1149 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-21 16:13:10 +00:00
fiddlosopher
246e5f9ea3 Bumped version number to 0.46.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1147 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-10 21:01:59 +00:00
fiddlosopher
46a2d9269c Added date to release note on website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1145 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-09 20:15:52 +00:00
fiddlosopher
7a68e64162 Use \{0,1\} instead of \? in sed, so it works on BSD/Mac OSX too.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1144 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-08 23:00:40 +00:00
fiddlosopher
0bf553142c Updated website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1143 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-08 23:00:35 +00:00
fiddlosopher
fa029799e6 Makefile website target: create changelog.txt, not changelog.
This ensures that browsers will treat it as text.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1142 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-08 23:00:28 +00:00
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
1fa54ab190 Updated debian/changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1140 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-06 00:36:44 +00:00
fiddlosopher
702bb47450 Added new HTML math demos to website. Revamped mkdemos.pl for simplicity.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1139 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-04 04:14:38 +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
13b1b87efc Improvements to LaTeX and ConTeXt footnote handling:
+ ConTeXt:  } at end of footnote now occurs on a new line when the
  footnote ends with \stoptyping, just as in LaTeX writer.
+ LaTeX and ConTeXt:  \footnote is no longer indented.  The indentation
  causes problems with wrapping, as it makes the line too long.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1137 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-04 04:14:16 +00:00
fiddlosopher
3dc0a9141c If gladtex specified, don't prettyprint <EQ> tags, or gladtex gets confused.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1136 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-02 16:49:11 +00:00
fiddlosopher
af2ea8647b Small fix to error handling in TeXMath parser:
+ misc now parses anything but a '}' character
+ if there's a TeX parsing error, the string is included verbatim
  and no error is issued.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1135 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-02 16:29:14 +00:00
fiddlosopher
804756dd1f Removed note about public mimetex server from README.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1134 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-02 16:29:07 +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
defe18242b TeXMath parser: use emphasis only for letters, not numbers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1132 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-02 08:35:16 +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
d411b10438 Put math in HTML inside <span class="math">.
This way it can be distinguished from the surrounding text, e.g. put
in a different font.  Updated README accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1130 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-02 02:50:41 +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
8e872f9f7d Website: Added note about inclusion in Ubuntu Hardy Heron.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1128 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-02 00:36:09 +00:00
fiddlosopher
882c1bf66a Removed TODO.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1127 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-01 03:12:01 +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
ef028fee59 Added --gladtex and --mimetex options.
+ New HTMLMathMethod structure in WriterOptions keeps track of how to
  display math in HTML output.
+ If none of the special options are selected, default to displaying
  TeX math verbatim, with no enclosing $'s, in HTML.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1125 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-01 03:11:52 +00:00
fiddlosopher
6e079a67e8 Documented new --gladtex and --mimetex options, and new treatment of TeX math.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1124 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-01 03:11:47 +00:00
fiddlosopher
0b15448d64 Added HTMLMathMethod writer option.
This selects between asciimathml, mimetex, gladtex, and plain math.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1123 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-01 03:11:44 +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
b6f1ccc90b Small change to wording in README.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1121 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-01 03:11:35 +00:00
fiddlosopher
0814ee0e77 New version of ASCIIMathML.js.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1120 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-01 03:11:32 +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
03f4a665ff Changed all writers to handle new Math block element.
This allows TeX element to be handled differently (and in
many output formats, simply ignored).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1118 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:31 +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
576ddc1b99 Modified markdown reader for new Math block.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1115 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:17 +00:00
fiddlosopher
7f4fd9ab3d Modified LaTeX reader for new Math blocks.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1114 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:13 +00:00
fiddlosopher
53964297b5 Modified refsMatch for new Math block element.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1113 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:10 +00:00