Commit graph

6549 commits

Author SHA1 Message Date
fiddlosopher
ff93d50142 + Added --strip-trailing-cr option to diff in runtests.pl, so that
the test suite will work in Windows.
+ Converted some CR's to LF's in print.css and adjusted test suite
  accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@290 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-24 22:58:29 +00:00
fiddlosopher
618d2ff006 Changed default ASCIIMathML text color to black.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@289 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-24 16:45:17 +00:00
fiddlosopher
5dfab2cb48 + Updates to Makefile:
- New win-pkg target to build Windows binary package.
  - Changed name on OSX package.
  - New RELNAME global variable contains release name, e.g. pandoc-0.3
  - Mac dmg is now created in top-level directory, not ..
+ Updates to website:
  - Changed download links to point to Google Code downloads area.
  - Added section on Windows binary package.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@286 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-24 02:32:01 +00:00
roktas
a923f22443 Add rst2markdown to dh_strip exclude list.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@284 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-23 13:00:26 +00:00
roktas
2deea0966a Pandoc package didn't contain 'pandoc' executable. This is because we're
using "Simply expanded variables" and PROGS expands before EXECS.  Put
PROGS after EXECS to fix this bug.  As an alternative solution, we could 
make PROGS -and possibly others- "recursively expanded" variables, but I 
tend to avoid using that flavour of variables.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@283 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-23 12:37:31 +00:00
roktas
c113b24808 Fix the version of Debian packages, it should be "0.3" now.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@282 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-23 10:12:09 +00:00
roktas
7fe2018a46 Lintian complains as follows:
E: pandoc-doc: copyright-should-refer-to-common-license-file-for-gpl
  N:
  N:   The string "GNU General Public License" or "GPL" appears in the
  N:   copyright file for this package, but the copyright file does not
  N:   reference /usr/share/common-licenses as the location of the GPL on
  N:   Debian systems.
  N:
  N:   Refer to Policy Manual, section 12.5 for details.

Add a short note to copyright file just to make lintian happy (which is 
probably not the most elegant solution).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@281 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-23 10:08:31 +00:00
fiddlosopher
54a7700bcb Changed osx-pkg target in Makefile to refer to COPYRIGHT
instead of (obsolete) LICENSE.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@280 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22 20:27:32 +00:00
fiddlosopher
d829c4820a Merged changes from branches/wrappers since r177.
Summary of main changes:
+ Added -o/--output and -d/--debug options to pandoc.
+ Modified pandoc to behave differently depending on the name
  of the program.  For example, if the program name is 'html2latex',
  the default reader will be html and the default writer latex. 
+ Removed most of the old wrappers, replacing them with symlinks
  to pandoc.
+ Rewrote markdown2pdf and created a new wrapper web2markdown,
  with the functionality of the old html2markdown script.  These
  new scripts exploit pandoc's -d option to avoid having to do
  complex command-line parsing.
+ Revised man pages and documentation appropriately.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@279 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22 20:16:03 +00:00
fiddlosopher
cfaf0c178c Removed README-WINDOWS. Instead, we'll have the Makefile
tailor README to Windows (removing references to the wrappers,
for example).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@277 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22 18:53:13 +00:00
fiddlosopher
16708b174c Added README-WINDOWS with instructions to be included with
the binary distribution of Pandoc.  Still to be completed.
Perhaps this should also be hidden in a subdirectory eventually.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@275 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22 18:13:29 +00:00
fiddlosopher
aa3853f274 Removed some stray characters (form feeds?) from COPYING.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@274 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22 17:48:46 +00:00
fiddlosopher
129f259257 Added to COPYRIGHT a note that the source code is available from the
website, and a link.  This is necessary for GPL compliance in binary
distributions (as far as I can see).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@273 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-22 17:47:08 +00:00
fiddlosopher
aac442e761 Removed TODO. ToDo list now maintained on the Wiki at pandoc's
Google Code site.  (Also in the repository:  wiki/ToDo.wiki.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@266 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-21 20:21:40 +00:00
fiddlosopher
d2105f6693 + Added regression tests with footnotes in quote blocks and lists.
+ This uncovered an existing bug in the RTF writer, which got indentation
  wrong on footnotes occuring in indented blocks like lists.  Fixed
  this bug.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@263 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-21 19:33:57 +00:00
fiddlosopher
48b8267126 Fixed a serious bug in the Markdown reader (also affecting LaTeX
and RST readers).  The problem:  these readers ran 'runParser' on
processed chunks of text to handle embedded block lists in lists
and quotation blocks.  But then any changes made to the parser state
in these chunks was lost, as the state is local to the parser.
So, for example, footnotes didn't work in quotes or list items.

The fix:  instead of calling runParser on some raw text, use
setInput to make it the input, then parse it, then use setInput
to restore the input to what it was before.  This is shorter and more
elegant, and it fixes the problem.

'BlockQuoteContext' was also eliminated from ParserContext, as it
isn't used anywhere.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@261 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-21 09:02:06 +00:00
fiddlosopher
862471e417 Fixed two small haddock bugs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@260 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-21 08:30:08 +00:00
fiddlosopher
11cd6e94e0 Added license text to top of source files.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@258 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 20:54:23 +00:00
fiddlosopher
70d291026d Changed 'stability' from 'provisional' to 'alpha'.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@257 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 20:20:10 +00:00
fiddlosopher
99ffb97d15 Added some extra fields to Pandoc.cabal.in.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@256 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 19:53:56 +00:00
fiddlosopher
1fded403c5 Changed 'status' in comment headers from 'unstable' to 'provisional'
(which seems to be the term that is used in this context).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@255 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 19:48:46 +00:00
fiddlosopher
b98edf2c74 Made javascript obfuscation of emails even more obfuscatory,
by combining it with entity obfuscation.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@254 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 18:16:07 +00:00
fiddlosopher
19a81cb504 Put notice about the GPL on web page.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@253 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 06:56:41 +00:00
fiddlosopher
dc9c6450f3 + Added module data for haddock.
+ Reformatted code consistently.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@252 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 06:50:14 +00:00
fiddlosopher
42d2983896 Obscured email addresses in documents that will be web-accessible.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@251 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 03:56:36 +00:00
fiddlosopher
62e2ee16cb Modified debian/copyright, and made COPYRIGHT in top level
a symlink to it, to avoid duplication.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@250 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 03:29:53 +00:00
fiddlosopher
cda0a6d584 Removed LICENSE, replacing it with COPYING (text of GPL)
and COPYRIGHT (including copyright information and licenses
for other packages used).  Modified Pandoc.cabal.in and
README accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@249 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 03:23:00 +00:00
fiddlosopher
48f64f64c9 Cleaned up TODO file.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@248 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 00:52:37 +00:00
fiddlosopher
5cf769b1cd Modified the HTML writer to add invisible anchors to each section
heading.  The anchors are derived form the text of the section
heading as described in README.  This makes it easy to insert
links that jump from one part of a document to another:
for example, '[back to the Introduction](#Introduction)'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@246 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-20 00:25:54 +00:00
fiddlosopher
c1ebe94e40 + Replaced 'comparing' combinator in markdown reader with 'compare'.
'comparing' is from Data.Ord, which is not available in GHC 6.4.
+ Added line break after </li> in HTML footnote output, for easier
  inspection of the source.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@245 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 23:46:07 +00:00
fiddlosopher
34bb7a125e Fixed a minor mistake introduced in resolving conflicts from the
merge.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@243 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 23:17:53 +00:00
fiddlosopher
661c7e7b1d Merged changes to footnotes branch r219-r240.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@241 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 23:13:03 +00:00
fiddlosopher
66da30cd78 Added 'clean' target to src/templates/Makefile, main
Makefile's 'clean' calls it to clean out template-generated
files.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@237 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 22:20:58 +00:00
fiddlosopher
31a956b655 Changes to build process relating to r234.
+ Corrected dependencies in Makefiles to ensure that templates
  get filled when the relevant files are modified.
+ Changed template placeholders to @xxx@ instead of <xxx>,
  for consistency with our practice with the Cabal template.
+ Changed default font for RTF writer (this had been changed earlier,
  but in the target rather than the template!)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@235 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 22:00:41 +00:00
fiddlosopher
206c59a386 Removed three files from the repository. These are generated
from templates in src/templates, and so should not be in the
repository.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@234 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 21:35:14 +00:00
fiddlosopher
3a6296acae Changed footnote syntax to conform to the de facto standard
for markdown footnotes.  References are now like this[^1]
rather than like this^(1).  There are corresponding changes
in the footnotes themselves.  See the updated README for
more details.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@230 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-19 07:30:36 +00:00
fiddlosopher
a8bbd950e5 Changed '--smartypants' to '--smart' and adjusted documentation
and symbols accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@224 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-18 22:02:39 +00:00
fiddlosopher
cd4a035a75 + BUGS now contains a link to pandoc's issue tracker at Google Code.
+ Modified TODO.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@216 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-17 21:09:26 +00:00
fiddlosopher
75dbe3248e Removed a / in a comment that was causing haddock to fail.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@213 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-17 18:41:26 +00:00
fiddlosopher
7c319e55ff Modified markdown reader to allow ordered list items to begin
with (single) letters, as well as numbers.  The list item marker
may now be terminated either by '.' or by ')'.  These extensions
to standard markdown are documented in README.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@211 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-16 19:43:00 +00:00
fiddlosopher
4ab3eb3003 + Small changes to Makefile for better handling of Windows executable.
+ Added windows executable to the website target.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@210 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-16 19:11:49 +00:00
fiddlosopher
19bad8253d Improvements to smart-quote regexs. Now we can better handle
cases where latex commands or HTML entity references appear
after quotes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@202 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-16 06:14:37 +00:00
fiddlosopher
fe66a90a2a Changed 'putStrLn' to 'putStr' in Main.hs, and modified some
of the readers to make spacing at end of output more consistent.
Modified tests accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@201 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-16 05:05:02 +00:00
fiddlosopher
61ec2c0d4a Bumped version to 0.3 after tagging 0.22.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@200 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-13 23:14:55 +00:00
fiddlosopher
f6235d8c1d Changed version to 0.22 for tag creation.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@198 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-13 23:12:38 +00:00
fiddlosopher
ba16d6ae47 Makefile now checks to see if we're running Cygwin/Windows; if we are,
'.exe' extension is added to each executable in EXECS.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@192 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-13 17:54:59 +00:00
fiddlosopher
00fff7d940 Reverted addition of .exe to Windows executables in cabalize.
It seems that Cabal does not expect these extensions.  Better
to handle this in the Makefile.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@191 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-13 17:42:14 +00:00
fiddlosopher
cc26d7cfed In cabalize, add '.exe' extension to executables if we're on
Windows/Cygwin.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@190 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-13 17:28:26 +00:00
fiddlosopher
1fdafb5204 Extract version number from src/Main.hs in cabalize and Makefile.
The authoritative version number is now in src/Main.hs, with no
duplication.  (This seems a better solution than building Main.hs
from a template.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@182 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-12 15:41:55 +00:00
fiddlosopher
2d653dc1da Minor change: 'test 4' to 'test 3' in testwrapper.in.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@180 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-12 07:58:57 +00:00