jspdf-dynamo 1.0.1 → 1.0.5

package/dist/index.cjs

@@ -118,9 +118,6 @@ var AppLogger = class {
         this._logLevel = newLevel;
       }
     }
-    if (this._logger.logLevel) {
-      this._logger.logLevel(this._logLevel);
-    }
   }
   canLog(level) {
     return level >= this._logLevel;
@@ -355,10 +352,18 @@ var JsPdfProcessor = class {
       })
     );
     this._variables.set("_DATEDMY", (/* @__PURE__ */ new Date()).toLocaleDateString("en-GB"));
+    this._variables.set("_IMAGEASPECT", "1");
+    this._variables.set("_IMAGEHEIGHT", "0");
+    this._variables.set("_IMAGEHEIGHTPX", "0");
+    this._variables.set("_IMAGEWIDTH", "0");
+    this._variables.set("_IMAGEWIDTHPX", "0");
     this._variables.set("_PAGENO", "1");
     this._variables.set("_PAGES", "1");
+    this.posnX = 0;
+    this.posnY = 0;
     this.spaceHoz = 0;
     this.spaceVert = 0;
+    this.currentPageNumber = 1;
     this.lineWidth = this.pointsToUom(mmToPoints(0.2));
     this.lineColour = "black";
     this.fontPointSize = 12;
@@ -716,8 +721,8 @@ var JsPdfProcessor = class {
       this.pageWidth = document.internal.pageSize.width - this._marginLeft - this._marginRight;
     }
   }
-  addImageFromFile(input) {
-    const subs = this.logAndParseCommand(".addImageFromFile", input);
+  LoadImageFromFile(input) {
+    const subs = this.logAndParseCommand(".LoadImageFromFile", input);
     let fileName = subs;
     if (!fileName) {
       this.lastError = "A file name is required.";
@@ -738,9 +743,9 @@ var JsPdfProcessor = class {
       this.lastResult = "0";
     }
   }
-  addImageFromUrl(input) {
+  LoadImageFromUrl(input) {
     return __async(this, null, function* () {
-      const subs = this.logAndParseCommand(".addImageFromUrl", input);
+      const subs = this.logAndParseCommand(".LoadImageFromUrl", input);
       let url = subs;
       if (!url) {
         this.lastError = "A URL is required.";
@@ -783,6 +788,10 @@ var JsPdfProcessor = class {
       this.setFixedDec(this.pixelsToUom(info.height), 3)
     );
     this._variables.set("_IMAGEHEIGHTPX", info.height.toString());
+    this._variables.set(
+      "_IMAGEASPECT",
+      info.height > 0 ? this.setFixedDec(info.width / info.height, 3) : "1"
+    );
   }
   getContentType(fileName) {
     const mediaType = fileName.split(".").pop();
@@ -1193,10 +1202,16 @@ var JsPdfProcessor = class {
         return;
       }
       let lastObjectHeight = 0;
-      text = text.replace("\\n", " \n").replace("\\N", " \n") + " ";
+      text = text.replace(/\\[nN]/g, " \n") + " ";
+      const splitText = text.split("\n");
+      const lines = [];
+      for (let line of splitText) {
+        lines.push(...this._pdfDocument.splitTextToSize(line, maxWidth));
+      }
+      if (lines.length > splitText.length) {
+        this._logger.trace(`Text was wrapped into ${lines.length} lines`, lines);
+      }
       this.posnY = top;
-      const lines = this._pdfDocument.splitTextToSize(text, maxWidth) || [];
-      this._logger.trace(`Text was wrapped into ${lines.length} lines`, lines);
       while (lines.length > 0) {
         if (!cmdGroup.startsWith("*")) {
           yield jsPdfDynamo.processGroups(this, cmdGroup, false);
@@ -1390,6 +1405,51 @@ var JsPdfProcessor = class {
       "Variable " + varName + " incremented to " + this._variables.get(varName)
     );
   }
+  divVar(input) {
+    let subs = this.substitute(input.trim());
+    this._logger.debug(".divVar " + subs);
+    let { first: varName, rest } = getNextString(subs.toLocaleUpperCase());
+    if (varName === "") {
+      this.lastResult = "0";
+      this.lastError = "DivVar must reference a variable";
+      return;
+    }
+    if (varName.startsWith("_")) {
+      this.lastResult = "0";
+      this.lastError = "DivVar can not be used to update system maintained variables";
+      return;
+    }
+    let varValue = this._variables.get(varName);
+    if (!varValue) {
+      this.lastResult = "0";
+      this.lastError = "Variable '" + varName + "' is not defined";
+      return;
+    }
+    if (isNaN(Number(varValue))) {
+      this._variables.set(varName, "0");
+    }
+    while (rest.length > 0) {
+      const { first: nextOp, rest: remainder } = getNextNumber(rest, 4);
+      rest = remainder;
+      let varValue2 = this._variables.get(varName);
+      if (!isNaN(Number(nextOp)) && Number(nextOp) === 0) {
+        this.lastResult = "0";
+        this.lastError = "Divide by zero error";
+        return;
+      }
+      if (!isNaN(Number(varValue2)) && !isNaN(Number(nextOp))) {
+        this._variables.set(
+          varName,
+          removeTrailingZeros((Number(varValue2) / Number(nextOp)).toFixed(4))
+        );
+      }
+      varValue2 = this._variables.get(varName);
+    }
+    this.lastResult = "1";
+    this._logger.trace(
+      "Variable " + varName + " incremented to " + this._variables.get(varName)
+    );
+  }
   multVar(input) {
     let subs = this.substitute(input.trim());
     this._logger.debug(".multVar " + subs);
@@ -1840,10 +1900,7 @@ var JsPdfDynamo = class {
   }
   toBlobUrl() {
     try {
-      const result = this._processor.PdfDocument.output(
-        "bloburi",
-        "application/pdf"
-      );
+      const result = this._processor.PdfDocument.output("bloburi");
       return result;
     } catch (e) {
       __privateGet(this, _appLogger).warn(
@@ -1852,7 +1909,7 @@ var JsPdfDynamo = class {
       return null;
     }
   }
-  getVar(variableName) {
+  getVariable(variableName) {
     var _a;
     return this._processor ? (_a = this._processor.getVar(variableName)) != null ? _a : null : null;
   }
@@ -1874,7 +1931,7 @@ var JsPdfDynamo = class {
   }
   processTemplate(processor, input) {
     return __async(this, null, function* () {
-      let inGroupProcessing = false;
+      let inGroupLoading = false;
       let grpName = "";
       let currGroup = [];
       for (let ix = 0; ix < input.length; ix++) {
@@ -1883,8 +1940,8 @@ var JsPdfDynamo = class {
           continue;
         }
         if (currLine.startsWith("[")) {
-          if (inGroupProcessing) {
-            inGroupProcessing = false;
+          if (inGroupLoading) {
+            inGroupLoading = false;
             __privateGet(this, _appLogger).debug(
               `Finished loading group ${grpName}   (${currLine})
 `
@@ -1897,7 +1954,7 @@ var JsPdfDynamo = class {
               grpName = grpName.substring(0, iy);
             }
             grpName = grpName.trim().toLocaleUpperCase();
-            inGroupProcessing = true;
+            inGroupLoading = true;
             __privateGet(this, _appLogger).debug(`Loading group ${grpName}   (${currLine})
 `);
             currGroup = [];
@@ -1905,7 +1962,7 @@ var JsPdfDynamo = class {
           }
           continue;
         }
-        if (inGroupProcessing) {
+        if (inGroupLoading) {
           currGroup.push(currLine);
           __privateGet(this, _appLogger).trace(`  ${currLine}`);
           continue;
@@ -1929,12 +1986,6 @@ var JsPdfDynamo = class {
         case "AddBookmark".toLowerCase():
           processor.addBookmark(parameters);
           return;
-        case "AddImageFromFile".toLowerCase():
-          processor.addImageFromFile(parameters);
-          return;
-        case "AddImageFromUrl".toLowerCase():
-          yield processor.addImageFromUrl(parameters);
-          return;
         case "AddPage".toLowerCase():
           processor.addPage(parameters);
           return;
@@ -1944,6 +1995,9 @@ var JsPdfDynamo = class {
         case "CopyVar".toLowerCase():
           processor.copyVar(parameters);
           return;
+        case "DivVar".toLowerCase():
+          processor.divVar(parameters);
+          return;
         case "Do".toLowerCase():
           yield this.processGroups(processor, parameters);
           return;
@@ -1998,12 +2052,18 @@ var JsPdfDynamo = class {
         case "Include".toLowerCase():
           yield this.includeFile(processor, parameters);
           return;
-        case "IncludeUri".toLowerCase():
-          yield this.includeUri(processor, parameters);
+        case "IncludeUrl".toLowerCase():
+          yield this.includeUrl(processor, parameters);
           return;
         case "IncVar".toLowerCase():
           processor.incVar(parameters);
           return;
+        case "LoadImageFromFile".toLowerCase():
+          processor.LoadImageFromFile(parameters);
+          return;
+        case "LoadImageFromUrl".toLowerCase():
+          yield processor.LoadImageFromUrl(parameters);
+          return;
         case "MultVar".toLowerCase():
           processor.multVar(parameters);
           return;
@@ -2137,10 +2197,10 @@ var JsPdfDynamo = class {
       }
     });
   }
-  includeUri(processor, input) {
+  includeUrl(processor, input) {
     return __async(this, null, function* () {
       const subs = processor.substitute(input);
-      __privateGet(this, _appLogger).debug(`.includeUri ${subs}`);
+      __privateGet(this, _appLogger).debug(`.includeUrl ${subs}`);
       try {
         const response = yield fetch(subs, {
           headers: { Accept: "text/plain;q=0.9, text/*;q=0.8, */*;q=0.7" }

package/dist/index.d.cts

@@ -6,7 +6,18 @@ interface ILogger {
     info: (message: string, ...args: any | null) => void;
     trace: (message: string, ...args: any | null) => void;
     warn: (message: string, ...args: any | null) => void;
-    logLevel?: (newLevel: string | number) => void;
+}
+declare class AppLogger implements ILogger {
+    private _logLevel;
+    private _logger;
+    constructor(logger?: ILogger | null);
+    trace(message: string, ...args: any | null): void;
+    debug(message: string, ...args: any | null): void;
+    info(message: string, ...args: any | null): void;
+    warn(message: string, ...args: any | null): void;
+    error(message: string, ...args: any | null): void;
+    logLevel(newLevel: string | number): void;
+    private canLog;
 }
 
 type fontStyleType = "bold" | "italic" | "normal" | "bolditalic";
@@ -291,13 +302,13 @@ declare class JsPdfProcessor {
     get textColour(): string;
     private set textColour(value);
     private get pageCount();
-    constructor(options: Partial<IJsPdfOptions>, logger: ILogger);
+    constructor(options: Partial<IJsPdfOptions>, logger: AppLogger);
     private logAndParseCommand;
     addBookmark(input: string): void;
     addPage(input?: string): void;
     private calcPageDimensions;
-    addImageFromFile(input: string): void;
-    addImageFromUrl(input: string): Promise<void>;
+    LoadImageFromFile(input: string): void;
+    LoadImageFromUrl(input: string): Promise<void>;
     private saveImage;
     private getContentType;
     checkPage(jsPdfDynamo: JsPdfDynamo, input: string): Promise<void>;
@@ -318,6 +329,7 @@ declare class JsPdfProcessor {
     incCurrentX(input: string): void;
     incCurrentY(input: string): void;
     incVar(input: string): void;
+    divVar(input: string): void;
     multVar(input: string): void;
     savePdf(input: string): void;
     selectPage(input: string): void;
@@ -355,7 +367,7 @@ declare class JsPdfDynamo {
     constructor(options?: Partial<IJsPdfOptions>, logger?: ILogger | null);
     toBlob(): Blob | null;
     toBlobUrl(): string | null;
-    getVar(variableName: string): string | null;
+    getVariable(variableName: string): string | null;
     private prepareNewPdf;
     prepareWrappedString(input: string): string;
     processCommands(commands: string[]): Promise<void>;
@@ -364,7 +376,7 @@ declare class JsPdfDynamo {
     processGroups(processor: JsPdfProcessor, input: string, log?: boolean): Promise<void>;
     private processGroupsRepeat;
     private includeFile;
-    private includeUri;
+    private includeUrl;
 }
 
 export { JsPdfDynamo };

package/dist/index.d.ts

@@ -6,7 +6,18 @@ interface ILogger {
     info: (message: string, ...args: any | null) => void;
     trace: (message: string, ...args: any | null) => void;
     warn: (message: string, ...args: any | null) => void;
-    logLevel?: (newLevel: string | number) => void;
+}
+declare class AppLogger implements ILogger {
+    private _logLevel;
+    private _logger;
+    constructor(logger?: ILogger | null);
+    trace(message: string, ...args: any | null): void;
+    debug(message: string, ...args: any | null): void;
+    info(message: string, ...args: any | null): void;
+    warn(message: string, ...args: any | null): void;
+    error(message: string, ...args: any | null): void;
+    logLevel(newLevel: string | number): void;
+    private canLog;
 }
 
 type fontStyleType = "bold" | "italic" | "normal" | "bolditalic";
@@ -291,13 +302,13 @@ declare class JsPdfProcessor {
     get textColour(): string;
     private set textColour(value);
     private get pageCount();
-    constructor(options: Partial<IJsPdfOptions>, logger: ILogger);
+    constructor(options: Partial<IJsPdfOptions>, logger: AppLogger);
     private logAndParseCommand;
     addBookmark(input: string): void;
     addPage(input?: string): void;
     private calcPageDimensions;
-    addImageFromFile(input: string): void;
-    addImageFromUrl(input: string): Promise<void>;
+    LoadImageFromFile(input: string): void;
+    LoadImageFromUrl(input: string): Promise<void>;
     private saveImage;
     private getContentType;
     checkPage(jsPdfDynamo: JsPdfDynamo, input: string): Promise<void>;
@@ -318,6 +329,7 @@ declare class JsPdfProcessor {
     incCurrentX(input: string): void;
     incCurrentY(input: string): void;
     incVar(input: string): void;
+    divVar(input: string): void;
     multVar(input: string): void;
     savePdf(input: string): void;
     selectPage(input: string): void;
@@ -355,7 +367,7 @@ declare class JsPdfDynamo {
     constructor(options?: Partial<IJsPdfOptions>, logger?: ILogger | null);
     toBlob(): Blob | null;
     toBlobUrl(): string | null;
-    getVar(variableName: string): string | null;
+    getVariable(variableName: string): string | null;
     private prepareNewPdf;
     prepareWrappedString(input: string): string;
     processCommands(commands: string[]): Promise<void>;
@@ -364,7 +376,7 @@ declare class JsPdfDynamo {
     processGroups(processor: JsPdfProcessor, input: string, log?: boolean): Promise<void>;
     private processGroupsRepeat;
     private includeFile;
-    private includeUri;
+    private includeUrl;
 }
 
 export { JsPdfDynamo };

package/dist/index.js

@@ -89,9 +89,6 @@ var AppLogger = class {
         this._logLevel = newLevel;
       }
     }
-    if (this._logger.logLevel) {
-      this._logger.logLevel(this._logLevel);
-    }
   }
   canLog(level) {
     return level >= this._logLevel;
@@ -326,10 +323,18 @@ var JsPdfProcessor = class {
       })
     );
     this._variables.set("_DATEDMY", (/* @__PURE__ */ new Date()).toLocaleDateString("en-GB"));
+    this._variables.set("_IMAGEASPECT", "1");
+    this._variables.set("_IMAGEHEIGHT", "0");
+    this._variables.set("_IMAGEHEIGHTPX", "0");
+    this._variables.set("_IMAGEWIDTH", "0");
+    this._variables.set("_IMAGEWIDTHPX", "0");
     this._variables.set("_PAGENO", "1");
     this._variables.set("_PAGES", "1");
+    this.posnX = 0;
+    this.posnY = 0;
     this.spaceHoz = 0;
     this.spaceVert = 0;
+    this.currentPageNumber = 1;
     this.lineWidth = this.pointsToUom(mmToPoints(0.2));
     this.lineColour = "black";
     this.fontPointSize = 12;
@@ -687,8 +692,8 @@ var JsPdfProcessor = class {
       this.pageWidth = document.internal.pageSize.width - this._marginLeft - this._marginRight;
     }
   }
-  addImageFromFile(input) {
-    const subs = this.logAndParseCommand(".addImageFromFile", input);
+  LoadImageFromFile(input) {
+    const subs = this.logAndParseCommand(".LoadImageFromFile", input);
     let fileName = subs;
     if (!fileName) {
       this.lastError = "A file name is required.";
@@ -709,9 +714,9 @@ var JsPdfProcessor = class {
       this.lastResult = "0";
     }
   }
-  addImageFromUrl(input) {
+  LoadImageFromUrl(input) {
     return __async(this, null, function* () {
-      const subs = this.logAndParseCommand(".addImageFromUrl", input);
+      const subs = this.logAndParseCommand(".LoadImageFromUrl", input);
       let url = subs;
       if (!url) {
         this.lastError = "A URL is required.";
@@ -754,6 +759,10 @@ var JsPdfProcessor = class {
       this.setFixedDec(this.pixelsToUom(info.height), 3)
     );
     this._variables.set("_IMAGEHEIGHTPX", info.height.toString());
+    this._variables.set(
+      "_IMAGEASPECT",
+      info.height > 0 ? this.setFixedDec(info.width / info.height, 3) : "1"
+    );
   }
   getContentType(fileName) {
     const mediaType = fileName.split(".").pop();
@@ -1164,10 +1173,16 @@ var JsPdfProcessor = class {
         return;
       }
       let lastObjectHeight = 0;
-      text = text.replace("\\n", " \n").replace("\\N", " \n") + " ";
+      text = text.replace(/\\[nN]/g, " \n") + " ";
+      const splitText = text.split("\n");
+      const lines = [];
+      for (let line of splitText) {
+        lines.push(...this._pdfDocument.splitTextToSize(line, maxWidth));
+      }
+      if (lines.length > splitText.length) {
+        this._logger.trace(`Text was wrapped into ${lines.length} lines`, lines);
+      }
       this.posnY = top;
-      const lines = this._pdfDocument.splitTextToSize(text, maxWidth) || [];
-      this._logger.trace(`Text was wrapped into ${lines.length} lines`, lines);
       while (lines.length > 0) {
         if (!cmdGroup.startsWith("*")) {
           yield jsPdfDynamo.processGroups(this, cmdGroup, false);
@@ -1361,6 +1376,51 @@ var JsPdfProcessor = class {
       "Variable " + varName + " incremented to " + this._variables.get(varName)
     );
   }
+  divVar(input) {
+    let subs = this.substitute(input.trim());
+    this._logger.debug(".divVar " + subs);
+    let { first: varName, rest } = getNextString(subs.toLocaleUpperCase());
+    if (varName === "") {
+      this.lastResult = "0";
+      this.lastError = "DivVar must reference a variable";
+      return;
+    }
+    if (varName.startsWith("_")) {
+      this.lastResult = "0";
+      this.lastError = "DivVar can not be used to update system maintained variables";
+      return;
+    }
+    let varValue = this._variables.get(varName);
+    if (!varValue) {
+      this.lastResult = "0";
+      this.lastError = "Variable '" + varName + "' is not defined";
+      return;
+    }
+    if (isNaN(Number(varValue))) {
+      this._variables.set(varName, "0");
+    }
+    while (rest.length > 0) {
+      const { first: nextOp, rest: remainder } = getNextNumber(rest, 4);
+      rest = remainder;
+      let varValue2 = this._variables.get(varName);
+      if (!isNaN(Number(nextOp)) && Number(nextOp) === 0) {
+        this.lastResult = "0";
+        this.lastError = "Divide by zero error";
+        return;
+      }
+      if (!isNaN(Number(varValue2)) && !isNaN(Number(nextOp))) {
+        this._variables.set(
+          varName,
+          removeTrailingZeros((Number(varValue2) / Number(nextOp)).toFixed(4))
+        );
+      }
+      varValue2 = this._variables.get(varName);
+    }
+    this.lastResult = "1";
+    this._logger.trace(
+      "Variable " + varName + " incremented to " + this._variables.get(varName)
+    );
+  }
   multVar(input) {
     let subs = this.substitute(input.trim());
     this._logger.debug(".multVar " + subs);
@@ -1811,10 +1871,7 @@ var JsPdfDynamo = class {
   }
   toBlobUrl() {
     try {
-      const result = this._processor.PdfDocument.output(
-        "bloburi",
-        "application/pdf"
-      );
+      const result = this._processor.PdfDocument.output("bloburi");
       return result;
     } catch (e) {
       __privateGet(this, _appLogger).warn(
@@ -1823,7 +1880,7 @@ var JsPdfDynamo = class {
       return null;
     }
   }
-  getVar(variableName) {
+  getVariable(variableName) {
     var _a;
     return this._processor ? (_a = this._processor.getVar(variableName)) != null ? _a : null : null;
   }
@@ -1845,7 +1902,7 @@ var JsPdfDynamo = class {
   }
   processTemplate(processor, input) {
     return __async(this, null, function* () {
-      let inGroupProcessing = false;
+      let inGroupLoading = false;
       let grpName = "";
       let currGroup = [];
       for (let ix = 0; ix < input.length; ix++) {
@@ -1854,8 +1911,8 @@ var JsPdfDynamo = class {
           continue;
         }
         if (currLine.startsWith("[")) {
-          if (inGroupProcessing) {
-            inGroupProcessing = false;
+          if (inGroupLoading) {
+            inGroupLoading = false;
             __privateGet(this, _appLogger).debug(
               `Finished loading group ${grpName}   (${currLine})
 `
@@ -1868,7 +1925,7 @@ var JsPdfDynamo = class {
               grpName = grpName.substring(0, iy);
             }
             grpName = grpName.trim().toLocaleUpperCase();
-            inGroupProcessing = true;
+            inGroupLoading = true;
             __privateGet(this, _appLogger).debug(`Loading group ${grpName}   (${currLine})
 `);
             currGroup = [];
@@ -1876,7 +1933,7 @@ var JsPdfDynamo = class {
           }
           continue;
         }
-        if (inGroupProcessing) {
+        if (inGroupLoading) {
           currGroup.push(currLine);
           __privateGet(this, _appLogger).trace(`  ${currLine}`);
           continue;
@@ -1900,12 +1957,6 @@ var JsPdfDynamo = class {
         case "AddBookmark".toLowerCase():
           processor.addBookmark(parameters);
           return;
-        case "AddImageFromFile".toLowerCase():
-          processor.addImageFromFile(parameters);
-          return;
-        case "AddImageFromUrl".toLowerCase():
-          yield processor.addImageFromUrl(parameters);
-          return;
         case "AddPage".toLowerCase():
           processor.addPage(parameters);
           return;
@@ -1915,6 +1966,9 @@ var JsPdfDynamo = class {
         case "CopyVar".toLowerCase():
           processor.copyVar(parameters);
           return;
+        case "DivVar".toLowerCase():
+          processor.divVar(parameters);
+          return;
         case "Do".toLowerCase():
           yield this.processGroups(processor, parameters);
           return;
@@ -1969,12 +2023,18 @@ var JsPdfDynamo = class {
         case "Include".toLowerCase():
           yield this.includeFile(processor, parameters);
           return;
-        case "IncludeUri".toLowerCase():
-          yield this.includeUri(processor, parameters);
+        case "IncludeUrl".toLowerCase():
+          yield this.includeUrl(processor, parameters);
           return;
         case "IncVar".toLowerCase():
           processor.incVar(parameters);
           return;
+        case "LoadImageFromFile".toLowerCase():
+          processor.LoadImageFromFile(parameters);
+          return;
+        case "LoadImageFromUrl".toLowerCase():
+          yield processor.LoadImageFromUrl(parameters);
+          return;
         case "MultVar".toLowerCase():
           processor.multVar(parameters);
           return;
@@ -2108,10 +2168,10 @@ var JsPdfDynamo = class {
       }
     });
   }
-  includeUri(processor, input) {
+  includeUrl(processor, input) {
     return __async(this, null, function* () {
       const subs = processor.substitute(input);
-      __privateGet(this, _appLogger).debug(`.includeUri ${subs}`);
+      __privateGet(this, _appLogger).debug(`.includeUrl ${subs}`);
       try {
         const response = yield fetch(subs, {
           headers: { Accept: "text/plain;q=0.9, text/*;q=0.8, */*;q=0.7" }

package/documentation/3. Variables/Introduction.txt

@@ -11,26 +11,29 @@
 .DrawText 0 %_CurrentY% Commands are described in a following chapter.
 
 .incCurrentY %_FontHeight%
-.DrawText 0 %_CurrentY% Variables are referenced by enclosing them in percentage symbols. For example, to write some
-.DrawText 0 %_CurrentY% text at the current position on the page the following DrawText command can be used:
+.SetVar CommandLine1 Variables are referenced by enclosing them in percentage symbols. For example, to write some
+.SetVar CommandLine1 %CommandLine1% text at the current position on the page the following DrawText command can be used:
+.Do CommandLine1
 .incCurrentY %_FontHeight%
 .SetVar CommandLine1 .DrawText %%%%_CurrentX%%%% %%%%_CurrentY%%%% Hello World!
-.Do CommandLine2 
+.Do CommandLine2
 .incCurrentY %_FontHeight%
-.DrawText 0 %_CurrentY% Variables (and commands) are not case sensitive and the above command could also be given
-.DrawText 0 %_CurrentY% as:
+.SetVar CommandLine1 Variables (and commands) are not case sensitive and the above command could also be given as:
+.Do CommandLine1 
 .incCurrentY %_FontHeight%
 .SetVar CommandLine1 .drawTEXT %%%%_currentX%%%% %%%%_CURRENTy%%%% Hello World!
 .Do CommandLine2 
 .incCurrentY %_FontHeight%
-.DrawText 0 %_CurrentY% Variables are stored as strings though there is a limited capability to perform arithmatic on
-.DrawText 0 %_CurrentY% variables. For example, the .IncVar command can be used to add or subtract a number from
-.DrawText 0 %_CurrentY% a variable.
+
+.SetVar CommandLine1 Variables are stored as strings though there is a limited capability to perform arithmetic on
+.SetVar CommandLine1 %CommandLine1% variables. For example, the .IncVar command can be used to add or subtract a number from
+.SetVar CommandLine1 %CommandLine1% a variable.
+.Do CommandLine1
 .incCurrentY %_FontHeight%
+
 .DrawText 0 %_CurrentY% Variables do not have to be assigned a value before being used. 
 .DrawText 0 %_CurrentY% The value of a variable referenced before being assigned a value is an empty string.
 .incCurrentY %_FontHeight%
-.DrawText 0 %_CurrentY% All variables are global, there is no scoping of variables within a group. A variable
-.DrawText 0 %_CurrentY% defined within a group is available to commands run after that group.
-.incCurrentY %_FontHeight%
-
+.SetVar CommandLine1 All variables are global, there is no scoping of variables within a group. A variable
+.SetVar CommandLine1 %CommandLine1% defined within a group is available to commands run after that group.
+.Do CommandLine1