librarify langfilter too

Makefile

@@ -55,7 +55,7 @@ define copy
   cp $< $@
 endef
 
-$(LANGFILTER): langfilter/*.hs langfilter/langfilter.cabal
+$(LANGFILTER): langfilter/lib/*.hs langfilter/main/*.hs langfilter/langfilter.cabal
 	$(cabal-exe)
 
 $(LAANTAS_SCRIPT): laantas-script/*

langfilter/langfilter.cabal

@@ -7,15 +7,7 @@ license: AGPL-3.0-or-later
 author: Rhiannon Morris <rhi@rhiannon.website>
 maintainer: Rhiannon Morris <rhi@rhiannon.website>
 
-executable langfilter
+common base
-  hs-source-dirs: .
-  main-is: Main.hs
-  other-modules:
-    Lang,
-    Ebnf,
-    Spans,
-    LaantasImage,
-    Glosses
   ghc-options:
     -Wall -Wno-missing-signatures -Wno-missing-pattern-synonym-signatures
     -Wno-name-shadowing
@@ -31,6 +23,7 @@ executable langfilter
     OverloadedStrings,
     PatternSynonyms,
     RecordWildCards,
+    TupleSections,
     ViewPatterns
   build-depends:
     base >= 4.14.0.0 && < 4.21,
@@ -42,3 +35,20 @@ executable langfilter
     text ^>= 2.1,
     pretty-show ^>= 1.10,
     laantas-script
+
+library
+  import: base
+  hs-source-dirs: lib
+  exposed-modules:
+    Lang,
+    Ebnf,
+    Spans,
+    LaantasImage,
+    Glosses,
+    LangFilter
+
+executable langfilter
+  import: base
+  hs-source-dirs: main
+  main-is: Main.hs
+  build-depends: langfilter

langfilter/lib/LangFilter.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE TupleSections #-}
+module LangFilter where
 
 import Lang
 import Ebnf
@@ -6,7 +6,6 @@ import Spans
 import Glosses
 
 import Text.Pandoc.Definition
-import Text.Pandoc.JSON
 import Text.Pandoc.Walk
 import Data.Maybe
 import Data.Map (Map)
@@ -18,17 +17,16 @@ import Control.Monad
 import System.Environment
 
 
-main :: IO ()
+langFilter :: Pandoc -> IO Pandoc
-main = toJSONFilter filter where
+langFilter p@(Pandoc (Meta m) _) = do
-  filter p@(Pandoc (Meta m) _) = do
+  lang <- toLang $ Map.lookup "conlang" m
-    lang <- toLang $ Map.lookup "conlang" m
+  defColor <- getDefColor m
-    defColor <- getDefColor m
+  let ?lang = lang
-    let ?lang = lang
+  let ?defColor = defColor
-    let ?defColor = defColor
+  let f = map (walk spans . fixFigureClass . makeEbnf .
-    let f = map (walk spans . fixFigureClass . makeEbnf .
+               makeQuotes . letterList) .
-                 makeQuotes . letterList) .
+          concatMap (makeBlocks <=< glosses)
-            concatMap (makeBlocks <=< glosses)
+  pure $ walk f p
-    pure $ walk f p
 
 getDefColor :: Map Text MetaValue -> IO Text
 getDefColor m = do

langfilter/main/Main.hs

@@ -0,0 +1,4 @@
+import LangFilter
+import Text.Pandoc.JSON
+
+main = toJSONFilter langFilter