Jesse Rosenthal
ba5804f9ec
OMath: Remove Namespaces
...
We still need to test against prefixes, but this is only going to look
at oMath fragments, so we're not going to be worried about looking up
the real namespace.
2014-08-08 14:15:17 -04:00
Jesse Rosenthal
0acd139fb1
OMath: Start phasing out internal OMath type.
...
This is the first step in removing the intermediate OMath type, which we
no longer need since we're writing straight to TeXMath Exp.
2014-08-08 14:14:30 -04:00
Jesse Rosenthal
cf849443cb
OMath parser: don't group expressions if there's only one.
2014-08-08 14:12:05 -04:00
Matthew Pickering
40602c3df6
HTML EPUB exts: switch element can now be in either the inline or block position
2014-08-08 10:25:40 -07:00
John MacFarlane
10b662c120
EPUB test renaming.
...
Renamed epub test files so they're identified more clearly as
epub: features.{epub,native} -> epub.features.{epub,native},
and similarly with formatting.{epub,native}.
Added epub test files to cabal file, so they'll be included in
the tarball.
2014-08-07 22:25:06 -07:00
John MacFarlane
94466c0060
HTML reader: Really ignore DOCTYPE and xml declarations.
...
This actually does what d71b013841
said it did.
Revised epub tests to remove the repeated DOCTYPE and xml tags.
2014-08-07 22:12:44 -07:00
John MacFarlane
3c4079edc8
Merge pull request #1488 from mpickering/epubfixes
...
EPUB Reader: Improved image extraction
2014-08-07 19:00:32 -07:00
John MacFarlane
08bed142ba
Merge pull request #1496 from mpickering/master
...
Org Writer: Write anchor elements
2014-08-07 16:29:20 -07:00
Matthew Pickering
07bb41d6da
Org Writer: Write anchor elements
...
The Org Writer now writes empty span elements which have an id as an anchor.
For example `Span ("uid", [], []) []` becomes `<<uid>>`
2014-08-08 00:20:18 +01:00
Matthew Pickering
090b2da267
EPUB tests: Updated test file
2014-08-07 22:56:30 +01:00
Matthew Pickering
19d2ff68b1
EPUB Reader: Improved how images are extracted
2014-08-07 22:56:30 +01:00
John MacFarlane
17e48ba81e
Merge pull request #1494 from jkr/math-module
...
Math module
2014-08-07 13:44:19 -07:00
John MacFarlane
44dad52866
Merge pull request #1495 from jkr/inline-drawings
...
Docx reader: Inline image fix
2014-08-07 13:41:58 -07:00
Jesse Rosenthal
98d14b2b2a
Docx reader: Test inline image code.
2014-08-07 15:34:49 -04:00
Jesse Rosenthal
7bd7d4d476
Docx reader: Handle inline drawings.
...
Previous drawings that were under some other toplevel run (i.e., a
hyperlink) wouldn't be properly handled. This should fix that.
2014-08-07 15:01:05 -04:00
Jesse Rosenthal
d293dd528b
OMath module: Add new file.
2014-08-07 12:41:33 -04:00
Jesse Rosenthal
a7967d1aef
Docx reader: Split math out into math module.
...
Could use some cleanup, but this is the first step for getting
an OMML reader into TeXMath.
2014-08-07 12:20:22 -04:00
Matthew Pickering
13f26af84f
Docx Reader: Added Default instances and removed withDState
...
Signed-off-by: Jesse Rosenthal <jrosenthal@jhu.edu>
2014-08-06 19:15:33 -04:00
John MacFarlane
482f7f8e15
pandoc: Don't strip path off of sourceURL.
...
We need this information for relative URLs!
This should resolve the continuing problem noted in #750 .
2014-08-06 14:36:46 -07:00
John MacFarlane
56f2c61cf2
Merge pull request #1492 from jkr/nodocxenv
...
Get rid of unused docx variable.
2014-08-06 14:16:25 -07:00
Jesse Rosenthal
91ab2f155f
Get rid of unused docx variable.
...
Since changing the Docx type, this is no longer necessary. Thanks to
Matthew Pickering for picking up on this.
2014-08-06 12:19:24 -04:00
John MacFarlane
444b1c2ad8
Merge pull request #1491 from jkr/texmath-equations
...
Docx Reader: Use TeXMath for writing equations.
2014-08-06 09:07:00 -07:00
Jesse Rosenthal
cd9ca5a18a
Docx reader: remove now-unnecessary state variable.
...
This also introduces a `defaultDState` value.
2014-08-06 11:20:41 -04:00
Jesse Rosenthal
cdd769624f
Remove now-unnecessary TexChar
...
TeXMath does the work now.
2014-08-06 11:20:41 -04:00
Jesse Rosenthal
06488c95fa
Add a note on how mapD
works.
2014-08-06 11:20:41 -04:00
Jesse Rosenthal
3bc2ea4cf7
Docx reader: Use TeXMath to write math
...
The new version of TeXMath can translate from its type system into
LaTeX. So instead of writing the LaTeX ourself, we write to the TeXMath
`Exp` type, and let TeXMath do the rest.
2014-08-06 11:20:27 -04:00
John MacFarlane
192a33cc61
Merge pull request #1490 from ulikoehler/master
...
MediaWiki reader doesn't recognize german "Bild"
2014-08-05 16:25:59 -07:00
Uli Köhler
9d07db933c
MediaWiki reader doesn't recognize german "Bild"
2014-08-06 00:47:23 +02:00
John MacFarlane
1819bdfaed
Merge pull request #1487 from mpickering/master
...
MediaBag: Improved normalisation when writing files
2014-08-05 08:28:28 -07:00
Matthew Pickering
b04bb3b6d2
MediaBag: Improved normalisation when writing files
2014-08-05 11:02:23 +01:00
John MacFarlane
2de2842bdd
Merge pull request #1486 from Aelve/minor
...
Very minor cleanup and readability changes
2014-08-04 22:07:02 -07:00
John MacFarlane
39b59b7603
Merge pull request #1476 from jkr/endnote-fix
...
Docx Parser: Produce endnotes.
2014-08-04 21:59:58 -07:00
John MacFarlane
d71b013841
HTML reader: ignore <?xml..> and <DOCTYPE..> tags.
...
Previously they were parsed as raw.
2014-08-04 18:39:39 -07:00
John MacFarlane
2fabdf9d93
README: Removed duplicate ref of [EPUB].
2014-08-04 12:43:13 -07:00
John MacFarlane
40d8100d44
Use texmath 0.7 interface.
2014-08-04 11:13:09 -07:00
Artyom Kazak
675b15458a
Slightly fix readability of main program file.
2014-08-04 19:58:25 +04:00
Artyom Kazak
141fdf944a
Add PatternGuards pragmas.
2014-08-04 19:58:25 +04:00
Artyom Kazak
eb88444452
Remove redundant isHexDigit function.
2014-08-04 19:58:25 +04:00
Artyom Kazak
e51a2cedf9
Remove dangling where
from one function.
2014-08-04 19:58:25 +04:00
Artyom Kazak
82118b3328
Use stripPrefix
where appropriate.
2014-08-04 19:57:42 +04:00
Artyom Kazak
feebab9740
Clean up mediaTypeOf
a bit.
2014-08-04 19:41:37 +04:00
Artyom Kazak
f659644fcc
Use mapM_
instead of () <$ mapM
in one place.
2014-08-04 19:41:37 +04:00
John MacFarlane
4630cff2a6
Merge branch 'epubend' of https://github.com/mpickering/pandoc into mpickering-epubend
...
Conflicts:
pandoc.cabal
2014-08-04 07:36:18 -07:00
John MacFarlane
81335df9a5
Merge pull request #1461 from cben/readme-linkable-extensions
...
README: linkable extensions
2014-08-03 11:50:07 -07:00
John MacFarlane
cafc3c6e6c
Merge pull request #1479 from Aelve/capitalise
...
Correctly implement capitalisation.
2014-08-03 11:48:21 -07:00
Artyom Kazak
f6cf8e8b4b
Add plain writer testing module to .cabal file.
2014-08-03 18:32:31 +04:00
Artyom Kazak
ec88d47f23
Correctly implement capitalisation.
...
Using `map toUpper` to capitalise text is wrong, as e.g.
“Straße” should be converted to “STRASSE”, which is 1 character
longer. This commit adds a `capitalize` function and replaces
2 identical implementations in different modules (`toCaps` and
`capitalize`) with it.
2014-08-03 17:37:37 +04:00
John MacFarlane
842c705097
SelfContained: Fixed determining of source URL from within CSS files.
...
(This fixes a bug introduced a couple commits back.)
2014-08-02 16:33:22 -07:00
John MacFarlane
85ff3c5771
fetchItem: improved mime type guessing.
...
Strip a fragment like `?#iefix` from the extension before doing
the mime lookup.
2014-08-02 16:32:11 -07:00
John MacFarlane
1d137fbed6
Shared: fetchItem improvements.
...
* More consistent logic: absolute URIs are fetched from the net;
other things are treated as relative URIs if sourceURL is a Just,
otherwise as file paths.
* We escape characters that are not allowed in URIs before trying
to parse them (e.g. '|', which often occurs in the wild).
* When treating relative paths as local file paths, we drop
any fragment or query. This is useful e.g. when you've downloaded
web fonts locally, but your source still contains the original
relative URLs.
Together with the previous commit, this should close #1477 .
2014-08-02 16:12:05 -07:00