diff --git a/code/src/java/pcgen/core/Globals.java b/code/src/java/pcgen/core/Globals.java
index e810c63cf2b..7b874902a8a 100644
--- a/code/src/java/pcgen/core/Globals.java
+++ b/code/src/java/pcgen/core/Globals.java
@@ -742,15 +742,29 @@ public static boolean selectPaper(final String paperName)
/**
* Apply the user's preferences to the initial state of the Globals.
*/
- public static void initPreferences()
+public static void initPreferences()
{
if (selectedPaper != -1)
{
// Already initialized
return;
}
- final String papersize = PCGenSettings.getInstance().initProperty(PCGenSettings.PAPERSIZE, "A4");
- selectPaper(papersize);
+
+ String defaultPaper = "A4";
+ String country = java.util.Locale.getDefault().getCountry();
+ if ("US".equalsIgnoreCase(country) || "CA".equalsIgnoreCase(country))
+ {
+ defaultPaper = "Letter";
+ }
+
+ String papersize = PCGenSettings.getInstance().initProperty(PCGenSettings.PAPERSIZE, defaultPaper);
+
+ // Self-healing fallback: If the saved paper size is invalid, force it to the regional default
+ if (!selectPaper(papersize))
+ {
+ PCGenSettings.getInstance().setProperty(PCGenSettings.PAPERSIZE, defaultPaper);
+ selectPaper(defaultPaper);
+ }
}
/**
@@ -1085,4 +1099,4 @@ public static LoadContext getContext()
{
return SettingsHandler.getGameAsProperty().get().getContext();
}
-}
+}
\ No newline at end of file
diff --git a/outputsheets/d20/4e/pdf/fantasy_master_common_blocks.xslt b/outputsheets/d20/4e/pdf/fantasy_master_common_blocks.xslt
index 9a7ef032b69..14f909524ba 100644
--- a/outputsheets/d20/4e/pdf/fantasy_master_common_blocks.xslt
+++ b/outputsheets/d20/4e/pdf/fantasy_master_common_blocks.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/4e/pdf/inc_pagedimensions.xslt b/outputsheets/d20/4e/pdf/inc_pagedimensions.xslt
index f4aad31f1cc..90737075a51 100644
--- a/outputsheets/d20/4e/pdf/inc_pagedimensions.xslt
+++ b/outputsheets/d20/4e/pdf/inc_pagedimensions.xslt
@@ -21,7 +21,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
diff --git a/outputsheets/d20/5e/pdf/fantasy_master_alt_largetext.xslt b/outputsheets/d20/5e/pdf/fantasy_master_alt_largetext.xslt
index 99a854ff11d..0d5612ed966 100644
--- a/outputsheets/d20/5e/pdf/fantasy_master_alt_largetext.xslt
+++ b/outputsheets/d20/5e/pdf/fantasy_master_alt_largetext.xslt
@@ -34,7 +34,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
diff --git a/outputsheets/d20/5e/pdf/fantasy_master_common_blocks.xslt b/outputsheets/d20/5e/pdf/fantasy_master_common_blocks.xslt
index fcafc886dac..7377973311d 100644
--- a/outputsheets/d20/5e/pdf/fantasy_master_common_blocks.xslt
+++ b/outputsheets/d20/5e/pdf/fantasy_master_common_blocks.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/5e/pdf/fantasy_master_common_companion_box.xslt b/outputsheets/d20/5e/pdf/fantasy_master_common_companion_box.xslt
index 76ac7b7aae8..16b5398f673 100644
--- a/outputsheets/d20/5e/pdf/fantasy_master_common_companion_box.xslt
+++ b/outputsheets/d20/5e/pdf/fantasy_master_common_companion_box.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/5e/pdf/fantasy_master_no_header.xslt b/outputsheets/d20/5e/pdf/fantasy_master_no_header.xslt
index 44b13caf97b..e2b9790b419 100644
--- a/outputsheets/d20/5e/pdf/fantasy_master_no_header.xslt
+++ b/outputsheets/d20/5e/pdf/fantasy_master_no_header.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/5e/pdf/fantasy_master_no_spells.xslt b/outputsheets/d20/5e/pdf/fantasy_master_no_spells.xslt
index b3082f3c11a..daf6a1a3322 100644
--- a/outputsheets/d20/5e/pdf/fantasy_master_no_spells.xslt
+++ b/outputsheets/d20/5e/pdf/fantasy_master_no_spells.xslt
@@ -54,7 +54,7 @@
-
+
@@ -77,7 +77,7 @@
-
+
diff --git a/outputsheets/d20/5e/pdf/fantasy_master_spell_list_only.xslt b/outputsheets/d20/5e/pdf/fantasy_master_spell_list_only.xslt
index 7181aab1b88..7b65077682f 100644
--- a/outputsheets/d20/5e/pdf/fantasy_master_spell_list_only.xslt
+++ b/outputsheets/d20/5e/pdf/fantasy_master_spell_list_only.xslt
@@ -42,7 +42,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
diff --git a/outputsheets/d20/5e/pdf/inc_pagedimensions.xslt b/outputsheets/d20/5e/pdf/inc_pagedimensions.xslt
index f4aad31f1cc..90737075a51 100644
--- a/outputsheets/d20/5e/pdf/inc_pagedimensions.xslt
+++ b/outputsheets/d20/5e/pdf/inc_pagedimensions.xslt
@@ -21,7 +21,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
diff --git a/outputsheets/d20/fantasy/pdf/fantasy_master_alt_largetext.xslt b/outputsheets/d20/fantasy/pdf/fantasy_master_alt_largetext.xslt
index a4d60fe6018..828d17aece9 100644
--- a/outputsheets/d20/fantasy/pdf/fantasy_master_alt_largetext.xslt
+++ b/outputsheets/d20/fantasy/pdf/fantasy_master_alt_largetext.xslt
@@ -34,7 +34,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
diff --git a/outputsheets/d20/fantasy/pdf/fantasy_master_common_blocks.xslt b/outputsheets/d20/fantasy/pdf/fantasy_master_common_blocks.xslt
index a5be9b08473..3197cf059aa 100644
--- a/outputsheets/d20/fantasy/pdf/fantasy_master_common_blocks.xslt
+++ b/outputsheets/d20/fantasy/pdf/fantasy_master_common_blocks.xslt
@@ -64,7 +64,7 @@
-
+
@@ -87,7 +87,7 @@
-
+
diff --git a/outputsheets/d20/fantasy/pdf/fantasy_master_common_companion_box.xslt b/outputsheets/d20/fantasy/pdf/fantasy_master_common_companion_box.xslt
index 16ee92a7078..d7a2867d0c3 100644
--- a/outputsheets/d20/fantasy/pdf/fantasy_master_common_companion_box.xslt
+++ b/outputsheets/d20/fantasy/pdf/fantasy_master_common_companion_box.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/fantasy/pdf/fantasy_master_no_header.xslt b/outputsheets/d20/fantasy/pdf/fantasy_master_no_header.xslt
index 0394c3a1a29..fcf80ab8a54 100644
--- a/outputsheets/d20/fantasy/pdf/fantasy_master_no_header.xslt
+++ b/outputsheets/d20/fantasy/pdf/fantasy_master_no_header.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/fantasy/pdf/fantasy_master_spell_list_only.xslt b/outputsheets/d20/fantasy/pdf/fantasy_master_spell_list_only.xslt
index 8ff29bce62f..38f1d7b37dc 100644
--- a/outputsheets/d20/fantasy/pdf/fantasy_master_spell_list_only.xslt
+++ b/outputsheets/d20/fantasy/pdf/fantasy_master_spell_list_only.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/fantasy/pdf/inc_pagedimensions.xslt b/outputsheets/d20/fantasy/pdf/inc_pagedimensions.xslt
index f4aad31f1cc..90737075a51 100644
--- a/outputsheets/d20/fantasy/pdf/inc_pagedimensions.xslt
+++ b/outputsheets/d20/fantasy/pdf/inc_pagedimensions.xslt
@@ -21,7 +21,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
diff --git a/outputsheets/d20/fantasy_craft/pdf/fantasy_master_common_blocks.xslt b/outputsheets/d20/fantasy_craft/pdf/fantasy_master_common_blocks.xslt
index cfd4ebb84d1..8e5f983900f 100644
--- a/outputsheets/d20/fantasy_craft/pdf/fantasy_master_common_blocks.xslt
+++ b/outputsheets/d20/fantasy_craft/pdf/fantasy_master_common_blocks.xslt
@@ -64,7 +64,7 @@
-
+
@@ -87,7 +87,7 @@
-
+
diff --git a/outputsheets/d20/modern/pdf/csheet_modern_std.xslt b/outputsheets/d20/modern/pdf/csheet_modern_std.xslt
index e72bcb28958..7be56f516d9 100644
--- a/outputsheets/d20/modern/pdf/csheet_modern_std.xslt
+++ b/outputsheets/d20/modern/pdf/csheet_modern_std.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/pathfinder_2/pdf/fantasy_master_alt_largetext.xslt b/outputsheets/d20/pathfinder_2/pdf/fantasy_master_alt_largetext.xslt
index a4d60fe6018..828d17aece9 100644
--- a/outputsheets/d20/pathfinder_2/pdf/fantasy_master_alt_largetext.xslt
+++ b/outputsheets/d20/pathfinder_2/pdf/fantasy_master_alt_largetext.xslt
@@ -34,7 +34,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
diff --git a/outputsheets/d20/pathfinder_2/pdf/fantasy_master_common_blocks.xslt b/outputsheets/d20/pathfinder_2/pdf/fantasy_master_common_blocks.xslt
index 1f4fe4979d5..b194d27f68c 100644
--- a/outputsheets/d20/pathfinder_2/pdf/fantasy_master_common_blocks.xslt
+++ b/outputsheets/d20/pathfinder_2/pdf/fantasy_master_common_blocks.xslt
@@ -63,7 +63,7 @@
-
+
@@ -86,7 +86,7 @@
-
+
diff --git a/outputsheets/d20/pathfinder_2/pdf/fantasy_master_common_companion_box.xslt b/outputsheets/d20/pathfinder_2/pdf/fantasy_master_common_companion_box.xslt
index 6af8525106d..4a89558999f 100644
--- a/outputsheets/d20/pathfinder_2/pdf/fantasy_master_common_companion_box.xslt
+++ b/outputsheets/d20/pathfinder_2/pdf/fantasy_master_common_companion_box.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/pathfinder_2/pdf/fantasy_master_no_header.xslt b/outputsheets/d20/pathfinder_2/pdf/fantasy_master_no_header.xslt
index 820f75168fc..e742422c503 100644
--- a/outputsheets/d20/pathfinder_2/pdf/fantasy_master_no_header.xslt
+++ b/outputsheets/d20/pathfinder_2/pdf/fantasy_master_no_header.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/pathfinder_2/pdf/fantasy_master_spell_list_only.xslt b/outputsheets/d20/pathfinder_2/pdf/fantasy_master_spell_list_only.xslt
index 5bbb9d417de..657165c6286 100644
--- a/outputsheets/d20/pathfinder_2/pdf/fantasy_master_spell_list_only.xslt
+++ b/outputsheets/d20/pathfinder_2/pdf/fantasy_master_spell_list_only.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/pathfinder_2/pdf/inc_pagedimensions.xslt b/outputsheets/d20/pathfinder_2/pdf/inc_pagedimensions.xslt
index f4aad31f1cc..90737075a51 100644
--- a/outputsheets/d20/pathfinder_2/pdf/inc_pagedimensions.xslt
+++ b/outputsheets/d20/pathfinder_2/pdf/inc_pagedimensions.xslt
@@ -21,7 +21,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
diff --git a/outputsheets/d20/sagaborn/pdf/fantasy_master_alt_largetext.xslt b/outputsheets/d20/sagaborn/pdf/fantasy_master_alt_largetext.xslt
index 23d083e1333..da23659434b 100644
--- a/outputsheets/d20/sagaborn/pdf/fantasy_master_alt_largetext.xslt
+++ b/outputsheets/d20/sagaborn/pdf/fantasy_master_alt_largetext.xslt
@@ -34,7 +34,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
diff --git a/outputsheets/d20/sagaborn/pdf/fantasy_master_common_blocks.xslt b/outputsheets/d20/sagaborn/pdf/fantasy_master_common_blocks.xslt
index ce1d18ac1ef..8297dd9c670 100644
--- a/outputsheets/d20/sagaborn/pdf/fantasy_master_common_blocks.xslt
+++ b/outputsheets/d20/sagaborn/pdf/fantasy_master_common_blocks.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/sagaborn/pdf/fantasy_master_common_companion_box.xslt b/outputsheets/d20/sagaborn/pdf/fantasy_master_common_companion_box.xslt
index 76ac7b7aae8..16b5398f673 100644
--- a/outputsheets/d20/sagaborn/pdf/fantasy_master_common_companion_box.xslt
+++ b/outputsheets/d20/sagaborn/pdf/fantasy_master_common_companion_box.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/sagaborn/pdf/fantasy_master_no_header.xslt b/outputsheets/d20/sagaborn/pdf/fantasy_master_no_header.xslt
index 44b13caf97b..e2b9790b419 100644
--- a/outputsheets/d20/sagaborn/pdf/fantasy_master_no_header.xslt
+++ b/outputsheets/d20/sagaborn/pdf/fantasy_master_no_header.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/sagaborn/pdf/fantasy_master_spell_list_only.xslt b/outputsheets/d20/sagaborn/pdf/fantasy_master_spell_list_only.xslt
index cbeff18f336..fa135410ce4 100644
--- a/outputsheets/d20/sagaborn/pdf/fantasy_master_spell_list_only.xslt
+++ b/outputsheets/d20/sagaborn/pdf/fantasy_master_spell_list_only.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/sagaborn/pdf/inc_pagedimensions.xslt b/outputsheets/d20/sagaborn/pdf/inc_pagedimensions.xslt
index f4aad31f1cc..90737075a51 100644
--- a/outputsheets/d20/sagaborn/pdf/inc_pagedimensions.xslt
+++ b/outputsheets/d20/sagaborn/pdf/inc_pagedimensions.xslt
@@ -21,7 +21,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
diff --git a/outputsheets/d20/starfinder/pdf/fantasy_master_common_blocks.xslt b/outputsheets/d20/starfinder/pdf/fantasy_master_common_blocks.xslt
index 23dad5e28dc..f137b407313 100644
--- a/outputsheets/d20/starfinder/pdf/fantasy_master_common_blocks.xslt
+++ b/outputsheets/d20/starfinder/pdf/fantasy_master_common_blocks.xslt
@@ -64,7 +64,7 @@
-
+
@@ -87,7 +87,7 @@
-
+
diff --git a/outputsheets/d20/starfinder/pdf/fantasy_master_spell_list_only.xslt b/outputsheets/d20/starfinder/pdf/fantasy_master_spell_list_only.xslt
index 8ff29bce62f..38f1d7b37dc 100644
--- a/outputsheets/d20/starfinder/pdf/fantasy_master_spell_list_only.xslt
+++ b/outputsheets/d20/starfinder/pdf/fantasy_master_spell_list_only.xslt
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/outputsheets/d20/starfinder/pdf/inc_pagedimensions.xslt b/outputsheets/d20/starfinder/pdf/inc_pagedimensions.xslt
index f4aad31f1cc..90737075a51 100644
--- a/outputsheets/d20/starfinder/pdf/inc_pagedimensions.xslt
+++ b/outputsheets/d20/starfinder/pdf/inc_pagedimensions.xslt
@@ -21,7 +21,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
diff --git a/outputsheets/killshot/pdf/inc_pagedimensions.xslt b/outputsheets/killshot/pdf/inc_pagedimensions.xslt
index f4aad31f1cc..90737075a51 100644
--- a/outputsheets/killshot/pdf/inc_pagedimensions.xslt
+++ b/outputsheets/killshot/pdf/inc_pagedimensions.xslt
@@ -21,7 +21,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
diff --git a/outputsheets/killshot/pdf/killshot_master.xslt b/outputsheets/killshot/pdf/killshot_master.xslt
index b251df205a7..a5e56d39eaa 100644
--- a/outputsheets/killshot/pdf/killshot_master.xslt
+++ b/outputsheets/killshot/pdf/killshot_master.xslt
@@ -38,7 +38,7 @@
-
+
@@ -61,7 +61,7 @@
-
+
diff --git a/system/gameModes/default/paperInfo.lst b/system/gameModes/default/paperInfo.lst
index 904ec64fe7a..b8581f1ede7 100644
--- a/system/gameModes/default/paperInfo.lst
+++ b/system/gameModes/default/paperInfo.lst
@@ -6,4 +6,4 @@ NAME:B5 SORTKEY:003 HEIGHT:257mm WIDTH:182mm TOPMARGIN:10mm BOTTOMMARGIN:15mm
#
NAME:in_PaperExecutive SORTKEY:004 HEIGHT:10.5in WIDTH:7.25in TOPMARGIN:.4in BOTTOMMARGIN:.6in LEFTMARGIN:.4in RIGHTMARGIN:.4in
NAME:in_PaperLegal SORTKEY:005 HEIGHT:14in WIDTH:8.5in TOPMARGIN:.4in BOTTOMMARGIN:.6in LEFTMARGIN:.4in RIGHTMARGIN:.4in
-NAME:in_PaperLetter SORTKEY:006 HEIGHT:11in WIDTH:8.5in TOPMARGIN:.4in BOTTOMMARGIN:.6in LEFTMARGIN:.4in RIGHTMARGIN:.4in
+NAME:Letter SORTKEY:006 HEIGHT:11in WIDTH:8.5in TOPMARGIN:.4in BOTTOMMARGIN:.6in LEFTMARGIN:.4in RIGHTMARGIN:.4in