X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTexRow.h;h=e40867d7b1416f113ca41d448655729bc1ced685;hb=6a21ec854b356fbbc89aaf99b2a23e4c3de4aca6;hp=382d566a76ccba2a7095a2b0b7f9f7f696a2425c;hpb=f3e099960a97c4f8ae50230449a9c413e6851618;p=lyx.git diff --git a/src/TexRow.h b/src/TexRow.h index 382d566a76..e40867d7b1 100644 --- a/src/TexRow.h +++ b/src/TexRow.h @@ -28,45 +28,70 @@ #ifndef TEXROW_H #define TEXROW_H -#include "support/debug.h" +#include "support/docstring.h" #include "support/types.h" #include namespace lyx { -class LyXErr; class Buffer; class Cursor; class CursorSlice; class DocIterator; class docstring_list; +class FuncRequest; -/// types for cells and math insets -typedef void const * uid_type; -typedef size_t idx_type; +/// Represents the correspondence between paragraphs and the generated +/// LaTeX file + +class TexRow { +public: + /// We begin with defining the types of row information we are tracking + /// -/// an individual par id/pos <=> row mapping -struct TextEntry { int id; pos_type pos; }; + /// type of row entries + enum RowType { + text_entry, + math_entry, + begin_document + }; + + /// an individual par id/pos <=> row mapping + struct TextEntry { int id; pos_type pos; }; -/// an individual math id/cell <=> row mapping -struct MathEntry { uid_type id; idx_type cell; }; + /// an individual math id/cell <=> row mapping + struct MathEntry { uid_type id; idx_type cell; }; -/// a container for passing entries around -struct RowEntry { - bool is_math;// true iff the union is a math - union { - struct TextEntry text; - struct MathEntry math; + /// a container for passing entries around + struct RowEntry { + RowType type; + union { + struct TextEntry text;// iff the type is text_entry + struct MathEntry math;// iff the type is row_entry + struct {} begindocument;// iff the type is begin_document + }; }; -}; + /// Encapsulates the paragraph and position for later use + static RowEntry textEntry(int id, pos_type pos); + /// Encapsulates a cell and position for later use + static RowEntry mathEntry(uid_type id, idx_type cell); + /// Denotes the beginning of the document + static RowEntry beginDocument(); -/// Represents the correspondence between paragraphs and the generated -/// LaTeX file + /// Converts a CursorSlice into a RowEntry + static RowEntry rowEntryFromCursorSlice(CursorSlice const & slice); -class TexRow { + static const TextEntry text_none; + static const RowEntry row_none; + /// Returns true if RowEntry is devoid of information + static bool isNone(RowEntry entry); + /// Returns true if TextEntry is devoid of information + static bool isNone(TextEntry entry); + +private: /// id/pos correspondence for a single row class RowEntryList; @@ -89,7 +114,6 @@ public: /// TexRow(); -#if !(defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 6)) /// Copy can be expensive and is not usually useful for TexRow. /// Force explicit copy, prefer move instead. This also prevents /// move()s from being converted into copy silently. @@ -97,28 +121,10 @@ public: TexRow(TexRow && other) = default; TexRow & operator=(TexRow const & other) = default; TexRow & operator=(TexRow && other) = default; -# else - //for gcc 4.6, nothing to do: it's enough to disable implicit copy during - // dev with more recent versions of gcc. -#endif /// Clears structure. void reset(); - static const TextEntry text_none; - static const RowEntry row_none; - /// Returns true if RowEntry is devoid of information - static bool isNone(RowEntry entry); - /// Returns true if TextEntry is devoid of information - static bool isNone(TextEntry entry); - - /// Converts a CursorSlice into a RowEntry - static RowEntry rowEntryFromCursorSlice(CursorSlice const & slice); - /// Encapsulates the paragraph and position for later use - static RowEntry textEntry(int id, pos_type pos); - /// Encapsulates a cell and position for later use - static RowEntry mathEntry(uid_type id, idx_type cell); - /// for debugging purposes static docstring asString(RowEntry entry); @@ -145,30 +151,46 @@ public: /** * getEntriesFromRow - find pids and position for a given row - * @param row row number to find + * This is the main algorithm behind reverse-search. + * @param row number to find * @return a pair of TextEntry denoting the start and end of the position. * The TextEntry values can be isNone(). If no row is found then the first * value isNone(). */ std::pair getEntriesFromRow(int row) const; + /** + * getDocIteratorFromEntries - find pids and positions for a given row + * @param buffer where to look + * @return a pair of DocIterators denoting the start and end of the + * position. The DocIterators can be invalid. The starting DocIterator + * being invalid means that no location was found. Note: there is no + * guarantee that the DocIterators are in the same inset or even at the + * same depth. + */ + static std::pair getDocIteratorsFromEntries( + TextEntry start, + TextEntry end, + Buffer const & buf); + + // A FuncRequest to select from start to end + static FuncRequest goToFunc(TextEntry start, TextEntry end); + // A FuncRequest to select a row + FuncRequest goToFuncFromRow(int const row) const; + /** * getDocIteratorFromRow - find pids and positions for a given row * @param row number to find - * @param buffer here to look - * @return a pair of DocIterators the start and end of the position. - * The DocIterators can be invalid. The starting DocIterator being invalid - * means that no row was found. Note: there is no guarantee that the - * DocIterators are in the same inset or even at the same depth. + * @param buffer where to look + * @return a pair of DocIterators as above. */ - std::pair getDocIteratorFromRow( + std::pair getDocIteratorsFromRow( int row, Buffer const & buf) const; - //TODO: remove the following by replacing it with the above - bool getIdFromRow(int row, int & id, int & pos) const; /// Finds the best pair of rows for dit /// returns (-1,-1) if not found. + /// This is the main algorithm behind forward-search. std::pair rowFromDocIterator(DocIterator const & dit) const; /// Finds the best pair of rows for cursor, taking the selection into @@ -189,7 +211,7 @@ public: void prepend(docstring_list &) const; private: - /// true iff same paragraph or math inset + /// true iff same paragraph or math inset or begin_document static bool sameParOrInsetMath(RowEntry entry1, RowEntry entry2); /// computes the distance in pos or cell index /// assumes it is the sameParOrInsetMath @@ -199,7 +221,7 @@ private: /// TexString : dumb struct to pass around docstrings with TexRow information. -/// They are best created using oTexStringstream. +/// They are best created using otexstringstream. /// They can be output to otexrowstreams and otexstreams. /// A valid TexString has as many newlines in str as in texrow. Be careful not /// to introduce a mismatch between the line and the row counts, as this will @@ -209,7 +231,6 @@ struct TexString { docstring str; /// TexRow texrow; -#if !(defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 6)) /// Copy can be expensive and is not usually useful for TexString. /// Force explicit copy, prefer move instead. This also prevents /// move()s from being converted into copy silently. @@ -217,13 +238,13 @@ struct TexString { TexString(TexString && other) = default; TexString & operator=(TexString const & other) = default; TexString & operator=(TexString && other) = default; -# else - //for gcc 4.6, nothing to do: it's enough to disable implicit copy during - // dev with more recent versions of gcc. -#endif - /// + /// Empty TexString TexString() = default; - /// ensure that the string and the TexRow have as many newlines. + /// Texstring containing str and TexRow with enough lines which are empty + explicit TexString(docstring str); + /// Texstring containing str and texrow. Must be valid. + TexString(docstring str, TexRow texrow); + /// Ensure that the string and the TexRow have as many newlines. void validate(); }; @@ -268,10 +289,7 @@ public: }; -bool operator==(RowEntry entry1, RowEntry entry2); - - -LyXErr & operator<<(LyXErr &, TexRow const &); +bool operator==(TexRow::RowEntry entry1, TexRow::RowEntry entry2); } // namespace lyx