John MacFarlane
d9012a305b
Updated changelog.
2012-02-11 16:06:32 -08:00
John MacFarlane
5c30bce6e8
Version bump to 1.9.1.1.
2012-02-11 13:35:53 -08:00
John MacFarlane
26e5de8323
Fixed html5 template so it works properly with highlighting.
2012-02-11 11:48:43 -08:00
John MacFarlane
5cfec4b922
Fix _rels/.rels if it has been screwed up by Word.
...
Closes #414 .
Previously, if you edited the reference.docx with Word, then
created a new docx using the edited reference.docx, Word would complain
about the file being corrupt. The problem seems to be that Word
changes _rels/.rels, changing the Type of the Relationship to
docProps/core.xml from
"http://schemas.openxmlformats.org/officedocument/2006/relationships/metadata/core-properties "
to
"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties ".
As far as I can see, this is a bug in Word, since the latter is not
valid. (See
http://idippedut.dk/post/2010/04/22/Correct-according-to-spec-or-implementation.aspx .)
This change simply does a global replace on _rels/.rels that reverts
the change Word makes. And now producing docx files with Word-modified
reference.docx seems to work.
2012-02-11 09:12:58 -08:00
John MacFarlane
fdb11cdae9
Fixed problem in reference.docx styles.
...
Had xCs instead of iCs.
reference.docx now validates at
http://www.probatron.org:8080/officeotron/officeotron.html .
This may help with #414 .
2012-02-10 22:49:07 -08:00
John MacFarlane
163f0651bd
Fixed name on "Date" style in reference.docx.
...
See #414 .
2012-02-10 21:50:31 -08:00
John MacFarlane
f59e33dd1a
LaTeX reader: Add ", " to suffix...
...
if it doesn't start w space or punctuation. Otherwise we
get no space between the year and the suffix in author-date styles.
2012-02-10 21:48:42 -08:00
John MacFarlane
fe3d8ea418
Test suite: Don't print 'expected' in red.
2012-02-10 21:40:55 -08:00
John MacFarlane
b307b647ff
Added section in INSTALL on creating relocatable binary on windows.
2012-02-10 13:19:46 -08:00
John MacFarlane
ddd3e067d2
Added two needed gifs to the data files for s5.
...
ALso removed sildes.min.js, which was no longer being used.
2012-02-10 11:08:59 -08:00
John MacFarlane
ad4062fbff
Made LaTeX parser more robust.
...
+ Skip options after block commands.
+ Correctly handle {\\} in braced.
+ Added a needed 'try'.
2012-02-09 17:45:40 -08:00
John MacFarlane
5ac6f88e34
Better handling of raw latex environments in markdown.
...
Now
\begin{equation}
a_1
\end{equation}
turns into a raw latex block as expected.
2012-02-09 14:30:37 -08:00
John MacFarlane
c8cadbf5f3
Updated changelog.
2012-02-09 10:37:07 -08:00
John MacFarlane
61bde14523
Version bump in windows setup.
2012-02-09 08:59:27 -08:00
John MacFarlane
c0ddee2b5b
Merge pull request #411 from dfc/patch-1
...
"be is in" -> "be in"
2012-02-09 07:24:44 -08:00
John MacFarlane
04627b17ac
Changed a README example.
...
The old one was bad, because the HTML comment is no longer
needed for that case in pandoc.
2012-02-09 07:20:03 -08:00
Douglas Calvert
0d1cf3c526
"be is in" -> "be in"
2012-02-08 22:50:18 -05:00
John MacFarlane
24f7076622
Improvements to markdown attributes syntax (on code blocks).
...
(1) Attributes can contain line breaks.
(2) Values in key-value attributes can be surrounded by either
double or single quotes, or left unquoted if they contain no spaces.
2012-02-08 17:18:08 -08:00
John MacFarlane
ef5dcae211
Require texmath >= 0.6.0.2.
2012-02-08 14:33:17 -08:00
John MacFarlane
afd0d7eb90
Better description of pandoc 1.9 latex reader changes.
2012-02-08 14:09:05 -08:00
John MacFarlane
1c432e72ea
Put LaTeX verse environments in blockquotes.
2012-02-08 14:03:55 -08:00
John MacFarlane
421b362b99
Require h-k 0.5.0.2.
2012-02-08 11:14:53 -08:00
John MacFarlane
64304a2165
Don't wrap headers in markdown or rst.
2012-02-08 08:40:53 -08:00
John MacFarlane
142c29d908
More efficient implementation of nowrap in Pretty.
2012-02-08 08:32:32 -08:00
John MacFarlane
11e1e2b922
Version bump to 1.9.1.
...
(Due to new field in ParserState introduced in last commit.)
2012-02-07 22:47:07 -08:00
John MacFarlane
7a602d222f
Limit nesting of strong/emph.
...
This avoids exponential lookahead in parasitic cases, like
a**a*a**a*a**a*a**a*a**a*a**a*a**a*a**.
Added stateMaxNestingLevel to ParserState.
We set this to 6, so you can still have Emph inside Emph, just not
indefinitely.
2012-02-07 22:46:41 -08:00
John MacFarlane
12aa83f70e
PDF: Only run latex twice if \tableofcontents is present.
...
Note: This will pick up on \tableofcontents even if it's
in a verbatim environment. But the worst that can happen is
that the document takes a bit longer to build.
2012-02-07 22:00:22 -08:00
John MacFarlane
328c91e307
Handle escaped $ in latex math. Closes #186 .
2012-02-07 19:41:37 -08:00
John MacFarlane
9538328c6b
Added test case for issue #186 (\$ in latex math).
2012-02-07 19:41:37 -08:00
John MacFarlane
03d69daab6
Added test case for issue #186 (\$ in latex math).
2012-02-07 19:24:09 -08:00
John MacFarlane
136777e13c
Updated changelog.
2012-02-06 13:53:07 -08:00
John MacFarlane
535f52b196
Version bump to 1.9.0.5.
2012-02-06 13:51:34 -08:00
John MacFarlane
c0cb852265
cabal: Put build-depends for tests under conditional.
...
Otherwise even those who don't build with the tests flag need
to have dependencies like test-framework.
This restores the old behavior; I wrongly assumed that by now cabal
was smart enough not to bring in build-depends for components with
Buildable = False.
2012-02-06 13:49:56 -08:00
John MacFarlane
66ac842456
LaTeX writer: prevent adjacent hyphens from forming ligatures.
...
This is important primarily for things like `--option`.
Em and En dashes will produce '---' and '--' in LaTeX, but
hyphens should not otherwise combine into dashes.
2012-02-06 13:48:59 -08:00
John MacFarlane
408f975e47
Version bump to 1.9.0.4, updated changelog.
2012-02-06 12:49:13 -08:00
John MacFarlane
df3f3ddb6e
LaTeX reader: use raw latex as fallback for Cites.
...
This way you can still get the raw latex back, even if you don't
process with citeproc. Previously, cites were not visible at all
unless you specified --biblio on the command line and converted
them using citeproc, or used --natbib or --biblatex.
2012-02-06 12:42:12 -08:00
John MacFarlane
630c9f81ff
Fixed lhs+markdown instructions.
...
Classes 'literate' and 'haskell' are needed for bird tracks.
Closes #395 .
2012-02-06 12:38:45 -08:00
John MacFarlane
acdbdd7da5
Text.Pandoc.PDF: Simplified tex2pdf.
...
We no longer try to parse the log file to determine whether latex
needs to be rerun. Instead, we run latex twice -- which should be
enough for table of contents and hyperrefs.
Closes #402 .
2012-02-06 12:12:23 -08:00
John MacFarlane
0e866ba81c
Merge pull request #404 from conal/master
...
Relax test-framework version dependency to allow building with GHC 7.4.1
2012-02-06 11:55:08 -08:00
Conal Elliott
857552f85e
Relaxed version upper bound for test-framework from < 0.5 to < 0.6, since 0.5 is the first version on Hackage that builds under GHC 7.4.1.
2012-02-06 10:26:36 -08:00
John MacFarlane
0ce840f14e
Updated changelog.
2012-02-06 08:23:00 -08:00
John MacFarlane
abf5df9fa8
More cabal tweaks, default to Haskell98 for ghc 6.12 compatibility.
2012-02-06 08:10:56 -08:00
John MacFarlane
47f9a7daf8
Version bump to 1.9.0.3.
2012-02-06 08:07:53 -08:00
John MacFarlane
e13ad49f0d
cabal changes required by version >= 1.10.
2012-02-06 08:07:17 -08:00
John MacFarlane
a791e8a7bc
Fixed typo in changelog.
2012-02-06 07:23:06 -08:00
John MacFarlane
4f76f9f6e5
Require cabal version >= 1.10.
...
This is needed for ghcPackageDbOptions in Setup.hs.
2012-02-06 07:05:40 -08:00
John MacFarlane
880e5677e0
Updated changelog.
2012-02-05 23:39:12 -08:00
John MacFarlane
0e85ac299a
Bump version to 1.9.0.2.
2012-02-05 23:38:15 -08:00
John MacFarlane
8173625059
Allow json 0.4.
...
Otherwise we can't compile on ghc 6.12.
2012-02-05 23:37:45 -08:00
John MacFarlane
b63f924787
Fixed bug in fromEntities: require semicolon to process as entity.
2012-02-05 23:02:01 -08:00
John MacFarlane