Fix for WINDOW and WDWTITLE

Signed-off-by: Liam Allan <mrliamallan@live.co.uk>

Author: worksofliam

src/dspf.js

@@ -273,7 +273,7 @@ class DisplayFile {
         switch (value[i]) {
         case `+`:
         case `-`:
-          if (!inString) {
+          if (!inString && value[i+1] !== newLineMark) {
             innerValue += value[i];
           }
           break;
@@ -377,15 +377,41 @@ class RecordInfo {
         this.isWindow = true;
         let points = keyword.value.split(' ');
 
+
+        if (points.length >= 3 && points[0].toUpperCase() === `*DFT`) {
+          // WINDOW (*DFT Y X)
+          this.windowSize = {
+            y: 2,
+            x: 2,
+            width: Number(points[2]),
+            height: Number(points[1])
+          };
+        } else {
+          if (points.length === 1) {
+            // WINDOW (REF)
+            this.windowReference = points[0];
+
+          } else if (points.length >= 4) {
+            // WINDOW (*DFT SY SX Y X)
+            this.windowSize = {
+              y: Number(points[0]) || 2,
+              x: Number(points[1]) || 2,
+              width: Number(points[3]),
+              height: Number(points[2])
+            };
+          }
+        }
+
+        switch (points[0]) {
+          case `*DFT`:
+            break;
+          
+        }
+
         switch (points.length) {
         case 4:
           //WINDOW (STARTY STARTX SIZEY SIZEX)
-          this.windowSize = {
-            y: Number(points[0]) || 2,
-            x: Number(points[1]) || 2,
-            width: Number(points[3]),
-            height: Number(points[2])
-          };
+
           break;
         case 1:
           //WINDOW (REF)

test/file/issue1149.js

@@ -0,0 +1,22 @@
+exports.lines = [
+`     A          R HELP`,
+`     A*%%TS  SD  20080304  144943  PGML        REL-V5R4M0  5722-WDS`,
+`     A                                      KEEP`,
+`     A                                      OVERLAY`,
+`     A                                      WINDOW(10 2 10 70 *NORSTCSR)`,
+`     A                                      WDWBORDER((*DSPATR RI) (*CHAR ':.::-`,
+`     A                                      ::.:'))`,
+`     A                                      WDWTITLE((*TEXT 'Print accounts by -`,
+`     A                                      store number for status type - Help-`,
+`     A                                      ') (*COLOR WHT))`,
+`     A                                  1 26'Print accounts - Help'`,
+`     A                                      COLOR(WHT)`,
+`     A                                  3  3'This report print all accounts of -`,
+`     A                                      selected status for a store or all'`,
+`     A                                  4  2'stores.  An account will print for-`,
+`     A                                       a store only if that store has'`,
+`     A                                  5  2'taken a check from that account.  -`,
+`     A                                      You can only select one status type'`,
+`     A                                  6  2'for each report request.'`,
+`     A                                  9  2'Press Enter to return'`,
+]

test/tests.js

@@ -1,7 +1,9 @@
 const assert = require("assert");
 const { DisplayFile } = require("../src/dspf");
+
 const depts = require("./file/depts");
 const replloadfm = require("./file/replloadfm");
+const issue1149 = require(`./file/issue1149`);
 
 exports.simple = () => {
   const file = new DisplayFile();
@@ -135,4 +137,18 @@ exports.window = () => {
   assert.deepStrictEqual(confirmWindowFormat.windowSize, {
     height: 6, width: 54, x: 6, y: 6
   });
+}
+
+exports.issue1149 = () => {
+  const file = new DisplayFile();
+  file.parse(issue1149.lines);
+
+  const windowFormat = file.formats[1];
+  assert.strictEqual(windowFormat.name, `HELP`);
+  assert.deepStrictEqual(windowFormat.windowSize, {
+    height: 10, width: 70, x: 2, y: 10
+  });
+
+  const windowTitle = windowFormat.keywords.find(keyword => keyword.name === `WDWTITLE`);
+  assert.strictEqual(windowTitle.value, `*TEXT 'Print accounts by store number for status type - Help' *COLOR WHT`);
 }