X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fpaper.h;h=d892f920949c1d96ec70cd85537da3b209372d06;hb=9337d73f1f9a6d4dae2e239e9f679a7452660c40;hp=8cac625ea6c68db66396bfa9541560a96877e670;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/paper.h b/src/paper.h
index 8cac625ea6..d892f92094 100644
--- a/src/paper.h
+++ b/src/paper.h
@@ -15,62 +15,32 @@
 #ifndef PAPER_H
 #define PAPER_H
 
- ///
- enum PAPER_SIZE {
-	 ///
-	 PAPER_DEFAULT,
-	 ///
-	 PAPER_USLETTER,
-	 ///
-	 PAPER_LEGALPAPER,
-	 ///
-	 PAPER_EXECUTIVEPAPER,
-	 ///
-	 PAPER_A3PAPER,
-	 ///
-	 PAPER_A4PAPER,
-	 ///
-	 PAPER_A5PAPER,
-	 ///
-	 PAPER_B5PAPER
- };
+namespace lyx {
 
 ///
-enum PAPER_PACKAGES {
+enum PAPER_SIZE {
 	///
-	PACKAGE_NONE,
+	PAPER_DEFAULT,
 	///
-	PACKAGE_A4,
+	PAPER_CUSTOM,
 	///
-	PACKAGE_A4WIDE,
+	PAPER_USLETTER,
 	///
-	PACKAGE_WIDEMARGINSA4
-};
-
-///
-enum VMARGIN_PAPER_TYPE {
-	///
-	VM_PAPER_DEFAULT,
-	///
-	VM_PAPER_CUSTOM,
+	PAPER_USLEGAL,
 	///
-	VM_PAPER_USLETTER,
+	PAPER_USEXECUTIVE,
 	///
-	VM_PAPER_USLEGAL,
+	PAPER_A3,
 	///
-	VM_PAPER_USEXECUTIVE,
+	PAPER_A4,
 	///
-	VM_PAPER_A3,
+	PAPER_A5,
 	///
-	VM_PAPER_A4,
+	PAPER_B3,
 	///
-	VM_PAPER_A5,
+	PAPER_B4,
 	///
-	VM_PAPER_B3,
-	///
-	VM_PAPER_B4,
-	///
-	VM_PAPER_B5
+	PAPER_B5
 };
 
 ///
@@ -80,4 +50,8 @@ enum PAPER_ORIENTATION {
 	///
 	ORIENTATION_LANDSCAPE
 };
+
+} // namespace lyx
+
+
 #endif