Commit graph

1677 commits

Author SHA1 Message Date
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
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
fiddlosopher
af46691a20 Makefile: specify --template explicitly when using pandoc.
Reason:  pandoc may not yet have been installed, so the
templates may not be in the cabal data directory.
Resolves Issue #192.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1792 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-03 08:24:59 +00:00
fiddlosopher
dba0b40e2e Removed unneeded dependency on template-haskell.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1791 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-03 08:24:54 +00:00
fiddlosopher
6c2cf70fb0 Changed default of writerXeTeX to False.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1790 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-02 21:09:29 +00:00
fiddlosopher
a5110bec7b Latex template: only show \author if there are some...
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1789 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-02 21:05:10 +00:00
fiddlosopher
945ae2b252 Added to RELEASE_CHECKLIST - compile trypandoc.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1788 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-02 20:18:51 +00:00
fiddlosopher
a0a6616e16 Web makefile: Use rsync to upload website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1787 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-02 19:24:11 +00:00
fiddlosopher
adc5669778 Web: annouce 1.4 release.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1786 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-02 19:24:06 +00:00
fiddlosopher
9e8b95c49e Web makefile: build markdown2pdf man page.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1785 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-02 19:24:01 +00:00
fiddlosopher
47d77ce3bd Added note on markdown2pdf changes.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1783 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-02 18:59:11 +00:00
fiddlosopher
3fff3a383c changelog: noted addition of wrappers to windows installer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1782 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-02 18:59:06 +00:00
fiddlosopher
9070777091 markdown2pdf.hs: throw error if pandoc --dump-args does.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1781 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-02 18:19:28 +00:00
fiddlosopher
77396199e7 markdown2pdf.hs: When --toc, run latex an extra time.
Previously --toc was broken.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1780 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-02 18:19:24 +00:00
fiddlosopher
1e0c8e21cf pandoc.hs: warn of deprecated options after --dump-args has exited.
Otherwise we mess up the wrappers that look at the output of
--dump-args.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1779 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-02 18:19:19 +00:00
fiddlosopher
3f4d06d015 Include markdown2pdf and hsmarkdown in windows binary package.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1778 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-02 18:19:14 +00:00
fiddlosopher
cbb0229046 Changed example14 in web demos to use template & xetex instead of -C.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1777 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-02 18:19:09 +00:00