| Commit message (Collapse) | Author | Age |
|---|
| |
|
|
|
|
|
|
| |
`moveTo` and `moveFrom` are track-changes tags that are used when a
block of text is moved in the document. We now recognize these tags and
treat them the same as `insert` and `delete`, respectively. So,
`--track-changes=accept` will show the moved version, while
`--track-changes=reject` will show the original version.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Some word functions -- especially graphics -- give various choices for
content so there can be backwards compatibility. This follows the
largely undocumented feature by working through the choices until we
find one that works.
Note that we had to split out the processing of child elems of runs into
a separate function so we can recurse properly. Any processing of an
element *within* a run (other than a plain run) should go into
`childElemToRun`.
|
| |
|
|
|
| |
Word uses list numbering styles to number its headings. We only call
something a numbered list if it does not also heave a heading style.
|
| |
|
|
|
|
|
|
| |
In order to be able to collect warnings during parsing, we add a state
monad transformer to the D monad. At the moment, this only includes a
list of warning strings (nothing currently triggers them, however). We
use StateT instead of WriterT to correspond more closely with the
warnings behavior in T.P.Parsing.
|
| |
|
|
|
|
|
|
| |
The docx reader used to use a Modifiable typeclass to combine both
Blocks and Inlines. But all the work was in the inlines. So most of the
generality was wasted, at the expense of making the code harder to
understand. This gets rid of the generality, and adds functions for
Blocks and Inlines. It should be a bit easier to work with going forward.
|
| |
|
|
|
|
|
| |
We want to make sure that links have their spaces removed, and are
appropriately smushed together.
This closes #2689
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Change 5527465c introduced a `DummyListItem` type in Docx/Parse.hs. In
retrospect, this seems like it mixes parsing and iterpretation
excessively. What's *really* going on is that we have a list item
without and associate level or numeric info. We can decide what to do
what that in Docx.hs (treat it like a list paragraph), but the parser
shouldn't make that decision.
This commit makes what is going on a bit more explicit. `LevelInfo` is
now a Maybe value in the `ListItem` type. If it's a Nothing, we treat
it as a ListParagraph. If it's a Just, it's a normal list item.
|
| |
|
|
|
| |
A residue of a recent change was left around in the form of a
commented-out function. Let's clean that up.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
These come up when people create a list item and then delete the
bullet. It doesn't refer to any real list item, and we used to ignore
it.
We handle it with a DummyListItem type, which, in Docx.hs, is turned
into a normal paragraph with a "ListParagraph" class. If it follow
another list item, it is folded as another paragraph into that item. If
it doesn't, it's just its own (usually indented, and therefore
block-quoted) paragraph.
|
| |
|
|
|
|
| |
There are separate relationship (link) files for foot and
endnotes. These had previously been grouped together which led to
links not working correctly in notes. This should finally fix that.
|
| |
|
|
| |
This reverts commit c423dbb5a34c2d1195020e0f0ca3aae883d0749b.
|
| |
|
|
|
|
|
| |
This is needed for ghci to work with pandoc, given that we
now use a custom prelude.
Closes #2503.
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
- The (non-exported) prelude is in prelude/Prelude.hs.
- It exports Monoid and Applicative, like base 4.8 prelude,
but works with older base versions.
- It exports (<>) for mappend.
- It hides 'catch' on older base versions.
This allows us to remove many imports of Data.Monoid
and Control.Applicative, and remove Text.Pandoc.Compat.Monoid.
It should allow us to use -Wall again for ghc 7.10.
|
| | |
|
| |
|
|
|
| |
I've messed up badly with it, so it didn't work properly most of the
time. At the plus side, fallback mechanic is working wonderfully.
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
This allows inherited styles with numbering (lists). It works like this:
1. check to see if the style has numbering info.
2. if the paragraph has explicit numbering info in the doc that takes
precedence.
3. if not we use the numbering info in the style, if it's there.
4. otherwise normal paragraph.
We no longer assume it's not a numbering element if it doesn't have an
explicit level---we just set that level to 1. (In the style files, the
examples I've seen don't have that explicit level.)
|
| |
|
|
|
|
|
|
|
|
| |
Some older versions of word use vml (vector markup language) and put
their images in a "v:imagedata" tag inside a "w:pict". We read those as
we read the more modern "blip" inside a "w:drawing".
Note that this does not mean the reader knows anything about vml. It
just looks for a `v:imagdata`. It's possible that, with more complicated
uses of images in vml, it won't do the right thing.
|
| |
|
|
|
|
|
|
|
| |
Previously, if a URL had an anchor, such as
http://johnmacfarlane.net/pandoc/README.html#synopsis
the reader would incorrectly identify it as an internal link
and return "#synopsis" for the link in output.
|
| |
|
|
|
|
|
|
| |
This patch builds paragraph styles tree, then checks if paragraph has
style.styleId or style/name.val matching predetermined patterns.
Works with "Heading#" (name.val="heading #") for headings and
"Quote"|"BlockQuote"|"BlockQuotation" (name.val="Quote"|"Block Text")
for block quotes.
|
| |\
| |
| | |
Fix path-slashes inside archive for windows
|
| | |
| |
| |
| |
| | |
Don't use os-sensitive "combine", since we always want the paths in our
zip-archive to use forward-slashes.
|
| |/
|
|
|
| |
When users number their headers, Word understands that as a single item
enumerated list. We make the assumption that such a list is, in fact, a header.
|
| |
|
|
|
|
|
|
| |
Two points here: (1) We're going bottom-up, from styles not based on
anything, to avoid circular dependencies or any other sort of
maliciousness/incompetence. And (2) each style points to its
parent. That way, we don't need the whole tree to pass a style over to
Docx.hs
|
| | |
|
| |
|
|
|
| |
This will make it easier to build the style map from the bottom up (to
avoid any infinite references).
|
| |
|
|
|
|
| |
We want to be able to read user-defined styles. Eventually we'll be able
to figure out styles in terms of inheritance as well. The actual
cascading will happen in the docx reader.
|
| |
|
|
|
|
|
|
|
|
|
| |
In docx, super- and subscript are attributes of Vertalign. It makes more
sense to follow this, and have different possible values of Vertalign in
runStyle. This is mainly a preparatory step for real style parsing,
since it can distinguish between vertical align being explicitly turned
off and it not being set.
In addition, it makes parsing a bit clearer, and makes sure we don't do
docx-impossible things like being simultaneously super and sub.
|
| |
|
|
|
|
|
|
|
|
| |
The big news here is a rewrite of Docx to use the builder
functions. As opposed to previous attempts, we now see a significant
speedup -- times are cut in half (or more) in a few informal tests.
Reducible has also been rewritten. It can doubtless be simplified and
clarified further. We can consider this, at the moment, a reference for
correct behavior.
|
| | |
|
| |
|
|
|
|
|
|
| |
Note that "Italic" can be on, and, from the last commit, `<w:i>` can be
present, but be turned off. In that case, the turned-off tag takes
precedence. So, we have to distinguish between something being off and
something not being there. Hence, isItalic, isBold, isStrike, and
isSmallCaps have become Maybes.
|
| |
|
|
|
| |
Before we just checked for the existence of a tag. Now, we make sure to
check for its on/off value.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Introduces a new function in Reducibles, concatR. The idea is that if we
have two list of Reducibles (blocks or inlines), we can combine them and
just perform the reduction on the joining parts (the last element of the
first list, the first element of the second list). This is useful in cases
where the two lists are already reduced, and we're only worried about the
joining elements.
This actually improves the efficiency a bit further, because concatR can be
smart about empty lists.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |\
| |
| | |
Docx reader: Fix spacing issue.
|
| | | |
|
| | |
| |
| |
| |
| | |
Previously spaces at the beginning of Emph/Strong/etc were kept
inside. This makes sure they are moved out.
|
| | | |
|
| | |
| |
| |
| | |
range
|
| | | |
|
| |/ |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
This changes the signature of the exported `readOMML` to `String ->
Either String [Exp]`, so it can now, in theory, be slotted into
TeXMath. It doesn't have any real error reporting yet, but that might
make more sense once I put it in a branch, and understand how it works
in the other readers.
It also now reads strings that parse to either oMath or oMathPara
elements. Note that the distinction is lost in the output. It's up to
the caller to remember the display type.
|
| |
|
|
|
| |
This gets rid of commented-out functions, cleans up whitespace errors,
and exports and imports the correct functions.
|
| |
|
|
|
|
| |
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.
|
| |
|
|
|
| |
This is the first step in removing the intermediate OMath type, which we
no longer need since we're writing straight to TeXMath Exp.
|
