X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.h;h=5f603a41e5acb86e5e24a04e5cfff274d36c2ee7;hb=1583baeb34c3b5f1cd1c239cf8471132fd5c406a;hp=2d58f3376979853a041509d421a35fad6d1bbf6b;hpb=540ecf3e20600b36914d778f8439eaff7ec76ea6;p=lyx.git diff --git a/src/buffer.h b/src/buffer.h index 2d58f33769..5f603a41e5 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -1,56 +1,42 @@ // -*- C++ -*- /* This file is part of - * ====================================================== - * - * LyX, The Document Processor + * ====================================================== + * + * LyX, The Document Processor * Copyright 1995 Matthias Ettrich * * This file is Copyleft 1996 * Lars Gullik Bjønnes * * ====================================================== */ - -// Change Log: -// =========== -// 23/03/98 Heinrich Bauer (heinrich.bauer@t-mobil.de) -// Spots marked "changed Heinrich Bauer, 23/03/98" modified due to the -// following bug: dvi file export did not work after printing (or previewing) -// and vice versa as long as the same file was concerned. This happened -// every time the LyX-file was left unchanged between the two actions mentioned -// above. #ifndef BUFFER_H #define BUFFER_H -#ifdef __GNUG__ -#pragma interface -#endif - #include "LString.h" +#include "undo.h" +#include "support/limited_stack.h" -#include "BufferView.h" #include "lyxvc.h" #include "bufferparams.h" #include "texrow.h" +#include "ParagraphList.h" +#include "paragraph.h" +#include "author.h" +#include +class BufferView; class LyXRC; class TeXErrors; class LaTeXFeatures; class Language; +class ParIterator; +class ParConstIterator; -/// -struct DEPCLEAN { - /// - bool clean; - /// - string master; - /// - DEPCLEAN * next; -}; /** The buffer object. - The is is the buffer object. It contains all the informations about + This is the buffer object. It contains all the informations about a document loaded into LyX. I am not sure if the class is complete or minimal, probably not. \author Lars Gullik Bjønnes @@ -68,29 +54,19 @@ public: \param b optional \c false by default */ explicit Buffer(string const & file, bool b = false); - - /// Destrucotr - ~Buffer(); - /** Save the buffer's parameters as user default. - This function saves a file \c user_lyxdir/templates/defaults.lyx - which parameters are those of the current buffer. This file - is used as a default template when creating a new - file. Returns \c true on success. - */ - bool saveParamsAsDefaults(); + /// Destructor + ~Buffer(); /** High-level interface to buffer functionality. This function parses a command string and executes it */ - bool Dispatch(string const & command); + bool dispatch(string const & command, bool * result = 0); /// Maybe we know the function already by number... - bool Dispatch(int ac, string const & argument); + bool dispatch(int ac, string const & argument, bool * result = 0); - /// Should be changed to work for a list. - void resize(); - /// + /// void resizeInsets(BufferView *); /// Update window titles of all users. @@ -109,100 +85,111 @@ public: Since we only can have one at the moment, we just reset it. */ void delUser(BufferView *); - + /// void redraw(); /// Load the autosaved file. void loadAutoSaveFile(); - - /** Reads a file. + + /** Reads a file. \param par if != 0 insert the file. \return \c false if method fails. */ - bool readFile(LyXLex &, LyXParagraph * par = 0); - + bool readFile(LyXLex &, string const &, Paragraph * par = 0); + /** Reads a file without header. \param par if != 0 insert the file. \return \c false if file is not completely read. */ - bool readLyXformat2(LyXLex &, LyXParagraph * par = 0); + bool readLyXformat2(LyXLex &, Paragraph * par = 0); /// This parses a single LyXformat-Token. - bool parseSingleLyXformat2Token(LyXLex &, LyXParagraph *& par, - LyXParagraph *& return_par, + bool parseSingleLyXformat2Token(LyXLex &, Paragraph *& par, + Paragraph *& return_par, string const & token, int & pos, - char & depth, LyXFont & -#ifndef NEW_INSETS - ,LyXParagraph::footnote_flag &, - LyXParagraph::footnote_kind & -#endif - ); + Paragraph::depth_type & depth, + LyXFont &); + /// + void insertStringAsLines(Paragraph *&, lyx::pos_type &, + LyXFont const &, string const &) const; + /// + Paragraph * getParFromID(int id) const; private: /// Parse a single inset. - void readInset(LyXLex &, LyXParagraph *& par, int & pos, LyXFont &); + void readInset(LyXLex &, Paragraph *& par, int & pos, LyXFont &); public: /** Save file. Takes care of auto-save files and backup file if requested. Returns \c true if the save is successful, \c false otherwise. */ bool save() const; - + /// Write file. Returns \c false if unsuccesful. - bool writeFile(string const &, bool) const; - + bool writeFile(string const &) const; + /// void writeFileAscii(string const & , int); /// void writeFileAscii(std::ostream &, int); /// - string const asciiParagraph(LyXParagraph const *, - unsigned int linelen) const; - /// + string const asciiParagraph(Paragraph const &, unsigned int linelen, + bool noparbreak = false) const; + /// Just a wrapper for the method below, first creating the ofstream. void makeLaTeXFile(string const & filename, string const & original_path, - bool nice, bool only_body = false); + bool nice, + bool only_body = false, + bool only_preamble = false); + /// + void makeLaTeXFile(std::ostream & os, + string const & original_path, + bool nice, + bool only_body = false, + bool only_preamble = false); /** LaTeX all paragraphs from par to endpar. \param \a endpar if == 0 then to the end */ - void latexParagraphs(std::ostream & os, LyXParagraph * par, - LyXParagraph * endpar, TexRow & texrow) const; - - /// - void SimpleDocBookOnePar(std::ostream &, string & extra, - LyXParagraph * par, int & desc_on, - int depth) const ; - + void latexParagraphs(std::ostream & os, Paragraph * par, + Paragraph * endpar, TexRow & texrow, bool moving_arg = false) const; /// - int runChktex(); - + void simpleDocBookOnePar(std::ostream &, + Paragraph * par, int & desc_on, + Paragraph::depth_type depth) const ; + /// + void simpleLinuxDocOnePar(std::ostream & os, Paragraph * par, + Paragraph::depth_type depth); /// void makeLinuxDocFile(string const & filename, bool nice, bool only_body = false); /// void makeDocBookFile(string const & filename, bool nice, bool only_body = false); + /// + void sgmlError(Paragraph * par, int pos, string const & message) const; /// returns the main language for the buffer (document) - Language const * GetLanguage() const; + Language const * getLanguage() const; /// - bool isLyxClean() const; + int runChktex(); + /// return true if the main lyx file does not need saving + bool isClean() const; /// bool isBakClean() const; /// bool isDepClean(string const & name) const; - - /// - void markLyxClean() const; + + /// mark the main lyx file as not needing saving + void markClean() const; /// void markBakClean(); - + /// void markDepClean(string const & name); - + /// - void setUnnamed(bool flag=true); + void setUnnamed(bool flag = true); /// bool isUnnamed(); @@ -210,9 +197,13 @@ public: /// Mark this buffer as dirty. void markDirty(); - /// Returns the buffers filename. + /// Returns the buffer's filename. It is always an absolute path. string const & fileName() const; + /// Returns the the path where the buffer lives. + /// It is always an absolute path. + string const & filePath() const; + /** A transformed version of the file name, adequate for LaTeX. \param no_path optional if \c true then the path is stripped. */ @@ -220,7 +211,7 @@ public: /// Get the name and type of the log. std::pair const getLogName() const; - + /// Change name of buffer. Updates "read-only" flag. void setFileName(string const & newfile); @@ -242,11 +233,8 @@ public: /** returns \c true if the buffer contains either a LinuxDoc or DocBook document */ bool isSGML() const; - /// returns \c true if the buffer contains a Wed document - bool isLiterate() const; - - /// - void setPaperStuff(); + /// returns \c true if the buffer contains a Wed document + bool isLiterate() const; /** Validate a buffer for LaTeX. This validates the buffer, and returns a struct for use by @@ -259,53 +247,34 @@ public: */ void validate(LaTeXFeatures &) const; + /// return all bibkeys from buffer and its childs + void fillWithBibKeys(std::vector > & keys) const; /// - string const getIncludeonlyList(char delim = ','); - /// - std::vector > const getBibkeyList(); - /// - struct TocItem { - TocItem(LyXParagraph * p, int d, string const & s) - : par(p), depth(d), str(s) {} - /// - LyXParagraph * par; - /// - int depth; - /// - string str; - }; - /// - typedef std::vector SingleList; - /// - typedef std::map Lists; - /// - Lists const getLists() const; - /// - std::vector const getLabelList(); + std::vector const getLabelList() const; /** This will clearly have to change later. Later we can have more than one user per buffer. */ BufferView * getUser() const; /// - void ChangeLanguage(Language const * from, Language const * to); + void changeLanguage(Language const * from, Language const * to); /// bool isMultiLingual(); /// Does this mean that this is buffer local? - UndoStack undostack; - - /// Does this mean that this is buffer local? - UndoStack redostack; - + limited_stack > undostack; + + /// Does this mean that this is buffer local? + limited_stack > redostack; + /// BufferParams params; - + /** The list of paragraphs. This is a linked list of paragraph, this list holds the whole contents of the document. */ - LyXParagraph * paragraph; + ParagraphList paragraphs; /// LyX version control object. LyXVC lyxvc; @@ -313,9 +282,6 @@ public: /// Where to put temporary files. string tmppath; - /// The path to the document file. - string filepath; - /** If we are writing a nice LaTeX file or not. While writing as LaTeX, tells whether we are doing a 'nice' LaTeX file */ @@ -323,50 +289,36 @@ public: /// Used when typesetting to place errorboxes. TexRow texrow; + + /// the author list for the document + AuthorList & authors(); + private: -#ifndef NEW_INSETS - /// - void linuxDocHandleFootnote(std::ostream & os, - LyXParagraph * & par, int depth); -#endif - /// - void DocBookHandleCaption(std::ostream & os, string & inner_tag, - int depth, int desc_on, - LyXParagraph * & par); -#ifndef NEW_INSETS - /// - void DocBookHandleFootnote(std::ostream & os, - LyXParagraph * & par, int depth); -#endif - /// Open SGML/XML tag. - void sgmlOpenTag(std::ostream & os, int depth, - string const & latexname) const; - /// Closes SGML/XML tag. - void sgmlCloseTag(std::ostream & os, int depth, - string const & latexname) const; - /// - void LinuxDocError(LyXParagraph * par, int pos, - string const & message); - /// - void SimpleLinuxDocOnePar(std::ostream & os, LyXParagraph * par, int depth); + typedef std::map DepClean; + + /// need to regenerate .tex ? + DepClean dep_clean_; + + /// the author list + AuthorList authorlist; /// is save needed mutable bool lyx_clean; - + /// is autosave needed mutable bool bak_clean; - + /// is this a unnamed file (New...) bool unnamed; - /// is regenerating #.tex# necessary - DEPCLEAN * dep_clean; - /// buffer is r/o bool read_only; /// name of the file the buffer is associated with. - string filename; + string filename_; + + /// The path to the document file. + string filepath_; /// Format number of buffer int file_format; @@ -378,7 +330,6 @@ private: of the buffers in the list of users to do a #updateLayoutChoice#. */ BufferView * users; - public: /// class inset_iterator { @@ -388,228 +339,79 @@ public: typedef ptrdiff_t difference_type; typedef Inset * pointer; typedef Inset & reference; - - + typedef ParagraphList::iterator base_type; + /// - inset_iterator() : par(0) /*, it(0)*/ {} - // - inset_iterator(LyXParagraph * paragraph) : par(paragraph) { - SetParagraph(); - } + inset_iterator(); /// - inset_iterator(LyXParagraph * paragraph, - LyXParagraph::size_type pos); + inset_iterator(base_type p, base_type e); /// - inset_iterator & operator++() { // prefix ++ - if (par) { - ++it; - if (it == par->inset_iterator_end()) { -#ifndef NEW_INSETS - par = par->next_; -#else - par = par->next(); -#endif - SetParagraph(); - } - } - return *this; - } + inset_iterator(base_type p, lyx::pos_type pos, base_type e); + + /// prefix ++ + inset_iterator & operator++(); + /// postfix ++ + inset_iterator operator++(int); /// - inset_iterator operator++(int) { // postfix ++ - inset_iterator tmp(par, it.getPos()); - if (par) { - ++it; - if (it == par->inset_iterator_end()) { -#ifndef NEW_INSETS - par = par->next_; -#else - par = par->next(); -#endif - SetParagraph(); - } - } - return tmp; - } + reference operator*(); /// - Inset * operator*() { return *it; } - + pointer operator->(); + /// - LyXParagraph * getPar() { return par; } + Paragraph * getPar(); /// - LyXParagraph::size_type getPos() const { return it.getPos(); } + lyx::pos_type getPos() const; /// friend bool operator==(inset_iterator const & iter1, inset_iterator const & iter2); private: /// - void SetParagraph(); + void setParagraph(); + /// + ParagraphList::iterator pit; /// - LyXParagraph * par; + ParagraphList::iterator pend; /// - LyXParagraph::inset_iterator it; + InsetList::iterator it; }; /// inset_iterator inset_iterator_begin() { - return inset_iterator(paragraph); + return inset_iterator(paragraphs.begin(), paragraphs.end()); } + /// inset_iterator inset_iterator_end() { return inset_iterator(); } -}; - -inline -void Buffer::addUser(BufferView * u) -{ - users = u; -} - - -inline -void Buffer::delUser(BufferView *) -{ - users = 0; -} - - -inline -void Buffer::redraw() -{ - users->redraw(); - users->fitCursor(users->text); -} - - -inline -Language const * Buffer::GetLanguage() const -{ - return params.language; -} - - -inline -bool Buffer::isLyxClean() const -{ - return lyx_clean; -} - - -inline -bool Buffer::isBakClean() const -{ - return bak_clean; -} - - -inline -void Buffer::markLyxClean() const -{ - if (!lyx_clean) { - lyx_clean = true; - updateTitles(); + /// + inset_iterator inset_const_iterator_begin() const { + return inset_iterator(paragraphs.begin(), paragraphs.end()); } - // if the .lyx file has been saved, we don't need an - // autosave - bak_clean = true; -} - - -inline -void Buffer::markBakClean() -{ - bak_clean = true; -} - -inline -void Buffer::setUnnamed(bool flag) -{ - unnamed = flag; -} - - -inline -bool Buffer::isUnnamed() -{ - return unnamed; -} - - -inline -void Buffer::markDirty() -{ - if (lyx_clean) { - lyx_clean = false; - updateTitles(); - } - bak_clean = false; - DEPCLEAN * tmp = dep_clean; - while (tmp) { - tmp->clean = false; - tmp = tmp->next; + /// + inset_iterator inset_const_iterator_end() const { + return inset_iterator(); } -} - - -inline -string const & Buffer::fileName() const -{ - return filename; -} - - -inline -bool Buffer::isReadonly() const -{ - return read_only; -} - - -inline -BufferView * Buffer::getUser() const -{ - return users; -} - - -inline -void Buffer::setParentName(string const & name) -{ - params.parentname = name; -} - - -/// -inline -bool operator==(Buffer::TocItem const & a, Buffer::TocItem const & b) { - return a.par == b.par && a.str == b.str; - // No need to compare depth. -} + /// + ParIterator par_iterator_begin(); + /// + ParConstIterator par_iterator_begin() const; + /// + ParIterator par_iterator_end(); + /// + ParConstIterator par_iterator_end() const; -/// -inline -bool operator!=(Buffer::TocItem const & a, Buffer::TocItem const & b) { - return !(a == b); - // No need to compare depth. -} + /// + Inset * getInsetFromID(int id_arg) const; +}; -/// -inline bool operator==(Buffer::inset_iterator const & iter1, - Buffer::inset_iterator const & iter2) { - return iter1.par == iter2.par - && (iter1.par == 0 || iter1.it == iter2.it); -} + Buffer::inset_iterator const & iter2); -/// -inline bool operator!=(Buffer::inset_iterator const & iter1, - Buffer::inset_iterator const & iter2) { - return !(iter1 == iter2); -} + Buffer::inset_iterator const & iter2); #endif -