Use hyphenation package instead of providing own rules

Graphics/PDF.hs

@@ -62,14 +62,12 @@ module Graphics.PDF
   , mkType1Font
   -- ** Typesetting
   , module Graphics.PDF.Typesetting
-  , module Graphics.PDF.Hyphenate
   ) where
 
 #if !MIN_VERSION_base(4,8,0)
 import Data.Monoid
 #endif
 
-import Graphics.PDF.Hyphenate
 import Graphics.PDF.Typesetting
 import Graphics.PDF.Shading
 import Graphics.PDF.Pattern

Graphics/PDF/Typesetting/Breaking.hs

@@ -52,6 +52,7 @@ import Data.Maybe(fromJust)
 import Graphics.PDF.Fonts.Font hiding(fontSize)
 import Graphics.PDF.Typesetting.WritingSystem
 import qualified Data.Text as T(Text)
+import qualified Text.Hyphenation as H
 --import Debug.Trace
 
 data Justification = FullJustification
@@ -232,11 +233,9 @@ data BRState = BRState { firstPassTolerance :: !PDFFloat -- ^ Default value 100
                        , centered :: !Justification -- ^ Default value false
                        , writingSystem :: !WritingSystem
                        }
-
-defaultBreakingSettings :: BRState
-defaultBreakingSettings = BRState 100 100 50 1000 1000 10 FullJustification (Latin English)
 
-
+defaultBreakingSettings :: BRState
+defaultBreakingSettings = BRState 100 100 50 1000 1000 10 FullJustification (Latin H.english_US)
 
 
 computeDemerit :: Bool

Graphics/PDF/Typesetting/WritingSystem.hs

@@ -11,21 +11,17 @@
 ---------------------------------------------------------
 module Graphics.PDF.Typesetting.WritingSystem(
       WritingSystem(..)
-    , Language(..)
     , mapToSpecialGlyphs
 ) where 
 
 import qualified Data.Text as T
 import Graphics.PDF.LowLevel.Types
-import qualified Graphics.PDF.Hyphenate as H
+import qualified Text.Hyphenation as H
 import Data.List(intersperse)
 import Data.Char 
 import Data.List(unfoldr)
 
-data Language = English 
-              | OtherLanguage 
-
-data WritingSystem = Latin Language
+data WritingSystem = Latin H.Hyphenator
                    | UnknownWritingSystem
 
 
@@ -49,22 +45,19 @@ myWords l = concatMap onlyWord . unfoldr myWords' $ l
          (True,False) -> [p]
          (False,False) -> [w,p]
 
-addHyphens :: H.HyphenationDatabase -> T.Text -> T.Text
-addHyphens db f = T.concat . map (T.concat . intersperse (T.pack "/-") . H.hyphenate db) . myWords $ f
-
+addHyphens :: H.Hyphenator -> T.Text -> T.Text
+addHyphens hn f =
+    T.concat . map (T.concat . intersperse (T.pack "/-") . hyphenate) . myWords $ f
+  where
+    hyphenate = fmap T.pack . H.hyphenate hn . T.unpack
 
 mapToSpecialGlyphs :: WritingSystem -> T.Text -> [SpecialChar]
 mapToSpecialGlyphs UnknownWritingSystem theText = 
   let getBreakingGlyphs (' ':l) = NormalSpace:getBreakingGlyphs l 
       getBreakingGlyphs (a:l) = NormalChar a:getBreakingGlyphs l 
       getBreakingGlyphs [] = []
   in getBreakingGlyphs (T.unpack theText)
-mapToSpecialGlyphs (Latin OtherLanguage) theText = 
-  let getBreakingGlyphs (' ':l) = NormalSpace:getBreakingGlyphs l 
-      getBreakingGlyphs (a:l) = NormalChar a:getBreakingGlyphs l 
-      getBreakingGlyphs [] = []
-  in getBreakingGlyphs (T.unpack theText)
-mapToSpecialGlyphs (Latin English) theText = 
+mapToSpecialGlyphs (Latin hn) theText =
   let getBreakingGlyphs [] = []
       getBreakingGlyphs (a:'/':'-':d:l) = (NormalChar a):BreakingHyphen:getBreakingGlyphs (d:l)
       getBreakingGlyphs (',':' ':l) = NormalChar ',':BiggerSpace:getBreakingGlyphs l
@@ -75,4 +68,4 @@ mapToSpecialGlyphs (Latin English) theText =
       getBreakingGlyphs ('?':' ':l) = NormalChar '?':BiggerSpace:getBreakingGlyphs l
       getBreakingGlyphs (' ':l) = NormalSpace:getBreakingGlyphs l
       getBreakingGlyphs (a:l) = NormalChar a:getBreakingGlyphs l
-  in getBreakingGlyphs (T.unpack . addHyphens (H.English Nothing) $ theText)
+  in getBreakingGlyphs (T.unpack . addHyphens hn $ theText)

HPDF.cabal

@@ -87,7 +87,8 @@ library
       text >= 1.2.0,
       network-uri >= 2.6.0.3,
       parsec >=3.1.9,
-      filepath >= 1.4.0
+      filepath >= 1.4.0,
+      hyphenation
   Default-language:  Haskell2010
 
   ghc-options: -Wall -fno-warn-tabs -funbox-strict-fields  -O2
@@ -115,7 +116,6 @@ library
      Graphics.PDF.Pattern
      Graphics.PDF.Shading
      Graphics.PDF.Typesetting
-     Graphics.PDF.Hyphenate
      Graphics.PDF.Documentation
      Paths_HPDF
   Other-Modules:
@@ -126,8 +126,6 @@ library
      Graphics.PDF.Pages
      Graphics.PDF.Resources
      Graphics.PDF.Draw
-     Graphics.PDF.Hyphenate.English
-     Graphics.PDF.Hyphenate.LowLevel
      Graphics.PDF.Typesetting.Breaking
      Graphics.PDF.Typesetting.Horizontal
      Graphics.PDF.Typesetting.Vertical