X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=fca8d25163e77b0d775ab233b87ce0395473dde2;hb=af37f0d23e8aab1bfbd7ab7f26a10e7685dfca68;hp=1ad91412289600f282985b39c185fcea39b479de;hpb=bad6b926360afe4b5b27ac8012651ca826023fc1;p=lyx.git diff --git a/src/paragraph.h b/src/paragraph.h index 1ad9141228..fca8d25163 100644 --- a/src/paragraph.h +++ b/src/paragraph.h @@ -1,47 +1,48 @@ // -*- C++ -*- /** - * \file paragraph.h - * Copyright 1995 Matthias Ettrich - * Copyright 2002 the LyX Team - * Read the file COPYING + * \file paragraph.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * \author Asger Alstrup + * \author Lars Gullik Bjønnes + * \author John Levon + * \author André Pönitz + * \author Jürgen Vigna + * + * Full author contact details are available in file CREDITS. */ #ifndef PARAGRAPH_H #define PARAGRAPH_H -#include "lyxlayout_ptr_fwd.h" -#include "lyxfont.h" // Just for LyXFont::FONT_SIZE +#include "changes.h" #include "InsetList.h" - -#include "insets/inset.h" // Just for Inset::Code +#include "lyxlayout_ptr_fwd.h" +#include "RowList_fwd.h" #include "support/types.h" -#include "changes.h" -#include "ParagraphList.h" -#include "LString.h" +#include +class Buffer; class BufferParams; class BufferView; class Counters; class InsetBibitem; +class InsetOld_code; class Language; class LaTeXFeatures; +class OutputParams; +class LyXFont; +class LyXFont_size; class ParagraphParameters; class TexRow; - -// Define this if you want to try out the new storage container for -// paragraphs. (Lgb) -// This is non working and far from finished. -// #define NO_NEXT 1 +class UpdatableInset; /// A Paragraph holds all text, attributes and insets in a text paragraph class Paragraph { public: - // Remove this whan ParagraphList transition is over. (Lgb) - friend class ParagraphList; - friend class ParagraphList::iterator; - /// enum META_KIND { /// Note that this is 1 right now to avoid @@ -53,17 +54,24 @@ public: }; /// typedef char value_type; - /// The same as ParameterStruct::depth_type - typedef unsigned int depth_type; + /// + typedef lyx::depth_type depth_type; + /// + typedef std::vector TextContainer; /// Paragraph(); /// - Paragraph(Paragraph const &, bool same_ids); + Paragraph(Paragraph const &); + /// + void operator=(Paragraph const &); /// the destructor removes the new paragraph from the list ~Paragraph(); + /// + int id() const; + /// Language const * getParLanguage(BufferParams const &) const; /// @@ -75,20 +83,29 @@ public: bool isMultiLingual(BufferParams const &); /// - string const asString(Buffer const *, bool label) const; + std::string const asString(Buffer const &, + OutputParams const & runparams, + bool label) const; + /// + std::string const asString(Buffer const &, bool label) const; + /// + std::string const Paragraph::asString(Buffer const & buffer, + lyx::pos_type beg, + lyx::pos_type end, + bool label) const; /// - string const asString(Buffer const *, lyx::pos_type beg, lyx::pos_type end, - bool label) const; + std::string const asString(Buffer const &, + OutputParams const & runparams, + lyx::pos_type beg, + lyx::pos_type end, + bool label) const; /// - void write(Buffer const *, std::ostream &, BufferParams const &, - depth_type & depth) 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; - /// int startTeXParParams(BufferParams const &, std::ostream &, bool) const; @@ -97,29 +114,40 @@ public: /// - bool simpleTeXOnePar(Buffer const *, BufferParams const &, + bool simpleTeXOnePar(Buffer const &, BufferParams const &, LyXFont const & outerfont, std::ostream &, - TexRow & texrow, bool moving_arg); + TexRow & texrow, OutputParams const &); /// - bool hasSameLayout(Paragraph const & par) const; + void simpleLinuxDocOnePar(Buffer const & buf, + std::ostream & os, + LyXFont const & outerfont, + OutputParams const & runparams, + lyx::depth_type depth) const; /// - void makeSameLayout(Paragraph const & par); + void simpleDocBookOnePar(Buffer const & buf, + std::ostream &, + LyXFont const & outerfont, + OutputParams const & runparams, + lyx::depth_type depth, + bool labelid) const; /// - Inset * inInset() const; + bool hasSameLayout(Paragraph const & par) const; + /// - void setInsetOwner(Inset * i); + void makeSameLayout(Paragraph const & par); + /// - void deleteInsetsLyXText(BufferView *); + UpdatableInset * inInset() const; /// - void resizeInsetsLyXText(BufferView *); + void setInsetOwner(UpdatableInset * inset); /// - lyx::pos_type size() const; + lyx::pos_type size() const { return text_.size(); } /// - bool empty() const; + bool empty() const { return text_.empty(); } /// void setContentsFromPar(Paragraph const & par); /// @@ -130,31 +158,11 @@ public: /// void layout(LyXLayout_ptr const & new_layout); - /// - char enumdepth; + /// This is the item depth, only used by enumerate and itemize + signed char itemdepth; /// - char itemdepth; - - /// - InsetBibitem * bibitem(); // ale970302 - -#ifndef NO_NEXT - /// - void next(Paragraph *); - /** these function are able to hide closed footnotes - */ - Paragraph * next(); - /// - Paragraph const * next() const; - - /// - void previous(Paragraph *); - /// - Paragraph * previous(); - /// - Paragraph const * previous() const; -#endif + InsetBibitem * bibitem() const; // ale970302 /// initialise tracking for this par void trackChanges(Change::Type = Change::UNCHANGED); @@ -189,19 +197,22 @@ public: /// mark whole par as erased void markErased(); - /// Paragraphs can contain "manual labels", for example, Description environment. - /// The text for this user-editable label is stored in the paragraph alongside - /// the text of the rest of the paragraph (the body). This function returns - /// the starting position of the body of the text in the paragraph. - int beginningOfBody() const; + /// Paragraphs can contain "manual labels", for example, Description + /// environment. The text for this user-editable label is stored in + /// the paragraph alongside the text of the rest of the paragraph + /// (the body). This function returns the starting position of the + /// body of the text in the paragraph. + int beginOfBody() const; + /// recompute this value + void setBeginOfBody(); /// - string const & getLabelstring() const; + std::string const & getLabelstring() const; /// the next two functions are for the manual labels - string const getLabelWidthString() const; + std::string const getLabelWidthString() const; /// - void setLabelWidthString(string const & s); + void setLabelWidthString(std::string const & s); /// char getAlign() const; /// The nesting depth of a paragraph @@ -240,6 +251,13 @@ public: LyXFont const & outerfont) const; LyXFont const getLabelFont(BufferParams const &, LyXFont const & outerfont) const; + /** + * The font returned by the above functions is the same in a + * span of characters. This method will return the last position + * in the paragraph for which that font is the same. + * This can be used to avoid unnecessary calls to getFont. + */ + lyx::pos_type getEndPosOfFontSpan(lyx::pos_type pos) const; /// value_type getChar(lyx::pos_type pos) const; /// @@ -249,10 +267,12 @@ public: /// 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_size highestFontInRange(lyx::pos_type startpos, + lyx::pos_type endpos, + LyXFont_size def_size) const; + /// + void insert(lyx::pos_type pos, std::string const & str, + LyXFont const & font); /// void insertChar(lyx::pos_type pos, value_type c); /// @@ -260,23 +280,15 @@ public: /// bool checkInsertChar(LyXFont &); /// - void insertInset(lyx::pos_type pos, Inset * inset); - /// - void insertInset(lyx::pos_type pos, Inset * inset, LyXFont const &, Change change = Change(Change::INSERTED)); + void insertInset(lyx::pos_type pos, InsetOld * inset); /// - bool insetAllowed(Inset::Code code); + void insertInset(lyx::pos_type pos, InsetOld * inset, LyXFont const &, Change change = Change(Change::INSERTED)); /// - Inset * getInset(lyx::pos_type pos); + bool insetAllowed(InsetOld_code code); /// - Inset const * getInset(lyx::pos_type pos) const; - /** important for cut and paste - Temporary change from BufferParams to Buffer. Will revert when we - get rid of the argument to Inset::clone(Buffer const &) */ - void copyIntoMinibuffer(Buffer const &, lyx::pos_type pos) const; + InsetOld * getInset(lyx::pos_type pos); /// - void cutIntoMinibuffer(BufferParams const &, lyx::pos_type pos); - /// - bool insertFromMinibuffer(lyx::pos_type pos); + InsetOld const * getInset(lyx::pos_type pos) const; /// bool isHfill(lyx::pos_type pos) const; @@ -296,44 +308,53 @@ public: bool isWord(lyx::pos_type pos) const; /// returns -1 if inset not found - int getPositionOfInset(Inset const * inset) const; + int getPositionOfInset(InsetOld const * inset) const; /// int stripLeadingSpaces(); - /// + /// return true if we allow multiple spaces bool isFreeSpacing() const; + /// return true if we allow this par to stay empty + bool allowEmpty() const; + //// + unsigned char transformChar(unsigned char c, lyx::pos_type pos) const; /// ParagraphParameters & params(); /// ParagraphParameters const & params() const; + + /// + RowList::iterator getRow(lyx::pos_type pos); + /// InsetList insetlist; + /// - //Counters & counters(); + mutable RowList rows; + /// last draw y position (baseline of top row) + int y; + /// total height of paragraph + unsigned int height; + /// total width of paragraph, may differ from workwidth + unsigned int width; + private: /// LyXLayout_ptr layout_; - /// if anything uses this we don't want it to. - Paragraph(Paragraph const &); -#ifndef NO_NEXT - /// - Paragraph * next_; - /// - Paragraph * previous_; -#else - Paragraph * next_par_; - Paragraph * prev_par_; -#endif + /// keeping this here instead of in the pimpl makes LyX >10% faster + // for average tasks as buffer loading/switching etc. + TextContainer text_; + /// end of label + int begin_of_body_; + struct Pimpl; /// friend struct Paragraph::Pimpl; /// Pimpl * pimpl_; - /// unimplemented - void operator=(Paragraph const &); };