X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.h;h=67f41ddb8d4cbfbdfe355880bc9b95f532f8d890;hb=6fa973b3771ff9ff61d82ae3cbebad8442d30816;hp=450dfe3265f19e5e94250c1375b7d5030dc2144b;hpb=768c9a552e895b44b59f984a0533233b9845d11f;p=lyx.git diff --git a/src/Paragraph.h b/src/Paragraph.h index 450dfe3265..67f41ddb8d 100644 --- a/src/Paragraph.h +++ b/src/Paragraph.h @@ -16,7 +16,6 @@ #ifndef PARAGRAPH_H #define PARAGRAPH_H -#include "FontEnums.h" #include "LayoutEnums.h" #include "SpellChecker.h" @@ -24,6 +23,7 @@ #include "support/types.h" #include +#include namespace lyx { @@ -31,28 +31,25 @@ class AuthorList; class Buffer; class BufferParams; class Change; -class Counters; -class Cursor; -class CursorSlice; class DocIterator; class docstring_list; class DocumentClass; class Inset; -class InsetBibitem; class LaTeXFeatures; class InsetList; class Language; class Layout; class Font; -class MetricsInfo; class OutputParams; -class PainterInfo; class ParagraphParameters; class TocBackend; class WordLangTuple; -class XHTMLStream; +class XMLStream; class otexstream; +/// Inset identifier (above 0x10ffff, for ucs-4) +char_type const META_INSET = 0x200001; + class FontSpan { public: /// Invalid font span containing no character @@ -126,7 +123,8 @@ enum AsStringParameter AS_STR_INSETS = 2, ///< Go into insets. AS_STR_NEWLINES = 4, ///< Get also newline characters. AS_STR_SKIPDELETE = 8, ///< Skip deleted text in change tracking. - AS_STR_PLAINTEXT = 16 ///< Don't export formatting when descending into insets. + AS_STR_PLAINTEXT = 16, ///< Don't export formatting when descending into insets. + AS_STR_MATHED = 32 ///< Use a format suitable for mathed (eg. for InsetRef). }; @@ -153,10 +151,6 @@ public: /// void addChangesToToc(DocIterator const & cdit, Buffer const & buf, bool output_active, TocBackend & backend) const; - /// set the buffer flag if there are changes in the paragraph - void addChangesToBuffer(Buffer const & buf) const; - /// - bool isChangeUpdateRequired() const; /// Language const * getParLanguage(BufferParams const &) const; /// @@ -204,26 +198,29 @@ public: std::string getID(Buffer const & buf, OutputParams const & runparams) const; /// Output the first word of a paragraph, return the position where it left. - pos_type firstWordDocBook(odocstream & os, OutputParams const & runparams) const; + pos_type firstWordDocBook(XMLStream & xs, OutputParams const & runparams) const; /// Output the first word of a paragraph, return the position where it left. - pos_type firstWordLyXHTML(XHTMLStream & xs, OutputParams const & runparams) const; - - /// Writes to stream the docbook representation - void simpleDocBookOnePar(Buffer const & buf, - odocstream &, - OutputParams const & runparams, - Font const & outerfont, - pos_type initial = 0) const; + pos_type firstWordLyXHTML(XMLStream & xs, OutputParams const & runparams) const; + + /// Outputs to stream the DocBook representation, one element per paragraph. + std::tuple, std::vector, std::vector> + simpleDocBookOnePar(Buffer const & buf, + OutputParams const & runparams, + Font const & outerfont, + pos_type initial = 0, + bool is_last_par = false, + bool ignore_fonts = false) const; + /// \return any material that has had to be deferred until after the /// paragraph has closed. docstring simpleLyXHTMLOnePar(Buffer const & buf, - XHTMLStream & xs, - OutputParams const & runparams, - Font const & outerfont, - bool start_paragraph = true, - bool close_paragraph = true, - pos_type initial = 0) const; + XMLStream & xs, + OutputParams const & runparams, + Font const & outerfont, + bool start_paragraph = true, + bool close_paragraph = true, + pos_type initial = 0) const; /// bool hasSameLayout(Paragraph const & par) const; @@ -263,10 +260,16 @@ public: /// look up change at given pos Change const & lookupChange(pos_type pos) const; - /// is there a change within the given range ? + /// is there a change within the given range (does not + /// check contained paragraphs) bool isChanged(pos_type start, pos_type end) const; + /// Are there insets containing changes in the range? + bool hasChangedInsets(pos_type start, pos_type end) const; /// is there an unchanged char at the given pos ? bool isChanged(pos_type pos) const; + /// is there a change in the paragraph ? + bool isChanged() const; + /// is there an insertion at the given pos ? bool isInserted(pos_type pos) const; /// is there a deletion at the given pos ? @@ -277,6 +280,8 @@ public: /// will the paragraph be physically merged with the next /// one if the imaginary end-of-par character is logically deleted? bool isMergedOnEndOfParDeletion(bool trackChanges) const; + /// Return Change form of paragraph break + Change parEndChange() const; /// set change for the entire par void setChange(Change const & change); @@ -302,15 +307,15 @@ public: /// docstring expandLabel(Layout const &, BufferParams const &) const; /// - docstring expandDocBookLabel(Layout const &, BufferParams const &) const; - /// docstring const & labelString() const; /// the next two functions are for the manual labels docstring const getLabelWidthString() const; /// Set label width string. void setLabelWidthString(docstring const & s); /// Actual paragraph alignment used - LyXAlignment getAlign() const; + LyXAlignment getAlign(BufferParams const &) const; + /// Default paragraph alignment as determined by layout + LyXAlignment getDefaultAlign(BufferParams const &) const; /// The nesting depth of a paragraph depth_type getDepth() const; /// The maximal possible depth of a paragraph after this one @@ -335,12 +340,8 @@ public: /// Font const & getFirstFontSettings(BufferParams const &) 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 FONT_INHERIT, FONT_IGNORE or - FONT_TOGGLE. + /** Get fully instantiated font, i.e., one that does not have any + attributes with values FONT_INHERIT, FONT_IGNORE or FONT_TOGGLE. */ Font const getFont(BufferParams const &, pos_type pos, Font const & outerfont) const; @@ -358,7 +359,8 @@ public: /// char_type getChar(pos_type pos) const; /// Get the char, but mirror all bracket characters if it is right-to-left - char_type getUChar(BufferParams const &, pos_type pos) const; + char_type getUChar(BufferParams const &, OutputParams const &, + pos_type pos) const; /// pos <= size() (there is a dummy font change at the end of each par) void setFont(pos_type pos, Font const & font); /// @@ -416,7 +418,7 @@ public: bool isLineSeparator(pos_type pos) const; /// True if the character/inset at this point is a word separator. /// Note that digits in particular are not considered as word separator. - bool isWordSeparator(pos_type pos) const; + bool isWordSeparator(pos_type pos, bool const ignore_deleted = false) const; /// True if the element at this point is a character that is not a letter. bool isChar(pos_type pos) const; /// True if the element at this point is a space @@ -473,7 +475,7 @@ public: bool del = true) const; void locateWord(pos_type & from, pos_type & to, - word_location const loc) const; + word_location const loc, bool const ignore_deleted = false) const; /// void updateWords();