Commit graph

277 commits

Author SHA1 Message Date
John MacFarlane
8f408e4b7b Added --ascii option.
Currently supported only in HTML writer.
2011-02-06 09:27:03 -08:00
John MacFarlane
79a0fbe146 HTML writer: Put line breaks in section divs. 2011-02-05 11:27:25 -08:00
John MacFarlane
6c0e86d144 HTML writer: stringify alt text.
Previously, if you had formatting in the label of an Image
element, you'd get escaped HTML in the alt attribute.  Now
you just get a plain string version, which seems preferable.
2011-02-05 08:16:34 -08:00
John MacFarlane
bdf23d3a5d Improved HTML table output (line breaks). 2011-02-04 23:35:10 -08:00
John MacFarlane
58929eb4e5 More changes to HTML output.
Removed blank lines.  More consistent format.
2011-02-04 23:03:38 -08:00
John MacFarlane
ce4f9a3787 HTML writer: Spacing adjustments for Plain and RawHtml blocks. 2011-02-04 21:05:48 -08:00
John MacFarlane
99cb6076f8 Improved new HTML format; restored original --no-wrap behavior. 2011-02-04 20:12:17 -08:00
John MacFarlane
f9dcea6655 HTML writer: More normal line breaks.
Also removes any distinction between --no-wrap and default HTML
output.

Resolves Issue .
2011-02-04 18:37:02 -08:00
John MacFarlane
22969c1b9c HTML writer: avoid doubled <code> tag for highlighted inline code. 2011-01-29 16:11:16 -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
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
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
53eb2c4828 HTML writer: Add ids to <section> tags. 2011-01-15 22:35:25 -08: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
John MacFarlane
e8ad4ba43c Preliminary support for HTML5.
+ Added writerHtml5 writer option.
+ Added --html5 option.
+ Added support for lang in html tag (so you can do
  'pandoc -s --V lang=en', for example).
+ Updated html template with conditionals for HTML5.
+ When HTML5 selected, use <header> tag around title in document,
  and use <section> tags instead of <div>s if --section-divs
  specified.
2011-01-11 21:18:46 -08:00
Paul Rivier
e6dde36622 removed support for textile Inserted construct 2010-12-03 23:10:51 -08:00
paul.rivier
d532c72c5b Basic Textile Reader 2010-12-03 23:10:50 -08:00
John MacFarlane
bd24e83c81 --mathjax: Use mathjax with raw latex rather than mathml.
It seems to work better, and the default config can be used.
2010-10-31 18:55:35 -07:00
John MacFarlane
9cf27c92c1 Added support for MathJax for displaying math in HTML.
Added --mathjax option.
Added MathJax to HTMLMathMethod.
Supported MathJax in HTML writer.

Resolves Issue .
2010-10-26 21:07:51 -07:00
John MacFarlane
6ccdde5571 gladTeX HTML - specify ENV for display or inline.
Thanks to Jonathan Daugherty for the patch.

The gladTeX program gives finer control over the LaTeX environment
used to render its input.  The latest version (1.1) uses the
"displaymath" environment by default, which is nice for large,
block-level equations, but it isn't so nice for inline math (where
"math" is more appropriate).  This patch causes the HTML writer to
differentiate between the two by explicitly setting the LaTeX
environment on the generated EQ tag.
2010-08-01 08:30:04 -07:00
John MacFarlane
851d39f8f8 Improved cutUp function, removed extra </div> 2010-07-22 23:23:47 -07:00
John MacFarlane
a11b530935 Moved s5 writing from S5 module to HTML.
Now s5 is handled in more or less the same way as slidy,
as a variant of HTML.
2010-07-22 22:58:48 -07:00
John MacFarlane
5fd1389263 Slidy writer: Avoid spurious blank page. 2010-07-22 17:28:15 -07:00
John MacFarlane
465a4a6699 Slidy writer: create new slide at every level 1 header. 2010-07-18 23:06:22 -07:00
John MacFarlane
85f8c51b64 Use default highlighting CSS rather than embedding CSS in templates. 2010-07-16 00:23:13 -07:00
John MacFarlane
9be9bccfcf Added --section-divs option.
+ Header identifiers now get attached to the headers, unless
  --section-divs is specified, in which case they are added to
  enclosing divs. By default, the divs are not added.
+ Resolves Issue , .
2010-07-15 22:26:45 -07:00
John MacFarlane
57a91f3b6a Added --webtex option for HTML math.
+ Added --webtex command-line option, with optional parameter.
  (Defaults to using google charts API.)
+ Added WebTeX HTMLMathMethod.
+ Removed MimeTeX HTMLMathMethod.  (WebTeX is generic and subsumes it.)
+ Modified --mimetex option to use WebTeX.
+ Thanks to lpeterse for the idea and some of the code.
2010-07-15 19:01:00 -07:00
John MacFarlane
255aa7eb6e Improved Slidy writer.
We now carve up slides at HorizontalRules, rather than by level-1
headers. This gives the user lots of flexibility.
2010-07-13 23:41:18 -07:00
John MacFarlane
9b833e8744 Added a slidy writer.
Resolves Issue .
2010-07-13 20:44:56 -07:00
John MacFarlane
1cd99f9880 Addendum to the fix to issue .
The previous fix resulted in bird tracks being included in
both html and html+lhs renderings of literate haskell sections
when pandoc was compiled without highlighting support. This change make
pandoc without highlighting behave like pandoc with highlighting: the
bird tracks are used only if html+lhs output is specified.
2010-07-07 10:28:25 -07:00
John MacFarlane
d0be7ca8cb Add birdtracks to lhs in HTML when compiled wo -fhighlighting.
Resolves Issue .  Previously the bird tracks would be
stripped off when pandoc was not compiled with highlighting support,
even if -t html+lhs was specified.

Thanks to Nicholas Wu for pointing out the problem.
2010-06-28 19:49:07 -07:00
John MacFarlane
09ca37bd62 Don't escape URIs in HTML writer.
This should be done in the readers instead.
2010-03-23 14:02:37 -07:00
John MacFarlane
1aeb7d23ad Updated copyright notices. 2010-03-23 13:31:09 -07:00
John MacFarlane
71eac37ac5 Fixed treatment of unicode characters in URIs.
* Added stringToURI to Shared.  This is used in the HTML
  writer for all URIs.  It properly URI-encodes high
  characters (> 127), leaving everything else (including
  symbols and spaces) the same.

* Modified unsanitaryURI to allow UTF8 characters in a URI.
  (First, we convert the URI to URI-encoded octets, then we
  pass through parseURIReference.)
  This resolves gitit Issue . Previously
  '[abc](http://gitit.net/测试)' would not be rendered as
  a link when --sanitize was selected.
2010-03-23 00:33:50 -07:00
John MacFarlane
483a591eba HTML writer: fixed error in Math writer that caused infinite loop. 2010-03-21 22:48:47 -07:00
fiddlosopher
1547728d7e HTML writer: Don't include TOC div if table of contents is empty.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1922 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-20 17:14:18 +00:00
fiddlosopher
56217f1004 Added --mathml option; removed Text.Pandoc.LaTeXMathML.
* Added data/MathMLinHTML.js, which is included when no URL is provided
  for --mathml.  This allows MathML to be displayed in better browsers,
  as text/html.
* The module was no longer necessary; its functionality (two lines)
  was incorporated into pandoc.hs.
* Consolidated the two LaTeXMathML.js files into one.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1909 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 06:45:56 +00:00
fiddlosopher
a9b0d876d9 HTML writer: Use a p rather than a div for image caption.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1900 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 02:39:06 +00:00
fiddlosopher
cb31c89eab HTML writer: implemented image-with-caption feature.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1891 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-16 04:06:25 +00:00
fiddlosopher
3b9be92492 Use template variables for include-before/after.
* These options now imply -s; previously they worked also
  in fragment mode.
* Users can now adjust position of include-before and
  include-after text in the templates.
* Default position of include-before moved back (as it
  originally was) before table of contents.
* Resolves Issue .

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1883 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-13 04:11:24 +00:00
fiddlosopher
8382de28de HTML writer: Use tbody, thead, and cols in tables.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1875 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-10 06:19:53 +00:00
fiddlosopher
0943d24e47 HTML writer: Fixed multiline tables with no header.
In this case, the widths must be in the first table row.
In the process, simplified table generation code.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1864 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-07 19:35:14 +00:00
fiddlosopher
66d2fe3dd2 HTML, LaTeX writer: Don't print header row in headerless table.
Resolves Issue .

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1856 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-01 02:28:03 +00:00
fiddlosopher
2a4e5f9daa HTML writer: don't include empty UL if --toc but no sections.
Resolves Issue .

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1799 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-09 03:13:08 +00:00
fiddlosopher
41aff1cf55 HTML writer: Use functions from XML module to escape strings.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1768 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-01 04:11:54 +00:00
fiddlosopher
87c66d4623 Finished converting HTML writer to use unicode instead of entities.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1767 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-01 04:11:48 +00:00
fiddlosopher
709de16223 Use UTF8 instead of entities in HTML.
Resolves Issue .

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1744 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 02:06:52 +00:00
fiddlosopher
e620eab478 HTML footnotes: put anchor inside sup, instead of other way.
Resolves Issue .  Thanks to infinity0x for suggesting.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1743 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:47:08 +00:00
fiddlosopher
7baa79597e Use $for$ for --css option in HTML writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1721 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:15:42 +00:00
fiddlosopher
d5907b3034 Made renderTemplate polymorphic; added TemplateTarget class.
Now renderTemplate can return an Html, a Doc, a ByteString, or
a String.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1712 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:14:35 +00:00