5 files changed, 9 insertions(+), 19 deletions(-)

M Graphics/Layout/CSS.hs
M Graphics/Layout/CSS/Font.hs
R Graphics/Layout/CSS/{Internal.hs => Length.hs}
M Graphics/Layout/Grid/CSS.hs
M cattrap.cabal

@@ 9,7 9,7 @@ import Stylist.Tree (StyleTree(..))
 import Graphics.Layout.Box as B
 import Graphics.Layout
 import Graphics.Text.Font.Choose (Pattern(..), unset)
-import Graphics.Layout.CSS.Internal
+import Graphics.Layout.CSS.Length
 import Graphics.Layout.CSS.Font
 import Graphics.Layout.Grid.CSS
 import Graphics.Layout.Inline.CSS

@@ 1,16 1,14 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Graphics.Layout.CSS.Font(Font'(..), placeholderFont, hbScale, hbUnit,
-	pattern2hbfont, pattern2font, CSSFont(..), variations') where
+        pattern2hbfont, pattern2font, CSSFont(..), variations') where
 
 import Data.CSS.Syntax.Tokens (Token(..), NumericValue(..), serialize)
 import Stylist (PropertyParser(..))
 import qualified Data.Text as Txt
-import Data.Scientific (toRealFloat)
-import Debug.Trace (trace) -- For warnings.
 import Data.Maybe (fromMaybe)
 
 import Graphics.Layout.Box
-import Graphics.Layout.CSS.Internal
+import Graphics.Layout.CSS.Length
 
 import Data.Text.Glyphize as HB
 import Graphics.Text.Font.Choose (Pattern(..), Value(..), normalizePattern,

@@ 1,23 1,15 @@
 {-# LANGUAGE OverloadedStrings #-}
-module Graphics.Layout.CSS.Internal where
+module Graphics.Layout.CSS.Length where
 
-import Data.CSS.Syntax.Tokens (Token(..), NumericValue(..), serialize)
-import Stylist (PropertyParser(..))
+import Data.CSS.Syntax.Tokens (Token(..), NumericValue(..))
 import qualified Data.Text as Txt
 import Data.Scientific (toRealFloat)
 import Debug.Trace (trace) -- For warnings.
-import Data.Maybe (fromMaybe)
+import Data.Text.Glyphize (Font)
+import Graphics.Text.Font.Choose (Pattern(..))
 
 import Graphics.Layout.Box
 
-import Data.Text.Glyphize as HB
-import Graphics.Text.Font.Choose (Pattern(..), Value(..), normalizePattern,
-                                  getValue', getValue0, setValue, Binding(..),
-                                  configSubstitute', defaultSubstitute,
-                                  fontSort', MatchKind(..), fontRenderPrepare')
-import qualified Data.ByteString as B
-import System.IO.Unsafe (unsafePerformIO)
-
 type Unitted = (Double, Txt.Text)
 auto :: Unitted
 auto = (0,"auto")

@@ 8,7 8,7 @@ import qualified Data.Text as Txt
 import Data.Char (isAlphaNum)
 import Data.Maybe (fromMaybe)
 
-import Graphics.Layout.CSS.Internal
+import Graphics.Layout.CSS.Length
 import Graphics.Layout.Box
 import Graphics.Layout.Grid
 import Graphics.Layout

@@ 20,7 20,7 @@ library
   exposed-modules:     Graphics.Layout, Graphics.Layout.CSS, Graphics.Layout.Flow,
                         Graphics.Layout.Grid, Graphics.Layout.Grid.CSS,
                         Graphics.Layout.Box, Graphics.Layout.Arithmetic,
-                        Graphics.Layout.CSS.Internal, Graphics.Layout.CSS.Font,
+                        Graphics.Layout.CSS.Length, Graphics.Layout.CSS.Font,
                         Graphics.Layout.Inline, Graphics.Layout.Inline.CSS
   -- other-modules:
   -- other-extensions: