// -*- C++ -*-
+/**
+ * \file ParameterStruct.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
#ifndef PARAMETERSTRUCT_H
#define PARAMETERSTRUCT_H
-#include "vspace.h"
-#include "Spacing.h"
#include "layout.h"
+#include "lyxlength.h"
+#include "Spacing.h"
+
+#include "support/types.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
///
struct ParameterStruct {
///
- ParameterStruct();
- ///
- typedef unsigned int depth_type;
+ typedef lyx::depth_type depth_type;
///
- VSpace added_space_top;
- ///
- VSpace added_space_bottom;
+ ParameterStruct();
///
Spacing spacing;
///
bool noindent;
///
- bool line_top;
- ///
- bool line_bottom;
- ///
- bool pagebreak_top;
- ///
- bool pagebreak_bottom;
- ///
LyXAlignment align;
///
- depth_type depth;
+ depth_type depth;
///
bool start_of_appendix;
///
bool appendix;
///
- string labelstring;
+ std::string labelstring;
///
- string labelwidthstring;
-#ifndef NO_PEXTRA_REALLY
- ///
- int pextra_type;
- ///
- string pextra_width;
- ///
- string pextra_widthp;
- ///
- int pextra_alignment;
- ///
- bool pextra_hfill;
- ///
- bool pextra_start_minipage;
-#endif
+ std::string labelwidthstring;
+ ///
+ LyXLength leftindent;
};
inline
ParameterStruct::ParameterStruct()
- : noindent(false), line_top(false), line_bottom(false),
- pagebreak_top(false), pagebreak_bottom(false),
+ : noindent(false),
align(LYX_ALIGN_BLOCK), depth(0), start_of_appendix(false),
appendix(false)
-#ifndef NO_PEXTRA_REALLY
- , pextra_type(0), pextra_alignment(0), pextra_hfill(false),
- pextra_start_minipage(false)
-#endif
{}
inline
bool operator==(ParameterStruct const & ps1,
- ParameterStruct const & ps2)
+ ParameterStruct const & ps2)
{
- return ps1.added_space_top == ps2.added_space_top
- && ps1.added_space_bottom == ps2.added_space_bottom
- && ps1.spacing == ps2.spacing
+ return
+ ps1.spacing == ps2.spacing
&& ps1.noindent == ps2.noindent
- && ps1.line_top == ps2.line_top
- && ps1.line_bottom == ps2.line_bottom
- && ps1.pagebreak_top == ps2.pagebreak_top
- && ps1.pagebreak_bottom == ps2.pagebreak_bottom
&& ps1.align == ps2.align
&& ps1.depth == ps2.depth
&& ps1.start_of_appendix == ps2.start_of_appendix
&& ps1.appendix == ps2.appendix
&& ps1.labelstring == ps2.labelstring
&& ps1.labelwidthstring == ps2.labelwidthstring
-#ifndef NO_PEXTRA_REALLY
- && ps1.pextra_type == ps2.pextra_type
- && ps1.pextra_width == ps2.pextra_width
- && ps1.pextra_widthp == ps2.pextra_widthp
- && ps1.pextra_alignment == ps2.pextra_alignment
- && ps1.pextra_hfill == ps2.pextra_hfill
- && ps1.pextra_start_minipage == ps2.pextra_start_minipage
-#endif
- ;
-
+ && ps1.leftindent == ps2.leftindent;
}
#endif