Make the fake sequence for braces highly unlikely (addressing #6478).

[lyx.git] / src / Paragraph.h

diff --git a/src/Paragraph.h b/src/Paragraph.h
index a72ede5e7bb16e446f56d3f61ee81c4745d7c401..a558d3fafc4886ad06491f521890e05eb82d2e66 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -17,7 +17,6 @@
 #define PARAGRAPH_H
 
 #include "FontEnums.h"
-#include "Layout.h"
 
 #include "insets/InsetCode.h"
 
@@ -42,6 +41,7 @@ class LaTeXFeatures;
 class Inset_code;
 class InsetList;
 class Language;
+class Layout;
 class Font;
 class Font_size;
 class MetricsInfo;
@@ -51,6 +51,7 @@ class ParagraphParameters;
 class TexRow;
 class Toc;
 class WordLangTuple;
+class XHTMLStream;
 
 class FontSpan {
 public:
@@ -91,7 +92,7 @@ class Paragraph
 public:
        ///
        Paragraph();
-       ///
+       /// Copy constructor.
        Paragraph(Paragraph const &);
        /// Partial copy constructor.
        /// Copy the Paragraph contents from \p beg to \p end (without end).
@@ -102,6 +103,8 @@ public:
        ~Paragraph();
        ///
        int id() const;
+       ///
+       void setId(int id);
 
        ///
        void addChangesToToc(DocIterator const & cdit, Buffer const & buf) const;
@@ -151,7 +154,7 @@ public:
        pos_type firstWordDocBook(odocstream & os, OutputParams const & runparams) const;
 
        /// Output the first word of a paragraph, return the position where it left.
-       pos_type firstWordLyXHTML(odocstream & os, OutputParams const & runparams) const;
+       pos_type firstWordLyXHTML(XHTMLStream & xs, OutputParams const & runparams) const;
 
        /// Writes to stream the docbook representation
        void simpleDocBookOnePar(Buffer const & buf,
@@ -162,7 +165,7 @@ public:
        /// \return any material that has had to be deferred until after the
        /// paragraph has closed.
        docstring simpleLyXHTMLOnePar(Buffer const & buf,
-                                odocstream &,
+                                XHTMLStream & xs,
                                 OutputParams const & runparams,
                                 Font const & outerfont,
                                 pos_type initial = 0) const;
@@ -178,8 +181,6 @@ public:
        ///
        Inset const & inInset() const;
        ///
-       bool forcePlainLayout() const;
-       ///
        bool allowParagraphCustomization() const;
        ///
        bool usePlainLayout() const;
@@ -241,16 +242,16 @@ public:
        /// recompute this value
        void setBeginOfBody();
 
+       ///
+       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);
-       /// Expand the counters for the labelstring of \c layout
-       docstring expandLabel(Layout const &, BufferParams const &,
-               bool process_appendix = true) const;
        /// Actual paragraph alignment used
        char getAlign() const;
        /// The nesting depth of a paragraph
@@ -424,8 +425,14 @@ public:
        /// Spellcheck word at position \p pos.
        /// \return true if pointed word is misspelled.
        bool isMisspelled(pos_type pos) const;
+       /// an automatically generated identifying label for this paragraph.
+       /// presently used only in the XHTML output routines.
+       std::string magicLabel() const;
 
 private:
+       /// Expand the counters for the labelstring of \c layout
+       docstring expandParagraphLabel(Layout const &, BufferParams const &,
+               bool process_appendix) const;
        ///
        void deregisterWords();
        ///