Commit Graph
10211 Commits
Author SHA1 Message Date
fiddlosopher 5b888e8b3b Added a writer option for wrapped text and a command-line option
'--no-wrap', which disables text wrapping.  (Resolves Issue #26.)

+ Added support for '--no-wrap' to Main.hs.
+ Added wrapIfNeeded function to Text.Pandoc.Shared.
+ Use wrapIfNeeded instead of wrapped in the RST, Man, Docbook, and 
  Markdown writers.
+ Note:  Not yet implemented in HTML, LaTeX, or ConTeXt writers. 
  No documentation yet.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1034 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-27 01:23:44 +00:00
fiddlosopher fa45b970c9 Changed ref to MacPorts to point to the MacPorts DB entry for pandoc.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1033 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-27 01:20:05 +00:00
fiddlosopher 4f9814087e Fixed a bug in the Markdown writer: incorrect line wrapping in
paragraphs including hard line breaks.  Resolves Issue #25.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1032 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-25 05:43:38 +00:00
fiddlosopher b0ef5b5b65 Updated html2x.txt to reflect new location of script (in /cgi-bin
instead of /pandoc).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1031 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-19 03:12:37 +00:00
fiddlosopher 47f847e71f Removed html2x.pl -- it belongs in its own repository.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1030 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-19 03:11:59 +00:00
fiddlosopher d9dedf0813 RST writer: If label for a link reference contains a colon,
surround by ` signs so the colon won't be interpreted as the
end of the link label.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1029 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-19 01:15:20 +00:00
fiddlosopher 2b429e980e Fixed macports Portfile:
+ Do installation manually rather than using Makefile's install-all.
  (There appears to be a problem with the Makefile's handling of
  DESTDIR.)
+ Note that the library must be registered in the activate phase, after
  the library files have been copied out of the destroot.  Cabal
  generates a 'register.sh' script that will do this.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1028 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-18 15:23:20 +00:00
fiddlosopher 87fb10a316 Main (tabFilter):
Treat '\r' at end of line as newline (in addition to '\r\n' and '\n').


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1027 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-18 06:48:36 +00:00
fiddlosopher f8eac5b377 Markdown writer: Don't print title attribute if title is empty.
(This differs from the behavior of Markdown.pl, and agrees with PHP
Markdown.  But John Gruber has indicated that he prefers this behavior.)
Adjusted test suite accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1026 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-18 01:35:50 +00:00
fiddlosopher fbb048238e Markdown reader: require space before title in links and references.
This fixes a bug in parsing URLs like http://silly/url(withparen).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1025 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-18 01:34:36 +00:00
fiddlosopher 78ff2d2fee Modified html2x.pl URL validation regex:
+ allow port number in URL
+ allow : in URL path


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1024 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-17 19:55:22 +00:00
fiddlosopher 65047e354a Remove just one leading and one trailing newline
from contents of <pre>...</pre> in codeBlock parser.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1023 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-17 03:08:14 +00:00
fiddlosopher 6f16d52c11 Changed parsing of code blocks in HTML reader:
+ <code> tag is no longer needed.  <pre> suffices.
+ all HTML tags in the code block (e.g. for syntax highlighting)
  are skipped, because they are not portable to other output formats.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1022 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-17 02:49:28 +00:00
fiddlosopher 2094534b3c Modified html2x webpage.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1021 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-16 19:40:17 +00:00
fiddlosopher e00b892bf6 Added Google analytics tracking to website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1020 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-16 16:58:04 +00:00
fiddlosopher 9ed11f4500 Fixed URL regex in html2x.pl, and added a command to the pipe
to truncate input pages to 100K.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1019 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-15 21:30:31 +00:00
fiddlosopher bf100f8276 Added security measures to html2x.pl.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1018 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-15 03:15:27 +00:00
fiddlosopher b5819b8ed6 Added html2x demo to the website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1017 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-15 01:53:49 +00:00
fiddlosopher d5b7257d7f Simplified HTML attribute parsing (HTML reader).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1016 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-15 00:44:32 +00:00
fiddlosopher 28c2ee396c Fixed two bugs in HTML reader:
+ <code>...</code> not surrounded by <pre> should count as
  inline HTML, not code block.
+ parser for minimized attributes should not swallow trailing spaces


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1015 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-14 22:40:28 +00:00
fiddlosopher 85f655c8cb Changed pandoc home page to http://johnmacfarlane.net/pandoc/.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1014 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-13 17:26:01 +00:00
fiddlosopher 9cadf53621 + Fixed bug in RST writer's handling of ordered lists. Previously,
list items with multiple lines would not always line up with single-line
  list items.  Now, list items are nested the length of the list marker + 1.
  This looks better and ensures that list items all line up.  (Note that
  list markers are padded to the length of the longest list marker in the
  series.)
+ Use 3-space indent for unordered lists.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1013 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-10 23:44:21 +00:00
fiddlosopher 4b4060b8ef Simplified parsing of reference keys and notes in markdown and RST
readers:
+ The Reference data structure from Text.Pandoc.Shared is no longer
  needed, since
+ referenceKey and noteBlock parses return strings (as many blank lines
  as are occuried by the key or note) and update state themselves.
+ getPosition and setPosition are now used to ensure that error messages
  will give the correct line number.
+ This yields cleaner (and slightly faster) code, with more accurate
  parsing error messages.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1012 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-05 23:55:38 +00:00
fiddlosopher d5e8ab71a4 HTML writer: Don't produce HTML for table of contents if
there are no headers.  (This would be an empty list, which is
invalid XHTML.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1011 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-05 02:16:50 +00:00
fiddlosopher 9726ec04f5 Bumped version to 0.45.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1010 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-05 02:16:05 +00:00
fiddlosopher 9ce29d2a67 Updated website with news of 0.43.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1008 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 18:27:24 +00:00
fiddlosopher 4088ef9d36 Updated debian/changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1007 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 18:17:05 +00:00
fiddlosopher 175a7e27ee No need to add $(BUILDDIR) and $(BUILDCONF) to cleanup_files,
because they are removed automatically by '$(BUILDCMD) clean'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1006 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 18:06:38 +00:00
roktas 1142c88727 * The previous fix was wrong. Apply a proper fix and cross the fingers. :-)
+ On configure, compile 'Setup.hs' to 'setup' and use 'setup' as the build
    command instead of 'runhaskell', which, on some platforms (such as s390,
    alpha, m68k), throws the following error:
    	runhaskell Setup.hs configure --prefix=/usr
	ghc-6.6.1: not built for interactive use
    This causes a serious FTBFS bug.  Closes: #440668 (from Debian BTS).
  + Setup.hs: revert changes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1005 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 16:57:17 +00:00
roktas b13e696c93 * Urgent fix to address the following issue:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440668
  The below link of a similar bug explains things a bit more:
	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=431843#22


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1004 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 15:31:47 +00:00
fiddlosopher 2ea3e94957 Added xmlns attribute to html element in html writer tests.
This attribute is added by more recent versions of the
xhtml library, including the one that comes with GHC 6.6.1.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1003 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 03:02:01 +00:00
fiddlosopher bab51c6d44 Changed link to Arch PKGBUILD script on website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1002 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 17:52:55 +00:00
fiddlosopher d87b226f1f Bump version numbers to 0.44, which will be the next
bug-fix release (when enough bug fixes have accumulated).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1001 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 17:23:26 +00:00
fiddlosopher 4f3ad778ba HTML writer: put anchors around contents of headers, not around
the header tags themselves, when producing backlinks to TOC.
Resolves Issue #23.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1000 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 17:22:22 +00:00
fiddlosopher fcdbb7b058 Fixed CSS for website so headers linked back to TOC
don't have lines under them.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@999 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 17:21:09 +00:00
fiddlosopher 8c2ceebd72 Added note about Arch linux PKGBUILD script.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@998 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 16:57:29 +00:00
fiddlosopher 4647f6482e Small changes in website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@996 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 15:03:18 +00:00
fiddlosopher 65703dc39b Removed files no longer needed in website:
+ pandocwiki tarball
+ highlight.css


git-svn-id: https://pandoc.googlecode.com/svn/trunk@995 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 14:54:24 +00:00
fiddlosopher 4466607760 Fixed formatting mistakes in 0.43 news on website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@994 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 14:53:55 +00:00
fiddlosopher 7f8bac70d7 Added link to google code svn repository for pandocwiki, instead of
tarball.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@993 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 14:53:28 +00:00
fiddlosopher ed85501529 Added '-font monospace' to highlight command, so wretched
courier new won't be used in highlighted HTML and LaTeX in demos.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@992 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 14:52:36 +00:00
roktas 6a71ea1481 * debian/changelog: add signature
git-svn-id: https://pandoc.googlecode.com/svn/trunk@991 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 12:44:42 +00:00
fiddlosopher e2675ffcd4 Updated website with news of 0.43...
git-svn-id: https://pandoc.googlecode.com/svn/trunk@990 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 05:40:30 +00:00
fiddlosopher 4ddb156f4e Updated debian/changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@989 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 05:31:43 +00:00
fiddlosopher a70c2b261e Markdown writer: escape paragraphs that begin with ordered list
markers, so they don't get interpreted as ordered lists.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@988 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 00:39:56 +00:00
fiddlosopher 0982a67585 LaTeX command and environment names can't contain numbers.
LaTeX reader updated accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@987 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 00:36:44 +00:00
fiddlosopher f6043ef7bf Added separate latex reader and native reader tests;
removed round-trip tests.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@986 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-01 20:54:39 +00:00
fiddlosopher 25bbe134cb Skip notes parsing if running in strict mode. (This yields a nice
speed improvement in strict mode.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@983 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-01 20:26:40 +00:00
fiddlosopher 76d462c1cd Simplify autolink parsing code, using Network.URI to test for
URIs.  Added dependency on network library to debian/control
and pandoc.cabal.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@982 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-01 17:22:22 +00:00
fiddlosopher f8f9fa49d6 More perspicuous definition of nonindentSpaces.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@981 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-01 16:08:47 +00:00