X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fcom%2Fquemaster%2Ftransformations%2Fmjc2wsl%2Fmjc2wsl.java;h=dab321badf704a53d08d339ecca5788f68531e5e;hp=f5714aa692cb59df48c67ad996b09d2df75e48d8;hb=3b1f56b927d0338469b2cf17225b8b0d54c61463;hpb=caa4326027af649b03967612eed6430fc400d3ca

diff --git a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
index f5714aa..dab321b 100644
--- a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
+++ b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
@@ -40,7 +40,7 @@ import com.quemaster.transformations.TransMessages;
  */
 public class mjc2wsl{
 	//default version name, used if the file is not found
-	private static String versionN = "0.1.x";
+	private static String versionN = "0.2.x";
 
 	private String versionFile = "/version.properties";
 	
@@ -211,17 +211,12 @@ public class mjc2wsl{
 
 		if (!genInlinePrint) {
 				ret.append("\nPROC Print_MJ(val, format VAR)==\n");
-				ret.append(createComment("print spacing", C_SPEC));
-				ret.append("\n\tIF format>1 THEN\n\t\tFOR i:=1 TO ");
-				ret.append("MAX(0, format-SLENGTH(@String(val))) STEP 1 DO PRINFLUSH(\" \") OD\n");
-				ret.append("\tFI;\n\tPRINFLUSH(val)\nEND\n");
+				ret.append("PRINFLUSH(@Format(format, val ))");
+				ret.append("\nEND\n");
 
 				ret.append("\nPROC Print_MJ_CHAR(val, format VAR)==\n");
-				ret.append(createComment("print spacing", C_SPEC));
-				ret.append("\n\tIF format>1 THEN\n\t\tFOR i:=2 TO ");
-				ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");
-				ret.append("\tFI;\n\tPRINFLUSH(CHR(val))\n");
-				ret.append("END\n");
+				ret.append("PRINFLUSH(@Format(format, CHR(val)))");
+				ret.append("\nEND\n");
 		}
 
 		ret.append("\nEND");