aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc/Pretty.hs
AgeCommit message (Collapse)AuthorFilesLines
2017-03-04Stylish-haskell automatic formatting changes.John MacFarlane1-32/+34
2017-03-03Pretty: don't error for blocks of size < 1.John MacFarlane1-1/+1
Instead, resize to 1. Note, this (together with earlier changes to the Markdown writer) seems to fix #1785. The table renders as garbage, but pandoc now completes the conversion quickly and doesn't get tied up.
2017-02-23Pretty: simplified definition of realLength.John MacFarlane1-1/+1
2016-12-05Pretty: Added `afterBreak`.John MacFarlane1-0/+15
This makes it possible to insert escape codes for content that needs escaping at the beginning of a line.
2016-11-23Fixed some bugs in Pretty that caused blank lines in tables.John MacFarlane1-11/+19
The bugs caused spurious blank lines in grid tables when we had things like blankline $$ blankline Closes #3251.
2016-11-19Added function to compute the minimal width of a documentBjörn Peemöller1-0/+4
2016-11-19Added error message for illegal call to Pretty.blockBjörn Peemöller1-3/+6
2016-09-02Remove an inline monad compatibility macro.Jesse Rosenthal1-12/+0
2016-09-02Remove Compat.MonoidJesse Rosenthal1-1/+1
This was only necessary for GHC versions with base below 4.5 (i.e., ghc < 7.4).
2016-07-14Fixed compiler warnings.John MacFarlane1-4/+2
2016-03-22Updated copyright dates to include 2016.John MacFarlane1-2/+2
2015-11-19Merge branch 'new-image-attributes' of https://github.com/mb21/pandoc into ↵John MacFarlane1-1/+1
mb21-new-image-attributes * Bumped version to 1.16. * Added Attr field to Link and Image. * Added `common_link_attributes` extension. * Updated readers for link attributes. * Updated writers for link attributes. * Updated tests * Updated stack.yaml to build against unreleased versions of pandoc-types and texmath. * Fixed various compiler warnings. Closes #261. TODO: * Relative (percentage) image widths in docx writer. * ODT/OpenDocument writer (untested, same issue about percentage widths). * Update pandoc-citeproc.
2015-11-09Restored Text.Pandoc.Compat.Monoid.John MacFarlane1-0/+1
Don't use custom prelude for latest ghc. This is a better approach to making 'stack ghci' and 'cabal repl' work. Instead of using NoImplicitPrelude, we only use the custom prelude for older ghc versions. The custom prelude presents a uniform API that matches the current base version's prelude. So, when developing (presumably with latest ghc), we don't use a custom prelude at all and hence have no trouble with ghci. The custom prelude no longer exports (<>): we now want to match the base 4.8 prelude behavior.
2015-11-09Revert "Use -XNoImplicitPrelude and 'import Prelude' explicitly."John MacFarlane1-1/+0
This reverts commit c423dbb5a34c2d1195020e0f0ca3aae883d0749b.
2015-11-08Use -XNoImplicitPrelude and 'import Prelude' explicitly.John MacFarlane1-0/+1
This is needed for ghci to work with pandoc, given that we now use a custom prelude. Closes #2503.
2015-10-14Use custom Prelude to avoid compiler warnings.John MacFarlane1-1/+0
- 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.
2015-07-25Pretty: comment fix (mb21).John MacFarlane1-1/+1
2015-04-26Updated copyright notices to -2015. Closes #2111.John MacFarlane1-2/+2
2015-02-18Remove partial function from PrettyMatthew Pickering1-7/+11
2014-12-06Text.Pandoc.Pretty: Improve performance of realLengthMatthew Pickering1-1/+1
Eliminates memory usage and twofold increase in speed.
2014-10-20Pretty: Make CR + BLANKLINE = BLANKLINE.John MacFarlane1-0/+3
This fixes an extra blank line we were getting at the end of markdown fragments (as well as rst, org, etc.) Closes #1705.
2014-07-27Text.Pandoc.Pretty: added blanklines.John MacFarlane1-15/+17
This ensures a certain number of blanklines (and no more) in output.
2014-05-09Update copyright notices for 2014, add missing noticesAlbert Krewinkel1-2/+2
2014-02-06Removed RenderState datatype context.Merijn Verstraaten1-2/+1
Reasoning: - It's not Haskell2010 - It breaks some tools - Doesn't actually do anything - RenderState doesn't even have a Monoid instance
2014-01-02Pretty: Added nestle. API change, minor version bump to 1.12.3.John MacFarlane1-1/+10
2013-08-04Remove CPP from default-extensions; add pragmas to modules as needed.John MacFarlane1-1/+1
2013-02-28Pretty: Fixed chomp so it works inside Prefixed elements.John MacFarlane1-6/+8
2013-02-28Pretty: Better Show instance for debugging purposes.John MacFarlane1-4/+1
2012-08-13Pretty: Fixed bug that caused combining characters to be dropped.John MacFarlane1-6/+5
2012-07-26Fixed whitespace errors.John MacFarlane1-1/+1
2012-06-30Pretty: Added wide punctuation range to charWidth.John MacFarlane1-1/+3
Fixes bug with Chinese commas in tables.
2012-02-08More efficient implementation of nowrap in Pretty.John MacFarlane1-4/+4
2012-02-05Fixed Pretty so it uses Data.Monoid's <> w/ GHC 7.4.John MacFarlane1-2/+13
Note: changed fixity to infixr 6.
2012-02-05Remove dependency on dlist.John MacFarlane1-6/+7
Use sequence in Pretty instead.
2012-01-27Made charWidth in Text.Pandoc.Pretty complete.John MacFarlane1-29/+35
Used the unicode spec EastAsianWidth.txt. All characters marked W or F get width 2. Closes #377.
2012-01-25Pretty: Export realLength and use it in calculating offsets.John MacFarlane1-10/+16
This should help fix setext headers and tables containing asian wide characters and combining characters.
2012-01-25Pretty: Added charWidth function.John MacFarlane1-0/+37
2011-12-31Pretty: Added beforeNonBreak combinator.John MacFarlane1-0/+21
This allows you to include something conditionally on it being before a nonblank. Used for RST inline math.
2011-11-18Pretty: Added chomp combinator.John MacFarlane1-0/+13
2010-12-22Pretty: Added quote, doubleQuote.John MacFarlane1-0/+10
2010-12-21Pretty: don't print a breaking space before a newline.John MacFarlane1-0/+4
2010-12-20Renamed 'enclosed' to 'inside'.John MacFarlane1-7/+7
This avoids conflict with 'enclosed' in Text.Pandoc.Parsing.
2010-12-19Pretty: Fixed parens.John MacFarlane1-1/+1
2010-12-19Pretty: Added enclosed, parens.John MacFarlane1-2/+13
2010-12-19Pretty: Added braces and brackets.John MacFarlane1-0/+9
2010-12-17Added new prettyprinting module.John MacFarlane1-0/+395
* 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.