X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fpaper.h;h=d892f920949c1d96ec70cd85537da3b209372d06;hb=e08e5afeea7194d95be1f02fe9484383574d203f;hp=07c2f524da8089cee7cfa18ef8f5b84aade54a03;hpb=80d7f70dc340e8b1ab29d38284b8327d13757196;p=lyx.git

diff --git a/src/paper.h b/src/paper.h
index 07c2f524da..d892f92094 100644
--- a/src/paper.h
+++ b/src/paper.h
@@ -1,76 +1,46 @@
 // -*- C++ -*-
 /**
- *  \file paper.h
+ * \file paper.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- *  \author Jean-Marc Lasgouttes
+ * \author Jean-Marc Lasgouttes
  *
- *  Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
- *  A trivial header file to hold paper-related enums. It should later
- *  expand to contain many paper-related horrors access.
+ * A trivial header file to hold paper-related enums. It should later
+ * expand to contain many paper-related horrors access.
  */
 
 #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