Major code cleanup in all modules. (Removed unneeded imports,

reformatted, etc.)  More major changes are documented below:

+ Removed Text.Pandoc.ParserCombinators and moved all its definitions
  to Text.Pandoc.Shared.
+ In Text.Pandoc.Shared:
  - Removed unneeded 'try' in blanklines.
  - Removed endsWith function and rewrote functions to use isSuffixOf instead.
  - Added >>~ combinator.
  - Rewrote stripTrailingNewlines, removeLeadingSpaces.
+ Moved Text.Pandoc.Entities -> Text.Pandoc.CharacterReferences.
  - Removed unneeded functions charToEntity, charToNumericalEntity.
  - Renamed functions using proper terminology (character references,
    not entities).  decodeEntities -> decodeCharacterReferences,
    characterEntity -> characterReference.
  - Moved escapeStringToXML to Docbook writer, which is the only thing
    that uses it.
  - Removed old entity parser in HTML and Markdown readers; replaced with
    new charRef parser in Text.Pandoc.Shared.
+ Fixed accent bug in Text.Pandoc.Readers.LaTeX:  \^{} now correctly
  parses as a '^' character.
+ Text.Pandoc.ASCIIMathML is no longer an exported module.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@835 788f1e2b-df1e-0410-8736-df70ead52e1b

1 files changed, 15 insertions, 11 deletions

diff --git a/src/Text/Pandoc/Blocks.hs b/src/Text/Pandoc/Blocks.hs
index ffcd5bfe0..cfc22cb3e 100644
--- a/src/Text/Pandoc/Blocks.hs
+++ b/src/Text/Pandoc/Blocks.hs
@@ -43,9 +43,8 @@ module Text.Pandoc.Blocks
                 rightAlignBlock
                )
 where
-
 import Text.PrettyPrint
-import Data.List (transpose, intersperse)
+import Data.List ( intersperse )
 
 -- | A fixed-width block of text.  Parameters are width of block,
 -- height of block, and list of lines.
@@ -53,6 +52,17 @@ data TextBlock = TextBlock Int Int [String]
 instance Show TextBlock where
   show x = show $ blockToDoc x
 
+-- | Break lines in a list of lines so that none are greater than
+-- a given width.
+breakLines :: Int      -- ^ Maximum length of lines.
+           -> [String] -- ^ List of lines.
+           -> [String]
+breakLines width [] = []
+breakLines width (l:ls) =
+  if length l > width
+     then (take width l):(breakLines width ((drop width l):ls))
+     else l:(breakLines width ls)
+
 -- | Convert a @Doc@ element into a @TextBlock@ with a specified width. 
 docToBlock :: Int  -- ^ Width of text block.
            -> Doc  -- ^ @Doc@ to convert.
@@ -60,13 +70,8 @@ docToBlock :: Int  -- ^ Width of text block.
 docToBlock width doc =
   let rendered    = renderStyle (style {lineLength = width, 
                                         ribbonsPerLine = 1}) doc
-      lns         = lines rendered
-      chop []     = []
-      chop (l:ls) = if length l > width
-                       then (take width l):(chop ((drop width l):ls))
-                       else l:(chop ls)
-      lns'        = chop lns
-  in  TextBlock width (length lns') lns' 
+      lns         = breakLines width $ lines rendered
+  in  TextBlock width (length lns) lns
 
 -- | Convert a @TextBlock@ to a @Doc@ element.
 blockToDoc :: TextBlock -> Doc
@@ -116,8 +121,7 @@ isWhitespace x = x `elem` " \t"
 -- | Left-aligns the contents of a @TextBlock@ within the block.
 leftAlignBlock :: TextBlock -> TextBlock
 leftAlignBlock (TextBlock width height lns) =
-  TextBlock width height $ 
-            map (dropWhile isWhitespace) lns
+  TextBlock width height $ map (dropWhile isWhitespace) lns
 
 -- | Right-aligns the contents of a @TextBlock@ within the block.
 rightAlignBlock :: TextBlock -> TextBlock