Re-factor the Catalog.viewerPreferences method

This removes the `ViewerPreferencesValidators` structure, and thus (slightly) simplifies the code overall. With these changes we only have to iterate through, and validate, the actually available Dictionary entries.

src/core/catalog.js

@@ -776,44 +776,30 @@ class Catalog {
   }
 
   get viewerPreferences() {
-    const ViewerPreferencesValidators = {
-      HideToolbar: isBool,
-      HideMenubar: isBool,
-      HideWindowUI: isBool,
-      FitWindow: isBool,
-      CenterWindow: isBool,
-      DisplayDocTitle: isBool,
-      NonFullScreenPageMode: isName,
-      Direction: isName,
-      ViewArea: isName,
-      ViewClip: isName,
-      PrintArea: isName,
-      PrintClip: isName,
-      PrintScaling: isName,
-      Duplex: isName,
-      PickTrayByPDFSize: isBool,
-      PrintPageRange: Array.isArray,
-      NumCopies: Number.isInteger,
-    };
-
     const obj = this._catDict.get("ViewerPreferences");
+    if (!(obj instanceof Dict)) {
+      return shadow(this, "viewerPreferences", null);
+    }
     let prefs = null;
 
-    if (obj instanceof Dict) {
+    for (const key of obj.getKeys()) {
-      for (const key in ViewerPreferencesValidators) {
-        if (!obj.has(key)) {
-          continue;
-        }
       const value = obj.get(key);
-        // Make sure the (standard) value conforms to the specification.
-        if (!ViewerPreferencesValidators[key](value)) {
-          info(`Bad value in ViewerPreferences for "${key}".`);
-          continue;
-        }
       let prefValue;
 
       switch (key) {
+        case "HideToolbar":
+        case "HideMenubar":
+        case "HideWindowUI":
+        case "FitWindow":
+        case "CenterWindow":
+        case "DisplayDocTitle":
+        case "PickTrayByPDFSize":
+          if (typeof value === "boolean") {
+            prefValue = value;
+          }
+          break;
         case "NonFullScreenPageMode":
+          if (value instanceof Name) {
             switch (value.name) {
               case "UseNone":
               case "UseOutlines":
@@ -824,8 +810,10 @@ class Catalog {
               default:
                 prefValue = "UseNone";
             }
+          }
           break;
         case "Direction":
+          if (value instanceof Name) {
             switch (value.name) {
               case "L2R":
               case "R2L":
@@ -834,11 +822,13 @@ class Catalog {
               default:
                 prefValue = "L2R";
             }
+          }
           break;
         case "ViewArea":
         case "ViewClip":
         case "PrintArea":
         case "PrintClip":
+          if (value instanceof Name) {
             switch (value.name) {
               case "MediaBox":
               case "CropBox":
@@ -850,8 +840,10 @@ class Catalog {
               default:
                 prefValue = "CropBox";
             }
+          }
           break;
         case "PrintScaling":
+          if (value instanceof Name) {
             switch (value.name) {
               case "None":
               case "AppDefault":
@@ -860,8 +852,10 @@ class Catalog {
               default:
                 prefValue = "AppDefault";
             }
+          }
           break;
         case "Duplex":
+          if (value instanceof Name) {
             switch (value.name) {
               case "Simplex":
               case "DuplexFlipShortEdge":
@@ -871,13 +865,11 @@ class Catalog {
               default:
                 prefValue = "None";
             }
+          }
           break;
         case "PrintPageRange":
-            const length = value.length;
-            if (length % 2 !== 0) {
           // The number of elements must be even.
-              break;
+          if (Array.isArray(value) && value.length % 2 === 0) {
-            }
             const isValid = value.every((page, i, arr) => {
               return (
                 Number.isInteger(page) &&
@@ -889,30 +881,26 @@ class Catalog {
             if (isValid) {
               prefValue = value;
             }
+          }
           break;
         case "NumCopies":
-            if (value > 0) {
+          if (Number.isInteger(value) && value > 0) {
             prefValue = value;
           }
           break;
         default:
-            if (typeof value !== "boolean") {
+          warn(`Ignoring non-standard key in ViewerPreferences: ${key}.`);
-              throw new FormatError(
+          continue;
-                `viewerPreferences - expected a boolean value for: ${key}`
-              );
-            }
-            prefValue = value;
       }
 
-        if (prefValue !== undefined) {
+      if (prefValue === undefined) {
+        warn(`Bad value, for key "${key}", in ViewerPreferences: ${value}.`);
+        continue;
+      }
       if (!prefs) {
         prefs = Object.create(null);
       }
       prefs[key] = prefValue;
-        } else {
-          info(`Bad value in ViewerPreferences for "${key}".`);
-        }
-      }
     }
     return shadow(this, "viewerPreferences", prefs);
   }