From 8325ce97b23794169dbf7cc2ae4612d3b66f699b Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 1 Oct 2005 23:06:53 +0000
Subject: [PATCH] * Documentation/user/global.itely (Paper size): explain how
 to add sizes.

* scm/paper.scm (paper-alist): rename tabloid paper to 11x17 to
correspond to GS's definition.
---
 ChangeLog                       | 6 ++++++
 Documentation/user/global.itely | 8 ++++++--
 python/convertrules.py          | 9 +++++++++
 scm/paper.scm                   | 3 ++-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a8bc81448..8b6786cca9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-10-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* Documentation/user/global.itely (Paper size): explain how to add
+	sizes.
+
+	* scm/paper.scm (paper-alist): rename tabloid paper to 11x17 to
+	correspond to GS's definition.
+
 	* lily/tuplet-bracket.cc (after_line_breaking): suicide empty
 	tuplet bracket.
 	(print): only connect to next bracket if the next one is alive.
diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index 4408687e2b..a2bc344061 100644
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -220,8 +220,12 @@ block is at the top of the file, then it will apply to all pages.  If the
 @code{\paper} block is inside a @code{\book}, then the paper size will only
 apply to that book.
 
-The following paper sizes are supported: @code{a6}, @code{a5}, @code{a4},
-@code{a3}, @code{legal}, @code{letter}, @code{tabloid}.
+Support for the following paper sizes are included by default,
+@code{a6}, @code{a5}, @code{a4}, @code{a3}, @code{legal}, @code{letter},
+@code{11x17} (also known as tabloid).
+
+Extra sizes may be added by editing the definition for
+@code{paper-alist} in the initialization file @file{scm/paper.scm}.
 
 @cindex orientation
 @cindex landscape
diff --git a/python/convertrules.py b/python/convertrules.py
index f04577e8a4..1816a96e66 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2566,3 +2566,12 @@ def conv (str):
 
 conversions.append (((2, 7, 10), conv,
 		     '''\\applyxxx -> \\applyXxx'''))
+
+
+
+def conv (str):
+	str = re.sub(r'\"tabloid\"', '"11x17"', str)
+	return str
+
+conversions.append (((2, 7, 11), conv,
+		     '''\"tabloid\" -> \"11x17\"'''))
diff --git a/scm/paper.scm b/scm/paper.scm
index 2b4d2d1a5d..f2e51647c2 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -79,7 +79,8 @@
     ("a3" . (cons (* 297.9 mm) (* 420 mm)))
     ("legal" . (cons (* 8.5 in) (* 14.0 in)))
     ("letter" . (cons (* 8.5 in) (* 11.0 in)))
-    ("tabloid" . (cons (* 11.0 in) (* 17.0 in)))))
+    ("11x17" . (cons (* 11.0 in) (* 17.0 in)))
+    ))
 
 ;; todo: take dimension arguments.
 
-- 
2.39.2