Fixed module names and imports after giant file move.

15 files changed, 77 insertions, 77 deletions

diff --git a/src/GF/Text/Arabic.hs b/src/GF/Text/Arabic.hs
index 1b829981f..c482b1172 100644
--- a/src/GF/Text/Arabic.hs
+++ b/src/GF/Text/Arabic.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:13 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:23:34 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module Arabic (mkArabic) where
+module GF.Text.Arabic (mkArabic) where
 
 mkArabic :: String -> String
 mkArabic = unwords . (map mkArabicWord) . words
diff --git a/src/GF/Text/Devanagari.hs b/src/GF/Text/Devanagari.hs
index 86bcc3811..6bd23149f 100644
--- a/src/GF/Text/Devanagari.hs
+++ b/src/GF/Text/Devanagari.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:14 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:23:34 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module Devanagari (mkDevanagari) where
+module GF.Text.Devanagari (mkDevanagari) where
 
 mkDevanagari :: String -> String
 mkDevanagari = digraphWordToUnicode . adHocToDigraphWord
diff --git a/src/GF/Text/Ethiopic.hs b/src/GF/Text/Ethiopic.hs
index e67f8f1a2..26ae4b933 100644
--- a/src/GF/Text/Ethiopic.hs
+++ b/src/GF/Text/Ethiopic.hs
@@ -5,15 +5,15 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:14 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:23:35 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- Ascii-Unicode decoding for Ethiopian.
 -- Copyright (c) Harald Hammarström 2003 under Gnu General Public License
 -----------------------------------------------------------------------------
 
-module Ethiopic (mkEthiopic) where
+module GF.Text.Ethiopic (mkEthiopic) where
 
 mkEthiopic :: String -> String
 mkEthiopic = digraphWordToUnicode . adHocToDigraphWord
diff --git a/src/GF/Text/ExtendedArabic.hs b/src/GF/Text/ExtendedArabic.hs
index 1b77248e3..d2c5faac5 100644
--- a/src/GF/Text/ExtendedArabic.hs
+++ b/src/GF/Text/ExtendedArabic.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:14 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:23:36 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module ExtendedArabic (mkArabic0600, mkExtendedArabic) where
+module GF.Text.ExtendedArabic (mkArabic0600, mkExtendedArabic) where
 
 mkArabic0600 :: String -> String
 mkArabic0600 = digraphWordToUnicode . aarnesToDigraphWord
@@ -96,4 +96,4 @@ spoolMarkup2 :: String -> [(Char, Char)]
 spoolMarkup2 s = case s of
    [] -> [] -- Shouldn't happen
    '>' : cs -> ('\\', '>') : aarnesToDigraphWord cs
-   c1 : cs -> ('\\', c1) : spoolMarkup2 cs
\ No newline at end of file
+   c1 : cs -> ('\\', c1) : spoolMarkup2 cs
diff --git a/src/GF/Text/ExtraDiacritics.hs b/src/GF/Text/ExtraDiacritics.hs
index f9e484b59..f3d811c2c 100644
--- a/src/GF/Text/ExtraDiacritics.hs
+++ b/src/GF/Text/ExtraDiacritics.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:14 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:23:36 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module ExtraDiacritics (mkExtraDiacritics) where
+module GF.Text.ExtraDiacritics (mkExtraDiacritics) where
 
 mkExtraDiacritics :: String -> String
 mkExtraDiacritics = mkExtraDiacriticsWord
diff --git a/src/GF/Text/Greek.hs b/src/GF/Text/Greek.hs
index 191bc0985..6b9361a29 100644
--- a/src/GF/Text/Greek.hs
+++ b/src/GF/Text/Greek.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:14 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:23:37 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module Greek (mkGreek) where
+module GF.Text.Greek (mkGreek) where
 
 mkGreek :: String -> String
 mkGreek = unwords . (map mkGreekWord) . mkGravis . words
diff --git a/src/GF/Text/Hebrew.hs b/src/GF/Text/Hebrew.hs
index 6c7db2677..c7026d8da 100644
--- a/src/GF/Text/Hebrew.hs
+++ b/src/GF/Text/Hebrew.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:14 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.7 $
+-- > CVS $Date: 2005/04/21 16:23:37 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.8 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module Hebrew (mkHebrew) where
+module GF.Text.Hebrew (mkHebrew) where
 
 mkHebrew :: String -> String
 mkHebrew = mkHebrewWord
diff --git a/src/GF/Text/Hiragana.hs b/src/GF/Text/Hiragana.hs
index 877a22930..ba74fc83c 100644
--- a/src/GF/Text/Hiragana.hs
+++ b/src/GF/Text/Hiragana.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:14 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:23:38 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module Hiragana (mkJapanese) where
+module GF.Text.Hiragana (mkJapanese) where
 
 -- long vowel romaaji must be ei, ou not ee, oo  
 
diff --git a/src/GF/Text/LatinASupplement.hs b/src/GF/Text/LatinASupplement.hs
index 1952aa8a7..de6e170ac 100644
--- a/src/GF/Text/LatinASupplement.hs
+++ b/src/GF/Text/LatinASupplement.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:14 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:23:39 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module LatinASupplement (mkLatinASupplement) where
+module GF.Text.LatinASupplement (mkLatinASupplement) where
 
 mkLatinASupplement :: String -> String
 mkLatinASupplement = mkLatinASupplementWord
diff --git a/src/GF/Text/OCSCyrillic.hs b/src/GF/Text/OCSCyrillic.hs
index cffe064fe..7bbd1a773 100644
--- a/src/GF/Text/OCSCyrillic.hs
+++ b/src/GF/Text/OCSCyrillic.hs
@@ -4,14 +4,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/29 11:17:56 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.5 $
+-- > CVS $Date: 2005/04/21 16:23:39 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.6 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module OCSCyrillic (mkOCSCyrillic) where
+module GF.Text.OCSCyrillic (mkOCSCyrillic) where
 
 mkOCSCyrillic :: String -> String
 mkOCSCyrillic = mkOCSCyrillicWord
diff --git a/src/GF/Text/Russian.hs b/src/GF/Text/Russian.hs
index dd8751848..5e49d2fbb 100644
--- a/src/GF/Text/Russian.hs
+++ b/src/GF/Text/Russian.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:15 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:23:40 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module Russian (mkRussian, mkRusKOI8) where
+module GF.Text.Russian (mkRussian, mkRusKOI8) where
 
 -- | an ad hoc ASCII encoding. Delimiters: @\/_ _\/@
 mkRussian :: String -> String
diff --git a/src/GF/Text/Tamil.hs b/src/GF/Text/Tamil.hs
index 47623bac5..e938247c0 100644
--- a/src/GF/Text/Tamil.hs
+++ b/src/GF/Text/Tamil.hs
@@ -5,14 +5,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:16 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:23:40 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-module Tamil (mkTamil) where
+module GF.Text.Tamil (mkTamil) where
 
 mkTamil :: String -> String
 mkTamil = digraphWordToUnicode . adHocToDigraphWord
diff --git a/src/GF/Text/Text.hs b/src/GF/Text/Text.hs
index 92d8ca9e2..dc9130f90 100644
--- a/src/GF/Text/Text.hs
+++ b/src/GF/Text/Text.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/31 16:57:35 $ 
--- > CVS $Author: aarne $
--- > CVS $Revision: 1.8 $
+-- > CVS $Date: 2005/04/21 16:23:41 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.9 $
 --
 -- elementary text postprocessing. AR 21\/11\/2001.
 --
@@ -17,7 +17,7 @@
 -- XML hack 14\/8\/2004; not in use yet
 -----------------------------------------------------------------------------
 
-module Text (untokWithXML,
+module GF.Text.Text (untokWithXML,
 	     exceptXML,
 	     formatAsTextLit,
 	     formatAsCodeLit,
@@ -30,8 +30,8 @@ module Text (untokWithXML,
 	     concatRemSpace
 	    ) where
 
-import Operations
-import Char
+import GF.Data.Operations
+import Data.Char
 
 -- | does not apply untokenizer within XML tags --- heuristic "< "
 -- this function is applied from top level...
diff --git a/src/GF/Text/UTF8.hs b/src/GF/Text/UTF8.hs
index 32f5b49ff..e27773aad 100644
--- a/src/GF/Text/UTF8.hs
+++ b/src/GF/Text/UTF8.hs
@@ -5,15 +5,15 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:16 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.4 $
+-- > CVS $Date: 2005/04/21 16:23:42 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.5 $
 --
 -- From the Char module supplied with HBC.
 -- code by Thomas Hallgren (Jul 10 1999)
 -----------------------------------------------------------------------------
 
-module UTF8 (decodeUTF8, encodeUTF8) where
+module GF.Text.UTF8 (decodeUTF8, encodeUTF8) where
 
 -- | Take a Unicode string and encode it as a string
 -- with the UTF8 method.
diff --git a/src/GF/Text/Unicode.hs b/src/GF/Text/Unicode.hs
index 76bb6929c..9d0b9d1a8 100644
--- a/src/GF/Text/Unicode.hs
+++ b/src/GF/Text/Unicode.hs
@@ -5,31 +5,31 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/02/18 19:21:16 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.11 $
+-- > CVS $Date: 2005/04/21 16:23:42 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.12 $
 --
 -- ad hoc Unicode conversions from different alphabets.
 -- AR 12\/4\/2000, 18\/9\/2001, 30\/5\/2002, 26\/1\/2004
 -----------------------------------------------------------------------------
 
-module Unicode (mkUnicode, treat) where
+module GF.Text.Unicode (mkUnicode, treat) where
 
-import Greek (mkGreek)
-import Arabic (mkArabic)
-import Hebrew (mkHebrew)
-import Russian (mkRussian, mkRusKOI8)
-import Ethiopic (mkEthiopic)
-import Tamil (mkTamil)
-import OCSCyrillic (mkOCSCyrillic)
-import LatinASupplement (mkLatinASupplement)
-import Devanagari (mkDevanagari)
-import Hiragana (mkJapanese)
-import ExtendedArabic (mkArabic0600)
-import ExtendedArabic (mkExtendedArabic)
-import ExtraDiacritics (mkExtraDiacritics)
+import GF.Text.Greek (mkGreek)
+import GF.Text.Arabic (mkArabic)
+import GF.Text.Hebrew (mkHebrew)
+import GF.Text.Russian (mkRussian, mkRusKOI8)
+import GF.Text.Ethiopic (mkEthiopic)
+import GF.Text.Tamil (mkTamil)
+import GF.Text.OCSCyrillic (mkOCSCyrillic)
+import GF.Text.LatinASupplement (mkLatinASupplement)
+import GF.Text.Devanagari (mkDevanagari)
+import GF.Text.Hiragana (mkJapanese)
+import GF.Text.ExtendedArabic (mkArabic0600)
+import GF.Text.ExtendedArabic (mkExtendedArabic)
+import GF.Text.ExtraDiacritics (mkExtraDiacritics)
 
-import Char
+import Data.Char
 
 mkUnicode :: String -> String
 mkUnicode s = case s of