X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=5317f010118096d93c85299593b9920a25b7453f;hb=8555881d19d77b32315661699fab31a82d3833ab;hp=3a6999528e206009b402fba80e490298dac6a2f2;hpb=dbd7a961fc46bb10c85bdd8c7fb6626477ae63d8;p=lyx.git diff --git a/src/paragraph.h b/src/paragraph.h index 3a6999528e..5317f01011 100644 --- a/src/paragraph.h +++ b/src/paragraph.h @@ -1,13 +1,10 @@ // -*- C++ -*- -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * - * ====================================================== */ +/** + * \file paragraph.h + * Copyright 1995 Matthias Ettrich + * Copyright 2002 the LyX Team + * Read the file COPYING + */ #ifndef PARAGRAPH_H #define PARAGRAPH_H @@ -16,56 +13,33 @@ #pragma interface #endif -#include "LString.h" +#include "lyxlayout_ptr_fwd.h" +#include "lyxfont.h" // Just for LyXFont::FONT_SIZE +#include "InsetList.h" #include "insets/inset.h" // Just for Inset::Code -#include "lyxfont.h" // Just for LyXFont::FONT_SIZE + #include "support/types.h" -class ParagraphParameters; +#include "LString.h" + class BufferParams; -class TexRow; -class LaTeXFeatures; -class InsetBibKey; class BufferView; +class Counters; +class InsetBibKey; class Language; - -// After 1.2.0 is released, during 1.3.0cvs, we enable this. And after -// a while we verify that reading of 1.2.x files work perfectly we remove -// this code completely. (Lgb) -//#define NO_PEXTRA_REALLY 1 +class LaTeXFeatures; +class ParagraphParameters; +class TexRow; // Define this if you want to try out the new storage container for -// paragraphs. std::container instead of obfuscated homegrown -// linked list. (Lgb) +// paragraphs. (Lgb) // This is non working and far from finished. // #define NO_NEXT 1 /// A Paragraph holds all text, attributes and insets in a text paragraph class Paragraph { public: -#ifndef NO_PEXTRA_REALLY - /// - enum PEXTRA_TYPE { - /// - PEXTRA_NONE, - /// - PEXTRA_INDENT, - /// - PEXTRA_MINIPAGE, - /// - PEXTRA_FLOATFLT - }; - /// - enum MINIPAGE_ALIGNMENT { - /// - MINIPAGE_ALIGN_TOP, - /// - MINIPAGE_ALIGN_MIDDLE, - /// - MINIPAGE_ALIGN_BOTTOM - }; -#endif /// enum META_KIND { /// @@ -77,14 +51,16 @@ public: }; /// typedef char value_type; - /// The same as ParameterStruct::depth_type + /// The same as ParameterStruct::depth_type typedef unsigned int depth_type; /// Paragraph(); +#ifndef NO_NEXT /// this constructor inserts the new paragraph in a list explicit Paragraph(Paragraph * par); +#endif /// Paragraph(Paragraph const &, bool same_ids); /// the destructor removes the new paragraph from the list @@ -105,18 +81,16 @@ public: /// string const asString(Buffer const *, lyx::pos_type beg, lyx::pos_type end, bool label); - + /// - void writeFile(Buffer const *, std::ostream &, BufferParams const &, - depth_type) const; + void write(Buffer const *, std::ostream &, BufferParams const &, + depth_type & depth) const; /// void validate(LaTeXFeatures &) const; - - /// + + /// return the unique ID of this paragraph int id() const; /// - void id(int id_arg); - /// void read(); /// @@ -124,13 +98,13 @@ public: std::ostream &, TexRow & texrow, bool moving_arg); - /// - int startTeXParParams(BufferParams const &, std::ostream &) const; + /// + int startTeXParParams(BufferParams const &, std::ostream &, bool) const; + + /// + int endTeXParParams(BufferParams const &, std::ostream &, bool) const; - /// - int endTeXParParams(BufferParams const &, std::ostream &) const; - /// bool simpleTeXOnePar(Buffer const *, BufferParams const &, std::ostream &, TexRow & texrow, bool moving_arg); @@ -149,7 +123,7 @@ public: /** Check if the current paragraph is the last paragraph in a proof environment */ - int getEndLabel(BufferParams const &) const; + int getEndLabel() const; /// Inset * inInset() const; /// @@ -162,31 +136,27 @@ public: /// lyx::pos_type size() const; /// + bool empty() const; + /// void setContentsFromPar(Paragraph * par); /// void clearContents(); /// - string const & layout() const; - /// - void layout(string const & new_layout); - + LyXLayout_ptr const & layout() const; /// - void setCounter(int i, int v); - /// - int getCounter(int i) const; - /// - void incCounter(int i); + void layout(LyXLayout_ptr const & new_layout); /// char enumdepth; - + /// char itemdepth; - /// + /// InsetBibKey * bibkey; // ale970302 +#ifndef NO_NEXT /// void next(Paragraph *); /** these function are able to hide closed footnotes @@ -201,20 +171,20 @@ public: Paragraph * previous(); /// Paragraph const * previous() const; - +#endif /// for the environments Paragraph * depthHook(depth_type depth); /// for the environments Paragraph const * depthHook(depth_type depth) const; - /// + /// Paragraph * outerHook(); - /// + /// Paragraph const * outerHook() const; /// int beginningOfMainBody() const; /// string const & getLabelstring() const; - + /// the next two functions are for the manual labels string const getLabelWidthString() const; /// @@ -224,18 +194,11 @@ public: /// The nesting depth of a paragraph depth_type getDepth() const; /// The maximal possible depth of a paragraph after this one - depth_type getMaxDepthAfter(Buffer const *) const; - /// - void applyLayout(string const & new_layout); + depth_type getMaxDepthAfter() const; /// - int getFirstCounter(int i) const; + void applyLayout(LyXLayout_ptr const & new_layout); /// void erase(lyx::pos_type pos); - /** the flag determines wether the layout should be copied - */ - void breakParagraph(BufferParams const &, lyx::pos_type pos, int flag); - /// - void breakParagraphConservative(BufferParams const &, lyx::pos_type pos); /** Get unistantiated font setting. Returns the difference between the characters font and the layoutfont. This is what is stored in the fonttable @@ -249,7 +212,7 @@ public: 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 + attributes with values LyXFont::INHERIT, LyXFont::IGNORE or LyXFont::TOGGLE. */ LyXFont const getFont(BufferParams const &, lyx::pos_type pos) const; @@ -261,12 +224,13 @@ public: value_type getUChar(BufferParams const &, lyx::pos_type pos) const; /// The position must already exist. void setChar(lyx::pos_type pos, value_type c); - /// + /// pos <= size() (there is a dummy font change at the end of each par) void setFont(lyx::pos_type pos, LyXFont const & font); /// Returns the height of the highest font in range - LyXFont::FONT_SIZE highestFontInRange(lyx::pos_type startpos, - lyx::pos_type endpos, - LyXFont::FONT_SIZE const def_size) const; + LyXFont::FONT_SIZE + highestFontInRange(lyx::pos_type startpos, + lyx::pos_type endpos, + LyXFont::FONT_SIZE const def_size) const; /// void insertChar(lyx::pos_type pos, value_type c); /// @@ -306,19 +270,9 @@ public: bool isKomma(lyx::pos_type pos) const; /// Used by the spellchecker bool isLetter(lyx::pos_type pos) const; - /// + /// bool isWord(lyx::pos_type pos) const; - /** This one resets all layout and dtp switches but not the font - of the single characters - */ - void clear(); - - /** paste this paragraph with the next one - be carefull, this doesent make any check at all - */ - void pasteParagraph(BufferParams const &); - /// returns -1 if inset not found int getPositionOfInset(Inset const * inset) const; @@ -326,91 +280,31 @@ public: Paragraph * getParFromID(int id) const; /// - int stripLeadingSpaces(lyx::textclass_type tclass); + int stripLeadingSpaces(); -#ifndef NO_PEXTRA_REALLY - /* 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 setPExtraType(BufferParams const &, int type, - string const & width, string const & widthp); - /// - void unsetPExtraType(BufferParams const &); -#endif - /// - bool sgmlConvertChar(char c, string & sgml_string); /// bool isFreeSpacing() const; - ParagraphParameters & params(); - ParagraphParameters const & params() const; -private: - /// - string layout_; /// - struct InsetTable { - /// - lyx::pos_type pos; - /// - Inset * inset; - /// - InsetTable(lyx::pos_type p, Inset * i) : pos(p), inset(i) {} - }; - + ParagraphParameters & params(); /// - typedef std::vector InsetList; + ParagraphParameters const & params() const; /// InsetList insetlist; -public: /// - class inset_iterator { - public: - /// - inset_iterator() {} - // - inset_iterator(InsetList::iterator const & iter); - /// - inset_iterator & operator++() { - ++it; - return *this; - } - /// - Inset * operator*() { return it->inset; } - /// - Inset * operator->() { return it->inset; } - - /// - lyx::pos_type getPos() const { 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; - }; - /// - friend class inset_iterator; - - /// - inset_iterator inset_iterator_begin(); - /// - inset_iterator inset_iterator_end(); - /// - inset_iterator InsetIterator(lyx::pos_type pos); + //Counters & counters(); private: + /// + LyXLayout_ptr layout_; /// if anything uses this we don't want it to. Paragraph(Paragraph const &); +#ifndef NO_NEXT /// Paragraph * next_; /// Paragraph * previous_; - +#endif struct Pimpl; /// friend struct Paragraph::Pimpl;