X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fscripts%2Fprefs2prefs_prefs.py;h=5ce10511bce434564cb85dde500db2c19ccb39e9;hb=c0bbc020a56e0e55fe4a07230ab6d9851fef0c24;hp=ff447632802c989f583e24327e14ae884f475de8;hpb=b4f97b61cf0b257e31bcf512668ad458523d7f5a;p=lyx.git

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index ff44763280..5ce10511bc 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -25,6 +25,14 @@
 #   We must add the flag zipped=native to formats that
 #   were previously hardcoded in the C++ source: dia.
 
+# Incremented to format 4, r40028 by vfr
+#   Remove support for default paper size.
+
+# Incremented to format 5, r40030 by vfr
+#   Add a default length unit.
+#   No conversion necessary.
+
+
 import re
 
 
@@ -118,6 +126,12 @@ def zipped_native(line):
 	return (True,
 		"\\Format %s \"%s,zipped=native\"" % (fmat, opts))
 
+def remove_default_papersize(line):
+	if not line.startswith("\\default_papersize"):
+		return no_match
+	return (True, "")
+
+
 ########################
 
 
@@ -131,4 +145,6 @@ conversions = [
 	]],
 	[  2, []],
 	[  3, [ zipped_native ]],
+	[  4, [ remove_default_papersize ]],
+	[  5, []],
 ]