class InsetBibKey;
class BufferView;
+// I dare you to enable this and help me find all the bugs that then show
+// up. (Lgb)
+//#define NEW_INSETS 1
+
+// I dare you to try this one too. It is ortogonal with NEW_INSETS so you
+// can try both or just one of them.
+#define NEW_TABULAR 1
+
/// A LyXParagraph holds all text, attributes and insets in a text paragraph
class LyXParagraph {
public:
///
MINIPAGE_ALIGN_BOTTOM
};
-#ifndef NEW_INSETS
///
enum META_KIND {
+#ifndef NEW_INSETS
///
META_FOOTNOTE = 1,
///
META_WIDE_TAB,
///
META_HFILL,
+#else
///
- META_NEWLINE,
+ META_HFILL = 1,
+#endif
///
+ META_NEWLINE,
+ //
//META_PROTECTED_SEPARATOR,
///
META_INSET
};
+#ifndef NEW_INSETS
/// The footnoteflag
enum footnote_flag {
///
LyXParagraph * TeXOnePar(Buffer const *, BufferParams const &,
std::ostream &, TexRow & texrow,
- bool moving_arg,
+ bool moving_arg
+#ifndef NEW_INSETS
+ ,
std::ostream & foot, TexRow & foot_texrow,
- int & foot_count);
+ int & foot_count
+#endif
+ );
///
bool SimpleTeXOnePar(Buffer const *, BufferParams const &,
std::ostream &, TexRow & texrow, bool moving_arg);
///
LyXParagraph * TeXEnvironment(Buffer const *, BufferParams const &,
- std::ostream &, TexRow & texrow,
- std::ostream & foot, TexRow & foot_texrow,
- int & foot_count);
+ std::ostream &, TexRow & texrow
+#ifndef NEW_INSETS
+ ,std::ostream & foot, TexRow & foot_texrow,
+ int & foot_count
+#endif
+ );
///
LyXParagraph * Clone() const;
void SetInsetOwner(Inset * i);
///
void deleteInsetsLyXText(BufferView *);
+ ///
void resizeInsetsLyXText(BufferView *);
private:
///
/// footnote, margin, fig, tab
footnote_kind footnotekind;
#endif
- //@Man: the LyX- DTP-switches
- //@{
///
bool line_top;
bool noindent;
private:
+ ///
block<int, 10> counter_;
public:
///
void setCounter(int i, int v) { counter_[i] = v; }
+ ///
int getCounter(int i) const { return counter_[i]; }
+ ///
void incCounter(int i) { counter_[i]++; }
///
bool start_of_appendix;
///
string labelwidthstring;
- //@}
///
LyXParagraph * next;
///
LyXParagraph * previous;
+#ifndef NEW_TABULAR
/* table stuff -- begin*/
///
LyXTable * table;
/* table stuff -- end*/
-
+#endif
///
InsetBibKey * bibkey; // ale970302
///
LyXParagraph const * Previous() const;
+#ifndef NEW_INSETS
/** these function are able to hide open and closed footnotes
*/
LyXParagraph * NextAfterFootnote();
LyXParagraph * FirstPhysicalPar();
///
LyXParagraph const * FirstPhysicalPar() const;
-
/// returns the physical paragraph
LyXParagraph * ParFromPos(size_type pos);
/// returns the position in the physical par
int PositionInParFromPos(size_type pos) const;
+#endif
/// for the environments
LyXParagraph * DepthHook(int depth);
///
int BeginningOfMainBody() const;
///
- string GetLabelstring() const;
+ string const & GetLabelstring() const;
/// the next two functions are for the manual labels
string GetLabelWidthString() const;
LyXFont GetFirstFontSettings() const;
/** Get fully instantiated font. If pos == -1, use the layout
- font attached to this paragraph.
- If pos == -2, use the label font of the layout attached here.
- In all cases, the font is instantiated, i.e. does not have any
- attributes with values LyXFont::INHERIT, LyXFont::IGNORE or
- LyXFont::TOGGLE.
- */
+ font attached to this paragraph.
+ If pos == -2, use the label font of the layout attached here.
+ In all cases, the font is instantiated, i.e. does not have any
+ attributes with values LyXFont::INHERIT, LyXFont::IGNORE or
+ LyXFont::TOGGLE.
+ */
LyXFont getFont(BufferParams const &, size_type pos) const;
///
- value_type GetChar(size_type pos);
- ///
value_type GetChar(size_type pos) const;
/// The position must already exist.
void SetChar(size_type pos, value_type c) {
Inset * GetInset(size_type pos);
///
Inset const * GetInset(size_type pos) const;
+#ifndef NEW_INSETS
///
void OpenFootnote(size_type pos);
///
void CloseFootnote(size_type pos);
+#endif
/// important for cut and paste
void CopyIntoMinibuffer(BufferParams const &, size_type pos) const;
///
bool IsHfill(size_type pos) const;
///
bool IsInset(size_type pos) const;
+#ifndef NEW_INSETS
///
bool IsFloat(size_type pos) const;
+#endif
///
bool IsNewline(size_type pos) const;
///
/// returns -1 if inset not found
int GetPositionOfInset(Inset * inset) const;
-
+
+#ifndef NEW_INSETS
/// ok and now some footnote functions
void OpenFootnotes();
///
void CloseFootnotes();
-
///
LyXParagraph * FirstSelfrowPar();
+#endif
///
int StripLeadingSpaces(LyXTextClassList::size_type tclass);
-
+
+#ifndef NEW_INSETS
/** A paragraph following a footnote is a "dummy". A paragraph
- with a footnote in it is stored as three paragraphs:
- First a paragraph with the text up to the footnote, then
- one (or more) paragraphs with the footnote, and finally
- the a paragraph with the text after the footnote. Only the
- first paragraph keeps information about layoutparameters, */
+ with a footnote in it is stored as three paragraphs:
+ First a paragraph with the text up to the footnote, then
+ one (or more) paragraphs with the footnote, and finally
+ the a paragraph with the text after the footnote. Only the
+ first paragraph keeps information about layoutparameters, */
bool IsDummy() const;
-
+#endif
/* If I set a PExtra Indent on one paragraph of a ENV_LIST-TYPE
I have to set it on each of it's elements */
///
void UnsetPExtraType(BufferParams const &);
///
bool linuxDocConvertChar(char c, string & sgml_string);
+#ifndef NEW_TABULAR
///
void DocBookContTableRows(Buffer const *,
std::ostream &, string & extra,
void SimpleDocBookOneTablePar(Buffer const *,
std::ostream &, string & extra,
int & desc_on, int depth);
+#endif
private:
///
struct InsetTable {
///
FontTable(size_type p, LyXFont const & f) {pos = p; font = f;}
};
+ ///
friend struct matchFT;
///
struct matchFT {
InsetList insetlist;
///
LyXParagraph * TeXDeeper(Buffer const *, BufferParams const &,
- std::ostream &, TexRow & texrow,
- std::ostream & foot, TexRow & foot_texrow,
- int & foot_count);
+ std::ostream &, TexRow & texrow
+#ifndef NEW_INSETS
+ ,std::ostream & foot, TexRow & foot_texrow,
+ int & foot_count
+#endif
+ );
+#ifndef NEW_INSETS
///
LyXParagraph * TeXFootnote(Buffer const *, BufferParams const &,
std::ostream &, TexRow & texrow,
std::ostream & foot, TexRow & foot_texrow,
int & foot_count,
bool parent_is_rtl);
+#endif
+#ifndef NEW_TABULAR
///
bool SimpleTeXOneTablePar(Buffer const *, BufferParams const &,
std::ostream &, TexRow & texrow);
std::ostream &, size_type i,
int current_cell_number,
int & column, TexRow & texrow);
+#endif
///
void SimpleTeXBlanks(std::ostream &, TexRow & texrow,
size_type const i,
///
static unsigned int paragraph_id;
public:
+ ///
class inset_iterator {
public:
+ ///
inset_iterator() {}
+ //
inset_iterator(InsetList::iterator const & iter) : it(iter) {};
+ ///
inset_iterator & operator++() {
++it;
return *this;
}
+ ///
Inset * operator*() { return (*it).inset; }
+ ///
size_type getPos() {return (*it).pos; }
+ ///
bool operator==(inset_iterator const & iter) const {
return it == iter.it;
}
+ ///
bool operator!=(inset_iterator const & iter) const {
return it != iter.it;
}
private:
+ ///
InsetList::iterator it;
};
///
projects / lyx.git / blobdiff