get rid of MSVC warning (signed/unsigned comparison)

[lyx.git] / src / layout.h

diff --git a/src/layout.h b/src/layout.h
index 54ee90713112bdbc4b16e0b69a4bfbc9a4b3083d..2d62584d4e5fc90fad3ae5e96e5b09c9f7952f3a 100644 (file)
--- a/src/layout.h
+++ b/src/layout.h
@@ -1,30 +1,25 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *      
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+/**
+ * \file layout.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef LAYOUT_H
 #define LAYOUT_H
 
-enum layout_default {
-       ///
-       LYX_LAYOUT_DEFAULT = 99
-};
-
+namespace lyx {
 
 /// The different output types
 enum OutputType {
        ///
        LATEX = 1,
        ///
-       LINUXDOC,
-       ///
        DOCBOOK,
        ///
        LITERATE
@@ -82,10 +77,21 @@ enum LYX_LATEX_TYPES {
        ///
        LATEX_ITEM_ENVIRONMENT,
        ///
+       LATEX_BIB_ENVIRONMENT,
+       ///
        LATEX_LIST_ENVIRONMENT
 };
 
 
+/// The different title types
+enum LYX_TITLE_LATEX_TYPES {
+       ///
+       TITLE_COMMAND_AFTER = 1,
+       ///
+       TITLE_ENVIRONMENT
+};
+
+
 /// The different label types
 enum LYX_LABEL_TYPES {
        ///
@@ -105,25 +111,11 @@ enum LYX_LABEL_TYPES {
        ///
        LABEL_SENSITIVE,
        ///
-       LABEL_COUNTER_CHAPTER,
-       ///
-       LABEL_COUNTER_SECTION,
-       ///
-       LABEL_COUNTER_SUBSECTION,
-       ///
-       LABEL_COUNTER_SUBSUBSECTION,
-       ///
-       LABEL_COUNTER_PARAGRAPH,
-       ///
-       LABEL_COUNTER_SUBPARAGRAPH,
+       LABEL_COUNTER,
        ///
-       LABEL_COUNTER_ENUMI,
+       LABEL_ENUMERATE,
        ///
-       LABEL_COUNTER_ENUMII,
-       ///
-       LABEL_COUNTER_ENUMIII,
-       ///
-       LABEL_COUNTER_ENUMIV
+       LABEL_ITEMIZE
 };
 
 
@@ -142,25 +134,26 @@ enum LYX_END_LABEL_TYPES {
        ///
        END_LABEL_ENUM_LAST = END_LABEL_STATIC
 };
-               
-/* Fix labels are printed flushright, manual labels flushleft. 
+
+/* Fix labels are printed flushright, manual labels flushleft.
  * MARGIN_MANUAL and MARGIN_FIRST_DYNAMIC are *only* for LABEL_MANUAL,
- * MARGIN_DYNAMIC and MARGIN_STATIC are *not* for LABEL_MANUAL. 
+ * MARGIN_DYNAMIC and MARGIN_STATIC are *not* for LABEL_MANUAL.
  * This seems a funny restriction, but I think other combinations are
- * not needed, so I will not change it yet. 
+ * not needed, so I will not change it yet.
  * Correction: MARGIN_FIRST_DYNAMIC also usable with LABEL_STATIC
  */
 
 
-/* There is a parindent and a parskip. Which one is used depends on the 
- * paragraph_separation-flag of the text-object. 
+/* There is a parindent and a parskip. Which one is used depends on the
+ * paragraph_separation-flag of the text-object.
  * BUT: parindent is only thrown away, if a parskip is defined! So if you
- * want a space between the paragraphs and a parindent at the same time, 
+ * want a space between the paragraphs and a parindent at the same time,
  * you should set parskip to zero and use topsep, parsep and bottomsep.
- * 
- * The standard layout is an exception: its parindent is only set, if the 
+ *
+ * The standard layout is an exception: its parindent is only set, if the
  * previous paragraph is standard too. Well, this is LateX and it is good!
- */ 
+ */
 
+} // namespace lyx
 
 #endif