Commit graph

30 commits

Author SHA1 Message Date
John MacFarlane
2e8064346d Pretty: comment fix (mb21). 2015-07-25 15:51:55 +02:00
John MacFarlane
1868cb5e42 Updated copyright notices to -2015. Closes #2111. 2015-04-26 10:18:29 -07:00
Matthew Pickering
ef981492fd Remove partial function from Pretty 2015-02-18 20:11:08 +00:00
Matthew Pickering
9761283c8f Text.Pandoc.Pretty: Improve performance of realLength
Eliminates memory usage and twofold increase in speed.
2014-12-06 22:58:40 +00:00
John MacFarlane
7f6bbfadf4 Pretty: Make CR + BLANKLINE = BLANKLINE.
This fixes an extra blank line we were getting at the end
of markdown fragments (as well as rst, org, etc.)

Closes #1705.
2014-10-20 20:26:08 -07:00
John MacFarlane
cc24a1f3e5 Text.Pandoc.Pretty: added blanklines.
This ensures a certain number of blanklines (and no more) in output.
2014-07-27 07:56:55 -07:00
Albert Krewinkel
8fdbef841d Update copyright notices for 2014, add missing notices 2014-05-09 00:46:08 +02:00
Merijn Verstraaten
286781f801 Removed RenderState datatype context.
Reasoning:
    - It's not Haskell2010
    - It breaks some tools
    - Doesn't actually do anything
    - RenderState doesn't even have a Monoid instance
2014-02-06 23:10:59 +01:00
John MacFarlane
452a140d0c Pretty: Added nestle. API change, minor version bump to 1.12.3. 2014-01-02 21:09:39 -08:00
John MacFarlane
2d6e0b1530 Remove CPP from default-extensions; add pragmas to modules as needed. 2013-08-04 14:12:13 -07:00
John MacFarlane
68c95f4857 Pretty: Fixed chomp so it works inside Prefixed elements. 2013-02-28 20:22:08 -08:00
John MacFarlane
0c4965847f Pretty: Better Show instance for debugging purposes. 2013-02-28 20:12:21 -08:00
John MacFarlane
76edb6b848 Pretty: Fixed bug that caused combining characters to be dropped. 2012-08-13 15:52:41 -07:00
John MacFarlane
6d7f0a1b81 Fixed whitespace errors. 2012-07-26 22:32:53 -07:00
John MacFarlane
9e458d7974 Pretty: Added wide punctuation range to charWidth.
Fixes bug with Chinese commas in tables.
2012-06-30 11:51:52 -07:00
John MacFarlane
142c29d908 More efficient implementation of nowrap in Pretty. 2012-02-08 08:32:32 -08:00
John MacFarlane
bec945518c Fixed Pretty so it uses Data.Monoid's <> w/ GHC 7.4.
Note:  changed fixity to infixr 6.
2012-02-05 19:57:59 -08:00
John MacFarlane
4dec972cfe Remove dependency on dlist.
Use sequence in Pretty instead.
2012-02-05 14:25:12 -08:00
John MacFarlane
5b3c0a1081 Made charWidth in Text.Pandoc.Pretty complete.
Used the unicode spec EastAsianWidth.txt.
All characters marked W or F get width 2.

Closes #377.
2012-01-27 13:30:47 -08:00
John MacFarlane
f70dfe4d3d Pretty: Export realLength and use it in calculating offsets.
This should help fix setext headers and tables containing
asian wide characters and combining characters.
2012-01-25 23:30:21 -08:00
John MacFarlane
0c11d94e70 Pretty: Added charWidth function. 2012-01-25 23:15:18 -08:00
John MacFarlane
c264dc4f5b Pretty: Added beforeNonBreak combinator.
This allows you to include something conditionally on it being
before a nonblank.  Used for RST inline math.
2011-12-31 11:39:33 -08:00
John MacFarlane
23c26bbc65 Pretty: Added chomp combinator. 2011-11-18 13:19:22 -08:00
John MacFarlane
369502bbb4 Pretty: Added quote, doubleQuote. 2010-12-22 00:22:28 -08:00
John MacFarlane
ce533ffd90 Pretty: don't print a breaking space before a newline. 2010-12-21 16:45:13 -08:00
John MacFarlane
112717de4e Renamed 'enclosed' to 'inside'.
This avoids conflict with 'enclosed' in Text.Pandoc.Parsing.
2010-12-20 19:09:01 -08:00
John MacFarlane
2fe271d163 Pretty: Fixed parens. 2010-12-19 17:20:18 -08:00
John MacFarlane
9120514998 Pretty: Added enclosed, parens. 2010-12-19 12:39:49 -08:00
John MacFarlane
6aa5010617 Pretty: Added braces and brackets. 2010-12-19 10:13:11 -08:00
John MacFarlane
543aa28c38 Added new prettyprinting module.
* Added Text.Pandoc.Pretty.
  This is better suited for pandoc than the 'pretty' package.
  One advantage is that we now get proper wrapping; Emph [Inline]
  is no longer treated as a big unwrappable unit. Previously
  we only got breaks for spaces at the "outer level." We can also
  more easily avoid doubled blank lines.  Performance is
  significantly better as well.

* Removed Text.Pandoc.Blocks.
  Text.Pandoc.Pretty allows you to define blocks and concatenate
  them.

* Modified markdown, RST, org readers to use Text.Pandoc.Pretty
  instead of Text.PrettyPrint.HughesPJ.

* Text.Pandoc.Shared:  Added writerColumns to WriterOptions.

* Markdown, RST, Org writers now break text at writerColumns.

* Added --columns command-line option, which sets stColumns
  and writerColumns.

* Table parsing:  If the size of the header > stColumns,
  use the header size as 100% for purposes of calculating
  relative widths of columns.
2010-12-17 13:39:17 -08:00