Commit graph

621 commits

Author SHA1 Message Date
fiddlosopher
36a19e0f2e LaTeX reader: don't treat \section as inline LaTeX.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1885 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-13 07:03:26 +00:00
fiddlosopher
df6274e3d7 LaTeX reader: recognize nonbreaking space ~.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1884 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-13 04:30:27 +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 #217.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1883 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-13 04:11:24 +00:00
fiddlosopher
a35af5db29 OpenDocument writer: handle tables with no headers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1882 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-13 03:19:19 +00:00
fiddlosopher
533dd14f98 Man writer: properly handle headerless tables.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1881 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-13 03:19:13 +00:00
fiddlosopher
bc31d9fe28 Texinfo writer: fixed headerless tables.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1880 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-13 03:19:03 +00:00
fiddlosopher
a34afa91ef RST writer: Fixed headerless tables.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1879 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-11 03:01:27 +00:00
fiddlosopher
ea67219449 MediaWiki writer: fixed headerless tables.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1878 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-11 03:01:18 +00:00
fiddlosopher
df9d79cb81 RTF writer: fixed headerless tables.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1877 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-11 03:01:09 +00:00
fiddlosopher
3b9e7f36eb Markdown writer: proper support for headerless tables.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1876 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-10 07:34:10 +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
0cf4652ad6 Docbook writer: handle headerless tables.
In addition, use cols, thead, and tbody.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1874 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-09 04:34:07 +00:00
fiddlosopher
be34ad5b1d Markdown writer: Fixed citations.
Previously the markdown writer printed raw citation codes, e.g.
[geach1970], rather than the expanded citations provided by citeproc,
e.g. (Geach 1970).  Now it prints the expanded citations.  This means
that the document produced can be processed as a markdown document
without citeproc.  Thanks to dsanson for reporting, and arossato
for the patch.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1871 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-07 19:36:00 +00:00
fiddlosopher
53d8977886 ConTeXt writer: Don't use header in headerless table.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1868 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-07 19:35:41 +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
e9de86de2d Fixed docbook writer for headerless tables.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1863 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-07 19:35:06 +00:00
fiddlosopher
1f3b48c193 Markdown reader: Added p., pp., sec., ch., as abbreviations.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1861 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-06 04:08:34 +00:00
fiddlosopher
76e6c071d0 Disallow blank lines in inline code span.
Also added additional test cases for markdown code spans.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1860 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-06 02:42:15 +00:00
fiddlosopher
f5e00c50b8 Markdown reader: Allow footnotes to be indented < 4 spaces.
This fixes a regression.  A test case has been added in testsuite.txt.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1859 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-01 22:37:06 +00:00
fiddlosopher
66d2fe3dd2 HTML, LaTeX writer: Don't print header row in headerless table.
Resolves Issue #210.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1856 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-01 02:28:03 +00:00
fiddlosopher
77ba3429e2 Allow multi-line titles and authors in meta block.
Based on a patch by Justin Bogner.

Titles may span multiple lines, provided continuation lines
begin with a space character.

Separate authors may be put on multiple lines, provided
each line after the first begins with a space character.
Each author must fit on one line. Multiple authors on
a single line may still be separated by a semicolon.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1854 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-28 11:21:19 +00:00
fiddlosopher
36675bd206 Added accessors (docTitle, docAuthors, docDate) to Meta type.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1853 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-28 08:13:48 +00:00
fiddlosopher
76ab88807e RST reader: Improved grid tables.
+ Table cells can now contain multiple block elements, such
  as lists or paragraphs.
+ Table parser is now forgiving of spaces at ends of lines.
+ Added test cases.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1852 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-27 20:39:21 +00:00
fiddlosopher
ddcde4d543 Markdown reader: Use simpler approach for URLs - just escape spaces.
Markdown.pl doesn't URI-escape anything, so we won't do that either,
except for spaces, which can cause problems if not escaped.

Resolves Issue #220 and partially reverts r1847.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1851 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-27 04:59:34 +00:00
fiddlosopher
f2552cf382 Mediawiki writer: Don't print a "== Notes ==" header before references.
This is too English-centric. Writers can provide their own
header at the end of the document.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1850 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-27 03:57:24 +00:00
fiddlosopher
9089e54880 Promoted mediawiki headers.
= head = is now level 1, == head == level 2, etc.
This seems to be correct; it's only by convention that
wikipedia articles have level 2 headers at most.

Patch due to Eric Kow.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1849 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-27 03:57:11 +00:00
fiddlosopher
07ae5bc264 Markdown reader: properly escape URIs.
+ Resolves Issue #220.
+ Added escapeURI function to Markdown reader. This escapes
  links in a way that makes sense for markdown.  If they've
  used URI escapes like %20 in their link, these will be preserved.
  But if they've used a special character or space without escaping
  it, it will be escaped. This should make sense in most cases.
+ Previously pandoc collapsed adjacent spaces and replaced these
  sequences of spaces with + characters.  That isn't correct for
  a URI path (+ is to be used only in the query part).  We've also
  removed the space-collapsing behavior.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1847 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-27 03:06:39 +00:00
fiddlosopher
d3f1ddf57e LaTeX reader: handle \ (interword space).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1846 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-27 02:35:46 +00:00
fiddlosopher
4ded477409 LaTeX reader: allow any special character to be escaped.
Resolves Issue #221.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1845 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-26 23:57:41 +00:00
fiddlosopher
40ea955e23 Behave gracefully if HOME is not set.
If getAppUserDataDirectory raises an error, just use
the default data files.

Previously pandoc *assumed* HOME was set and would error out
if not.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1842 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-21 16:47:24 +00:00
fiddlosopher
c6b34574bf Incomplete support for RST tables (simple and grid).
Thanks to Eric Kow.
Note TODO for future improvement in RST reader code comments.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1840 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-20 08:30:34 +00:00
fiddlosopher
07f25fb13c LaTeX reader: treat \paragraph and \subparagraph as level 4, 5 headers.
Resolves Issue #207.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1838 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-12 03:03:23 +00:00
fiddlosopher
53ede0de5d HTML reader: handle spaces before <html>.
Resolves Issue #216.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1837 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-12 02:52:38 +00:00
fiddlosopher
0c21e4342c HTML reader: Be forgiving in parsing a bare list within a list.
The following is not valid xhtml, but the intent is clear:
<ol>
<li>one</li>
<ol><li>sub</li></ol>
<li>two</li>
</ol>

We'll treat the <ol> as if it's in a <li>.

Resolves Issue #215.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1836 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-12 02:47:24 +00:00
fiddlosopher
997ea5ea1d Removed html2markdown and hsmarkdown.
html2markdown is no longer needed, since you can pass URI arguments
to pandoc and directly convert web pages. (Note, however, that pandoc
assumes the pages are UTF8. html2markdown made an attempt to guess the
encoding and convert them.)

hsmarkdown is pointless -- a large executable that could be replaced
by 'pandoc --strict'.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1834 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-06 18:55:28 +00:00
fiddlosopher
6f0d4e49d1 Require two spaces after capital letter + period for list item.
Otherwise "E. coli" starts a list.  This might change the semantics
of some existing documents, since previously the two-space requirement
was only enforced when the second word started with a capital letter.
But it is consistent with the existing documentation and follows the
principle of least surprise.

Resolves Issue #212.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1829 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-03 05:48:46 +00:00
fiddlosopher
9fee73d2a3 Allow absolute URI as parameter (in this case, content is downloaded).
+ Adds dependency on HTTP.
+ If a parameter is an absolute URI, pandoc will try to
  get the content via HTTP.
+ So, you can do:  pandoc -r html -w markdown http://www.fsf.org

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1826 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-02 07:37:01 +00:00
fiddlosopher
19b0c72dd1 Made HTML reader much more forgiving.
+ Incorporated idea (from HXT) that an element can be closed
  by an open tag for another element.
+ Javascript is partially parsed to make sure that a <script>
  section is not closed by a </script> in a comment or string.
+ More lenient non-quoted attribute values.
  Now we accept anything but a space character, quote, or <>.
  This helps in parsing e.g. www.google.com!
+ Bare & signs are now parsed as a string.  This is a common
  HTML mistake.
+ Skip a bare < in malformed HTML.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1825 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-02 07:36:55 +00:00
fiddlosopher
70a7d7b214 LaTeX writer: set numbersections template variable.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1824 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-31 01:07:58 +00:00
fiddlosopher
f0bfbc5508 Made userdir arg of saveDocumentAsODT a Maybe.
This way it's consistent with other data file retrieval
functions.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1823 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-18 07:21:10 +00:00
fiddlosopher
4cdb4c0b36 Removed unneeded import.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1822 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-18 07:09:03 +00:00
fiddlosopher
b412a9cf4a Made user directory a Maybe in readFile, s5HeaderIncludes, laTeXMathML.
This is more uniform, and calling libraries can always disable
searching of user directories for overrides.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1821 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-18 07:01:29 +00:00
fiddlosopher
9fed26181f Rename getTemplate -> getDefaultTemplate.
(One reason is that getTemplate conflicts with a
function in yst.)

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1820 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-18 05:06:08 +00:00
fiddlosopher
eb851a41ca Added --data-dir option.
+ This specifies a user data directory. If not specified, will default
  to ~/.pandoc on unix or Application Data\pandoc on Windows.
  Files placed in the user data directory will override system default
  data files.
+ Added datadir parameter to readDataFile, saveOpenDocumentAsODT,
  latexMathMLScript, s5HeaderIncludes, and getTemplate.  Removed
  getDefaultTemplate.
+ Updated documentation.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1809 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-14 05:54:38 +00:00
fiddlosopher
fd7fe7d000 Added getTemplate to Text.Pandoc.Templates.
This allows the caller to select whether to allow user overrides
from the user data directory (~/.pandoc).

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

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1799 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-09 03:13:08 +00:00
fiddlosopher
66c4f90e09 markdown2pdf: always do at least two runs.
Reason:  hyperref bookmarks require this.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1797 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-05 08:36:08 +00:00
fiddlosopher
e1e9bfc004 LaTeX writer: Removed stLink, link template variable.
Reason: we now always include hyperref in the template.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1796 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-05 08:36:02 +00:00
fiddlosopher
d5d67f9657 Updated haddocks for changes in Meta type.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1794 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-04 02:27:24 +00:00
fiddlosopher
e91cb556d2 LaTeX writer: if book, report, or memoir documentclass, use \chapter{}
for first-level headers. Otherwise use \section{}.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1793 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-03 08:47:54 +00:00