Fix sections with spaces to not be interpreted as optargs

src/main/java/TeXCalc/latex/command/Command.java

@@ -16,18 +16,7 @@ public Command(String name)
 	public String to(String s) {
 		// TODO Auto-generated method stub
 		String w = "";
-		if(s.contains(" ")) {
-			String[] args = s.split(" ");
-			if(!args[args.length-1].trim().equals(""))
-				w += "["+ args[args.length-1] + "]"; 
-			for(int i =0; i  < args.length-1;++i) {
-				//if(!args[i].trim().equals(""))
-					w += "{" + args[i] + "}";
-			}
-		}
-		else {
 			 w = "{" + s + "}";
-		}
 		return "\\" + name + w + "\n";
 	}
 

src/main/java/TeXCalc/latex/command/Image.java

@@ -2,7 +2,7 @@
 
 import TeXCalc.latex.wrap.Wrapper;
 
-public class Image extends Command{
+public class Image extends OptCommand{
 	public Image() {
 		super("includegraphics");
 	}

src/main/java/TeXCalc/latex/command/OptCommand.java

@@ -0,0 +1,28 @@
+package TeXCalc.latex.command;
+
+public class OptCommand extends Command {
+
+	public OptCommand(String name) {
+		super(name);
+	}
+
+	@Override
+	public String to(String s) {
+		// TODO Auto-generated method stub
+		String w = "";
+		if(s.contains(" ")) {
+			String[] args = s.split(" ");
+			if(!args[args.length-1].trim().equals(""))
+				w += "["+ args[args.length-1] + "]"; 
+			for(int i =0; i  < args.length-1;++i) {
+				//if(!args[i].trim().equals(""))
+					w += "{" + args[i] + "}";
+			}
+		}
+		else {
+			 w = "{" + s + "}";
+		}
+		return "\\" + name + w + "\n";
+	}
+
+}