class LyXRC;
class TeXErrors;
class LaTeXFeatures;
+class auto_mem_buffer;
+class Language;
///
struct DEPCLEAN {
*/
class Buffer {
public:
- /**@name Constructors and destructor */
- //@{
///
explicit Buffer(string const & file, bool b = false);
///
~Buffer();
- //@}
-
- /**@name Methods */
- //@{
/** save the buffer's parameters as user default
- This function saves a file user_lyxdir/templates/defaults.lyx
+ This function saves a file #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 true on success.
+ file. Returns #true# on success.
*/
bool saveParamsAsDefaults();
- /** high-level interface to buffer functionality
+ /** High-level interface to buffer functionality.
This function parses a command string and executes it
*/
bool Dispatch(string const & command);
/// Maybe we know the function already by number...
bool Dispatch(int ac, string const & argument);
+ /// and have an xtl buffer to work with.
+ bool Dispatch(int, auto_mem_buffer &);
+
/// should be changed to work for a list.
- void resize() {
- if (users) {
- users->resize();
- }
- }
+ void resize();
+ ///
+ void resizeInsets(BufferView *);
/// Update window titles of all users
void updateTitles() const;
void resetAutosaveTimers() const;
/** Adds the BufferView to the users list.
- Later this func will insert the BufferView into a real list,
+ Later this func will insert the #BufferView# into a real list,
not just setting a pointer.
*/
void addUser(BufferView * u) { users = u; }
- /** Removes the BufferView from the users list.
+ /** Removes the #BufferView# from the users list.
Since we only can have one at the moment, we just reset it.
*/
void delUser(BufferView *) { users = 0; }
///
void redraw() {
users->redraw();
- users->fitCursor();
+ users->fitCursor(users->text);
//users->updateScrollbar();
}
void loadAutoSaveFile();
/** Reads a file.
- Returns false if it fails.
- If par is given, the file is inserted. */
+ @param par if != 0 insert the file.
+ @return #false# if method fails.
+ */
bool readFile(LyXLex &, LyXParagraph * par = 0);
/** Reads a file without header.
- Returns false, if file is not completely read.
- If par is given, the file is inserted. */
+ @param par if != 0 insert the file.
+ @return false if file is not completely read.
+ */
bool readLyXformat2(LyXLex &, LyXParagraph * par = 0);
- /* This parses a single LyXformat-Token */
+ /// This parses a single LyXformat-Token.
bool parseSingleLyXformat2Token(LyXLex &, LyXParagraph *& par,
LyXParagraph *& return_par,
string const & token, int & pos,
- char & depth, LyXFont &,
- LyXParagraph::footnote_flag &,
- LyXParagraph::footnote_kind &);
-
+ char & depth, LyXFont &
+#ifndef NEW_INSETS
+ ,LyXParagraph::footnote_flag &,
+ LyXParagraph::footnote_kind &
+#endif
+ );
+private:
+ /// Parse a single inset.
+ void readInset(LyXLex &, LyXParagraph *& par, int & pos, LyXFont &);
+public:
/** Save file
Takes care of auto-save files and backup file if requested.
- Returns true if the save is successful, false otherwise.
+ Returns #true# if the save is successful, #false# otherwise.
*/
bool save() const;
- /// Write file. Returns false if unsuccesful.
+ /// Write file. Returns #false# if unsuccesful.
bool writeFile(string const &, bool) const;
///
void writeFileAscii(string const & , int);
-
+ ///
+ void writeFileAscii(std::ostream &, int);
+ ///
+ string const asciiParagraph(LyXParagraph const *,
+ unsigned int linelen) const;
///
void makeLaTeXFile(string const & filename,
string const & original_path,
bool nice, bool only_body = false);
- //
- // LaTeX all paragraphs from par to endpar,
- // if endpar == 0 then to the end
- //
- void latexParagraphs(std::ostream & os, LyXParagraph *par,
- LyXParagraph *endpar, TexRow & texrow) const;
-
- ///
- int runLaTeX();
-
- ///
- int runLiterate();
-
- ///
- int buildProgram();
+ /** LaTeX all paragraphs from par to endpar.
+ @param endpar if == 0 then to the end
+ */
+ void latexParagraphs(std::ostream & os, LyXParagraph * par,
+ LyXParagraph * endpar, TexRow & texrow) const;
///
int runChktex();
///
- void makeLinuxDocFile(string const & filename, int column);
+ void makeLinuxDocFile(string const & filename,
+ bool nice, bool only_body = false);
///
- void makeDocBookFile(string const & filename, int column);
+ void makeDocBookFile(string const & filename,
+ bool nice, bool only_body = false);
/// returns the main language for the buffer (document)
- string GetLanguage() const {
+ Language const * GetLanguage() const {
return params.language;
}
///
bool isLyxClean() const { return lyx_clean; }
- /// changed Heinrich Bauer, 23/03/98
- bool isDviClean() const;
-
- ///
- bool isNwClean() const { return nw_clean; }
-
///
bool isBakClean() const { return bak_clean; }
bak_clean = true;
}
- /// changed Heinrich Bauer, 23/03/98
- void markDviClean();
-
- ///
- void markNwClean() { nw_clean = true; }
-
///
void markBakClean() { bak_clean = true; }
void markDepClean(string const & name);
///
- void markDviDirty();
-
- ///
- void markNwDirty() { nw_clean = false; }
-
+ void setUnnamed(bool flag=true) { unnamed = flag; }
+
+ ///
+ bool isUnnamed() { return unnamed; }
+
///
void markDirty() {
if (lyx_clean) {
lyx_clean = false;
updateTitles();
}
- dvi_clean_tmpd = false;
- dvi_clean_orgd = false;
- nw_clean = false;
bak_clean = false;
DEPCLEAN * tmp = dep_clean;
while (tmp) {
string const & fileName() const { return filename; }
/** A transformed version of the file name, adequate for LaTeX
- The path is stripped if no_path is true (default) */
- string getLatexName(bool no_path = true) const;
+ The path is stripped if no_path is true (default)
+ */
+ string const getLatexName(bool no_path = true) const;
/// Change name of buffer. Updates "read-only" flag.
- void fileName(string const & newfile);
+ void setFileName(string const & newfile);
/// Name of the document's parent
void setParentName(string const &);
/// Set buffer read-only flag
void setReadonly(bool flag = true);
- /// returns true if the buffer contains a LaTeX document
+ /// returns #true# if the buffer contains a LaTeX document
bool isLatex() const;
- /// returns true if the buffer contains a LinuxDoc document
+ /// returns #true# if the buffer contains a LinuxDoc document
bool isLinuxDoc() const;
- /// returns true if the buffer contains a DocBook document
+ /// returns #true# if the buffer contains a DocBook document
bool isDocBook() const;
- /** returns true if the buffer contains either a LinuxDoc
+ /** returns #true# if the buffer contains either a LinuxDoc
or DocBook document */
bool isSGML() const;
- /// returns true if the buffer contains a Wed document
+ /// returns #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
- makeLaTeX and others. Its main use is to figure out what
+ #makeLaTeX# and others. Its main use is to figure out what
commands and packages need to be included in the LaTeX file.
It (should) also check that the needed constructs are there
(i.e. that the \refs points to coresponding \labels). It
void validate(LaTeXFeatures &) const;
///
- string getIncludeonlyList(char delim = ',');
+ string const getIncludeonlyList(char delim = ',');
///
- std::vector<std::pair<string,string> > getBibkeyList();
+ std::vector<std::pair<string,string> > const getBibkeyList();
///
struct TocItem {
+ ///
LyXParagraph * par;
+ ///
int depth;
+ ///
string str;
};
///
TOC_LOA
};
///
- std::vector<std::vector<TocItem> > getTocList();
+ std::vector<std::vector<TocItem> > const getTocList();
///
- std::vector<string> getLabelList();
+ std::vector<string> const getLabelList();
/** This will clearly have to change later. Later we can have more
than one user per buffer. */
///
bool isMultiLingual();
- //@}
-
/// Does this mean that this is buffer local?
UndoStack undostack;
/// Used when typesetting to place errorboxes.
TexRow texrow;
private:
+#ifndef NEW_INSETS
///
void linuxDocHandleFootnote(std::ostream & os,
- LyXParagraph * & par, int const depth);
+ LyXParagraph * & par, int depth);
+#endif
///
void DocBookHandleCaption(std::ostream & os, string & inner_tag,
- int const depth, int desc_on,
+ int depth, int desc_on,
LyXParagraph * & par);
+#ifndef NEW_INSETS
///
void DocBookHandleFootnote(std::ostream & os,
- LyXParagraph * & par, int const depth);
+ LyXParagraph * & par, int depth);
+#endif
///
void sgmlOpenTag(std::ostream & os, int depth,
string const & latexname) const;
void sgmlCloseTag(std::ostream & os, int depth,
string const & latexname) const;
///
- void LinuxDocError(LyXParagraph * par, int pos, char const * message);
+ void LinuxDocError(LyXParagraph * par, int pos,
+ string const & message);
///
void SimpleLinuxDocOnePar(std::ostream & os, LyXParagraph * par,
- int desc_on, int const depth);
+ int desc_on, int depth);
///
void SimpleDocBookOnePar(std::ostream &, string & extra,
LyXParagraph * par, int & desc_on,
- int const depth);
+ int depth);
/// LinuxDoc.
- void push_tag(std::ostream & os, char const * tag,
+ void push_tag(std::ostream & os, string const & tag,
int & pos, char stack[5][3]);
/// LinuxDoc.
- void pop_tag(std::ostream & os, char const * tag,
+ void pop_tag(std::ostream & os, string const & tag,
int & pos, char stack[5][3]);
-#if 0
- ///
- void RoffAsciiTable(std::ostream &, LyXParagraph * par);
-#endif
-
/// is save needed
mutable bool lyx_clean;
/// is autosave needed
mutable bool bak_clean;
- /** do we need to run LaTeX, changed 23/03/98, Heinrich Bauer
- We have to distinguish between TeX-runs executed in the original
- directory (in which the original LyX-file resides) and TeX-runs
- executed in a temporary directory. The first situation is valid
- for a dvi-export, the latter one for printing or previewing. */
- bool dvi_clean_orgd;
- bool dvi_clean_tmpd;
-
- /// do we need to run weave/tangle
- bool nw_clean;
-
- /// is regenerating .tex necessary
+ /// is this a unnamed file (New...)
+ bool unnamed;
+
+ /// is regenerating #.tex# necessary
DEPCLEAN * dep_clean;
/// buffer is r/o
Why not keep a list of the BufferViews that use this buffer?
At least then we don't have to do a lot of magic like:
- buffer->lyx_gui->bufferview->updateLayoutChoice. Just ask each
- of the buffers in the list of users to do a updateLayoutChoice.
+ #buffer->lyx_gui->bufferview->updateLayoutChoice#. Just ask each
+ of the buffers in the list of users to do a #updateLayoutChoice#.
*/
BufferView * users;
public:
+ ///
class inset_iterator {
public:
+ typedef std::input_iterator_tag iterator_category;
+ typedef Inset value_type;
+ typedef ptrdiff_t difference_type;
+ typedef Inset * pointer;
+ typedef Inset & reference;
+
+
+ ///
inset_iterator() : par(0) /*, it(0)*/ {}
+ //
inset_iterator(LyXParagraph * paragraph) : par(paragraph) {
SetParagraph();
}
- inset_iterator(LyXParagraph * paragraph, LyXParagraph::size_type pos);
- inset_iterator & operator++() {
+ ///
+ inset_iterator(LyXParagraph * paragraph,
+ LyXParagraph::size_type pos);
+ ///
+ inset_iterator & operator++() { // prefix ++
if (par) {
++it;
if (it == par->inset_iterator_end()) {
}
return *this;
}
- Inset * operator*() {return *it; }
+ ///
+ inset_iterator operator++(int) { // postfix ++
+ inset_iterator tmp(par, it.getPos());
+ if (par) {
+ ++it;
+ if (it == par->inset_iterator_end()) {
+ par = par->next;
+ SetParagraph();
+ }
+ }
+ return tmp;
+ }
+ ///
+ Inset * operator*() { return *it; }
+
+ ///
LyXParagraph * getPar() { return par; }
- LyXParagraph::size_type getPos() {return it.getPos(); }
+ ///
+ LyXParagraph::size_type getPos() const { return it.getPos(); }
+ ///
friend
bool operator==(inset_iterator const & iter1,
- inset_iterator const & iter2) {
- return iter1.par == iter2.par
- && (iter1.par == 0 || iter1.it == iter2.it);
- }
- friend
- bool operator!=(inset_iterator const & iter1,
- inset_iterator const & iter2) {
- return !(iter1 == iter2);
- }
+ inset_iterator const & iter2);
+ //
+ //friend
+ //bool operator!=(inset_iterator const & iter1,
+ // inset_iterator const & iter2);
private:
+ ///
void SetParagraph();
+ ///
LyXParagraph * par;
+ ///
LyXParagraph::inset_iterator it;
};
params.parentname = name;
}
+///
inline
bool operator==(Buffer::TocItem const & a, Buffer::TocItem const & b) {
return a.par == b.par && a.str == b.str;
}
+///
inline
bool operator!=(Buffer::TocItem const & a, Buffer::TocItem const & b) {
return !(a == b);
// No need to compare depth.
}
+///
+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);
+}
+
+///
+inline
+bool operator!=(Buffer::inset_iterator const & iter1,
+ Buffer::inset_iterator const & iter2) {
+ return !(iter1 == iter2);
+}
#endif
+
projects / lyx.git / blobdiff