jspdf-dynamo 1.0.4 → 1.0.5

package/dist/index.cjs

@@ -352,6 +352,11 @@ 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;
@@ -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();
@@ -1396,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);
@@ -1844,11 +1898,9 @@ var JsPdfDynamo = class {
       return null;
     }
   }
-  toBlobUrl(fileName) {
+  toBlobUrl() {
     try {
-      const result = this._processor.PdfDocument.output("bloburi", {
-        filename: fileName
-      });
+      const result = this._processor.PdfDocument.output("bloburi");
       return result;
     } catch (e) {
       __privateGet(this, _appLogger).warn(
@@ -1879,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++) {
@@ -1888,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})
 `
@@ -1902,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 = [];
@@ -1910,7 +1962,7 @@ var JsPdfDynamo = class {
           }
           continue;
         }
-        if (inGroupProcessing) {
+        if (inGroupLoading) {
           currGroup.push(currLine);
           __privateGet(this, _appLogger).trace(`  ${currLine}`);
           continue;
@@ -1934,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;
@@ -1949,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;
@@ -2009,6 +2058,12 @@ var JsPdfDynamo = class {
         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;

package/dist/index.d.cts

@@ -307,8 +307,8 @@ declare class JsPdfProcessor {
     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>;
@@ -329,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;
@@ -365,7 +366,7 @@ declare class JsPdfDynamo {
     _processor: JsPdfProcessor;
     constructor(options?: Partial<IJsPdfOptions>, logger?: ILogger | null);
     toBlob(): Blob | null;
-    toBlobUrl(fileName?: string): string | null;
+    toBlobUrl(): string | null;
     getVariable(variableName: string): string | null;
     private prepareNewPdf;
     prepareWrappedString(input: string): string;

package/dist/index.d.ts

@@ -307,8 +307,8 @@ declare class JsPdfProcessor {
     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>;
@@ -329,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;
@@ -365,7 +366,7 @@ declare class JsPdfDynamo {
     _processor: JsPdfProcessor;
     constructor(options?: Partial<IJsPdfOptions>, logger?: ILogger | null);
     toBlob(): Blob | null;
-    toBlobUrl(fileName?: string): string | null;
+    toBlobUrl(): string | null;
     getVariable(variableName: string): string | null;
     private prepareNewPdf;
     prepareWrappedString(input: string): string;

package/dist/index.js

@@ -323,6 +323,11 @@ 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;
@@ -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();
@@ -1367,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);
@@ -1815,11 +1869,9 @@ var JsPdfDynamo = class {
       return null;
     }
   }
-  toBlobUrl(fileName) {
+  toBlobUrl() {
     try {
-      const result = this._processor.PdfDocument.output("bloburi", {
-        filename: fileName
-      });
+      const result = this._processor.PdfDocument.output("bloburi");
       return result;
     } catch (e) {
       __privateGet(this, _appLogger).warn(
@@ -1850,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++) {
@@ -1859,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})
 `
@@ -1873,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 = [];
@@ -1881,7 +1933,7 @@ var JsPdfDynamo = class {
           }
           continue;
         }
-        if (inGroupProcessing) {
+        if (inGroupLoading) {
           currGroup.push(currLine);
           __privateGet(this, _appLogger).trace(`  ${currLine}`);
           continue;
@@ -1905,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;
@@ -1920,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;
@@ -1980,6 +2029,12 @@ var JsPdfDynamo = class {
         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;

package/documentation/3. Variables/SystemMaintained.txt

@@ -52,6 +52,11 @@
 .SetVar CommandLine2 The current font style. For example, "normal" or "italic".
 .Do VariableLine
 
+.incCurrentY %halfLineGap%
+.SetVar CommandLine1 _ImageAspect
+.SetVar CommandLine2 The aspect ratio of the last loaded image, calculated as width divided by height.
+.Do VariableLineWrapped
+
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _ImageHeight
 .SetVar CommandLine2 The height of the last loaded image.

package/documentation/4. Commands/AddBookmark.txt

@@ -6,7 +6,7 @@
 
 .SetVar CommandSubHeading Syntax
 .Do CommandSubHeading
-.SetVar CommandLine1 .AddBookmark ParentId PageNo Text
+.SetVar CommandLine1 .AddBookmark  ParentId  PageNo  Text
 .Do CommandLine2
 
 .SetVar CommandSubHeading Parameters

package/documentation/4. Commands/AddPage.txt

@@ -4,15 +4,17 @@
 
 .SetVar CommandSubHeading Syntax
 .Do CommandSubHeading
-.SetVar CommandLine1 .AddPage {PageSize}
+.SetVar CommandLine1 .AddPage  PageSize  Orientation
 .Do CommandLine2
 
 .SetVar CommandSubHeading Parameters
 .Do CommandSubHeading
 .SetVar CommandLine1 PageSize
-.SetVar CommandLine2 The page size: A3, A4, Letter, etc. Optional and if not supplied the
+.SetVar CommandLine2 The size of the page to be added: A3, A4, Letter, etc. Optional and if not supplied, the current page size is used.
 .Do CommandLine2
-.SetVar CommandLine2 current page size is used
+.SetVar CommandLine1 Orientation
+.SetVar CommandLine2 The orientation of the page to be added: 'portrait' or 'landscape'. Optional and if not supplied, the
+.SetVar CommandLine2 %CommandLine2% current orientation is used. The orientation can be abbreviated to the first letter, 'p' or 'l'.
 .Do CommandLine2
 
 .SetVar CommandSubHeading Other

package/documentation/4. Commands/CheckPage.txt

@@ -12,7 +12,7 @@
 
 .SetVar CommandSubHeading Syntax
 .Do CommandSubHeading
-.SetVar CommandLine1 .CheckPage Distance {Group1, Group2 ...}
+.SetVar CommandLine1 .CheckPage  Distance  {Group1,  Group2 ...}
 .Do CommandLine2
 
 .SetVar CommandSubHeading Parameters

package/documentation/4. Commands/CopyVar.txt

@@ -6,7 +6,7 @@
 
 .SetVar CommandSubHeading Syntax
 .Do CommandSubHeading
-.SetVar CommandLine1 .CopyVar CopyTo CopyFrom
+.SetVar CommandLine1 .CopyVar  CopyTo  CopyFrom
 .Do CommandLine2
 
 .SetVar CommandSubHeading Parameters
@@ -47,6 +47,6 @@
 
 .SetVar CommandSubHeading See Also
 .Do CommandSubHeading
-.SetVar CommandLine1 IncVar, MultVar, SetVar
+.SetVar CommandLine1 DivVar, IncVar, MultVar, SetVar
 .Do CommandLine2
 .incCurrentY %_FontHeight%

package/documentation/4. Commands/DivVar.txt

@@ -0,0 +1,67 @@
+.SetVar CommandName DivVar
+.Do CommandHeading
+.DrawText 0 %_CurrentY% Divide the value of a variable by one or more factors.
+
+.SetVar CommandSubHeading Syntax
+.Do CommandSubHeading
+.SetVar CommandLine1 .DivVar  Variable  Value  Value (etc)
+.Do CommandLine2
+
+.SetVar CommandSubHeading Parameters
+.Do CommandSubHeading
+.SetVar CommandLine1 Variable
+.SetVar CommandLine2 The name of the variable to update. This is not usually a substitution variable,
+.SetVar CommandLine2 %CommandLine2% but it can be, or contain substitution variables. The variable must exist.
+.Do CommandLine2
+.SetVar CommandLine1 Value
+.SetVar CommandLine2 One or more values to multiple the variable by. These can be constants or substitution variables.
+.Do CommandLine2
+
+.SetVar CommandSubHeading Other
+.Do CommandSubHeading
+.SetVar CommandLine1 Variable _LastResult is set to '1' if a valid variable name is provided, otherwise it is set to '0'.
+.Do CommandLine
+.SetVar CommandLine1 The JsPdfDynamo maintained variables (those whose name starts with an underscore) can not 
+.Do CommandLine
+.SetVar CommandLine1 be changed by this command.
+.Do CommandLine
+.incCurrentY %halfLineGap%
+.SetVar CommandLine1 The variable name may itself be, or contain a variable.
+.Do CommandLine 
+
+.SetVar CommandSubHeading Examples
+.Do CommandSubHeading
+.SetVar CommandLine1 Divide the value of the variable 'Total' by '4':
+.Do CommandLine
+.incCurrentY %halfLineGap%
+.SetVar CommandLine1 .SetVar  Total  12
+.Do CommandLine2
+.SetVar CommandLine1 .DivVar  Total  4
+.Do CommandLine2
+.incCurrentY %_FontHeight%
+
+.SetVar CommandLine1 Decrease the value of 'Weight6' by half from '78.6' to '39.3':
+.Do CommandLine
+.incCurrentY %halfLineGap%
+.SetVar CommandLine1 .SetVar  index  6
+.Do CommandLine2
+.SetVar CommandLine1 .SetVar  Weight%%%%index%%%%  78.6
+.Do CommandLine2
+.SetVar CommandLine1 .DivVar  Weight%%%%index%%%%  2
+.Do CommandLine2
+.incCurrentY %_FontHeight%
+
+.SetVar CommandLine1 Multiple values can be used to increase value of 'total' from 100 to 5
+.Do CommandLine
+.incCurrentY %halfLineGap%
+.SetVar CommandLine1 .SetVar  Total  10
+.Do CommandLine2
+.SetVar CommandLine1 .DivVar  Total  10  2
+.Do CommandLine2
+.incCurrentY %_FontHeight%
+
+.SetVar CommandSubHeading See Also
+.Do CommandSubHeading
+.SetVar CommandLine1 CopyVar, IncVar, MultVar, SetVar
+.Do CommandLine2
+.incCurrentY %_FontHeight%

package/documentation/4. Commands/Do.txt

@@ -3,7 +3,7 @@
 .DrawText 0 %_CurrentY% 'Do' (ie process) one or more groups of commands that have already been defined.
 .SetVar CommandSubHeading Syntax
 .Do CommandSubHeading
-.SetVar CommandLine1 .Do Group1, Group2...etc
+.SetVar CommandLine1 .Do  Group1,  Group2...etc
 .Do CommandLine2
 
 .SetVar CommandSubHeading Parameters

package/documentation/4. Commands/DoRepeat.txt

@@ -6,7 +6,7 @@
 
 .SetVar CommandSubHeading Syntax
 .Do CommandSubHeading
-.SetVar CommandLine1 .DoRepeat Number Group1, Group2...etc
+.SetVar CommandLine1 .DoRepeat  Number  Group1,  Group2...etc
 .Do CommandLine2
 
 .SetVar CommandSubHeading Parameters

package/documentation/4. Commands/DrawBox.txt

@@ -4,7 +4,7 @@
 
 .SetVar CommandSubHeading Syntax
 .Do CommandSubHeading
-.SetVar CommandLine1 .DrawBox Left Top Width Height Option
+.SetVar CommandLine1 .DrawBox  Left  Top  Width  Height  Option
 .Do CommandLine2
 
 .SetVar CommandSubHeading Parameters

package/documentation/4. Commands/DrawDebugGrid.txt

@@ -7,7 +7,7 @@
 
 .SetVar CommandSubHeading Syntax
 .Do CommandSubHeading
-.SetVar CommandLine1 .DrawDebugGrid Option
+.SetVar CommandLine1 .DrawDebugGrid  Option
 .Do CommandLine2
 
 .SetVar CommandSubHeading Parameters

package/documentation/4. Commands/DrawImage.txt

@@ -5,7 +5,7 @@
 
 .SetVar CommandSubHeading Syntax
 .Do CommandSubHeading
-.SetVar CommandLine1 .DrawImage ImageNo Left Top Width Height Scale
+.SetVar CommandLine1 .DrawImage  ImageNo  Left  Top  Width  Height  Scale
 .Do CommandLine2
 
 .SetVar CommandSubHeading Parameters
@@ -87,6 +87,6 @@
 
 .SetVar CommandSubHeading See Also
 .Do CommandSubHeading
-.SetVar CommandLine1 AddImageFromFile, AddImageFromUrl
+.SetVar CommandLine1 LoadImageFromFile, LoadImageFromUrl
 .Do CommandLine2
 .incCurrentY %_FontHeight%

package/documentation/4. Commands/DrawLine.txt

@@ -7,7 +7,7 @@
 
 .SetVar CommandSubHeading Syntax
 .Do CommandSubHeading
-.SetVar CommandLine1 .DrawLine Left Top Right Bottom
+.SetVar CommandLine1 .DrawLine  Left  Top  Right  Bottom
 .Do CommandLine2
 
 .SetVar CommandSubHeading Parameters

package/documentation/4. Commands/ForEachPage.txt

@@ -12,7 +12,7 @@
 
 .SetVar CommandSubHeading Syntax
 .Do CommandSubHeading
-.SetVar CommandLine1 .ForEachPage Group1, Group2...etc
+.SetVar CommandLine1 .ForEachPage  Group1,  Group2...etc
 .Do CommandLine2
 
 .SetVar CommandSubHeading Parameters