Commit graph

1543 commits

Author SHA1 Message Date
fiddlosopher
b165e4c50c No longer need to set 'HOME' in RunTests.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1843 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-21 16:47:28 +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
f9c690849e Added tests/tables-rst-subset.native, part of RST tables patch.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1841 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-21 16:39:08 +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
e8a753edff Fixed minor error in README.
Thanks to Justin Bogner.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1839 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-12 03:16:42 +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
eecaec51f9 Removed refs to wrappers from website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1835 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-06 18:55:35 +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
645d5d48b9 Tweaked INSTALL instructions.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1833 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-04 02:57:43 +00:00
fiddlosopher
012c569f06 Updated INSTALL instructions.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1832 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-03 08:27:31 +00:00
fiddlosopher
d6642c322c Bump version to 1.5 since API has changed.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1831 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-03 05:53:49 +00:00
fiddlosopher
7414339e70 Updated markdown2pdf man page.
It no longer says all pandoc options are accepted.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1830 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-03 05:52:26 +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
14bc8ffc2e Removed spurious Makefile reference from README.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1828 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-03 05:48:40 +00:00
fiddlosopher
183ea8d839 Removed advice to pipe through tidy before HTML reader.
This is obsolete, now that we have a forgiving HTML parser.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1827 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-02 16:39:15 +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
00da8f49bf Removed ref to Makefile in cabal file.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1819 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-17 09:10:51 +00:00
fiddlosopher
5c65e7085f Deleted empty macports, freebsd directories.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1818 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-17 08:46:41 +00:00
fiddlosopher
0fb6a1b5af Removed obsolete Makefile.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1817 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-17 08:45:16 +00:00
fiddlosopher
d7f2d6c960 Website: renamed index.txt.in -> index.txt.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1816 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-17 08:45:12 +00:00
fiddlosopher
7cf373dd88 New batch file to make-windows-installer.
+ Removed old Makefile.windows
+ Added make-windows-installer.bat
+ Modified default installer name in pandoc-setup.iss

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1815 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-17 00:37:44 +00:00
fiddlosopher
811ef9a0b8 Removed freebsd and macports directories.
They are no longer up to date.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1814 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-17 00:28:56 +00:00
fiddlosopher
79a8862828 Added 'update' target to web/Makefile.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1813 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-17 00:28:48 +00:00
fiddlosopher
bd8ac75e51 Setup: Made man page building sensitive to build verbosity.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1812 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-17 00:28:42 +00:00
fiddlosopher
9b9c26c6e5 Setup.hs : -Wall and hlint cleanup.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1811 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-17 00:28:36 +00:00
fiddlosopher
d0879bcc13 Fixed RunTests so it doesn't require data files to have been installed.
The trick:  use 'pandoc --data-dir ..'

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1810 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-14 05:54:44 +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
385dcb116c Setup.hs: improved detection of highlighting support in test hook.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1808 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-14 05:54:24 +00:00
fiddlosopher
cc41e16285 Setup.hs: Install wrapper scripts into cabal bin directory.
Also simplified installManpages.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1807 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-12 07:02:36 +00:00
fiddlosopher
48c240de2d Setup.hs: install manpages to mandir.
Code borrowed from darcs.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1806 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-12 07:02:30 +00:00
fiddlosopher
abd73635a1 Removed obsolete debian stuff from distclean target.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1805 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-12 05:24:22 +00:00
fiddlosopher
bfba911b03 Removed obsolete win-pkg Makefile target.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1804 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-12 03:47:00 +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
58f32c1928 Version bump to 1.4.1.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1802 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-10 08:30:21 +00:00
fiddlosopher
bb570472de Updated changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1801 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-10 08:29:56 +00:00
fiddlosopher
96e0995258 Deprecated --custom-header in documentation.
Removed old "Custom Headers" section in README.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1800 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-10 02:40:08 +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
13a262af6a Windows installer - fixed bug in data file locations.
Resolves Issue #197.

+ Moved windows/makefile to Makefile.windows
+ Minor fixes in Makefile.windows
+ Use globbing to simplify pandoc-setup.iss
+ Put binaries in bin/ subdirectory of install dir
+ Specify null datafile subdirectory, so that data files
  go right in install dir, rather than in {installdir}/pandoc-{version}.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1798 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-09 02:53:05 +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
b4925d08c6 LaTeX template: always include hyperref package.
It is used not just for links but for toc, section heading bookmarks,
footnotes, etc.

Also added unicode=true on hyperref options.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1795 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-05 08:35:55 +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