Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
5546 commits 2 branches 0 tags 65 MiB
Commit graph

5546 commits

This branch
This branch
All branches
Author SHA1 Message Date
John MacFarlane
c3f60e972c Updated changelog. 2014-08-30 11:52:37 -07:00
John MacFarlane
f70e3c3297 Merge branch 'mime' of https://github.com/Aelve/John into Aelve-mime 
Conflicts:
	src/Text/Pandoc/Writers/Docx.hs
 2014-08-30 11:49:50 -07:00
John MacFarlane
eb29aab959 Updated changelog. 2014-08-30 11:13:22 -07:00
John MacFarlane
ee28dfb502 Updated README on --self-contained. 
Removed outdated claim that pandoc will look in the user data
directory if a relative path is specified and the file is not
found locally.  Closes #1572.
 2014-08-30 11:09:15 -07:00
John MacFarlane
8b09d954f9 Merge pull request #1580 from jkr/stringCellDokuWiki 
DokuWiki writer: Backslash newlines in table cells
 2014-08-30 09:22:38 -07:00
John MacFarlane
b36600092c Removed extra blank line after version. 2014-08-30 08:16:00 -07:00
Jesse Rosenthal
ccda2a902c DokuWiki writer: Use backslash newlines in table cells. 
Write out strings in table cells with backslash linebreaks in place of
newlines. We also want to remove the first two spaces of an indent in lists.
 2014-08-30 07:17:55 -04:00
John MacFarlane
aab833b4b4 Updated changelog. 2014-08-29 22:41:25 -07:00
John MacFarlane
218633548f Merge pull request #1574 from jlduran/latex-horizontal-rule 
LaTeX writer: Make Horizontal Rules more flexible
 2014-08-29 21:40:55 -07:00
John MacFarlane
017d44af1d Merge branch 'ugly-tables' of https://github.com/jlduran/pandoc into jlduran-ugly-tables 2014-08-29 21:24:36 -07:00
Jose Luis Duran
4c684561ee LaTeX writer: Add \strut to fix multiline tables 
See: http://tex.stackexchange.com/questions/34971
 2014-08-29 13:54:08 +00:00
John MacFarlane
608e402802 Merge pull request #1577 from jkr/plainCells 
Plain cells
 2014-08-28 13:10:48 -07:00
Jesse Rosenthal
3b5a868533 Docx reader: update tests for new table behavior. 2014-08-28 14:39:04 -04:00
Jesse Rosenthal
c931be24e1 Docx Reader: Read single para in table cell as plain 
This makes to docx reader's native output fit with the way the markdown
reader understands its markdown output. Ie, as far as table cells go:

docx -> native == docx -> native -> markdown -> native

(This identity isn't true for other things outside of table cells, of
course).
 2014-08-28 14:35:33 -04:00
Jose Luis Duran
1fc665c07d LaTeX writer: Make Horizontal Rules more flexible 
Currently, pandoc has hard-coded the following in order to make horizontal
rules in LaTeX:

```hs
"\\begin{center}\\rule{3in}{0.4pt}\\end{center}"
```

Which is fine, but does not allow customizations.  It also does not take into
consideration the current line width.

I'm proposing this change:

```diff
@@ In Writers/LaTeX.hs:
-"\\begin{center}\\rule{3in}{0.4pt}\\end{center}"
+"\\begin{center}\\rule{0.5\\linewidth}{\\linethickness}\\end{center}"
```
 2014-08-28 03:12:37 +00:00
Jose Luis Duran
f1d330b7b5 LaTeX writer: Fix tables 
- [x] Fix a bug introduced in 66378062b6, which
  causes the table caption to repeat across all pages
- [x] Address the issues discussed
  [here](https://groups.google.com/forum/#!msg/pandoc-discuss/qMu6_5lYy0o/ZAU7lzAIKw0J)
  regarding the extra vertical space.
  - [ ] NOTE: This will cause multiline table cells to appear unpadded. See
    http://tex.stackexchange.com/questions/34971
  - [x] Use [`\tabularnewline`](http://tex.stackexchange.com/questions/78796)
    instead of `\\`.
 2014-08-28 02:02:20 +00:00
John MacFarlane
c7f47d7646 Merge pull request #1567 from mpickering/dokuwidth 
DokuWiki cleanup
 2014-08-27 09:42:05 -07:00
Matthew Pickering
404a58f456 DokuWiki Writer: Refactor to use Reader monad 2014-08-27 14:29:09 +01:00
Matthew Pickering
495f55b03e DokuWiki Writer: Hlint cleanup 2014-08-27 13:48:19 +01:00
Matthew Pickering
3412018287 DokuWiki Writer: Qualified all imports 2014-08-27 13:29:09 +01:00
John MacFarlane
8f2aa45d69 Merge pull request #1564 from jkr/trackChangesWriter 
Docx writer: write track changes.
 2014-08-26 22:22:16 -07:00
John MacFarlane
5a6e0d3a08 Merge pull request #1565 from Chobbes/master 
Org exampleLine parser accepts indented example lines!
 2014-08-26 22:18:50 -07:00
Calvin Beck
f813755c55 Fixed exampleLine parser to accept example lines which have indentation at the start of the line. 2014-08-26 21:56:40 -06:00
Jesse Rosenthal
b613d85af9 Docx writer: Accomodate GHC 7.4 (no lookupEnv) 2014-08-26 06:43:14 -04:00
Jesse Rosenthal
21253b59e8 Docx writer: Default to user login and time of change if not given. 2014-08-25 14:03:35 -04:00
Jesse Rosenthal
e1bb28a388 Docx writer: Implement track changes. 
These have default authors and dates of "unknown" and timestamp-zero,
respectively.
 2014-08-25 12:37:56 -04:00
John MacFarlane
9f8051d95d Hlint changes to Docx writer. 2014-08-24 11:37:23 -07:00
John MacFarlane
c956eb617d Capitalized Build-Depends for consistency. 2014-08-24 08:34:30 -07:00
Gabor Pali
80af713743 Fix build dependencies for the trypandoc flag. 
Build dependencies of the trypandoc executable are required, regardless of the
trypandoc flag was set to either True or False.  Correct package description
to make them truly optional.
 2014-08-24 16:49:26 +02:00
John MacFarlane
0ef1f787c7 Docx writer: Bibliography entries get Bibliography style. 
Closes #1559.
 2014-08-23 20:52:09 -07:00
John MacFarlane
2956ef251c Fixed --self-contained with Windows paths. 
Previously C:\foo.js was being wrongly interpreted as a URI.
Closes #1558.
 2014-08-22 23:21:57 -07:00
John MacFarlane
17f71002ae Merge pull request #1553 from mpickering/master 
Txt2Tags reader: Header is now parsed only if standalone flag is set
 2014-08-21 16:42:28 -07:00
mpickering
aa808055f0 Txt2Tags Reader: Fixed crash when reading from stdin 2014-08-21 17:11:21 +01:00
mpickering
3b6d7afa71 Txt2Tags Reader: Corrected formatting of %%mtime macro 2014-08-21 17:11:16 +01:00
mpickering
2a7319541d Txt2Tags Reader: Parse Meta information 
The header is now parsed as meta information. The first line is the
`title`, the second is the `author` and third line is the `date`.
 2014-08-21 17:09:40 +01:00
John MacFarlane
604e1da878 Added network-uri flag. 
This addresses the split of network and network-uri.
 2014-08-20 15:34:13 -07:00
mpickering
2cd049a1bf Txt2Tags reader: Header is now parsed only if standalone flag is set 2014-08-20 18:11:37 +01:00
John MacFarlane
13469af843 More test updates. 2014-08-20 09:47:47 -07:00
John MacFarlane
7e69f4a4fa Updated tests. 2014-08-20 09:23:19 -07:00
John MacFarlane
27ea34489a LaTeX template: disable microtype protrusion for typewriter font. 
Closes #1549. Thanks to lemzwerg.
 2014-08-20 08:17:10 -07:00
John MacFarlane
60f3e777f3 EPUB writer: don't use page-progression-direction in EPUB2. 
Also, if page-progression-direction not specified in metadata,
don't include the attribute even in EPUB3; not including it is
the same as including it with the value "default", as we did before.

Closes #1550.
 2014-08-19 09:21:26 -07:00
John MacFarlane
a79d477667 More Makefile tweaks. 2014-08-18 18:12:49 -07:00
John MacFarlane
112b2f9f52 Makefile tweaks. 2014-08-18 17:40:35 -07:00
John MacFarlane
84f27995ca Makefile: Added 'install' to PHONY list. 2014-08-18 16:14:31 -07:00
John MacFarlane
716ad5fd8a Merge pull request #1547 from jkr/styleparse 
Docx reader: parsing styles
 2014-08-18 14:14:01 -07:00
John MacFarlane
6dce8c6760 HTML reader: improved handling of tags that can be block or inline. 
Previously a section like this would be enclosed in a paragraph,
with RawInline for the video tags (since video is a tag that can
be either block or inline):

    <video controls="controls">
       <source src="../videos/test.mp4" type="video/mp4" />
       <source src="../videos/test.webm" type="video/webm" />
       <p>
          The videos can not be played back on your system.<br/>
          Try viewing on Youtube (requires Internet connection):
          <a href="http://youtu.be/etE5urBps_w">Relative Velocity on
    Youtube</a>.
       </p>
    </video>

This change will cause the video and source tags to be parsed
as RawBlock instead, giving better output.

The general change is this:  when we're parsing a "plain" sequence
of inlines, we don't parse anything that COULD be a block-level tag.
 2014-08-18 12:41:09 -07:00
John MacFarlane
ee88f5662b Improved osx build procedure. 2014-08-17 23:24:21 -07:00
Jesse Rosenthal
4b38e9f1f0 Docx reader: whitespace fix. 2014-08-17 20:11:50 -04:00
John MacFarlane
d5c41bdd84 Updated release checklist. 2014-08-17 16:29:22 -07:00
John MacFarlane
915ff1c9d3 Added tables.dokuwiki and tables.icml to extra-source-files. 2014-08-17 16:23:26 -07:00