new \lyxline difinition, fixes also bug 1988:

[lyx.git] / src / paper.h

diff --git a/src/paper.h b/src/paper.h
index 8cac625ea6c68db66396bfa9541560a96877e670..d892f920949c1d96ec70cd85537da3b209372d06 100644 (file)
--- 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