more anonymization

latex/src/main/scala/com/fifom/latex/LaTeXParser.scala

 package com.fifom.latex
 
 import com.fifom.latex.bindings.Basic
-import com.fifom.latex.commands.{DefaultBegin, LatexCommand, SimpleCO}
-import com.fifom.latex.syntax.{Block, CommandToken, Comment, ExpandedEnv, FileSource, LatexFile, LatexObject, Math, NoSource, RefSource, Reference, StringSource, Token, Whitespace}
-import com.jazzpirate.latex.commands.DefaultEnd
-import com.jazzpirate.latex.syntax.Math
+import com.fifom.latex.commands.{CommandObject, DefaultBegin, DefaultEnd, Environment, LatexCommand, SimpleCO}
+import com.fifom.latex.syntax.{Block, CommandToken, Comment, Expanded, ExpandedEnv, FileSource, LatexContainer, LatexFile, LatexObject, Math, NoRef, NoSource, RefSource, Reference, StringSource, Token, Whitespace}
 import info.kwarc.mmt.api.utils.File
 
 import scala.annotation.tailrec

latex/src/main/scala/com/fifom/latex/LaTeXProcessor.scala

 package com.fifom.latex
 
 import com.fifom.latex.commands.{CommandObject, DefaultEnd, Environment, EnvironmentObject, LatexCommand, SimpleEnv}
-import com.fifom.latex.syntax.{Block, CommandToken, Comment, LatexFile, LatexObject, Math, NoRef, Token, Whitespace}
-import com.jazzpirate.latex.commands.SimpleEnv
-import com.jazzpirate.latex.syntax.Math
+import com.fifom.latex.syntax.{Block, CommandToken, Comment, Expanded, LatexFile, LatexObject, Math, NoRef, Reference, Token, Whitespace}
 import info.kwarc.mmt.api.utils.File
 
 import scala.collection.mutable

latex/src/main/scala/com/fifom/latex/Normalize.scala

 package com.fifom.latex
 
-import com.fifom.latex
 import com.fifom.latex.syntax.{Expanded, Reference, Token}
-import com.jazzpirate.latex.syntax.Token
 
 object Normalize {
   import bindings.Basic._
@@ -15,13 +13,13 @@ object Normalize {
     Remove(vspace),
     Remove(strut),
     Modifier(colon,co => Token(":",0,Expanded(co)) :: Nil),
-    Modifier(vert,co => Token("|",0,syntax.Expanded(co)) :: Nil),
-    Modifier(mid,co => Token("|",0,syntax.Expanded(co)) :: Nil),
-    latex.Modifier(_ne, co => neq.simpleObject(Reference(syntax.Expanded(co),0,0)) :: Nil),
+    Modifier(vert,co => Token("|",0,Expanded(co)) :: Nil),
+    Modifier(mid,co => Token("|",0,Expanded(co)) :: Nil),
+    Modifier(_ne,co => neq.simpleObject(Reference(Expanded(co),0,0)) :: Nil),
     Modifier(rule,{co =>
       co.children.map(_.asString) match {
         case "{.3ex}" :: "{.3ex}" :: Nil =>
-          Token(".",0,syntax.Expanded(co)) :: Nil
+          Token(".",0,Expanded(co)) :: Nil
         case _ =>
           Nil
       }

latex/src/main/scala/com/fifom/latex/bindings/Commands.scala

@@ -2,12 +2,9 @@ package com.fifom.latex.bindings
 
 import java.io.FileNotFoundException
 
-import com.fifom.latex.{FileParser, LaTeXParser}
 import com.fifom.latex.commands.{CommandObject, Dummy, LatexCommand, SimpleCO}
-import com.fifom.latex.syntax.{Block, FileSource, LatexObject, Reference}
-import com.jazzpirate.latex.commands.SimpleCO
-import com.jazzpirate.latex.syntax._
-import com.jazzpirate.latex.LaTeXParser
+import com.fifom.latex.syntax._
+import com.fifom.latex.{FileParser, LaTeXParser}
 import info.kwarc.mmt.api.utils.File
 
 case class Simple(skey : String,soptArgs : Boolean = false, sarguments : Int = 0) extends LatexCommand(skey,soptArgs,sarguments)

latex/src/main/scala/com/fifom/latex/commands/Command.scala

 package com.fifom.latex.commands
 
 import com.fifom.latex.LaTeXParser
-import com.fifom.latex.syntax.{Block, Expanded, Latex, LatexContainer, LatexObject, NoRef, Reference, Token, Whitespace}
-import com.jazzpirate.latex.syntax.Latex
+import com.fifom.latex.syntax.{Block, CommandToken, Expanded, Latex, LatexContainer, LatexObject, NoRef, Reference, Token, Whitespace}
 
 abstract class CommandObject(ref : Reference, val command:LatexCommand,override val children:List[LatexObject]) extends LatexContainer(ref,children) {
   def expand : List[LatexObject]

latex/src/main/scala/com/fifom/latex/commands/Environment.scala

@@ -2,7 +2,6 @@ package com.fifom.latex.commands
 
 import com.fifom.latex.LaTeXParser
 import com.fifom.latex.syntax.{Block, Latex, LatexContainer, LatexObject, Reference}
-import com.jazzpirate.latex.syntax.Latex
 
 import scala.collection.mutable
 

latex/src/main/scala/com/fifom/latex/syntax/Token.scala

 package com.fifom.latex.syntax
 
 import com.fifom.latex.commands.{CommandObject, EnvironmentObject}
-import com.jazzpirate.latex.commands.EnvironmentObject
 import info.kwarc.mmt.api.utils.File
 
 class RefSource(val length : Int)

stex/src/main/scala/com/fifom/stex/Main.scala

@@ -7,11 +7,11 @@ import com.fifom.latex.commands.CommandObject
 import com.fifom.latex.syntax.{Expanded, Latex, LatexFile, LatexObject, Math, Reference}
 import com.fifom.mmt.{MMT, MitM}
 import com.fifom.stex.bindings.{Basics, Defis, StexCommands}
-import com.jazzpirate.{latex, stex}
-import com.jazzpirate.latex.bindings.Commands
-import com.jazzpirate.latex.LaTeXProcessor
-import com.jazzpirate.latex.commands.Environment
-import com.jazzpirate.latex.syntax.Latex
+import com.fifom.{latex, stex}
+import com.fifom.latex.bindings.Commands
+import com.fifom.latex.LaTeXProcessor
+import com.fifom.latex.commands.Environment
+import com.fifom.latex.syntax.Latex
 import info.kwarc.mmt.api.{DPath, GlobalName, LocalName, RuleSet}
 import info.kwarc.mmt.api.checking.{CheckingUnit, History, Solver}
 import info.kwarc.mmt.api.frontend.Controller

stex/src/main/scala/com/fifom/stex/Notations.scala

@@ -3,10 +3,10 @@ package com.fifom.stex
 import com.fifom.latex.bindings.Basic
 import com.fifom.latex.commands.{CommandObject, EnvironmentObject, SimpleCO}
 import com.fifom.latex.syntax.{Block, CommandToken, Expanded, Latex, LatexObject, Reference, Token}
-import com.jazzpirate.latex.bindings.Commands
-import com.jazzpirate.latex.LaTeXParser
-import com.jazzpirate.latex.commands.Environment
-import com.jazzpirate.latex.syntax.Latex
+import com.fifom.latex.bindings.Commands
+import com.fifom.latex.LaTeXParser
+import com.fifom.latex.commands.Environment
+import com.fifom.latex.syntax.Latex
 
 object Notations {
   private def getPrec(tks : List[LatexObject]): Option[Int] = {

stex/src/main/scala/com/fifom/stex/STeX.scala

 package com.fifom.stex
 
 import com.fifom
-import com.fifom.latex.{Expand, LaTeXProcessor, Normalize, ParseError, Remove, bindings}
-import com.fifom.latex.bindings.{Commands, Environments}
-import com.fifom.latex.syntax.{Latex, LatexFile, LatexObject, Math}
 import com.fifom.mmt.{MMT, MitM}
 import com.fifom.stex.bindings.{Basics, Defis, StexCommands}
-import com.jazzpirate.latex.LaTeXProcessor
-import com.jazzpirate.latex.syntax.Latex
-import com.jazzpirate.{latex, stex}
+import com.fifom.latex.{Expand, LaTeXProcessor, Normalize, ParseError, Remove}
+import com.fifom.latex.bindings.{Commands, Environments}
+import com.fifom.latex.syntax.{Latex, LatexFile, LatexObject}
+import com.fifom.{latex, stex}
 import info.kwarc.mmt.api.{DPath, LocalName, ParsingNotationComponent}
 import info.kwarc.mmt.api.modules.Theory
 import info.kwarc.mmt.api.notations.{CommonMarkerProperties, Delim, Precedence, SimpArg, SimpSeqArg, TextNotation}

stex/src/main/scala/com/fifom/stex/StexChecker.scala

@@ -5,10 +5,10 @@ import com.fifom.latex.bindings.{Commands, Environments, Greek}
 import com.fifom.latex.commands.{CommandObject, EnvironmentObject, SimpleCO, SimpleEnv}
 import com.fifom.latex.syntax.{Block, CommandToken, Comment, LatexFile, LatexObject, Math, NoSource, Token, Whitespace}
 import com.fifom.stex.bindings.{Calbf, Others, StexCommands}
-import com.jazzpirate.{latex, stex}
-import com.jazzpirate.latex.LaTeXProcessor
-import com.jazzpirate.latex.commands.SimpleEnv
-import com.jazzpirate.latex.syntax.Latex
+import com.fifom.{latex, stex}
+import com.fifom.latex.LaTeXProcessor
+import com.fifom.latex.commands.SimpleEnv
+import com.fifom.latex.syntax.Latex
 import info.kwarc.mmt.api.utils.File
 
 object StexChecker {

stex/src/main/scala/com/fifom/stex/SymdefParser.scala

@@ -3,9 +3,9 @@ package com.fifom.stex
 import com.fifom.latex.{FileParser, LaTeXParser}
 import com.fifom.latex.commands.{CommandObject, LatexCommand}
 import com.fifom.latex.syntax.{Block, Latex, LatexObject, NoRef, NoSource, Reference, Token}
-import com.jazzpirate.latex.LaTeXParser
-import com.jazzpirate.latex.commands.LatexCommand
-import com.jazzpirate.latex.syntax.Latex
+import com.fifom.latex.LaTeXParser
+import com.fifom.latex.commands.LatexCommand
+import com.fifom.latex.syntax.Latex
 import info.kwarc.mmt.api.utils.File
 
 import scala.collection.mutable

stex/src/main/scala/com/fifom/stex/Tokenizer.scala

@@ -3,8 +3,8 @@ package com.fifom.stex
 import com.fifom.latex.commands.{CommandObject, EnvironmentObject}
 import com.fifom.latex.syntax
 import com.fifom.latex.syntax.{Block, CommandToken, LatexContainer, LatexFile, LatexObject, NoRef, Token, Whitespace}
-import com.jazzpirate.latex.commands.SimpleEnv
-import com.jazzpirate.latex.syntax.Math
+import com.fifom.latex.commands.SimpleEnv
+import com.fifom.latex.syntax.Math
 
 object Tokenizer {
 

stex/src/main/scala/com/fifom/stex/bindings/Commands.scala

@@ -6,10 +6,10 @@ import com.fifom.latex.{FileParser, LaTeXParser, bindings}
 import com.fifom.latex.bindings.{Math, Simple, Symbols}
 import com.fifom.latex.commands.{CommandObject, LatexCommand}
 import com.fifom.latex.syntax.{Block, Expanded, LatexObject, NoSource, Reference, Token}
-import com.jazzpirate.latex.bindings.Commands
-import com.jazzpirate.latex.commands.LatexCommand
-import com.jazzpirate.latex.syntax.Block
-import com.jazzpirate.latex.LaTeXParser
+import com.fifom.latex.bindings.Commands
+import com.fifom.latex.commands.LatexCommand
+import com.fifom.latex.syntax.Block
+import com.fifom.latex.LaTeXParser
 import info.kwarc.mmt.api.utils.File
 
 object Basics {