aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2007-11-06Modified build procedure to allow compilation with GHC 6.8:fiddlosopher7-35/+74
+ pandoc.cabal now uses Cabal configurations and requires Cabal >=1.2. + An alternative pandoc.cabal.ghc66 is provided for those who have older versions of Cabal. + Debian build process has been modified to use pandoc.cabal.ghc66, as a temporary measure until GHC 6.8 gets into debian unstable. + INSTALL instructions have been updated. + Makefile has been updated to accommodate changes in pandoc.cabal. + pandoc.cabal.ghc68 has been removed, since the default version now works with GHC 6.8. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1066 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-04Added a version of pandoc.cabal that works with GHC 6.8.1.fiddlosopher1-0/+62
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1065 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03Reverted back to state as of r1062. The template haskell changesfiddlosopher50-55/+7195
are more trouble than they're worth. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1064 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03Use template haskell to avoid the need for templates:fiddlosopher51-200/+137
+ Added library Text.Pandoc.Include, with a template haskell function $(includeStrFrom fname) to include a file as a string constant at compile time. + This removes the need for the 'templates' directory or Makefile target. These have been removed. + The base source directory has been changed from src to . + A new 'data' directory has been added, containing the ASCIIMathML.js script, writer headers, and S5 files. + The src/wrappers directory has been moved to 'wrappers'. + The Text.Pandoc.ASCIIMathML library is no longer needed, since Text.Pandoc.Writers.HTML can use includeStrFrom to include the ASCIIMathML.js code directly. It has been removed. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1063 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-01Updated changelog in light of last change.fiddlosopher1-0/+5
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1062 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-01Cleaned up LaTeX footnotes:fiddlosopher2-18/+19
+ Footnotes start on a separate line. A comment % is used at the end of the previous line to prevent unwanted spaces. This makes footnotes easier to see, delete, and move around. + The final } now only appears on a separate line if it needs to (i.e. if the note ends with a Verbatim environment). git-svn-id: https://pandoc.googlecode.com/svn/trunk@1061 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-29Fixed bug in parsing files that begin with blank lines.fiddlosopher3-7/+7
+ In Text.Pandoc.Shared: rewrote lineClump to parse EITHER a string of blank lines OR a string of nonblanks. Removed code for parsing eof. + In Markdown and RST readers, use 'manyTill (... <|> lineClump) eof' instead of many, since lineClump no longer parses eof. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1057 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-28Modified specialChar in LaTeX reader so that '"'fiddlosopher2-1/+5
characters are parsed and do not cause an error. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1056 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-27Updated changelog to reflect change to fromUTF8.fiddlosopher1-0/+4
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1055 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-27Modified fromUTF8 to strip out the BOM (byte order marker)fiddlosopher1-0/+1
wherever it is present. See http://en.wikipedia.org/wiki/Byte_Order_Mark and http://six.pairlist.net/pipermail/markdown-discuss/2007-October/000874.html. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1054 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-18'--no-wrap' option now prevents the addition of structural whitespacefiddlosopher4-9/+17
in HTML output, minimizing the file size. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1053 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-15Removed 'version' constant from Main.hs; added 'pandocVersion' to Text.Pandoc.fiddlosopher3-4/+9
This way all programs that use pandoc libraries will have access to the version number. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1052 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-13Updated changelog.fiddlosopher1-3/+15
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1051 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-13Improvements to RST reader:fiddlosopher3-34/+81
+ Allow field lists to be indented. + Parse the contents of field lists instead of treating them as raw strings. + Represent field lists as definition lists rather than blockquotes. + Fixed bug in which metadata would be overridden if the document contained more than one field list. + Parse fields associated with ..image: blocks, and use the 'alt' field, if present, for image alt text and title. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1050 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-13Save and restore position in parseFromString, so that it doesn'tfiddlosopher1-0/+2
mess up accurate error location reporting. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1049 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-12Undid last change: instead of blocking the internal links in thefiddlosopher2-3/+0
writers, it makes more sense to block them in the HTML reader. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1048 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-11Man writer: Don't print link source for internal links (#...).fiddlosopher2-0/+3
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1047 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-11Fixed bug in RST reader: previously, code blocks had to befiddlosopher3-14/+13
indented a full tabstop, but RST allows any amount of indentation. Resolves Issue #27. + removed 'variable' parameter from indentedBlock function in RST reader, as it is no longer needed + updated test suite + updated changelog git-svn-id: https://pandoc.googlecode.com/svn/trunk@1046 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-07Makefile:roktas2-4/+8
- New variables to make use in debian/rules: DATADIR, DOCDIR. Cabal uses $prefix/pandoc-$VERSION/doc for the documentation files, where as the Debian package uses $prefix/doc/pandoc. We need these variables to resolve the conflict. debian/rules: - Set and export DATADIR, DOCDIR which controls the installation of document files at install-program target. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1045 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-07Changes in debian/changelog:roktas1-2/+9
- Use "Closes" phrase to mark the related bug as "done" upon uploading. - Add signature and comment on changes in Makefile. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1044 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-07Changes in Makefile:roktas1-79/+63
- For generic installations, use $prefix/share/pandoc-$VERSION/doc directory to put all the documentation files. This fixes the issue of having two copies of the library documentation (one in $prefix/share/pandoc-doc, the other is in $prefix/share/pandoc-$VERSION). - Remove uninstall-lib-doc target and move the relevant code to uninstall-all target. Add extra code to remove the html directory. These changes fix the issue of leaving the library documentation in $prefix/share/pandoc-$VERSION uninstalled. - Remove the confusing NAME and THIS variables and create new variables: PKG (same as THIS), and PKGID ($PKG-$VERSION = $THIS-$VERSION). Remove RELNAME (which is equal to PKGID). All these changes simplified things a bit in "Cabal constants" section and uninstall-all target. - Remove some Cabal constants for the sake of simplicity and add a few new ones: PKGDATAPATH and PKGDOCPATH. We at least need a PKGDOCPATH variable to install DOCS, as Cabal doesn't provide a command for this target (hence, install-doc). I wish to set this variable by using ghc-pkg (just like libdir in install-all), but this seems a bit difficult to me, as there is no docdir variable in .installed-pkg-config and we would have to resort to an unclean hack which extracts docdir from haddock-dir. - Keep all non-critical steps (i.e. rmdir) quiet to reduce noise. - Ensure to use stderr for all messages. - Avoid forking a subshell in $(web_dest). - A few unrelated cosmetic changes. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1043 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-06Updated debian/changelog.fiddlosopher1-0/+102
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1042 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-06New MacPorts Portfile template. Installs pandoc programs and libraries.fiddlosopher1-12/+17
Note that 'make install-all' cannot be used to install the libraries, because registration must be done after the files are copied out of the destroot. So a custom install procedure is included in the Portfile. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1041 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-04Added libghc6-network-dev, libghc6-xhtml-dev, and libghc6-mtl-dev asfiddlosopher1-1/+1
dependencies for libghc6-pandoc-dev. Addresses Debian Bug #445235. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1040 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-02Modified html2markdown. Previously html2markdown piped all inputfiddlosopher1-10/+15
through html tidy before passing it to pandoc. This causes problems on certain sites (e.g. daringfireball.com/markdown) which have well-formed xhtml that causes tidy to choke. Solution is to try pandoc on the original HTML, and run it through tidy only if that fails. This means that a temp file is now always used, even when input comes from a local file or standard input. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1039 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-30Add default value for URL in html2x.txt.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1038 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-29Added link to /pandoc/try on web page.fiddlosopher1-1/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1037 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-27Fixed bug in markdown writer: If an ordered list item began withfiddlosopher1-1/+5
a marker greater than 3 characters in width, and the item took more than one line, it would appear on the line after the list marker, e.g.: (12) My list item. Multiline. Now it works as follows: (12) My list item. Multiline. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1036 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-27Documented '--no-wrap' option in README and man pages.fiddlosopher3-0/+11
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1035 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-27Added a writer option for wrapped text and a command-line optionfiddlosopher6-23/+44
'--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-27Changed ref to MacPorts to point to the MacPorts DB entry for pandoc.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1033 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-25Fixed a bug in the Markdown writer: incorrect line wrapping in fiddlosopher1-2/+11
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-19Updated html2x.txt to reflect new location of script (in /cgi-binfiddlosopher1-9/+9
instead of /pandoc). git-svn-id: https://pandoc.googlecode.com/svn/trunk@1031 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-19Removed html2x.pl -- it belongs in its own repository.fiddlosopher1-40/+0
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1030 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-19RST writer: If label for a link reference contains a colon,fiddlosopher1-1/+4
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-18Fixed macports Portfile:fiddlosopher1-1/+29
+ 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-18Main (tabFilter):fiddlosopher1-1/+2
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-18Markdown writer: Don't print title attribute if title is empty.fiddlosopher2-2/+5
(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-18Markdown reader: require space before title in links and references.fiddlosopher1-5/+2
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-17Modified html2x.pl URL validation regex:fiddlosopher1-1/+1
+ 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-17Remove just one leading and one trailing newlinefiddlosopher1-3/+11
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-17Changed parsing of code blocks in HTML reader:fiddlosopher1-7/+8
+ <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-16Modified html2x webpage.fiddlosopher1-12/+17
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1021 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-16Added Google analytics tracking to website.fiddlosopher2-7/+15
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1020 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-15Fixed URL regex in html2x.pl, and added a command to the pipefiddlosopher1-2/+4
to truncate input pages to 100K. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1019 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-15Added security measures to html2x.pl.fiddlosopher1-24/+28
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1018 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-15Added html2x demo to the website.fiddlosopher4-2/+89
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1017 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-15Simplified HTML attribute parsing (HTML reader).fiddlosopher1-10/+5
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1016 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-14Fixed two bugs in HTML reader:fiddlosopher1-11/+4
+ <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-13Changed pandoc home page to http://johnmacfarlane.net/pandoc/.fiddlosopher10-12/+12
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1014 788f1e2b-df1e-0410-8736-df70ead52e1b
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-16 09:53:20 +0000