Commit graph

8582 commits

Author SHA1 Message Date
fiddlosopher
c27d8adc78 Modified changelog to bring up to date.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@390 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-01 21:20:55 +00:00
fiddlosopher
a734aaf2ae Removed a line that was causing a compiler warning in docbook
writer.  The line isn't necessary, since we have a case for
every kind of block element.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@388 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-01 21:11:47 +00:00
fiddlosopher
2f764a25f8 Added docbook writer to list of exposed modules in Pandoc.cabal.in.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@387 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-01 21:09:38 +00:00
fiddlosopher
a9e32505de Merged changes from docbook branch since r363.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@386 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-01 21:08:12 +00:00
fiddlosopher
0c6c5d528b Refactored fillTemplates.pl.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@366 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-01 01:35:29 +00:00
fiddlosopher
e9abe72a27 Added a note to pandoc(1) man page about the differences between
standard markdown and Pandoc's markdown-variant.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@361 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-31 19:41:44 +00:00
fiddlosopher
0d182772f9 Revised inline code parsing in Markdown reader to conform to
Markdown.pl.  Now any number of `'s can begin inline code,
which will end with the same number of `'s.  For example, to
have two backticks as code, write
``` `` ```


git-svn-id: https://pandoc.googlecode.com/svn/trunk@360 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-31 19:22:02 +00:00
fiddlosopher
7f7b456d96 Documented makefile targets in INSTALL.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@359 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-31 19:12:53 +00:00
fiddlosopher
8b3ac98171 Simplified list parsing code in RST reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@356 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-31 18:14:51 +00:00
fiddlosopher
df980b899d Added instructions for using the GHC profiler.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@355 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-31 17:53:44 +00:00
fiddlosopher
3f5194b3bf Cleaned up some code in RST reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@354 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-31 17:34:26 +00:00
fiddlosopher
0b6dc98a0a Changed Markdown reader so that the first pass, in which a list
of reference keys is made, is much faster.  This gets us a big
performance boost.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@353 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-31 17:34:06 +00:00
fiddlosopher
83cddbc682 Removed unneeded 'do' block from 'parseBlocks' definition
in Markdown reader.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@352 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-31 16:46:48 +00:00
fiddlosopher
68122303c0 Changed usage message so that it is more compact (and slightly
less informative).  It's important that it be able to fit on one
screen.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@351 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-31 01:12:01 +00:00
fiddlosopher
cf53a18bc1 Documented the "blank line before header and block quote" discrepancy
between standard markdown and pandoc.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@350 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-30 23:19:14 +00:00
fiddlosopher
c3bad6e89e Updates to changelog for --strict option and other changes
from the last revision.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@348 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-30 22:57:40 +00:00
fiddlosopher
4ea1b2bdc0 Merged 'strict' branch from r324. This adds a '--strict'
option to pandoc, which forces it to stay as close as possible
to official Markdown syntax.  


git-svn-id: https://pandoc.googlecode.com/svn/trunk@347 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-30 22:51:49 +00:00
fiddlosopher
7cd9db048b Slight changes in website target:
+ history.html -> changelog.html
+ demo.html -> examples.html
+ Added title to changelog.html
+ Removed header div on html pages
+ Changed widths in css


git-svn-id: https://pandoc.googlecode.com/svn/trunk@319 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 22:51:05 +00:00
fiddlosopher
08fa385d80 Changed date on README.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@318 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 21:49:31 +00:00
fiddlosopher
787140069b Print command-line to stderr when making demo page.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@317 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 21:48:56 +00:00
fiddlosopher
369b99513d Make wrappers executable in the top-level directory, in case people
want to try them in place without installing.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@316 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 21:41:09 +00:00
fiddlosopher
3c9fd01ad8 + Renamed web/demos.sh to mkdemos.sh
+ Added parameter for directory containing executables
+ Changed arithmetic statement for portability.
+ Modified Makefile accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@315 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 21:25:13 +00:00
fiddlosopher
96c614083e Minor changes to changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@312 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 20:25:54 +00:00
fiddlosopher
cd54d015bf Modified changelog to bring up to date.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@311 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 19:45:59 +00:00
fiddlosopher
c6bdfe8485 Revised uninstall-pandoc with new wrapper names.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@310 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 19:32:54 +00:00
fiddlosopher
3491420b53 + Changed 'web2markdown' to 'html2markdown'.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@309 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 18:50:13 +00:00
fiddlosopher
eea359203a Reversed changes from r246:
+ Removed invisible anchors in front of header tags in HTML output.
  Reason:  no way to prevent duplicate ID attributes (which is invalid
  HTML), since there might be duplicate header titles.  See 
  http://six.pairlist.net/pipermail/markdown-discuss/2005-January/000975.html.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@306 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 08:04:39 +00:00
fiddlosopher
17837b343b Added two more demo cases to website. Put a footnote in
README for demonstration purposes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@302 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28 07:22:41 +00:00
fiddlosopher
2d253cadd3 Added a latex -> markdown case to demos.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@301 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28 06:58:04 +00:00
fiddlosopher
2933f9f5e7 Added another demo case, with header and footer and css.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@299 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28 06:48:16 +00:00
fiddlosopher
5468e76a7e Added "Demos" page to the website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@298 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28 06:40:21 +00:00
fiddlosopher
a1a30d69bd + Removed the convenience symlinks (which don't work on Windows under
Cygwin, due to Windows' lack of true symbolic links).
+ Modified the wrappers to use 'pandoc' instead of the symlinks.
+ Modified the Makefile to remove all references to the symlinks.
+ Removed code from Main.hs that made pandoc's behavior depend on the
  name of the calling program.
+ Added code to Main.hs that sets default reader and writer based on
  extensions of input and output filenames (if provided).  (Thanks to
  roktas for the idea.)
+ Modified README and man pages accordingly.
+ Removed WINDOWS-README target from Makefile.  It is no longer needed
  now that we don't have the symlinks.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@295 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-28 02:20:09 +00:00
fiddlosopher
a1539d9ab8 Added README-WINDOWS.html to windows package documentation.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@291 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-24 23:11:27 +00:00
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