Commit graph

838 commits

Author SHA1 Message Date
fiddlosopher
b6f1ccc90b Small change to wording in README.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1121 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-01 03:11:35 +00:00
fiddlosopher
0814ee0e77 New version of ASCIIMathML.js.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1120 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-01 03:11:32 +00:00
fiddlosopher
b008e5d347 Modified writer tests for new Math and TeX output.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1119 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:37 +00:00
fiddlosopher
03f4a665ff Changed all writers to handle new Math block element.
This allows TeX element to be handled differently (and in
many output formats, simply ignored).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1118 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:31 +00:00
fiddlosopher
132186e6b0 Revised s5.native test with Math block.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1117 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:23 +00:00
fiddlosopher
55b31b708e Fixed small error in testsuite.native.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1116 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:20 +00:00
fiddlosopher
576ddc1b99 Modified markdown reader for new Math block.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1115 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:17 +00:00
fiddlosopher
7f4fd9ab3d Modified LaTeX reader for new Math blocks.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1114 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:13 +00:00
fiddlosopher
53964297b5 Modified refsMatch for new Math block element.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1113 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:10 +00:00
fiddlosopher
f795a1219b Added new Math block element.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1112 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:07 +00:00
fiddlosopher
dc42600081 Changed tests to use new Math block element.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1111 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:09:04 +00:00
fiddlosopher
e9f16683f2 Added TODO for math branch notes.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1110 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 08:08:59 +00:00
fiddlosopher
91ee26d332 Removed src, headers, ui from top-level -- git-svn didn't do this.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1109 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 03:58:13 +00:00
fiddlosopher
8589f118d8 Makefile changes: BUILDCONF and CABAL_BKP.
+ Changed BUILDCONF to point to dist/setup-config, not .setup-config.
  This is where current versions of Cabal put it.  'make clean' works again!
+ Do not clean up CABAL_BKP, because it might need to be recovered for
  a new build with a different GHC version.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1108 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 02:03:09 +00:00
fiddlosopher
ae5697e3b4 Small improvements in Makefile:
+ Added $(BUILDCMD) target, so setup doesn't get compiled every time.
+ Removed (now circular) dependency of templates on ./templates.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1107 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 02:03:07 +00:00
fiddlosopher
b2fa8c7dd2 Moved ASCIIMathML.js, headers, and ui into templates.
Adjusted templates/Makefile and fillTemplates.pl as needed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1106 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 02:03:04 +00:00
fiddlosopher
2b52241928 Changed references to source directory in Makefile and pandoc.cabal.*.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1105 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 02:02:38 +00:00
fiddlosopher
9a67a486c2 Moved everything from src into the top-level directory.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1104 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 02:02:34 +00:00
fiddlosopher
47a4a3ab89 Removed Text directory. This is a remnant of an experiment
moving the contents of src/ to the top level, and should have
been deleted long ago.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1097 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-28 21:01:17 +00:00
fiddlosopher
3dfe4cb708 Makefile: Add .exe extension to BUILDCMD if building on Windows.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1096 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-26 21:27:59 +00:00
fiddlosopher
99d8d45b74 + Makefile now checks GHC version. If GHC is 6.6, pandoc.cabal.ghc66
is copied to pandoc.cabal, and the old pandoc.cabal is copied to
  pandoc.cabal.orig.  Otherwise, pandoc.cabal is copied to pandoc.cabal.orig
  but otherwise unmodified.  This way, the Makefile will work properly
  with either GHC 6.6 or 6.8.
+ The changes in debian/rules from r1066 have been reverted, since they
  are no longer needed.  Also, debian/rules has been converted to UTF-8.
+ INSTALL instructions have been updated accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1095 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-25 01:51:36 +00:00
fiddlosopher
3703f625be Updated debian/changelog.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1094 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-25 00:38:08 +00:00
fiddlosopher
7deee9c874 Reverted changes in r1086 (implicit section header references).
This caused too much of a performance hit.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1093 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-23 03:51:21 +00:00
fiddlosopher
66efec1670 Improved and simplified setextHeader parser in markdown reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1092 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-22 19:09:38 +00:00
fiddlosopher
7e540720aa Updated PROFILING instructions. It is no longer necessary
to insert -auto-all by hand, since Ghc-Prof-Options takes
care of that.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1091 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-22 19:09:10 +00:00
fiddlosopher
a4e0b97bf8 Use Ghc-Prof-Options to ensure that '-auto-all' is used
when '--enable-*-profiling' is specified.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1090 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-22 19:08:34 +00:00
fiddlosopher
5a0179d0a0 Improved efficiency of romanNumeral parser (in Text.Pandoc.Shared)
for a big speed boost in (non-strict) markdown parsing.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1089 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-22 18:17:29 +00:00
fiddlosopher
f957c6ef32 Changes to testsuite for new \useURL in context writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1088 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-22 18:16:39 +00:00
fiddlosopher
fb07803be6 + Changed \useurl to \useURL in ConTeXt output.
+ Changed links from red to blue in ConTeXt output.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1087 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-22 17:33:12 +00:00
fiddlosopher
f7b705b44c Implemented implicit reference-style links to section headers in markdown.
For example, if you have a header '# Supported architectures', you can
link to it with '[Supported architectures]'.  If there are multiple
headers with this label, the link will point to the first of them.
Implicit references are always overridden by explicitly specified references.
Addresses Issue #20.

+ Moved isPunctuation, uniqueIdentifiers, and inlineListToIdentifier from
  Text.Pandoc.Writers.HTML to Text.Pandoc.Shared.

+ Added stHeaders to ParserState.   This holds a list of header texts
  used in the document, and is used to construct implicit header references.

+ In Text.Pandoc.Readers.Markdown, added call to headerReference
  parser in initial parsing pass, constructing a list of section header
  labels. This is then passed to uniqueIdentifiers to produce
  identifiers, and a list of implicit references is constructed. This is
  added to the end of the explicitly specified references, so it will be
  overridden by explicitly specified references. All of this processing
  is skipped if --strict was specified.

+ Modified documentation in README.



git-svn-id: https://pandoc.googlecode.com/svn/trunk@1086 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-22 17:14:21 +00:00
fiddlosopher
8d334b84cc Fixed some haddock documentation bugs in Shared.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1085 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-18 01:44:08 +00:00
fiddlosopher
f4a1fa4b8d More improvements to ConTeXt writer:
+ writer options are now in state, so they don't have to be passed as
  a parameter
+ state also keeps track of ordered list level, so the right default
  numbering scheme can be used
+ extra blank line after \stopitemize
+ removed definitions of ltxenum and ltxitem from the preamble
+ both kinds of lists are now generated using \start-stopitemize, with
  appropriate options
+ in the case of bulleted lists, no options need be specified, because
  defaults are given in the preamble
+ test suite updated accordingly


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1084 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-18 01:24:43 +00:00
fiddlosopher
5fa78695bc ConTeXt writer:
+ Don't use \(sub)+subject if header level > 5.
+ Modified tests to conform to new treatment of level 4 and 5 headers.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1083 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-17 23:34:16 +00:00
fiddlosopher
4c9a85b821 Modified ConTeXt writer to use \subsubsubsubsection etc.,
since these are supported (up to at least sub x 5).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1082 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-17 23:26:51 +00:00
roktas
5b5d9bcd76 Use $(GHC) instead of ghc and make them user configurable through environment
to support unusual ghc installations, for example:

	GHC=/opt/ghc/bin/ghc GHC_PKG=/opt/ghc/bin/ghc-pkg make


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1081 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-17 21:01:34 +00:00
fiddlosopher
09b57fcf9c Adjusted formatting of LaTeX and ConTeXt footnotes:
- in ConTeXt, % is not needed at end of line before note, since
  space is gobbled.
- beginning of footnote indented four spaces.
- this required an additional parameter in wrappedTeX and
  wrapTeXIfNeeded, in Text.Pandoc.Shared.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1080 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-17 18:42:11 +00:00
fiddlosopher
780b77c147 ConTeXt writer: Use itemize options, not sym{}, to produce ordered
lists with custom numbering styles.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1079 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-16 06:20:25 +00:00
fiddlosopher
13d8a75060 New, "official" definition of blockquote environment in ConTeXt header.
Also, use blank line after \startblockquote to balance blank line at the end.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1078 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-16 04:04:53 +00:00
fiddlosopher
87d6d0d069 Fixed logic in markdown smart quote parsing:
+ Added some needed 'try' statements.
+ Unicode right single-quote can double as apostrophe, so treat it
  as a quote-end only when not followed by an alphanumeric character.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1077 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-15 17:29:24 +00:00
fiddlosopher
ccb5fbb209 Fixed smart quote parsing in markdown reader so that unicode
characters 8216 and 8217 are recognized as single quotes,
and 8220 and 8221 as double quotes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1075 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-15 03:55:58 +00:00
fiddlosopher
506bf38bcb Updated documentation to reflect the fact that LaTeX and ConTeXt writers
now wrap text by default.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1074 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-15 03:23:02 +00:00
fiddlosopher
a487bbb5a9 Updated tests for changes in LaTeX and ConTeXt writers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1073 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-15 03:21:10 +00:00
fiddlosopher
ea5e945470 Changes to ConTeXt writer:
+ PrettyPrint module now used for output.
+ Text wrapping now provided, using wrapTeXIfNeeded.
+ Better treatment of footnotes:  footnotes are always on lines by themselves.
+ Use \subject, \subsubject, ... or \section, \subsection, ... for headings,
  depending on whether --number-sections option is selected.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1072 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-15 03:20:05 +00:00
fiddlosopher
851c04dfcd Improved footnote handling in LaTeX writer:
+ use wrapTeXIfNeeded instead of wrapIfNeeded
+ make sure footnotes occur on lines by themselves, with a % at the
  end of the preceding line to prevent unwanted spaces
+ added writer options to state, so it can be accessed by wrapTeXIfNeeded 


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1071 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-15 03:11:33 +00:00
fiddlosopher
e73c3d3561 Added wrappedTeX and wrapTeXIfNeeded functions to Text.Pandoc.Shared.
These ensure that footnotes occur on lines by themselves (to make them
easier to move around), and that they don't screw up text wrapping.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1070 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-15 03:09:31 +00:00
fiddlosopher
1ba0c8f483 Modified debian/changelog -- include last bugfix.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1069 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-10 21:52:25 +00:00
fiddlosopher
bd7f5f3f7c Fixed bug in LaTeX reader (pointed out by Mark Eli Kalderon):
needed a "try" before "string" in parser for \[ math blocks.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1068 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-10 21:44:05 +00:00
roktas
466b75d997 Remove a duplicate comment line.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1067 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-06 01:35:22 +00:00
fiddlosopher
8a057e77af Modified build procedure to allow compilation with GHC 6.8:
+ 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-06 00:07:17 +00:00
fiddlosopher
8d8639711d Added a version of pandoc.cabal that works with GHC 6.8.1.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1065 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-04 00:36:41 +00:00