Error messages improvement and arguments for prefixes

- Error messages improved
- Added errors for multiple definitions with the same name
- All symbols allowed in prefixes
- Excluding `\` from allowed prefix' first-symbol 
- `@Suffix`, `@NoGroup` and `@OneLine` options added to prefixes
- Arguments for prefixes added
- New type of argument: `Math`

LaTeX-generator.cabal

@@ -94,6 +94,9 @@ executable texgen
                        TupleSections
                        LambdaCase
                        FlexibleContexts
+                       ScopedTypeVariables
+                       ConstraintKinds
+                       RankNTypes
   ghc-options:
     -Wall
     -Wno-name-shadowing

examples/example.tex

@@ -17,7 +17,6 @@
 
     \subsection{Environments}
 
-
     \subsection{Prefs}
 
 

examples/examples-from-wiki/prefs/args.tex

@@ -0,0 +1,5 @@
+First example:
+\begin{argument}
+  arg is a: some text here suffix a
+  arg is b: another text suffix b
+\end{argument}

examples/examples-from-wiki/prefs/args.ttex

@@ -0,0 +1,9 @@
+@Define
+  @Prefs
+    |# (n : String) = @TexBeginEnd "argument" @Pref "arg is $n:" @Suf "suffix $n"
+
+First example:
+  |# "a" some text here
+  |# "b" another text
+
+

examples/examples-from-wiki/prefs/math-args.tex

@@ -0,0 +1,3 @@
+Example:
+$ a_1 \wedge a_2 \wedge \ldots \wedge v_n $ Some text here
+$ b_1 + b_2 + \ldots + v_n $ Some text there

examples/examples-from-wiki/prefs/math-args.ttex

@@ -0,0 +1,9 @@
+@Define
+  @Prefs
+    ## (v : String) (op : Math) = @Pref "$ $v_1 $op $v_2 $op \\ldots $op v_n $"
+  @MathCommands
+    /\ = "\\wedge"
+
+Example:
+  ## "a" `/\` Some text here
+  ## "b" `+`  Some text there

examples/examples-from-wiki/prefs/nogroup-oneline.tex

@@ -0,0 +1,6 @@
+Example:
+Begin 1
+Begin 2
+1 End.
+2 End.
+Begin 1 2

examples/examples-from-wiki/prefs/nogroup-oneline.ttex

@@ -0,0 +1,13 @@
+@Define
+  @Prefs
+    |$  = @Begin "Begin" @NoGroup @OneLine
+    |>  = @End   "End."  @NoGroup @OneLine
+    ||$ = @Begin "Begin"          @OneLine
+
+Example:
+  |$ 1
+  |$ 2
+  |> 1
+  |> 2
+  ||$ 1
+  ||$ 2

src/Main.hs

@@ -2,8 +2,8 @@
 
 module Main where
 
-import Control.Monad.Except (ExceptT, runExceptT)
-import Control.Monad.Writer (runWriter)
+import Control.Monad.Except (runExceptT)
+import Control.Monad.Writer (WriterT (runWriterT), runWriter)
 import Data.ByteString (writeFile)
 import Data.Char (isSpace)
 import Data.List.Extra (spanEnd)
@@ -14,10 +14,10 @@ import Data.Void (Void)
 import qualified IOUtils
 import Options.Applicative (readerError)
 import qualified Options.Applicative as Opt
-import Parser (Definitions, DocElement, Parser, readDoc)
+import Parser (Parser, readDoc)
 import Prettyprinter
   ( LayoutOptions (..),
-    PageWidth (AvailablePerLine),
+    PageWidth (..),
     defaultLayoutOptions,
     layoutSmart,
   )
@@ -29,8 +29,9 @@ import Printer
     PrintOpts (PrintOpts),
     texDoc,
   )
-import Processor (prettyError, processDoc)
+import Processor (processDoc)
 import Text.Megaparsec (MonadParsec (eof), errorBundlePretty, parse)
+import Utils (renderErrors)
 import Prelude hiding (writeFile)
 
 parsePart :: Parser a -> Text -> Either String a
@@ -43,23 +44,17 @@ parseAll p = parsePart (p <* eof)
 
 processFile :: Options -> IO ()
 processFile Options {inpFile, outpFile, pageWidth, printOpts} = do
-  res <-
-    runExceptT
-      ( readDoc inpFile ::
-          ExceptT String IO (Text, (Definitions, [DocElement]))
-      )
+  (res, srcs) <- runWriterT $ runExceptT $ readDoc inpFile
   case res of
-    Left e -> IOUtils.putStrLn e
-    Right (file, (defs, docEls)) -> do
+    Left e -> IOUtils.putStrLn $ T.unpack $ renderErrors srcs [e]
+    Right (defs, docEls) -> do
       let (els', errs) = runWriter $ processDoc defs docEls
       case errs of
         [] -> do
           let stream = layoutSmart renderOpts $ texDoc printOpts els'
           writeFile outpFile . encodeUtf8 . renderStrict . h $ stream
         _ ->
-          IOUtils.putStrLn $
-            T.unpack $
-              T.unlines $ map (prettyError (T.lines file)) errs
+          IOUtils.putStrLn $ T.unpack $ renderErrors srcs errs
   where
     renderOpts = defaultLayoutOptions {layoutPageWidth = AvailablePerLine pageWidth 1.0}
     h :: P.SimpleDocStream Ann -> P.SimpleDocStream Void
@@ -177,5 +172,5 @@ main = processFile . defaultOutp =<< Opt.execParser opts
       | otherwise = opts
     replExt ext' filePath =
       case spanEnd (/= '.') filePath of
-        (_, []) -> filePath <> ext'
+        ([], _) -> filePath <> "." <> ext'
         (f', _) -> f' <> ext'