jspdf-dynamo 1.0.0 → 1.0.4

package/dist/index.cjs

@@ -61,9 +61,6 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
-// src/jsPdfDynamo.ts
-var import_node_fetch = __toESM(require("node-fetch"), 1);
-
 // src/models/jsPdfProcessor.ts
 var import_jspdf = __toESM(require("jspdf"), 1);
 var fs = __toESM(require("fs"), 1);
@@ -121,9 +118,6 @@ var AppLogger = class {
         this._logLevel = newLevel;
       }
     }
-    if (this._logger.logLevel) {
-      this._logger.logLevel(this._logLevel);
-    }
   }
   canLog(level) {
     return level >= this._logLevel;
@@ -360,8 +354,11 @@ var JsPdfProcessor = class {
     this._variables.set("_DATEDMY", (/* @__PURE__ */ new Date()).toLocaleDateString("en-GB"));
     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;
@@ -995,6 +992,7 @@ var JsPdfProcessor = class {
     this.lastResult = "1";
   }
   drawText(input) {
+    var _a;
     const subs = this.logAndParseCommand(".drawText", input);
     const { first: left, rest: rest1 } = getNextNumber(subs);
     const { first: top, rest: rest2 } = getNextNumber(rest1);
@@ -1006,7 +1004,7 @@ var JsPdfProcessor = class {
     this.lastObjectWidth = 0;
     this.lastResult = "1";
     if (lines.length > 1) {
-      this.lastError = "Text was truncated to fit within the available width";
+      this.lastError = `Text was truncated to fit within the available width (${(_a = lines[0]) == null ? void 0 : _a.substring(0, 20)}...)`;
       this.lastResult = "0";
       if (lines[0]) {
         if (this._pdfDocument.getTextWidth(lines[0]) < maxWidth) {
@@ -1038,7 +1036,7 @@ var JsPdfProcessor = class {
       return false;
     }
     if (isNaN(top)) {
-      this.lastError = `Vertical position '${top}' is not a number`;
+      this.lastError = `Vertical position '${top}' is not a number on page ${this._currentPageNumber}.`;
       this.lastResult = "0";
       return false;
     }
@@ -1195,10 +1193,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);
@@ -1350,8 +1354,8 @@ var JsPdfProcessor = class {
       this.lastError = "Y Position resulted in negative value, adjusted to 0";
     }
     if (this.posnY > this._pageHeight) {
+      this.lastError = `Y Position ${this.posnY} exceeded page ${this._currentPageNumber} height, adjusted to page height (${this._pageHeight})`;
       this.posnY = this._pageHeight;
-      this.lastError = "Y Position exceeded page height, adjusted to page height";
     }
   }
   incVar(input) {
@@ -1840,12 +1844,11 @@ var JsPdfDynamo = class {
       return null;
     }
   }
-  toBlobUrl() {
+  toBlobUrl(fileName) {
     try {
-      const result = this._processor.PdfDocument.output(
-        "bloburi",
-        "application/pdf"
-      );
+      const result = this._processor.PdfDocument.output("bloburi", {
+        filename: fileName
+      });
       return result;
     } catch (e) {
       __privateGet(this, _appLogger).warn(
@@ -1854,7 +1857,7 @@ var JsPdfDynamo = class {
       return null;
     }
   }
-  getVar(variableName) {
+  getVariable(variableName) {
     var _a;
     return this._processor ? (_a = this._processor.getVar(variableName)) != null ? _a : null : null;
   }
@@ -2000,8 +2003,8 @@ 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);
@@ -2139,12 +2142,12 @@ 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 (0, import_node_fetch.default)(subs, {
+        const response = yield fetch(subs, {
           headers: { Accept: "text/plain;q=0.9, text/*;q=0.8, */*;q=0.7" }
         });
         if (!response.ok) {

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,7 +302,7 @@ 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;
@@ -354,8 +365,8 @@ declare class JsPdfDynamo {
     _processor: JsPdfProcessor;
     constructor(options?: Partial<IJsPdfOptions>, logger?: ILogger | null);
     toBlob(): Blob | null;
-    toBlobUrl(): string | null;
-    getVar(variableName: string): string | null;
+    toBlobUrl(fileName?: string): string | null;
+    getVariable(variableName: string): string | null;
     private prepareNewPdf;
     prepareWrappedString(input: string): string;
     processCommands(commands: string[]): Promise<void>;
@@ -364,7 +375,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,7 +302,7 @@ 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;
@@ -354,8 +365,8 @@ declare class JsPdfDynamo {
     _processor: JsPdfProcessor;
     constructor(options?: Partial<IJsPdfOptions>, logger?: ILogger | null);
     toBlob(): Blob | null;
-    toBlobUrl(): string | null;
-    getVar(variableName: string): string | null;
+    toBlobUrl(fileName?: string): string | null;
+    getVariable(variableName: string): string | null;
     private prepareNewPdf;
     prepareWrappedString(input: string): string;
     processCommands(commands: string[]): Promise<void>;
@@ -364,7 +375,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

@@ -32,9 +32,6 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 
-// src/jsPdfDynamo.ts
-import fetch2 from "node-fetch";
-
 // src/models/jsPdfProcessor.ts
 import jsPDF from "jspdf";
 import * as fs from "fs";
@@ -92,9 +89,6 @@ var AppLogger = class {
         this._logLevel = newLevel;
       }
     }
-    if (this._logger.logLevel) {
-      this._logger.logLevel(this._logLevel);
-    }
   }
   canLog(level) {
     return level >= this._logLevel;
@@ -331,8 +325,11 @@ var JsPdfProcessor = class {
     this._variables.set("_DATEDMY", (/* @__PURE__ */ new Date()).toLocaleDateString("en-GB"));
     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;
@@ -966,6 +963,7 @@ var JsPdfProcessor = class {
     this.lastResult = "1";
   }
   drawText(input) {
+    var _a;
     const subs = this.logAndParseCommand(".drawText", input);
     const { first: left, rest: rest1 } = getNextNumber(subs);
     const { first: top, rest: rest2 } = getNextNumber(rest1);
@@ -977,7 +975,7 @@ var JsPdfProcessor = class {
     this.lastObjectWidth = 0;
     this.lastResult = "1";
     if (lines.length > 1) {
-      this.lastError = "Text was truncated to fit within the available width";
+      this.lastError = `Text was truncated to fit within the available width (${(_a = lines[0]) == null ? void 0 : _a.substring(0, 20)}...)`;
       this.lastResult = "0";
       if (lines[0]) {
         if (this._pdfDocument.getTextWidth(lines[0]) < maxWidth) {
@@ -1009,7 +1007,7 @@ var JsPdfProcessor = class {
       return false;
     }
     if (isNaN(top)) {
-      this.lastError = `Vertical position '${top}' is not a number`;
+      this.lastError = `Vertical position '${top}' is not a number on page ${this._currentPageNumber}.`;
       this.lastResult = "0";
       return false;
     }
@@ -1166,10 +1164,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);
@@ -1321,8 +1325,8 @@ var JsPdfProcessor = class {
       this.lastError = "Y Position resulted in negative value, adjusted to 0";
     }
     if (this.posnY > this._pageHeight) {
+      this.lastError = `Y Position ${this.posnY} exceeded page ${this._currentPageNumber} height, adjusted to page height (${this._pageHeight})`;
       this.posnY = this._pageHeight;
-      this.lastError = "Y Position exceeded page height, adjusted to page height";
     }
   }
   incVar(input) {
@@ -1811,12 +1815,11 @@ var JsPdfDynamo = class {
       return null;
     }
   }
-  toBlobUrl() {
+  toBlobUrl(fileName) {
     try {
-      const result = this._processor.PdfDocument.output(
-        "bloburi",
-        "application/pdf"
-      );
+      const result = this._processor.PdfDocument.output("bloburi", {
+        filename: fileName
+      });
       return result;
     } catch (e) {
       __privateGet(this, _appLogger).warn(
@@ -1825,7 +1828,7 @@ var JsPdfDynamo = class {
       return null;
     }
   }
-  getVar(variableName) {
+  getVariable(variableName) {
     var _a;
     return this._processor ? (_a = this._processor.getVar(variableName)) != null ? _a : null : null;
   }
@@ -1971,8 +1974,8 @@ 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);
@@ -2110,12 +2113,12 @@ 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 fetch2(subs, {
+        const response = yield fetch(subs, {
           headers: { Accept: "text/plain;q=0.9, text/*;q=0.8, */*;q=0.7" }
         });
         if (!response.ok) {

package/documentation/1. Introduction/Introduction.txt

@@ -6,7 +6,7 @@
 .DrawTextWrapped 0 %_CurrentY% %_PageWidth% *None %text%
 .incCurrentY  %_FONTHEIGHT%
 
-.SetVar text jsPdf-Dynamo can be used with browser or NodeJs JavaScript or TypeScript applications.
+.SetVar text jsPdf-Dynamo can be used with browser or NodeJs applications written in JavaScript or TypeScript.
 .DrawTextWrapped 0 %_CurrentY% %_PageWidth% *None %text%
 .incCurrentY  %_FONTHEIGHT%
 
@@ -51,7 +51,7 @@
 .SetVar text Output is driven by a series of plain text 'commands'. These
 .SetVar text %text% commands can be provided as a list of strings from multiple sources, 
 .SetVar text %text% including the JavaScript or TypeScript application, or loaded from
-.SetVar text %text% 'templates' retrieved from a URL (browser or NodeJs) or from local text 
+.SetVar text %text% 'templates' retrieved from a URL (browser only) or from local text 
 .SetVar text %text% files (NodeJs only).
 .DrawTextWrapped 10 %top% %width% *None %text%
 

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

package/documentation/3. Variables/SystemMaintained.txt

@@ -3,44 +3,44 @@
 
 .incCurrentY %halfLineGap%
 .SetVar text JsPdfDynamo maintains and updates various variables as each command is processed. These
-.SetVar text %text% variables can not be changed directly by using the SetVar command. They include:
-.DrawTextWrapped 0 %_CurrentY% %_PageWidth% CommandCheckPage %LongText%
+.SetVar text %text% variables can not be changed directly by using the SetVar command. 
+.DrawTextWrapped 0 %_CurrentY% %_PageWidth% CommandCheckPage %text%
+.incCurrentY %halfLineGap%
+.SetVar text Note that unless otherwise stated, all distances and positions are in the unit of measure specified
+.SetVar text %text% when creating the JsPdfDynamo object.
+.DrawTextWrapped 0 %_CurrentY% %_PageWidth% CommandCheckPage %text%
 .incCurrentY %halfLineGap%
 .SetMargin L 20
 
 .SetVar CommandLine1 _CurrentX
-.SetVar CommandLine2 The current horizontal position on the page, relative to the left margin, in
-.Do VariableLine
-.SetVar CommandLine2 millimeters.
+.SetVar CommandLine2 The current horizontal position on the page, relative to the left margin.
 .Do VariableLine
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _CurrentY
-.SetVar CommandLine2 The current vertical position on the page, relative to the top margin, in
-.Do VariableLine
-.SetVar CommandLine2 millimeters.
+.SetVar CommandLine2 The current vertical position on the page, relative to the top margin.
 .Do VariableLine
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _CurrentPageSize
-.SetVar CommandLine2 The name of the last page size specified, for example, 'A4', 'Letter'.
+.SetVar CommandLine2 The name of the last page size specified, for example, 'a4', 'letter'.
 .Do VariableLineWide
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _CurrentPageOrientation
-.SetVar CommandLine2 The last page orientation specified: 
-.Do VariableLineWide
-.SetVar CommandLine2 0=Portrait (default) 1=Landscape 
+.SetVar CommandLine2 The last page orientation specified:  'portrait' or 'landscape'
 .Do VariableLineWide
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _FontHeight
-.SetVar CommandLine2 The height of the current font, in millimeters. This can be used to create
-.Do VariableLine
-.SetVar CommandLine2 a space between paragraphs when used in conjunction with the
-.Do VariableLine
-.SetVar CommandLine2 incCurrentY command: .incCurrentY %%%%_FontHeight%%%%
-.Do VariableLine
+.SetVar CommandLine2 The height of the current font. This can be used to create a space between
+.SetVar CommandLine2 %CommandLine2% paragraphs when used in conjunction with the incCurrentY command.
+.Do VariableLineWrapped
+
+.incCurrentY %halfLineGap%
+.SetVar CommandLine1 _FontName
+.SetVar CommandLine2 The name of the current font. For example, "helvetica", which is the default font.
+.Do VariableLineWrapped
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _FontPointSize
@@ -52,16 +52,9 @@
 .SetVar CommandLine2 The current font style. For example, "normal" or "italic".
 .Do VariableLine
 
-.incCurrentY %halfLineGap%
-.SetVar CommandLine1 _FontType
-.SetVar CommandLine2 The name of the current font. For example, "Helvetica", which is the
-.Do VariableLine
-.SetVar CommandLine2 default font type.
-.Do VariableLine
-
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _ImageHeight
-.SetVar CommandLine2 The height of the last loaded image in the current units of measure.
+.SetVar CommandLine2 The height of the last loaded image.
 .Do VariableLine
 
 .incCurrentY %halfLineGap%
@@ -71,7 +64,7 @@
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _ImageWidth
-.SetVar CommandLine2 The width of the last loaded image in the current units of measure.
+.SetVar CommandLine2 The width of the last loaded image.
 .Do VariableLine
 
 .incCurrentY %halfLineGap%
@@ -81,7 +74,7 @@
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _LastError
-.SetVar CommandLine2 A description of the last error encountered. 
+.SetVar CommandLine2 A description of the last error encountered.
 .Do VariableLine
 
 .incCurrentY %halfLineGap%
@@ -95,50 +88,46 @@
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _LastObjectHeight
-.SetVar CommandLine2 The height of the last object that has been output, in millimeters.
+.SetVar CommandLine2 The height of the last object that has been drawn.
 .Do VariableLine
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _LastObjectWidth
-.SetVar CommandLine2 The width of the last object that has been output, in millimeters.
+.SetVar CommandLine2 The width of the last object that has been drawn.
 .Do VariableLine
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _LastOutline
 .SetVar CommandLine2 This contains the number assigned to each outline entry when it is
-.Do VariableLine
-.SetVar CommandLine2 created. This number is used when creating child outline entries. 
-.Do VariableLine
+.SetVar CommandLine2 %CommandLine2% created. This is used when creating child outline entries. 
+.Do VariableLineWrapped
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _LastResult
 .SetVar CommandLine2 Most commands update this variable. If the command fails, this will be
-.Do VariableLine
-.SetVar CommandLine2 set to '0'. A successful command wil set this to '1' or to some other
-.Do VariableLine
-.SetVar CommandLine2 useful value. For example, when a new page is created the page number
-.Do VariableLine
-.SetVar CommandLine2 is returned in this variable.
-.Do VariableLine
+.SetVar CommandLine2 %CommandLine2% set to '0'. A successful command will set this to '1' or to some other
+.SetVar CommandLine2 %CommandLine2% useful value. For example, when a new page is added, _LastResult 
+.SetVar CommandLine2 %CommandLine2% will contain the number of the added page.
+.Do VariableLineWrapped
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _MarginBottom
-.SetVar CommandLine2 The current margin, in millimeters, from the page bottom edge.
+.SetVar CommandLine2 The current margin from the bottom edge of the page.
 .Do VariableLine
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _MarginLeft
-.SetVar CommandLine2 The current margin, in millimeters, from the page left edge.
+.SetVar CommandLine2 The current margin from the left edge of the page.
 .Do VariableLine
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _MarginRight
-.SetVar CommandLine2 The current margin, in millimeters, from the page right edge.
+.SetVar CommandLine2 The current margin from the right edge of the page.
 .Do VariableLine
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _MarginTop
-.SetVar CommandLine2 The current margin, in millimeters, from the page top edge.
+.SetVar CommandLine2 The current margin from the top edge of the page.
 .Do VariableLine
 
 .incCurrentY %halfLineGap%
@@ -148,9 +137,7 @@
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _PageHeight
-.SetVar CommandLine2 The height of the page, less the current top and bottom margins,
-.Do VariableLine
-.SetVar CommandLine2 expressed in millimeters.
+.SetVar CommandLine2 The height of the page, less the current top and bottom margins.
 .Do VariableLine
 
 .incCurrentY %halfLineGap%
@@ -160,31 +147,23 @@
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _PageWidth
-.SetVar CommandLine2 The width of the page, less the current left and right margins, expressed
-.Do VariableLine
-.SetVar CommandLine2 in millimeters.
+.SetVar CommandLine2 The width of the page, less the current left and right margins.
 .Do VariableLine
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _SpaceHoz
 .SetVar CommandLine2 JsPdfDynamo keeps track of the current position, relative to the left
-.Do VariableLine
-.SetVar CommandLine2 margin, after each object is output. This position is calculated in
-.Do VariableLine
-.SetVar CommandLine2 millimeters from the width of the object plus the current horizontal spacing, 
-.Do VariableLine
-.SetVar CommandLine2 which can be set with the SetSpaceHoz command. 
-.Do VariableLine
+.SetVar CommandLine2 %CommandLine2% margin, after each object is output. This position is calculated
+.SetVar CommandLine2 %CommandLine2% from the width of the object plus the current horizontal spacing, 
+.SetVar CommandLine2 %CommandLine2% which can be set with the SetSpaceHoz command. 
+.Do VariableLineWrapped
 
 .incCurrentY %halfLineGap%
 .SetVar CommandLine1 _SpaceVert
-.SetVar CommandLine2 JsPdfDynamo keeps track of the current position, in millimeters, relative
-.Do VariableLine
-.SetVar CommandLine2 to the top margin, after each object is output. This position is calculated
-.Do VariableLine
-.SetVar CommandLine2 from the height of the object plus the current vertical spacing, which can 
-.Do VariableLine
-.SetVar CommandLine2 be set with the SetSpaceVert command. 
-.Do VariableLine
+.SetVar CommandLine2 %CommandLine2% JsPdfDynamo keeps track of the current position, relative
+.SetVar CommandLine2 %CommandLine2% to the top margin, after each object is output. This position is calculated
+.SetVar CommandLine2 %CommandLine2% from the height of the object plus the current vertical spacing, which can 
+.SetVar CommandLine2 %CommandLine2% be set with the SetSpaceVert command. 
+.Do VariableLineWrapped
 .incCurrentY %_SPACEVERT%
 .Do SetMargins 

package/documentation/4. Commands/AddBookmark.txt

@@ -34,14 +34,14 @@
 .SetVar CommandLine1 Create a top level bookmark entry for the current page:
 .Do CommandLine
 .incCurrentY %halfLineGap%
-.SetVar CommandLine1 .AddBookmark 0 %%%%_PAGENO%%%% Chapter one of the document 
+.SetVar CommandLine1 .AddBookmark  0  %%%%_PAGENO%%%%  Chapter one of the document 
 .Do CommandLine2
-.SetVar CommandLine1 .SetVar Chapter1 %%%%_LastResult%%%% 
+.SetVar CommandLine1 .SetVar  Chapter1  %%%%_LastResult%%%% 
 .Do CommandLine2
 .incCurrentY %_FontHeight%
 .SetVar CommandLine1 Create a child bookmark entry for the chapter 1:
 .Do CommandLine
 .incCurrentY %halfLineGap%
-.SetVar CommandLine1 .AddBookmark %%%%Chapter1%%%% %%%%_PAGENO%%%% Chapter one, Paragraph 1 
+.SetVar CommandLine1 .AddBookmark  %%%%Chapter1%%%%  %%%%_PAGENO%%%%  Chapter one, Paragraph 1 
 .Do CommandLine2
 .incCurrentY %_FontHeight%