* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-1999 The LyX Team.
+ * Copyright 1995-2000 The LyX Team.
*
* This file is Copyright 1996-1999
* 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.
-
#include <config.h>
#include <fstream>
#include <iomanip>
-using std::ofstream;
-using std::ifstream;
-using std::fstream;
-using std::ios;
-using std::setw;
-
#include <cstdlib>
#include <unistd.h>
+#include <sys/types.h>
+#include <utime.h>
+
+#include <algorithm>
#ifdef __GNUG__
#pragma implementation "buffer.h"
#include "lyxlex.h"
#include "tex-strings.h"
#include "layout.h"
-#include "lyx_cb.h"
+#include "bufferview_funcs.h"
#include "minibuffer.h"
#include "lyxfont.h"
#include "version.h"
#include "insets/inseturl.h"
#include "insets/insetinfo.h"
#include "insets/insetquotes.h"
-#if 0
-#include "insets/insetlatex.h"
-#endif
#include "insets/insetlatexaccent.h"
#include "insets/insetbib.h"
+#include "insets/insetcite.h"
+#include "insets/insetexternal.h"
#include "insets/insetindex.h"
#include "insets/insetinclude.h"
#include "insets/insettoc.h"
-#include "insets/insetlof.h"
-#include "insets/insetlot.h"
-#include "insets/insetloa.h"
#include "insets/insetparent.h"
#include "insets/insetspecialchar.h"
#include "insets/figinset.h"
+#include "insets/insettext.h"
+#include "insets/insetert.h"
+#include "insets/insetgraphics.h"
+#include "insets/insetfoot.h"
+#include "insets/insetmarginal.h"
+#include "insets/insetminipage.h"
+#include "insets/insetfloat.h"
+#include "insets/insetlist.h"
+#include "insets/insettabular.h"
+#include "insets/insettheorem.h"
+#include "insets/insetcaption.h"
#include "support/filetools.h"
#include "support/path.h"
#include "LaTeX.h"
#include "support/FileInfo.h"
#include "lyxtext.h"
#include "gettext.h"
+#include "language.h"
+#include "lyx_gui_misc.h" // WarnReadonly()
+#include "frontends/Dialogs.h"
+#include "encoding.h"
-// Uncomment this line to enable a workaround for the weird behaviour
-// of the cursor between a displayed inset and last character
-// at the upper line. (Alejandro 20.9.96)
-// #define BREAK_BEFORE_INSET
-
-/* Lars, when changing this file sometime in the future to a list,
- * please check out the figinsets-sideeffects described at the
- * beginning of figinset.C Matthias (04.07.1996)
- */
-
+using std::ostream;
+using std::ofstream;
+using std::ifstream;
+using std::fstream;
+using std::ios;
+using std::setw;
+using std::endl;
+using std::pair;
+using std::vector;
+using std::max;
+using std::set;
+#ifdef HAVE_SSTREAM
+using std::istringstream;
+#endif
// all these externs should eventually be removed.
extern BufferList bufferlist;
extern LyXAction lyxaction;
-static const float LYX_FORMAT = 2.15;
+static const float LYX_FORMAT = 2.16;
extern int tex_code_break_column;
-extern void FreeUpdateTimer();
-
-Buffer::Buffer(string const & file, LyXRC * lyxrc, bool ronly)
+Buffer::Buffer(string const & file, bool ronly)
{
lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl;
filename = file;
paragraph = 0;
lyx_clean = true;
bak_clean = true;
- dvi_clean_orgd = false; // Heinrich Bauer, 23/03/98
- dvi_clean_tmpd = false; // Heinrich Bauer, 23/03/98
dep_clean = 0;
read_only = ronly;
+ unnamed = false;
users = 0;
lyxvc.buffer(this);
- if (read_only || (lyxrc && lyxrc->use_tempdir)) {
+ if (read_only || (lyxrc.use_tempdir)) {
tmppath = CreateBufferTmpDir();
- } else tmppath.clear();
+ } else tmppath.erase();
}
}
+string Buffer::getLatexName(bool no_path) const
+{
+ if (no_path)
+ return OnlyFilename(ChangeExtension(MakeLatexName(filename),
+ ".tex"));
+ else
+ return ChangeExtension(MakeLatexName(filename),
+ ".tex");
+}
+
+
+void Buffer::setReadonly(bool flag)
+{
+ if (read_only != flag) {
+ read_only = flag;
+ updateTitles();
+ users->owner()->getDialogs()->updateBufferDependent();
+ }
+ if (read_only) {
+ WarnReadonly(filename);
+ }
+}
+
+
bool Buffer::saveParamsAsDefaults()
{
string fname = AddName(AddPath(user_lyxdir, "templates/"),
- "defaults.lyx");
+ "defaults.lyx");
Buffer defaults = Buffer(fname);
// Use the current buffer's parameters as default
/// Update window titles of all users
// Should work on a list
-void Buffer::updateTitles()
+void Buffer::updateTitles() const
{
if (users) users->owner()->updateWindowTitle();
}
/// Reset autosave timer of all users
// Should work on a list
-void Buffer::resetAutosaveTimers()
+void Buffer::resetAutosaveTimers() const
{
if (users) users->owner()->resetAutosaveTimer();
}
}
-// Inserts a file into current document
-bool BufferView::insertLyXFile(string const & filen)
- //
- // (c) CHT Software Service GmbH
- // Uwe C. Schroeder
- //
- // Insert a Lyxformat - file into current buffer
- //
- // Moved from lyx_cb.C (Lgb)
-{
- if (filen.empty()) return false;
-
- string fname = MakeAbsPath(filen);
-
- // check if file exist
- FileInfo fi(fname);
-
- if (!fi.readable()) {
- WriteAlert(_("Error!"),
- _("Specified file is unreadable: "),
- MakeDisplayPath(fname, 50));
- return false;
- }
-
- beforeChange();
-
- ifstream ifs(fname.c_str());
- if (!ifs) {
- WriteAlert(_("Error!"),
- _("Cannot open specified file: "),
- MakeDisplayPath(fname, 50));
- return false;
- }
- LyXLex lex(0, 0);
- lex.setStream(ifs);
- char c; ifs.get(c);
- ifs.putback(c);
-
- bool res = true;
-
- if (c == '#') {
- lyxerr.debug() << "Will insert file with header" << endl;
- res = buffer()->readFile(lex, text->cursor.par);
- } else {
- lyxerr.debug() << "Will insert file without header" << endl;
- res = buffer()->readLyXformat2(lex, text->cursor.par);
- }
-
- resize();
- return res;
-}
-
-
// candidate for move to BufferView
// (at least some parts in the beginning of the func)
//
bool Buffer::readLyXformat2(LyXLex & lex, LyXParagraph * par)
{
string tmptok;
- Inset * inset = 0;
int pos = 0;
- int tmpret, tmpret2;
char depth = 0; // signed or unsigned?
+#ifndef NEW_INSETS
LyXParagraph::footnote_flag footnoteflag = LyXParagraph::NO_FOOTNOTE;
LyXParagraph::footnote_kind footnotekind = LyXParagraph::FOOTNOTE;
+#endif
bool the_end_read = false;
LyXParagraph * return_par = 0;
- LyXFont font = LyXFont(LyXFont::ALL_INHERIT);
+ LyXFont font(LyXFont::ALL_INHERIT, params.language_info);
+ if (format < 2.16 && params.language == "hebrew")
+ font.setLanguage(default_language);
// If we are inserting, we cheat and get a token in advance
bool has_token = false;
if(!par) {
par = new LyXParagraph;
} else {
- users->text->BreakParagraph();
+ users->text->BreakParagraph(users);
return_par = users->text->FirstParagraph();
pos = 0;
markDirty();
if (token.empty())
continue;
- else if (token[0] != '\\') {
- int n = token.length();
- for (int i = 0; i < n; ++i) {
- par->InsertChar(pos, token[i]);
- par->SetFont(pos, font);
- ++pos;
- }
- } else if (token == "\\i") {
- inset = new InsetLatexAccent;
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
-
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- pos++;
- } else if (token == "\\layout") {
- if (!return_par)
- return_par = par;
- else {
- par->text.resize(par->text.size());
- par = new LyXParagraph(par);
- }
- pos = 0;
- lex.EatLine();
- string layoutname = lex.GetString();
- pair<bool, LyXTextClass::LayoutList::size_type> pp
- = textclasslist.NumberOfLayout(params.textclass,
- layoutname);
- if (pp.first) {
- par->layout = pp.second;
- } else { // layout not found
- // use default layout "Standard" (0)
- par->layout = 0;
- }
- // Test whether the layout is obsolete.
- LyXLayout const & layout = textclasslist.Style(params.textclass,
- par->layout);
- if (!layout.obsoleted_by().empty())
- par->layout =
- textclasslist.NumberOfLayout(params.textclass,
- layout.obsoleted_by()).second;
- par->footnoteflag = footnoteflag;
- par->footnotekind = footnotekind;
- par->depth = depth;
- font = LyXFont(LyXFont::ALL_INHERIT);
- } else if (token == "\\end_float") {
- if (!return_par)
- return_par = par;
- else {
- par->text.resize(par->text.size());
- par = new LyXParagraph(par);
- }
- footnotekind = LyXParagraph::FOOTNOTE;
- footnoteflag = LyXParagraph::NO_FOOTNOTE;
- pos = 0;
- lex.EatLine();
- par->layout = LYX_DUMMY_LAYOUT;
- font = LyXFont(LyXFont::ALL_INHERIT);
- } else if (token == "\\begin_float") {
- tmpret = lex.FindToken(string_footnotekinds);
- if (tmpret == -1) ++tmpret;
- if (tmpret != LYX_LAYOUT_DEFAULT)
- footnotekind = static_cast<LyXParagraph::footnote_kind>(tmpret); // bad
- if (footnotekind == LyXParagraph::FOOTNOTE
- || footnotekind == LyXParagraph::MARGIN)
- footnoteflag = LyXParagraph::CLOSED_FOOTNOTE;
- else
- footnoteflag = LyXParagraph::OPEN_FOOTNOTE;
- } else if (token == "\\begin_deeper") {
- ++depth;
- } else if (token == "\\end_deeper") {
- if (!depth) {
- lex.printError("\\end_deeper: "
- "depth is already null");
- }
- else
- --depth;
- } else if (token == "\\begin_preamble") {
- params.readPreamble(lex);
- } else if (token == "\\textclass") {
- lex.EatLine();
- pair<bool, LyXTextClassList::size_type> pp =
- textclasslist.NumberOfClass(lex.GetString());
- if (pp.first) {
- params.textclass = pp.second;
+ the_end_read = parseSingleLyXformat2Token(lex, par, return_par,
+ token, pos, depth,
+ font
+#ifndef NEW_INSETS
+ , footnoteflag,
+ footnotekind
+#endif
+ );
+ }
+
+ if (!return_par)
+ return_par = par;
+
+ paragraph = return_par;
+
+ return the_end_read;
+}
+
+
+// We'll remove this later. (Lgb)
+static string last_inset_read;
+
+
+bool
+Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
+ LyXParagraph *& return_par,
+ string const & token, int & pos,
+ char & depth, LyXFont & font
+#ifndef NEW_INSETS
+ , LyXParagraph::footnote_flag & footnoteflag,
+ LyXParagraph::footnote_kind & footnotekind
+#endif
+ )
+{
+ bool the_end_read = false;
+
+ if (token[0] != '\\') {
+ for (string::const_iterator cit = token.begin();
+ cit != token.end(); ++cit) {
+ par->InsertChar(pos, (*cit), font);
+ ++pos;
+ }
+ } else if (token == "\\i") {
+ Inset * inset = new InsetLatexAccent;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (token == "\\layout") {
+ if (!return_par)
+ return_par = par;
+ else {
+ par->fitToSize();
+ par = new LyXParagraph(par);
+ }
+ pos = 0;
+ lex.EatLine();
+ string layoutname = lex.GetString();
+ pair<bool, LyXTextClass::LayoutList::size_type> pp
+ = textclasslist.NumberOfLayout(params.textclass,
+ layoutname);
+ if (pp.first) {
+ par->layout = pp.second;
+ } else { // layout not found
+ // use default layout "Standard" (0)
+ par->layout = 0;
+ }
+ // Test whether the layout is obsolete.
+ LyXLayout const & layout =
+ textclasslist.Style(params.textclass,
+ par->layout);
+ if (!layout.obsoleted_by().empty())
+ par->layout =
+ textclasslist.NumberOfLayout(params.textclass,
+ layout.obsoleted_by()).second;
+#ifndef NEW_INSETS
+ par->footnoteflag = footnoteflag;
+ par->footnotekind = footnotekind;
+#endif
+ par->depth = depth;
+ font = LyXFont(LyXFont::ALL_INHERIT, params.language_info);
+ if (format < 2.16 && params.language == "hebrew")
+ font.setLanguage(default_language);
+#ifndef NEW_INSETS
+ } else if (token == "\\end_float") {
+ if (!return_par)
+ return_par = par;
+ else {
+ par->fitToSize();
+ par = new LyXParagraph(par);
+ }
+ footnotekind = LyXParagraph::FOOTNOTE;
+ footnoteflag = LyXParagraph::NO_FOOTNOTE;
+ pos = 0;
+ lex.EatLine();
+ par->layout = LYX_DUMMY_LAYOUT;
+ font = LyXFont(LyXFont::ALL_INHERIT, params.language_info);
+ if (format < 2.16 && params.language == "hebrew")
+ font.setLanguage(default_language);
+ } else if (token == "\\begin_float") {
+ int tmpret = lex.FindToken(string_footnotekinds);
+ if (tmpret == -1) ++tmpret;
+ if (tmpret != LYX_LAYOUT_DEFAULT)
+ footnotekind = static_cast<LyXParagraph::footnote_kind>(tmpret); // bad
+ if (footnotekind == LyXParagraph::FOOTNOTE
+ || footnotekind == LyXParagraph::MARGIN)
+ footnoteflag = LyXParagraph::CLOSED_FOOTNOTE;
+ else
+ footnoteflag = LyXParagraph::OPEN_FOOTNOTE;
+#else
+ } else if (token == "\\begin_float") {
+ // This is the compability reader, unfinished but tested.
+ // (Lgb)
+ lex.next();
+ string tmptok = lex.GetString();
+ //lyxerr << "old float: " << tmptok << endl;
+
+ Inset * inset = 0;
+ string old_float;
+
+ if (tmptok == "footnote") {
+ inset = new InsetFoot;
+ } else if (tmptok == "margin") {
+ inset = new InsetMarginal;
+ } else if (tmptok == "fig") {
+ inset = new InsetFloat("figure");
+ old_float += "placement htbp\n";
+ } else if (tmptok == "tab") {
+ inset = new InsetFloat("table");
+ old_float += "placement htbp\n";
+ } else if (tmptok == "alg") {
+ inset = new InsetFloat("algorithm");
+ old_float += "placement htbp\n";
+ } else if (tmptok == "wide-fig") {
+ InsetFloat * tmp = new InsetFloat("figure");
+ tmp->wide(true);
+ inset = tmp;
+ old_float += "placement htbp\n";
+ } else if (tmptok == "wide-tab") {
+ InsetFloat * tmp = new InsetFloat("table");
+ tmp->wide(true);
+ inset = tmp;
+ old_float += "placement htbp\n";
+ }
+
+ if (!inset) return false; // no end read yet
+
+ old_float += "collapsed true\n";
+
+ // Here we need to check for \end_deeper and handle that
+ // before we do the footnote parsing.
+ // This _is_ a hack! (Lgb)
+ while(true) {
+ lex.next();
+ string tmp = lex.GetString();
+ if (tmp == "\\end_deeper") {
+ lyxerr << "\\end_deeper caught!" << endl;
+ if (!depth) {
+ lex.printError("\\end_deeper: "
+ "depth is already null");
+ } else
+ --depth;
+
} else {
- lex.printError("Unknown textclass `$$Token'");
- params.textclass = 0;
+ old_float += tmp;
+ old_float += ' ';
+ break;
}
- if (!textclasslist.Load(params.textclass)) {
+ }
+
+ old_float += lex.getLongString("\\end_float");
+ old_float += "\n\\end_inset\n";
+ //lyxerr << "float body: " << old_float << endl;
+
+#ifdef HAVE_SSTREAM
+ istringstream istr(old_float);
+#else
+ istrstream istr(old_float.c_str());
+#endif
+
+ LyXLex nylex(0, 0);
+ nylex.setStream(istr);
+
+ inset->Read(this, nylex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+#endif
+ } else if (token == "\\begin_deeper") {
+ ++depth;
+ } else if (token == "\\end_deeper") {
+ if (!depth) {
+ lex.printError("\\end_deeper: "
+ "depth is already null");
+ }
+ else
+ --depth;
+ } else if (token == "\\begin_preamble") {
+ params.readPreamble(lex);
+ } else if (token == "\\textclass") {
+ lex.EatLine();
+ pair<bool, LyXTextClassList::size_type> pp =
+ textclasslist.NumberOfClass(lex.GetString());
+ if (pp.first) {
+ params.textclass = pp.second;
+ } else {
+ lex.printError("Unknown textclass `$$Token'");
+ params.textclass = 0;
+ }
+ if (!textclasslist.Load(params.textclass)) {
// if the textclass wasn't loaded properly
// we need to either substitute another
// or stop loading the file.
// I can substitute but I don't see how I can
// stop loading... ideas?? ARRae980418
- WriteAlert(_("Textclass Loading Error!"),
- string(_("Can't load textclass ")) +
- textclasslist.NameOfClass(params.textclass),
- _("-- substituting default"));
- params.textclass = 0;
- }
- } else if (token == "\\options") {
- lex.EatLine();
- params.options = lex.GetString();
- } else if (token == "\\language") {
- params.readLanguage(lex);
- } else if (token == "\\fontencoding") {
- lex.EatLine();
- } else if (token == "\\inputencoding") {
- lex.EatLine();
- params.inputenc = lex.GetString();
- } else if (token == "\\graphics") {
- params.readGraphicsDriver(lex);
- } else if (token == "\\fontscheme") {
- lex.EatLine();
- params.fonts = lex.GetString();
- } else if (token == "\\noindent") {
- par->noindent = true;
- } else if (token == "\\fill_top") {
- par->added_space_top = VSpace(VSpace::VFILL);
- } else if (token == "\\fill_bottom") {
- par->added_space_bottom = VSpace(VSpace::VFILL);
- } else if (token == "\\line_top") {
- par->line_top = true;
- } else if (token == "\\line_bottom") {
- par->line_bottom = true;
- } else if (token == "\\pagebreak_top") {
- par->pagebreak_top = true;
- } else if (token == "\\pagebreak_bottom") {
- par->pagebreak_bottom = true;
- } else if (token == "\\start_of_appendix") {
- par->start_of_appendix = true;
- } else if (token == "\\paragraph_separation") {
- tmpret = lex.FindToken(string_paragraph_separation);
- if (tmpret == -1) tmpret++;
- if (tmpret != LYX_LAYOUT_DEFAULT)
- params.paragraph_separation =
- static_cast<BufferParams::PARSEP>(tmpret);
- } else if (token == "\\defskip") {
- lex.nextToken();
- params.defskip = VSpace(lex.GetString());
- } else if (token == "\\no_isolatin1") { // obsolete
- lex.nextToken();
- } else if (token == "\\no_babel") { // obsolete
- lex.nextToken();
- } else if (token == "\\no_epsfig") { // obsolete
- lex.nextToken();
- } else if (token == "\\epsfig") { // obsolete
- // Indeed it is obsolete, but we HAVE to be backwards
- // compatible until 0.14, because otherwise all figures
- // in existing documents are irretrivably lost. (Asger)
- params.readGraphicsDriver(lex);
- } else if (token == "\\quotes_language") {
- tmpret = lex.FindToken(string_quotes_language);
- if (tmpret == -1) tmpret++;
- if (tmpret != LYX_LAYOUT_DEFAULT) {
- InsetQuotes::quote_language tmpl =
- InsetQuotes::EnglishQ;
- switch(tmpret) {
- case 0:
- tmpl = InsetQuotes::EnglishQ;
- break;
- case 1:
- tmpl = InsetQuotes::SwedishQ;
- break;
- case 2:
- tmpl = InsetQuotes::GermanQ;
- break;
- case 3:
- tmpl = InsetQuotes::PolishQ;
- break;
- case 4:
- tmpl = InsetQuotes::FrenchQ;
- break;
- case 5:
- tmpl = InsetQuotes::DanishQ;
- break;
- }
- params.quotes_language = tmpl;
- }
- } else if (token == "\\quotes_times") {
- lex.nextToken();
- switch(lex.GetInteger()) {
- case 1:
- params.quotes_times = InsetQuotes::SingleQ;
+ WriteAlert(_("Textclass Loading Error!"),
+ string(_("Can't load textclass ")) +
+ textclasslist.NameOfClass(params.textclass),
+ _("-- substituting default"));
+ params.textclass = 0;
+ }
+ } else if (token == "\\options") {
+ lex.EatLine();
+ params.options = lex.GetString();
+ } else if (token == "\\language") {
+ params.readLanguage(lex);
+ } else if (token == "\\fontencoding") {
+ lex.EatLine();
+ } else if (token == "\\inputencoding") {
+ lex.EatLine();
+ params.inputenc = lex.GetString();
+ } else if (token == "\\graphics") {
+ params.readGraphicsDriver(lex);
+ } else if (token == "\\fontscheme") {
+ lex.EatLine();
+ params.fonts = lex.GetString();
+ } else if (token == "\\noindent") {
+ par->noindent = true;
+ } else if (token == "\\fill_top") {
+ par->added_space_top = VSpace(VSpace::VFILL);
+ } else if (token == "\\fill_bottom") {
+ par->added_space_bottom = VSpace(VSpace::VFILL);
+ } else if (token == "\\line_top") {
+ par->line_top = true;
+ } else if (token == "\\line_bottom") {
+ par->line_bottom = true;
+ } else if (token == "\\pagebreak_top") {
+ par->pagebreak_top = true;
+ } else if (token == "\\pagebreak_bottom") {
+ par->pagebreak_bottom = true;
+ } else if (token == "\\start_of_appendix") {
+ par->start_of_appendix = true;
+ } else if (token == "\\paragraph_separation") {
+ int tmpret = lex.FindToken(string_paragraph_separation);
+ if (tmpret == -1) ++tmpret;
+ if (tmpret != LYX_LAYOUT_DEFAULT)
+ params.paragraph_separation =
+ static_cast<BufferParams::PARSEP>(tmpret);
+ } else if (token == "\\defskip") {
+ lex.nextToken();
+ params.defskip = VSpace(lex.GetString());
+ } else if (token == "\\epsfig") { // obsolete
+ // Indeed it is obsolete, but we HAVE to be backwards
+ // compatible until 0.14, because otherwise all figures
+ // in existing documents are irretrivably lost. (Asger)
+ params.readGraphicsDriver(lex);
+ } else if (token == "\\quotes_language") {
+ int tmpret = lex.FindToken(string_quotes_language);
+ if (tmpret == -1) ++tmpret;
+ if (tmpret != LYX_LAYOUT_DEFAULT) {
+ InsetQuotes::quote_language tmpl =
+ InsetQuotes::EnglishQ;
+ switch(tmpret) {
+ case 0:
+ tmpl = InsetQuotes::EnglishQ;
break;
- case 2:
- params.quotes_times = InsetQuotes::DoubleQ;
+ case 1:
+ tmpl = InsetQuotes::SwedishQ;
break;
+ case 2:
+ tmpl = InsetQuotes::GermanQ;
+ break;
+ case 3:
+ tmpl = InsetQuotes::PolishQ;
+ break;
+ case 4:
+ tmpl = InsetQuotes::FrenchQ;
+ break;
+ case 5:
+ tmpl = InsetQuotes::DanishQ;
+ break;
}
- } else if (token == "\\papersize") {
-#if 0
- if (format > 2.13)
-#endif
- tmpret = lex.FindToken(string_papersize);
-#if 0
- else
- tmpret = lex.FindToken(string_oldpapersize);
-#endif
- if (tmpret == -1)
- tmpret++;
- else
- params.papersize2 = tmpret;
- } else if (token == "\\paperpackage") {
- tmpret = lex.FindToken(string_paperpackages);
- if (tmpret == -1) {
- tmpret++;
- params.paperpackage = BufferParams::PACKAGE_NONE;
- } else
- params.paperpackage = tmpret;
- } else if (token == "\\use_geometry") {
- lex.nextToken();
- params.use_geometry = lex.GetInteger();
- } else if (token == "\\use_amsmath") {
- lex.nextToken();
- params.use_amsmath = lex.GetInteger();
- } else if (token == "\\paperorientation") {
- tmpret = lex.FindToken(string_orientation);
- if (tmpret == -1) tmpret++;
- if (tmpret != LYX_LAYOUT_DEFAULT)
- params.orientation = static_cast<BufferParams::PAPER_ORIENTATION>(tmpret);
- } else if (token == "\\paperwidth") {
- lex.next();
- params.paperwidth = lex.GetString();
- } else if (token == "\\paperheight") {
- lex.next();
- params.paperheight = lex.GetString();
- } else if (token == "\\leftmargin") {
- lex.next();
- params.leftmargin = lex.GetString();
- } else if (token == "\\topmargin") {
- lex.next();
- params.topmargin = lex.GetString();
- } else if (token == "\\rightmargin") {
- lex.next();
- params.rightmargin = lex.GetString();
- } else if (token == "\\bottommargin") {
- lex.next();
- params.bottommargin = lex.GetString();
- } else if (token == "\\headheight") {
- lex.next();
- params.headheight = lex.GetString();
- } else if (token == "\\headsep") {
- lex.next();
- params.headsep = lex.GetString();
- } else if (token == "\\footskip") {
- lex.next();
- params.footskip = lex.GetString();
- } else if (token == "\\paperfontsize") {
- lex.nextToken();
- params.fontsize = strip(lex.GetString());
- } else if (token == "\\papercolumns") {
- lex.nextToken();
- params.columns = lex.GetInteger();
- } else if (token == "\\papersides") {
- lex.nextToken();
- switch(lex.GetInteger()) {
- default:
- case 1: params.sides = LyXTextClass::OneSide; break;
- case 2: params.sides = LyXTextClass::TwoSides; break;
- }
- } else if (token == "\\paperpagestyle") {
- lex.nextToken();
- params.pagestyle = strip(lex.GetString());
- } else if (token == "\\bullet") {
- lex.nextToken();
- int index = lex.GetInteger();
- lex.nextToken();
- int temp_int = lex.GetInteger();
- params.user_defined_bullets[index].setFont(temp_int);
- params.temp_bullets[index].setFont(temp_int);
- lex.nextToken();
- temp_int = lex.GetInteger();
- params.user_defined_bullets[index].setCharacter(temp_int);
- params.temp_bullets[index].setCharacter(temp_int);
- lex.nextToken();
- temp_int = lex.GetInteger();
- params.user_defined_bullets[index].setSize(temp_int);
- params.temp_bullets[index].setSize(temp_int);
- lex.nextToken();
- string temp_str = lex.GetString();
- if (temp_str != "\\end_bullet") {
+ params.quotes_language = tmpl;
+ }
+ } else if (token == "\\quotes_times") {
+ lex.nextToken();
+ switch(lex.GetInteger()) {
+ case 1:
+ params.quotes_times = InsetQuotes::SingleQ;
+ break;
+ case 2:
+ params.quotes_times = InsetQuotes::DoubleQ;
+ break;
+ }
+ } else if (token == "\\papersize") {
+ int tmpret = lex.FindToken(string_papersize);
+ if (tmpret == -1)
+ ++tmpret;
+ else
+ params.papersize2 = tmpret;
+ } else if (token == "\\paperpackage") {
+ int tmpret = lex.FindToken(string_paperpackages);
+ if (tmpret == -1) {
+ ++tmpret;
+ params.paperpackage = BufferParams::PACKAGE_NONE;
+ } else
+ params.paperpackage = tmpret;
+ } else if (token == "\\use_geometry") {
+ lex.nextToken();
+ params.use_geometry = lex.GetInteger();
+ } else if (token == "\\use_amsmath") {
+ lex.nextToken();
+ params.use_amsmath = lex.GetInteger();
+ } else if (token == "\\paperorientation") {
+ int tmpret = lex.FindToken(string_orientation);
+ if (tmpret == -1) ++tmpret;
+ if (tmpret != LYX_LAYOUT_DEFAULT)
+ params.orientation = static_cast<BufferParams::PAPER_ORIENTATION>(tmpret);
+ } else if (token == "\\paperwidth") {
+ lex.next();
+ params.paperwidth = lex.GetString();
+ } else if (token == "\\paperheight") {
+ lex.next();
+ params.paperheight = lex.GetString();
+ } else if (token == "\\leftmargin") {
+ lex.next();
+ params.leftmargin = lex.GetString();
+ } else if (token == "\\topmargin") {
+ lex.next();
+ params.topmargin = lex.GetString();
+ } else if (token == "\\rightmargin") {
+ lex.next();
+ params.rightmargin = lex.GetString();
+ } else if (token == "\\bottommargin") {
+ lex.next();
+ params.bottommargin = lex.GetString();
+ } else if (token == "\\headheight") {
+ lex.next();
+ params.headheight = lex.GetString();
+ } else if (token == "\\headsep") {
+ lex.next();
+ params.headsep = lex.GetString();
+ } else if (token == "\\footskip") {
+ lex.next();
+ params.footskip = lex.GetString();
+ } else if (token == "\\paperfontsize") {
+ lex.nextToken();
+ params.fontsize = strip(lex.GetString());
+ } else if (token == "\\papercolumns") {
+ lex.nextToken();
+ params.columns = lex.GetInteger();
+ } else if (token == "\\papersides") {
+ lex.nextToken();
+ switch(lex.GetInteger()) {
+ default:
+ case 1: params.sides = LyXTextClass::OneSide; break;
+ case 2: params.sides = LyXTextClass::TwoSides; break;
+ }
+ } else if (token == "\\paperpagestyle") {
+ lex.nextToken();
+ params.pagestyle = strip(lex.GetString());
+ } else if (token == "\\bullet") {
+ lex.nextToken();
+ int index = lex.GetInteger();
+ lex.nextToken();
+ int temp_int = lex.GetInteger();
+ params.user_defined_bullets[index].setFont(temp_int);
+ params.temp_bullets[index].setFont(temp_int);
+ lex.nextToken();
+ temp_int = lex.GetInteger();
+ params.user_defined_bullets[index].setCharacter(temp_int);
+ params.temp_bullets[index].setCharacter(temp_int);
+ lex.nextToken();
+ temp_int = lex.GetInteger();
+ params.user_defined_bullets[index].setSize(temp_int);
+ params.temp_bullets[index].setSize(temp_int);
+ lex.nextToken();
+ string temp_str = lex.GetString();
+ if (temp_str != "\\end_bullet") {
// this element isn't really necessary for
// parsing but is easier for humans
// to understand bullets. Put it back and
// set a debug message?
- lex.printError("\\end_bullet expected, got" + temp_str);
+ lex.printError("\\end_bullet expected, got" + temp_str);
//how can I put it back?
- }
- } else if (token == "\\bulletLaTeX") {
- lex.nextToken();
- int index = lex.GetInteger();
- lex.next();
- string temp_str = lex.GetString(), sum_str;
- while (temp_str != "\\end_bullet") {
+ }
+ } else if (token == "\\bulletLaTeX") {
+ lex.nextToken();
+ int index = lex.GetInteger();
+ lex.next();
+ string temp_str = lex.GetString(), sum_str;
+ while (temp_str != "\\end_bullet") {
// this loop structure is needed when user
// enters an empty string since the first
// thing returned will be the \\end_bullet
// OR
// if the LaTeX entry has spaces. Each element
// therefore needs to be read in turn
- sum_str += temp_str;
- lex.next();
- temp_str = lex.GetString();
- }
- params.user_defined_bullets[index].setText(sum_str);
- params.temp_bullets[index].setText(sum_str);
- } else if (token == "\\secnumdepth") {
- lex.nextToken();
- params.secnumdepth = lex.GetInteger();
- } else if (token == "\\tocdepth") {
- lex.nextToken();
- params.tocdepth = lex.GetInteger();
- } else if (token == "\\baselinestretch") { // obsolete
- lex.nextToken(); // should not be used directly
- // anymore.
- // Will probably keep a kind of support just for
- // compability.
- params.spacing.set(Spacing::Other, lex.GetFloat());
- } else if (token == "\\spacing") {
- lex.next();
- string tmp = strip(lex.GetString());
- if (tmp == "single") {
- params.spacing.set(Spacing::Single);
- } else if (tmp == "onehalf") {
- params.spacing.set(Spacing::Onehalf);
- } else if (tmp == "double") {
- params.spacing.set(Spacing::Double);
- } else if (tmp == "other") {
- lex.next();
- params.spacing.set(Spacing::Other,
- lex.GetFloat());
- } else {
- lex.printError("Unknown spacing token: '$$Token'");
- }
- } else if (token == "\\float_placement") {
- lex.nextToken();
- params.float_placement = lex.GetString();
- } else if (token == "\\cursor") { // obsolete
- // this is obsolete, so we just skip it.
- lex.nextToken();
- } else if (token == "\\family") {
- lex.next();
- font.setLyXFamily(lex.GetString());
- } else if (token == "\\series") {
+ sum_str += temp_str;
lex.next();
- font.setLyXSeries(lex.GetString());
- } else if (token == "\\shape") {
- lex.next();
- font.setLyXShape(lex.GetString());
- } else if (token == "\\size") {
- lex.next();
- font.setLyXSize(lex.GetString());
- } else if (token == "\\latex") {
- lex.next();
- string tok = lex.GetString();
- // This is dirty, but gone with LyX3. (Asger)
- if (tok == "no_latex")
- font.setLatex(LyXFont::OFF);
- else if (tok == "latex")
- font.setLatex(LyXFont::ON);
- else if (tok == "default")
- font.setLatex(LyXFont::INHERIT);
- else
- lex.printError("Unknown LaTeX font flag "
- "`$$Token'");
- } else if (token == "\\emph") {
- lex.next();
- font.setEmph(font.setLyXMisc(lex.GetString()));
- } else if (token == "\\bar") {
- lex.next();
- string tok = lex.GetString();
- // This is dirty, but gone with LyX3. (Asger)
- if (tok == "under")
- font.setUnderbar(LyXFont::ON);
- else if (tok == "no")
- font.setUnderbar(LyXFont::OFF);
- else if (tok == "default")
- font.setUnderbar(LyXFont::INHERIT);
- else
- lex.printError("Unknown bar font flag "
- "`$$Token'");
- } else if (token == "\\noun") {
- lex.next();
- font.setNoun(font.setLyXMisc(lex.GetString()));
- } else if (token == "\\color") {
+ temp_str = lex.GetString();
+ }
+ params.user_defined_bullets[index].setText(sum_str);
+ params.temp_bullets[index].setText(sum_str);
+ } else if (token == "\\secnumdepth") {
+ lex.nextToken();
+ params.secnumdepth = lex.GetInteger();
+ } else if (token == "\\tocdepth") {
+ lex.nextToken();
+ params.tocdepth = lex.GetInteger();
+ } else if (token == "\\spacing") {
+ lex.next();
+ string tmp = strip(lex.GetString());
+ Spacing::Space tmp_space = Spacing::Default;
+ float tmp_val = 0.0;
+ if (tmp == "single") {
+ tmp_space = Spacing::Single;
+ } else if (tmp == "onehalf") {
+ tmp_space = Spacing::Onehalf;
+ } else if (tmp == "double") {
+ tmp_space = Spacing::Double;
+ } else if (tmp == "other") {
lex.next();
- font.setLyXColor(lex.GetString());
- } else if (token == "\\align") {
- tmpret = lex.FindToken(string_align);
- if (tmpret == -1) tmpret++;
- if (tmpret != LYX_LAYOUT_DEFAULT) { // tmpret != 99 ???
- tmpret2 = 1;
- for (; tmpret > 0; --tmpret)
- tmpret2 = tmpret2 * 2;
- par->align = LyXAlignment(tmpret2);
- }
- } else if (token == "\\added_space_top") {
- lex.nextToken();
- par->added_space_top = lex.GetString();
- } else if (token == "\\added_space_bottom") {
- lex.nextToken();
- par->added_space_bottom = lex.GetString();
- } else if (token == "\\pextra_type") {
- lex.nextToken();
- par->pextra_type = lex.GetInteger();
- } else if (token == "\\pextra_width") {
- lex.nextToken();
- par->pextra_width = lex.GetString();
- } else if (token == "\\pextra_widthp") {
- lex.nextToken();
- par->pextra_widthp = lex.GetString();
- } else if (token == "\\pextra_alignment") {
- lex.nextToken();
- par->pextra_alignment = lex.GetInteger();
- } else if (token == "\\pextra_hfill") {
- lex.nextToken();
- par->pextra_hfill = lex.GetInteger();
- } else if (token == "\\pextra_start_minipage") {
- lex.nextToken();
- par->pextra_start_minipage = lex.GetInteger();
- } else if (token == "\\labelwidthstring") {
- lex.EatLine();
- par->labelwidthstring = lex.GetString();
- /* do not delete this token, it is still needed! */
- } else if (token == "\\end_inset") {
- /* simple ignore this. The insets do not have
- * to read this */
- // but insets should read it, it is a part of
- //the inset isn't it? Lgb.
- } else if (token == "\\begin_inset") {
+ tmp_space = Spacing::Other;
+ tmp_val = lex.GetFloat();
+ } else {
+ lex.printError("Unknown spacing token: '$$Token'");
+ }
+ // Small hack so that files written with klyx will be
+ // parsed correctly.
+ if (return_par) {
+ par->spacing.set(tmp_space, tmp_val);
+ } else {
+ params.spacing.set(tmp_space, tmp_val);
+ }
+ } else if (token == "\\paragraph_spacing") {
+ lex.next();
+ string tmp = strip(lex.GetString());
+ if (tmp == "single") {
+ par->spacing.set(Spacing::Single);
+ } else if (tmp == "onehalf") {
+ par->spacing.set(Spacing::Onehalf);
+ } else if (tmp == "double") {
+ par->spacing.set(Spacing::Double);
+ } else if (tmp == "other") {
lex.next();
- tmptok = lex.GetString();
- /* test the different insets */
- if (tmptok == "Quotes") {
- inset = new InsetQuotes;
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- pos++;
-#if 0 // should not be used any more
- } else if (tmptok == "Latex") {
- // This one is on its way out
- lex.EatLine();
- tmptok = strip(lex.GetString());
- //lyxerr <<string(tmptok[0]));
- if (tmptok[0] == '\\') {
- // then this latex is a
- // latex command
- InsetCommand *tmpinset =
- new InsetCommand();
- tmpinset->scanCommand(tmptok);
- inset = tmpinset;
+ par->spacing.set(Spacing::Other,
+ lex.GetFloat());
+ } else {
+ lex.printError("Unknown spacing token: '$$Token'");
+ }
+ } else if (token == "\\float_placement") {
+ lex.nextToken();
+ params.float_placement = lex.GetString();
+ } else if (token == "\\family") {
+ lex.next();
+ font.setLyXFamily(lex.GetString());
+ } else if (token == "\\series") {
+ lex.next();
+ font.setLyXSeries(lex.GetString());
+ } else if (token == "\\shape") {
+ lex.next();
+ font.setLyXShape(lex.GetString());
+ } else if (token == "\\size") {
+ lex.next();
+ font.setLyXSize(lex.GetString());
+ } else if (token == "\\latex") {
+ lex.next();
+ string tok = lex.GetString();
+ // This is dirty, but gone with LyX3. (Asger)
+ if (tok == "no_latex")
+ font.setLatex(LyXFont::OFF);
+ else if (tok == "latex")
+ font.setLatex(LyXFont::ON);
+ else if (tok == "default")
+ font.setLatex(LyXFont::INHERIT);
+ else
+ lex.printError("Unknown LaTeX font flag "
+ "`$$Token'");
+ } else if (token == "\\lang") {
+ lex.next();
+ string tok = lex.GetString();
+ Languages::iterator lit = languages.find(tok);
+ if (lit != languages.end()) {
+ font.setLanguage(&(*lit).second);
+ } else {
+ font.setLanguage(params.language_info);
+ lex.printError("Unknown language `$$Token'");
+ }
+ } else if (token == "\\emph") {
+ lex.next();
+ font.setEmph(font.setLyXMisc(lex.GetString()));
+ } else if (token == "\\bar") {
+ lex.next();
+ string tok = lex.GetString();
+ // This is dirty, but gone with LyX3. (Asger)
+ if (tok == "under")
+ font.setUnderbar(LyXFont::ON);
+ else if (tok == "no")
+ font.setUnderbar(LyXFont::OFF);
+ else if (tok == "default")
+ font.setUnderbar(LyXFont::INHERIT);
+ else
+ lex.printError("Unknown bar font flag "
+ "`$$Token'");
+ } else if (token == "\\noun") {
+ lex.next();
+ font.setNoun(font.setLyXMisc(lex.GetString()));
+ } else if (token == "\\color") {
+ lex.next();
+ font.setLyXColor(lex.GetString());
+ } else if (token == "\\align") {
+ int tmpret = lex.FindToken(string_align);
+ if (tmpret == -1) ++tmpret;
+ if (tmpret != LYX_LAYOUT_DEFAULT) { // tmpret != 99 ???
+ int tmpret2 = 1;
+ for (; tmpret > 0; --tmpret)
+ tmpret2 = tmpret2 * 2;
+ par->align = LyXAlignment(tmpret2);
+ }
+ } else if (token == "\\added_space_top") {
+ lex.nextToken();
+ par->added_space_top = VSpace(lex.GetString());
+ } else if (token == "\\added_space_bottom") {
+ lex.nextToken();
+ par->added_space_bottom = VSpace(lex.GetString());
+ } else if (token == "\\pextra_type") {
+ lex.nextToken();
+ par->pextra_type = lex.GetInteger();
+ } else if (token == "\\pextra_width") {
+ lex.nextToken();
+ par->pextra_width = lex.GetString();
+ } else if (token == "\\pextra_widthp") {
+ lex.nextToken();
+ par->pextra_widthp = lex.GetString();
+ } else if (token == "\\pextra_alignment") {
+ lex.nextToken();
+ par->pextra_alignment = lex.GetInteger();
+ } else if (token == "\\pextra_hfill") {
+ lex.nextToken();
+ par->pextra_hfill = lex.GetInteger();
+ } else if (token == "\\pextra_start_minipage") {
+ lex.nextToken();
+ par->pextra_start_minipage = lex.GetInteger();
+ } else if (token == "\\labelwidthstring") {
+ lex.EatLine();
+ par->labelwidthstring = lex.GetString();
+ // do not delete this token, it is still needed!
+ } else if (token == "\\end_inset") {
+ lyxerr << "Solitary \\end_inset. Missing \\begin_inset?.\n"
+ << "Last inset read was: " << last_inset_read
+ << endl;
+ // Simply ignore this. The insets do not have
+ // to read this.
+ // But insets should read it, it is a part of
+ // the inset isn't it? Lgb.
+ } else if (token == "\\begin_inset") {
+ readInset(lex, par, pos, font);
+ } else if (token == "\\SpecialChar") {
+ LyXLayout const & layout =
+ textclasslist.Style(params.textclass,
+ par->GetLayout());
+
+ // Insets don't make sense in a free-spacing context! ---Kayvan
+ if (layout.free_spacing) {
+ if (lex.IsOK()) {
+ lex.next();
+ string next_token = lex.GetString();
+ if (next_token == "\\-") {
+ par->InsertChar(pos, '-', font);
+ } else if (next_token == "\\protected_separator"
+ || next_token == "~") {
+ par->InsertChar(pos, ' ', font);
} else {
- // This should not use InsetLaTexDel
- // it should rather insert text into
- // the paragraph and mark it as tex.
- inset = new InsetLatex(tmptok);
- }
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- pos++;
-#endif
-#if 0 // should not be used any more
- } else if (tmptok == "LatexDel") {
- // This one is on its way out...
- lex.EatLine();
- tmptok = strip(lex.GetString());
- //lyxerr <<string(tmptok[0]));
- if (tmptok == "\\tableofcontents") {
- inset = new InsetTOC(this);
- } else if (tmptok == "\\listoffigures") {
- inset = new InsetLOF(this);
- } else if (tmptok == "\\listoftables") {
- inset = new InsetLOT(this);
- } else if (tmptok == "\\listofalgorithms") {
- inset = new InsetLOA(this);
- } else if (contains(tmptok, "\\ref{")
- || contains(tmptok, "\\pageref{")) {
- inset = new InsetRef(tmptok, this);
- } else if (contains(tmptok, "\\url{")
- || contains(tmptok, "\\htmlurl{")) {
- string cont, opt, tmptmptok, cmdname;
- lex.next();
- while(lex.IsOK() && lex.GetString() != "\\end_inset" ) {
- lex.next();
- }
- lex.next();
- while(lex.IsOK()) {
- tmptmptok = lex.GetString();
- if(tmptmptok[0] == '\\') {
- if( tmptmptok == "\\backslash")
- opt += '\\';
- else
- break;
- }
- else
- opt += tmptmptok;
- opt += ' ';
- lex.next();
- }
- while(lex.IsOK() && lex.GetString() != "\\end_inset" ) {
- lex.next();
- }
- lex.next();
- while(lex.IsOK()) {
- tmptmptok = lex.GetString();
- if(tmptmptok[0] == '\\') {
- if( tmptmptok == "\\backslash")
- cont += '\\';
- else
- break;
- }
- else
- cont += tmptmptok;
- cont += ' ';
- lex.next();
- }
- while(lex.IsOK() && lex.GetString() != "\\end_inset" ) {
- lex.next();
- }
- if(contains(tmptok, "\\url{"))
- cmdname = string("url");
- else
- cmdname = string("htmlurl");
- cont = strip(cont);
- opt = strip(opt);
- inset = new InsetUrl(cmdname, cont, opt);
- } else if (tmptok[0] == '\\') {
- // then this latex del is a
- // latex command
- InsetCommand * tmpinset =
- new InsetCommand();
- tmpinset->scanCommand(tmptok);
- inset = tmpinset;
- }
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- pos++;
-#endif
- } else if (tmptok == "\\i") {
- inset = new InsetLatexAccent;
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- pos++;
- } else if (tmptok == "FormulaMacro") {
- inset = new InsetFormulaMacro;
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- pos++;
- } else if (tmptok == "Formula") {
- inset = new InsetFormula;
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- pos++;
- } else if (tmptok == "Figure") {
- inset = new InsetFig(100, 100, this);
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- pos++;
-#if 0
- } else if (tmptok == "Label") {
- // Kept for compability. Remove in 0.13.
- if (lex.EatLine()) {
- string tmp = "\\label{";
- tmp += lex.GetString();
- tmp += '}';
- inset = new InsetLabel(tmp);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- pos++;
- }
-#endif
- } else if (tmptok == "Info") {
- inset = new InsetInfo;
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- pos++;
- } else if (tmptok == "Include") {
- inset = new InsetInclude(string(), this);
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- pos++;
- } else if (tmptok == "LatexCommand") {
- InsetCommand inscmd;
- inscmd.Read(lex);
- if (inscmd.getCmdName() == "cite") {
- inset = new InsetCitation(inscmd.getContents(), inscmd.getOptions());
- } else if (inscmd.getCmdName() == "bibitem") {
- lex.printError("Wrong place for bibitem");
- inset = inscmd.Clone();
- } else if (inscmd.getCmdName() == "BibTeX") {
- inset = new InsetBibtex(inscmd.getContents(), inscmd.getOptions(), this);
- } else if (inscmd.getCmdName() == "index") {
- inset = new InsetIndex(inscmd.getContents());
- } else if (inscmd.getCmdName() == "include") {
- inset = new InsetInclude(inscmd.getContents(), this);
- } else if (inscmd.getCmdName() == "label") {
- inset = new InsetLabel(inscmd.getCommand());
- } else if (inscmd.getCmdName() == "url"
- || inscmd.getCmdName() == "htmlurl") {
- inset = new InsetUrl(inscmd.getCommand());
- } else if (inscmd.getCmdName() == "ref"
- || inscmd.getCmdName() == "pageref") {
- if (!inscmd.getOptions().empty() || !inscmd.getContents().empty()) {
- inset = new InsetRef(inscmd, this);
- }
- // This condition comes from a
- // temporary solution to the latexdel
- // ref inset that was transformed to
- // an empty ref inset plus the body
- // surronded by latexdel insets
- else {
- string cont, opt, tmptmptok, cmdname;
- lex.next();
- while(lex.IsOK() && lex.GetString() != "\\end_inset" ) {
- lex.next();
- }
- lex.next();
- while(lex.IsOK()) {
- tmptmptok = lex.GetString();
- if(tmptmptok[0] == '\\') {
- if( tmptmptok == "\\backslash")
- opt += '\\';
- else
- break;
- }
- else
- opt += tmptmptok;
- opt += ' ';
- lex.next();
- }
- while(lex.IsOK() && lex.GetString() != "\\end_inset" ) {
- lex.next();
- }
- lex.next();
- while(lex.IsOK()) {
- tmptmptok = lex.GetString();
- if(tmptmptok[0] == '\\') {
- if( tmptmptok == "\\backslash")
- cont += '\\';
- else
- break;
- }
- else
- cont += tmptmptok;
- cont += ' ';
- lex.next();
- }
- while(lex.IsOK() && lex.GetString() != "\\end_inset" ) {
- lex.next();
- }
-
- cont = strip(cont);
- opt = strip(opt);
- cmdname = "\\" + inscmd.getCmdName();
- cmdname += "[" + cont + "]";
- cmdname += "{" + opt + "}";
- inset = new InsetRef(cmdname, this);
- }
- } else if (inscmd.getCmdName() == "tableofcontents") {
- inset = new InsetTOC(this);
- } else if (inscmd.getCmdName() == "listoffigures") {
- inset = new InsetLOF(this);
- } else if (inscmd.getCmdName() == "listofalgorithms") {
- inset = new InsetLOA(this);
- } else if (inscmd.getCmdName() == "listoftables") {
- inset = new InsetLOT(this);
- } else if (inscmd.getCmdName() == "printindex") {
- inset = new InsetPrintIndex(this);
- } else if (inscmd.getCmdName() == "lyxparent") {
- inset = new InsetParent(inscmd.getContents(), this);
- }
-#if 0
- // Do we need this at all now?
- else
- // The following three are only for compatibility
- if (inscmd.getCmdName() == "-") {
- inset = new InsetSpecialChar(InsetSpecialChar::HYPHENATION);
- } else if (inscmd.getCmdName() == "@.") {
- inset = new InsetSpecialChar(InsetSpecialChar::END_OF_SENTENCE);
- } else if (inscmd.getCmdName() == "ldots") {
- inset = new InsetSpecialChar(InsetSpecialChar::LDOTS);
- } else
- inset = inscmd.Clone();
-#endif
-
- if (inset) {
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- ++pos;
+ lex.printError("Token `$$Token' "
+ "is in free space "
+ "paragraph layout!");
+ --pos;
}
}
- } else if (token == "\\InsetQuotes") {
- inset = new InsetQuotes;
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- ++pos;
-#if 0
- } else if (token == "\\InsetLatex") {
- inset = new InsetLatex;
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- ++pos;
- } else if (token == "\\InsetLatexDel") {
- lex.printError(_("Warning: Ignoring Old Inset"));
+ } else {
+ Inset * inset = new InsetSpecialChar;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ }
+ ++pos;
+ } else if (token == "\\newline") {
+ par->InsertChar(pos, LyXParagraph::META_NEWLINE, font);
+ ++pos;
+ } else if (token == "\\LyXTable") {
+#ifdef NEW_TABULAR
+ Inset * inset = new InsetTabular(this);
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+#else
+ par->table = new LyXTable(lex);
#endif
- } else if (token == "\\InsetFormula") {
- inset = new InsetFormula;
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- ++pos;
- } else if (token == "\\SpecialChar") {
- inset = new InsetSpecialChar;
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- ++pos;
- } else if (token == "\\Figure") {
- inset = new InsetFig(100, 100, this);
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
- ++pos;
- } else if (token == "\\newline") {
- par->InsertChar(pos, LyXParagraph::META_NEWLINE);
- par->SetFont(pos, font);
- ++pos;
- } else if (token == "\\LyXTable") {
- par->table = new LyXTable(lex);
- } else if (token == "\\hfill") {
- par->InsertChar(pos, LyXParagraph::META_HFILL);
- par->SetFont(pos, font);
- ++pos;
- } else if (token == "\\protected_separator") {
- par->InsertChar(pos, LyXParagraph::META_PROTECTED_SEPARATOR);
- par->SetFont(pos, font);
- ++pos;
- } else if (token == "\\bibitem") { // ale970302
- if (!par->bibkey)
- par->bibkey = new InsetBibKey;
- par->bibkey->Read(lex);
- }else if (token == "\\backslash") {
- par->InsertChar(pos, '\\');
- par->SetFont(pos, font);
- ++pos;
- }else if (token == "\\the_end") {
- the_end_read = true;
+ } else if (token == "\\hfill") {
+ par->InsertChar(pos, LyXParagraph::META_HFILL, font);
+ ++pos;
+ } else if (token == "\\protected_separator") { // obsolete
+ // This is a backward compability thingie. (Lgb)
+ // Remove it later some time...introduced with fileformat
+ // 2.16. (Lgb)
+ LyXLayout const & layout =
+ textclasslist.Style(params.textclass,
+ par->GetLayout());
+
+ if (layout.free_spacing) {
+ par->InsertChar(pos, ' ', font);
} else {
- // This should be insurance for the future: (Asger)
- lex.printError("Unknown token `$$Token'. "
- "Inserting as text.");
- int n = token.length();
- for (int i = 0; i < n; ++i) {
- par->InsertChar(pos, token[i]);
- par->SetFont(pos, font);
- ++pos;
- }
+ Inset * inset = new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
+ par->InsertInset(pos, inset, font);
+ }
+ ++pos;
+ } else if (token == "\\bibitem") { // ale970302
+ if (!par->bibkey) {
+ InsetCommandParams p( "bibitem" );
+ par->bibkey = new InsetBibKey(p);
+ }
+ par->bibkey->Read(this, lex);
+ } else if (token == "\\backslash") {
+ par->InsertChar(pos, '\\', font);
+ ++pos;
+ } else if (token == "\\the_end") {
+ the_end_read = true;
+ } else {
+ // This should be insurance for the future: (Asger)
+ lex.printError("Unknown token `$$Token'. "
+ "Inserting as text.");
+ string::const_iterator cit = token.begin();
+ string::const_iterator end = token.end();
+ for(; cit != end; ++cit) {
+ par->InsertChar(pos, (*cit), font);
+ ++pos;
}
}
-
- if (!return_par)
- return_par = par;
+ return the_end_read;
+}
- paragraph = return_par;
+
+void Buffer::readInset(LyXLex & lex, LyXParagraph *& par,
+ int & pos, LyXFont & font)
+{
+ // consistency check
+ if (lex.GetString() != "\\begin_inset") {
+ lyxerr << "Buffer::readInset: Consistency check failed."
+ << endl;
+ }
- return the_end_read;
+ lex.next();
+ string tmptok = lex.GetString();
+ last_inset_read = tmptok;
+ // test the different insets
+ if (tmptok == "Quotes") {
+ Inset * inset = new InsetQuotes;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "External") {
+ Inset * inset = new InsetExternal;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "FormulaMacro") {
+ Inset * inset = new InsetFormulaMacro;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "Formula") {
+ Inset * inset = new InsetFormula;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "Figure") {
+ Inset * inset = new InsetFig(100, 100, this);
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "Info") {
+ Inset * inset = new InsetInfo;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "Include") {
+ InsetCommandParams p( "Include" );
+ Inset * inset = new InsetInclude(p, this);
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "ERT") {
+ Inset * inset = new InsetERT;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "Tabular") {
+ Inset * inset = new InsetTabular(this);
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "Text") {
+ Inset * inset = new InsetText;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "Foot") {
+ Inset * inset = new InsetFoot;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "Marginal") {
+ Inset * inset = new InsetMarginal;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "Minipage") {
+ Inset * inset = new InsetMinipage;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "Float") {
+ lex.next();
+ string tmptok = lex.GetString();
+ Inset * inset = new InsetFloat(tmptok);
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "List") {
+ Inset * inset = new InsetList;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "Theorem") {
+ Inset * inset = new InsetList;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "Caption") {
+ Inset * inset = new InsetCaption;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "GRAPHICS") {
+ Inset * inset = new InsetGraphics;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ } else if (tmptok == "LatexCommand") {
+ InsetCommandParams inscmd;
+ inscmd.Read(lex);
+ Inset * inset = 0;
+ if (inscmd.getCmdName() == "cite") {
+ inset = new InsetCitation(inscmd);
+ } else if (inscmd.getCmdName() == "bibitem") {
+ lex.printError("Wrong place for bibitem");
+ inset = new InsetBibKey(inscmd);
+ } else if (inscmd.getCmdName() == "BibTeX") {
+ inset = new InsetBibtex(inscmd, this);
+ } else if (inscmd.getCmdName() == "index") {
+ inset = new InsetIndex(inscmd);
+ } else if (inscmd.getCmdName() == "include") {
+ inset = new InsetInclude(inscmd, this);
+ } else if (inscmd.getCmdName() == "label") {
+ inset = new InsetLabel(inscmd);
+ } else if (inscmd.getCmdName() == "url"
+ || inscmd.getCmdName() == "htmlurl") {
+ inset = new InsetUrl(inscmd);
+ } else if (inscmd.getCmdName() == "ref"
+ || inscmd.getCmdName() == "pageref"
+ || inscmd.getCmdName() == "vref"
+ || inscmd.getCmdName() == "vpageref"
+ || inscmd.getCmdName() == "prettyref") {
+ if (!inscmd.getOptions().empty()
+ || !inscmd.getContents().empty()) {
+ inset = new InsetRef(inscmd);
+ }
+ } else if (inscmd.getCmdName() == "tableofcontents"
+ || inscmd.getCmdName() == "listofalgorithms"
+ || inscmd.getCmdName() == "listoffigures"
+ || inscmd.getCmdName() == "listoftables") {
+ inset = new InsetTOC(inscmd);
+ } else if (inscmd.getCmdName() == "printindex") {
+ inset = new InsetPrintIndex(inscmd);
+ } else if (inscmd.getCmdName() == "lyxparent") {
+ inset = new InsetParent(inscmd, this);
+ }
+
+ if (inset) {
+ par->InsertInset(pos, inset, font);
+ ++pos;
+ }
+ }
}
bool Buffer::readFile(LyXLex & lex, LyXParagraph * par)
{
- string token;
-
if (lex.IsOK()) {
lex.next();
- token = lex.GetString();
+ string token(lex.GetString());
if (token == "\\lyxformat") { // the first token _must_ be...
lex.next();
format = lex.GetFloat();
// Formats >= 2.13 support "\the_end" marker
if (format < 2.13)
the_end = true;
-#if 0
- // Formats >= 2.14 changed papersize stuff
- if (format < 2.14) {
- setOldPaperStuff();
- } else {
-#endif
- setPaperStuff();
-#if 0
- }
-#endif
+
+ setPaperStuff();
+
if (!the_end)
WriteAlert(_("Warning!"),
_("Reading of document is not complete"),
}
+
+// Should probably be moved to somewhere else: BufferView? LyXView?
+bool Buffer::save() const
+{
+ // We don't need autosaves in the immediate future. (Asger)
+ resetAutosaveTimers();
+
+ // make a backup
+ string s;
+ if (lyxrc.make_backup) {
+ s = fileName() + '~';
+ if (!lyxrc.backupdir_path.empty())
+ s = AddName(lyxrc.backupdir_path,
+ subst(CleanupPath(s),'/','!'));
+
+ // Rename is the wrong way of making a backup,
+ // this is the correct way.
+ /* truss cp fil fil2:
+ lstat("LyXVC3.lyx", 0xEFFFF898) Err#2 ENOENT
+ stat("LyXVC.lyx", 0xEFFFF688) = 0
+ open("LyXVC.lyx", O_RDONLY) = 3
+ open("LyXVC3.lyx", O_WRONLY|O_CREAT|O_TRUNC, 0600) = 4
+ fstat(4, 0xEFFFF508) = 0
+ fstat(3, 0xEFFFF508) = 0
+ read(3, " # T h i s f i l e w".., 8192) = 5579
+ write(4, " # T h i s f i l e w".., 5579) = 5579
+ read(3, 0xEFFFD4A0, 8192) = 0
+ close(4) = 0
+ close(3) = 0
+ chmod("LyXVC3.lyx", 0100644) = 0
+ lseek(0, 0, SEEK_CUR) = 46440
+ _exit(0)
+ */
+
+ // Should proabaly have some more error checking here.
+ // Should be cleaned up in 0.13, at least a bit.
+ // Doing it this way, also makes the inodes stay the same.
+ // This is still not a very good solution, in particular we
+ // might loose the owner of the backup.
+ FileInfo finfo(fileName());
+ if (finfo.exist()) {
+ mode_t fmode = finfo.getMode();
+ struct utimbuf times = {
+ finfo.getAccessTime(),
+ finfo.getModificationTime() };
+
+ ifstream ifs(fileName().c_str());
+ ofstream ofs(s.c_str(), ios::out|ios::trunc);
+ if (ifs && ofs) {
+ ofs << ifs.rdbuf();
+ ifs.close();
+ ofs.close();
+ ::chmod(s.c_str(), fmode);
+
+ if (::utime(s.c_str(), ×)) {
+ lyxerr << "utime error." << endl;
+ }
+ } else {
+ lyxerr << "LyX was not able to make "
+ "backupcopy. Beware." << endl;
+ }
+ }
+ }
+
+ if (writeFile(fileName(), false)) {
+ markLyxClean();
+ removeAutosaveFile(fileName());
+ } else {
+ // Saving failed, so backup is not backup
+ if (lyxrc.make_backup) {
+ ::rename(s.c_str(), fileName().c_str());
+ }
+ return false;
+ }
+ return true;
+}
+
+
// Returns false if unsuccesful
-bool Buffer::writeFile(string const & fname, bool flag)
+bool Buffer::writeFile(string const & fname, bool flag) const
{
// if flag is false writeFile will not create any GUI
// warnings, only cerr.
// this will write out all the paragraphs
// using recursive descent.
- paragraph->writeFile(ofs, params, footnoteflag, depth);
+ paragraph->writeFile(this, ofs, params, footnoteflag, depth);
// Write marker that shows file is complete
ofs << "\n\\the_end" << endl;
char c, footnoteflag = 0, depth = 0;
string tmp;
LyXParagraph::size_type i;
- int j, h, ltype = 0, ltype_depth = 0,
- * clen = 0, actcell = 0, actpos = 0, cell = 0, cells = 0,
- currlinelen = 0;
+ int j;
+ int ltype = 0;
+ int ltype_depth = 0;
+ int actcell = 0;
+ int actpos = 0;
+#ifndef NEW_TABULAR
+ int h;
+ int * clen = 0;
+ int cell = 0;
+ int cells = 0;
+#endif
+ int currlinelen = 0;
long fpos = 0;
bool ref_printed = false;
while (par) {
int noparbreak = 0;
int islatex = 0;
- if (par->footnoteflag != LyXParagraph::NO_FOOTNOTE ||
- !par->previous ||
- par->previous->footnoteflag == LyXParagraph::NO_FOOTNOTE){
-
+ if (
+#ifndef NEW_INSETS
+ par->footnoteflag != LyXParagraph::NO_FOOTNOTE ||
+#endif
+ !par->previous
+#ifndef NEW_INSETS
+ || par->previous->footnoteflag == LyXParagraph::NO_FOOTNOTE
+#endif
+ ){
+
+#ifndef NEW_INSETS
/* begins a footnote environment ? */
if (footnoteflag != par->footnoteflag) {
footnoteflag = par->footnoteflag;
currlinelen += j;
}
}
+#endif
/* begins or ends a deeper area ?*/
if (depth != par->depth) {
if (par->depth > depth) {
while (par->depth > depth) {
- depth++;
+ ++depth;
}
}
else {
while (par->depth < depth) {
- depth--;
+ --depth;
}
}
}
/* noindent ? */
/* what about the alignment */
- }
- else {
+ } else {
+#ifndef NEW_INSETS
/* dummy layout, that means a footnote ended */
footnoteflag = LyXParagraph::NO_FOOTNOTE;
ofs << ") ";
noparbreak = 1;
+#else
+ lyxerr << "Should this ever happen?" << endl;
+#endif
}
+ //LyXLayout const & layout =
+ // textclasslist.Style(params.textclass,
+ // par->GetLayout()); // unused
+ //bool free_spc = layout.free_spacing; //unused
+
+#ifndef NEW_TABULAR
/* It might be a table */
if (par->table){
-#if 0
- if (!lyxrc->ascii_roff_command.empty() &&
- lyxrc->ascii_roff_command != "none") {
- RoffAsciiTable(ofs, par);
- par = par->next;
- continue;
- }
-#endif
cell = 1;
actcell = 0;
cells = par->table->columns;
clen = new int [cells];
memset(clen, 0, sizeof(int) * cells);
+
for (i = 0, j = 0, h = 1; i < par->size(); ++i, ++h) {
c = par->GetChar(i);
if (c == LyXParagraph::META_INSET) {
if ((inset = par->GetInset(i))) {
- ofstream fs(fname1.c_str());
- if (!fs) {
- WriteFSAlert(_("Error: Cannot open temporary file:"), fname1);
- return;
- }
- inset->Latex(fs, -1);
- h += fs.tellp() - 1;
- remove(fname1.c_str());
+#ifdef HAVE_SSTREAM
+ std::ostringstream ost;
+ inset->Ascii(this, ost);
+ h += ost.str().length();
+#else
+ ostrstream ost;
+ inset->Ascii(this, ost);
+ ost << '\0';
+ char * tmp = ost.str();
+ string tstr(tmp);
+ h += tstr.length();
+ delete [] tmp;
+#endif
}
} else if (c == LyXParagraph::META_NEWLINE) {
if (clen[j] < h)
if (clen[j] < h)
clen[j] = h;
}
-
- font1 = LyXFont(LyXFont::ALL_INHERIT);
+#endif
+ font1 = LyXFont(LyXFont::ALL_INHERIT, params.language_info);
actcell = 0;
for (i = 0, actpos = 1; i < par->size(); ++i, ++actpos) {
if (!i && !footnoteflag && !noparbreak){
ofs << " ";
currlinelen = depth * 2;
switch(ltype) {
- case 0: /* Standart */
+ case 0: /* Standard */
case 4: /* (Sub)Paragraph */
case 5: /* Description */
break;
ofs << " ";
currlinelen += (ltype_depth-depth)*2;
}
+#ifndef NEW_TABULAR
if (par->table) {
for(j = 0; j < cells; ++j) {
ofs << '+';
}
ofs << "| ";
}
+#endif
}
- font2 = par->GetFontSettings(i);
+ font2 = par->GetFontSettings(params, i);
if (font1.latex() != font2.latex()) {
if (font2.latex() == LyXFont::OFF)
islatex = 0;
else
islatex = 1;
- }
- else {
+ } else {
islatex = 0;
}
c = par->GetChar(i);
case LyXParagraph::META_INSET:
if ((inset = par->GetInset(i))) {
fpos = ofs.tellp();
- inset->Latex(ofs, -1);
+ inset->Ascii(this, ofs);
currlinelen += (ofs.tellp() - fpos);
actpos += (ofs.tellp() - fpos) - 1;
}
break;
case LyXParagraph::META_NEWLINE:
+#ifndef NEW_TABULAR
if (par->table) {
if (par->table->NumberOfCellsInRow(actcell) <= cell) {
- for(j = actpos; j < clen[cell-1];j++)
+ for(j = actpos; j < clen[cell - 1]; ++j)
ofs << ' ';
ofs << " |\n";
for(j = 0; j < depth; ++j)
++actcell;
currlinelen = actpos = 0;
} else {
+#endif
ofs << "\n";
for(j = 0; j < depth; ++j)
ofs << " ";
ofs << " ";
currlinelen += (ltype_depth - depth) * 2;
}
+#ifndef NEW_TABULAR
}
+#endif
break;
case LyXParagraph::META_HFILL:
ofs << "\t";
break;
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- ofs << " ";
- break;
case '\\':
ofs << "\\";
break;
break;
}
}
+#ifndef NEW_TABULAR
if (par->table) {
for(j = actpos; j < clen[cell - 1]; ++j)
ofs << ' ';
}
ofs << "+\n";
delete [] clen;
- }
+ }
+#endif
par = par->next;
}
{
lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl;
- // How the **** can this be needed?
- //params.textclass = current_view->buffer()->params.textclass;
-
niceFile = nice; // this will be used by Insetincludes.
- tex_code_break_column = lyxrc->ascii_linelen;
+ tex_code_break_column = lyxrc.ascii_linelen;
LyXTextClass const & tclass =
textclasslist.TextClass(params.textclass);
// validate the buffer.
lyxerr[Debug::LATEX] << " Validating buffer..." << endl;
- LaTeXFeatures features(tclass.numLayouts());
+ LaTeXFeatures features(params, tclass.numLayouts());
validate(features);
lyxerr[Debug::LATEX] << " Buffer validation done." << endl;
// first paragraph of the document. (Asger)
texrow.start(paragraph, 0);
- string LFile;
-
if (!only_body && nice) {
- LFile += "%% " LYX_DOCVERSION " created this file. "
- "For more info, see http://www.lyx.org/.\n";
- LFile += "%% Do not edit unless you really know what you are doing.\n";
+ ofs << "%% " LYX_DOCVERSION " created this file. "
+ "For more info, see http://www.lyx.org/.\n"
+ "%% Do not edit unless you really know what "
+ "you are doing.\n";
texrow.newline();
texrow.newline();
}
if (!only_body) {
if (!nice){
// code for usual, NOT nice-latex-file
- LFile += "\\batchmode\n"; // changed
+ ofs << "\\batchmode\n"; // changed
// from \nonstopmode
texrow.newline();
}
if (!original_path.empty()) {
- LFile += "\\makeatletter\n";
+ ofs << "\\makeatletter\n"
+ << "\\def\\input@path{{"
+ << original_path << "/}}\n"
+ << "\\makeatother\n";
texrow.newline();
- LFile += "\\def\\input@path{{" + original_path
- + "/}}\n";
texrow.newline();
- LFile += "\\makeatother\n";
texrow.newline();
}
- LFile += "\\documentclass";
+ ofs << "\\documentclass";
string options; // the document class options.
- if (tokenPos(tclass.opt_fontsize(), '|', params.fontsize) >= 0) {
+ if (tokenPos(tclass.opt_fontsize(),
+ '|', params.fontsize) >= 0) {
// only write if existing in list (and not default)
options += params.fontsize;
options += "pt,";
// if needed
if (params.sides != tclass.sides()) {
- if (params.sides == 2)
- options += "twoside,";
- else
+ switch (params.sides) {
+ case LyXTextClass::OneSide:
options += "oneside,";
+ break;
+ case LyXTextClass::TwoSides:
+ options += "twoside,";
+ break;
+ }
+
}
// if needed
options += "landscape,";
// language should be a parameter to \documentclass
- if (params.language != "default") {
- options += params.language + ',';
+ bool use_babel = false;
+ if (params.language_info->lang() == "hebrew") // This seems necessary
+ features.UsedLanguages.insert(default_language);
+ if (params.language != "default" ||
+ !features.UsedLanguages.empty() ) {
+ use_babel = true;
+ for (LaTeXFeatures::LanguageList::const_iterator cit =
+ features.UsedLanguages.begin();
+ cit != features.UsedLanguages.end(); ++cit)
+ options += (*cit)->lang() + ",";
+ options += params.language_info->lang() + ',';
}
-
+
// the user-defined options
if (!params.options.empty()) {
options += params.options + ',';
if (!options.empty()){
options = strip(options, ',');
- LFile += '[';
- LFile += options;
- LFile += ']';
+ ofs << '[' << options << ']';
}
- LFile += '{';
- LFile += textclasslist.LatexnameOfClass(params.textclass);
- LFile += "}\n";
+ ofs << '{'
+ << textclasslist.LatexnameOfClass(params.textclass)
+ << "}\n";
texrow.newline();
// end of \documentclass defs
// font selection must be done before loading fontenc.sty
if (params.fonts != "default") {
- LFile += "\\usepackage{" + params.fonts + "}\n";
+ ofs << "\\usepackage{" << params.fonts << "}\n";
texrow.newline();
}
// this one is not per buffer
- if (lyxrc->fontenc != "default") {
- LFile += "\\usepackage[" + lyxrc->fontenc
- + "]{fontenc}\n";
+ if (lyxrc.fontenc != "default") {
+ ofs << "\\usepackage[" << lyxrc.fontenc
+ << "]{fontenc}\n";
texrow.newline();
}
- if (params.inputenc != "default") {
- LFile += "\\usepackage[" + params.inputenc
- + "]{inputenc}\n";
+
+ if (params.inputenc == "auto") {
+ string doc_encoding =
+ params.language_info->encoding()->LatexName();
+
+ // Create a list with all the input encodings used
+ // in the document
+ set<string> encodings;
+ for (LaTeXFeatures::LanguageList::const_iterator it =
+ features.UsedLanguages.begin();
+ it != features.UsedLanguages.end(); ++it)
+ if ((*it)->encoding()->LatexName() != doc_encoding)
+ encodings.insert((*it)->encoding()->LatexName());
+
+ ofs << "\\usepackage[";
+ for (set<string>::const_iterator it = encodings.begin();
+ it != encodings.end(); ++it)
+ ofs << *it << ",";
+ ofs << doc_encoding << "]{inputenc}\n";
+ texrow.newline();
+ } else if (params.inputenc != "default") {
+ ofs << "\\usepackage[" << params.inputenc
+ << "]{inputenc}\n";
texrow.newline();
}
-
- /* at the very beginning the text parameters */
+
+ // At the very beginning the text parameters.
if (params.paperpackage != BufferParams::PACKAGE_NONE) {
switch (params.paperpackage) {
case BufferParams::PACKAGE_A4:
- LFile += "\\usepackage{a4}\n";
+ ofs << "\\usepackage{a4}\n";
texrow.newline();
break;
case BufferParams::PACKAGE_A4WIDE:
- LFile += "\\usepackage{a4wide}\n";
+ ofs << "\\usepackage{a4wide}\n";
texrow.newline();
break;
case BufferParams::PACKAGE_WIDEMARGINSA4:
- LFile += "\\usepackage[widemargins]{a4}\n";
+ ofs << "\\usepackage[widemargins]{a4}\n";
texrow.newline();
break;
}
}
if (params.use_geometry) {
- LFile += "\\usepackage{geometry}\n";
+ ofs << "\\usepackage{geometry}\n";
texrow.newline();
- LFile += "\\geometry{verbose";
+ ofs << "\\geometry{verbose";
if (params.orientation == BufferParams::ORIENTATION_LANDSCAPE)
- LFile += ",landscape";
+ ofs << ",landscape";
switch (params.papersize2) {
case BufferParams::VM_PAPER_CUSTOM:
if (!params.paperwidth.empty())
- LFile += ",paperwidth="
- + params.paperwidth;
+ ofs << ",paperwidth="
+ << params.paperwidth;
if (!params.paperheight.empty())
- LFile += ",paperheight="
- + params.paperheight;
+ ofs << ",paperheight="
+ << params.paperheight;
break;
case BufferParams::VM_PAPER_USLETTER:
- LFile += ",letterpaper";
+ ofs << ",letterpaper";
break;
case BufferParams::VM_PAPER_USLEGAL:
- LFile += ",legalpaper";
+ ofs << ",legalpaper";
break;
case BufferParams::VM_PAPER_USEXECUTIVE:
- LFile += ",executivepaper";
+ ofs << ",executivepaper";
break;
case BufferParams::VM_PAPER_A3:
- LFile += ",a3paper";
+ ofs << ",a3paper";
break;
case BufferParams::VM_PAPER_A4:
- LFile += ",a4paper";
+ ofs << ",a4paper";
break;
case BufferParams::VM_PAPER_A5:
- LFile += ",a5paper";
+ ofs << ",a5paper";
break;
case BufferParams::VM_PAPER_B3:
- LFile += ",b3paper";
+ ofs << ",b3paper";
break;
case BufferParams::VM_PAPER_B4:
- LFile += ",b4paper";
+ ofs << ",b4paper";
break;
case BufferParams::VM_PAPER_B5:
- LFile += ",b5paper";
+ ofs << ",b5paper";
break;
default:
// default papersize ie BufferParams::VM_PAPER_DEFAULT
- switch (lyxrc->default_papersize) {
+ switch (lyxrc.default_papersize) {
case BufferParams::PAPER_DEFAULT: // keep compiler happy
case BufferParams::PAPER_USLETTER:
- LFile += ",letterpaper";
+ ofs << ",letterpaper";
break;
case BufferParams::PAPER_LEGALPAPER:
- LFile += ",legalpaper";
+ ofs << ",legalpaper";
break;
case BufferParams::PAPER_EXECUTIVEPAPER:
- LFile += ",executivepaper";
+ ofs << ",executivepaper";
break;
case BufferParams::PAPER_A3PAPER:
- LFile += ",a3paper";
+ ofs << ",a3paper";
break;
case BufferParams::PAPER_A4PAPER:
- LFile += ",a4paper";
+ ofs << ",a4paper";
break;
case BufferParams::PAPER_A5PAPER:
- LFile += ",a5paper";
+ ofs << ",a5paper";
break;
case BufferParams::PAPER_B5PAPER:
- LFile += ",b5paper";
+ ofs << ",b5paper";
break;
}
}
if (!params.topmargin.empty())
- LFile += ",tmargin=" + params.topmargin;
+ ofs << ",tmargin=" << params.topmargin;
if (!params.bottommargin.empty())
- LFile += ",bmargin=" + params.bottommargin;
+ ofs << ",bmargin=" << params.bottommargin;
if (!params.leftmargin.empty())
- LFile += ",lmargin=" + params.leftmargin;
+ ofs << ",lmargin=" << params.leftmargin;
if (!params.rightmargin.empty())
- LFile += ",rmargin=" + params.rightmargin;
+ ofs << ",rmargin=" << params.rightmargin;
if (!params.headheight.empty())
- LFile += ",headheight=" + params.headheight;
+ ofs << ",headheight=" << params.headheight;
if (!params.headsep.empty())
- LFile += ",headsep=" + params.headsep;
+ ofs << ",headsep=" << params.headsep;
if (!params.footskip.empty())
- LFile += ",footskip=" + params.footskip;
- LFile += "}\n";
+ ofs << ",footskip=" << params.footskip;
+ ofs << "}\n";
texrow.newline();
}
if (params.use_amsmath
- && !prefixIs(textclasslist.LatexnameOfClass(params.textclass), "ams")) {
- LFile += "\\usepackage{amsmath}\n";
+ && !tclass.provides(LyXTextClass::amsmath)) {
+ ofs << "\\usepackage{amsmath}\n";
+ texrow.newline();
}
- if (tokenPos(tclass.opt_pagestyle(), '|', params.pagestyle) >= 0) {
+ if (tokenPos(tclass.opt_pagestyle(),
+ '|', params.pagestyle) >= 0) {
if (params.pagestyle == "fancy") {
- LFile += "\\usepackage{fancyhdr}\n";
+ ofs << "\\usepackage{fancyhdr}\n";
texrow.newline();
}
- LFile += "\\pagestyle{" + params.pagestyle + "}\n";
+ ofs << "\\pagestyle{" << params.pagestyle << "}\n";
texrow.newline();
}
// We try to load babel late, in case it interferes
// with other packages.
- if (params.language != "default") {
- LFile += "\\usepackage{babel}\n";
+ if (use_babel) {
+ ofs << lyxrc.language_package << endl;
texrow.newline();
}
if (params.secnumdepth != tclass.secnumdepth()) {
- LFile += "\\setcounter{secnumdepth}{";
- LFile += tostr(params.secnumdepth);
- LFile += "}\n";
+ ofs << "\\setcounter{secnumdepth}{"
+ << params.secnumdepth
+ << "}\n";
texrow.newline();
}
if (params.tocdepth != tclass.tocdepth()) {
- LFile += "\\setcounter{tocdepth}{";
- LFile += tostr(params.tocdepth);
- LFile += "}\n";
+ ofs << "\\setcounter{tocdepth}{"
+ << params.tocdepth
+ << "}\n";
texrow.newline();
}
if (params.paragraph_separation) {
switch (params.defskip.kind()) {
case VSpace::SMALLSKIP:
- LFile += "\\setlength\\parskip{\\smallskipamount}\n";
+ ofs << "\\setlength\\parskip{\\smallskipamount}\n";
break;
case VSpace::MEDSKIP:
- LFile += "\\setlength\\parskip{\\medskipamount}\n";
+ ofs << "\\setlength\\parskip{\\medskipamount}\n";
break;
case VSpace::BIGSKIP:
- LFile += "\\setlength\\parskip{\\bigskipamount}\n";
+ ofs << "\\setlength\\parskip{\\bigskipamount}\n";
break;
case VSpace::LENGTH:
- LFile += "\\setlength\\parskip{"
- + params.defskip.length().asLatexString()
- + "}\n";
+ ofs << "\\setlength\\parskip{"
+ << params.defskip.length().asLatexString()
+ << "}\n";
break;
default: // should never happen // Then delete it.
- LFile += "\\setlength\\parskip{\\medskipamount}\n";
+ ofs << "\\setlength\\parskip{\\medskipamount}\n";
break;
}
texrow.newline();
- LFile += "\\setlength\\parindent{0pt}\n";
+ ofs << "\\setlength\\parindent{0pt}\n";
texrow.newline();
}
- // Write out what we've generated so far...and reset LFile
- ofs << LFile;
- LFile.clear();
-
// Now insert the LyX specific LaTeX commands...
- string preamble, tmppreamble;
// The optional packages;
- preamble = features.getPackages(params);
+ string preamble(features.getPackages());
// this might be useful...
- preamble += "\n\\makeatletter\n\n";
+ preamble += "\n\\makeatletter\n";
// Some macros LyX will need
- tmppreamble = features.getMacros(params);
+ string tmppreamble(features.getMacros());
if (!tmppreamble.empty()) {
preamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
}
// the text class specific preamble
- tmppreamble = features.getTClassPreamble(params);
+ tmppreamble = features.getTClassPreamble();
if (!tmppreamble.empty()) {
preamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"Textclass specific LaTeX commands.\n"
+ params.preamble + '\n';
}
- preamble += "\\makeatother\n\n";
+ preamble += "\\makeatother\n";
// Itemize bullet settings need to be last in case the user
// defines their own bullets that use a package included
ofs << preamble;
// make the body.
- LFile += "\\begin{document}\n\n";
- texrow.newline();
+ ofs << "\\begin{document}\n";
texrow.newline();
} // only_body
lyxerr.debug() << "preamble finished, now the body." << endl;
+ if (!lyxrc.language_auto_begin && params.language != "default") {
+ ofs << subst(lyxrc.language_command_begin, "$$lang",
+ params.language)
+ << endl;
+ texrow.newline();
+ }
+ latexParagraphs(ofs, paragraph, 0, texrow);
+
+ // add this just in case after all the paragraphs
+ ofs << endl;
+ texrow.newline();
+
+ if (!lyxrc.language_auto_end && params.language != "default") {
+ ofs << subst(lyxrc.language_command_end, "$$lang",
+ params.language)
+ << endl;
+ texrow.newline();
+ }
+
+ if (!only_body) {
+ ofs << "\\end{document}\n";
+ texrow.newline();
+
+ lyxerr[Debug::LATEX] << "makeLaTeXFile...done" << endl;
+ } else {
+ lyxerr[Debug::LATEX] << "LaTeXFile for inclusion made."
+ << endl;
+ }
+
+ // Just to be sure. (Asger)
+ texrow.newline();
+
+ // tex_code_break_column's value is used to decide
+ // if we are in batchmode or not (within mathed_write()
+ // in math_write.C) so we must set it to a non-zero
+ // value when we leave otherwise we save incorrect .lyx files.
+ tex_code_break_column = lyxrc.ascii_linelen;
+
+ ofs.close();
+ if (ofs.fail()) {
+ lyxerr << "File was not closed properly." << endl;
+ }
+
+ lyxerr.debug() << "Finished making latex file." << endl;
+}
+
+
+//
+// LaTeX all paragraphs from par to endpar, if endpar == 0 then to the end
+//
+void Buffer::latexParagraphs(ostream & ofs, LyXParagraph * par,
+ LyXParagraph * endpar, TexRow & texrow) const
+{
bool was_title = false;
bool already_title = false;
- string ftnote;
+#ifdef HAVE_SSTREAM
+ std::ostringstream ftnote;
+#else
+ char * tmpholder = 0;
+#endif
TexRow ft_texrow;
int ftcount = 0;
- int loop_count = 0;
-
- LyXParagraph * par = paragraph;
// if only_body
- while (par) {
- ++loop_count;
+ while (par != endpar) {
+#ifndef HAVE_SSTREAM
+ ostrstream ftnote;
+ if (tmpholder) {
+ ftnote << tmpholder;
+ delete [] tmpholder;
+ tmpholder = 0;
+ }
+#endif
+#ifndef NEW_INSETS
if (par->IsDummy())
- lyxerr[Debug::LATEX] << "Error in MakeLateXFile."
+ lyxerr[Debug::LATEX] << "Error in latexParagraphs."
<< endl;
- LyXLayout const & layout = textclasslist.Style(params.textclass,
- par->layout);
+#endif
+ LyXLayout const & layout =
+ textclasslist.Style(params.textclass,
+ par->layout);
if (layout.intitle) {
if (already_title) {
- lyxerr <<"Error in MakeLatexFile: You"
+ lyxerr <<"Error in latexParagraphs: You"
" should not mix title layouts"
" with normal ones." << endl;
} else
was_title = true;
} else if (was_title && !already_title) {
- LFile += "\\maketitle\n";
+ ofs << "\\maketitle\n";
texrow.newline();
already_title = true;
was_title = false;
ftcount = -1;
if (layout.isEnvironment()
|| par->pextra_type != LyXParagraph::PEXTRA_NONE) {
- par = par->TeXEnvironment(LFile, texrow,
- ftnote, ft_texrow, ftcount);
+ par = par->TeXEnvironment(this, params, ofs, texrow
+#ifndef NEW_INSETS
+ ,ftnote, ft_texrow, ftcount
+#endif
+ );
} else {
- par = par->TeXOnePar(LFile, texrow,
- ftnote, ft_texrow, ftcount);
+ par = par->TeXOnePar(this, params, ofs, texrow, false
+#ifndef NEW_INSETS
+ ,
+ ftnote, ft_texrow, ftcount
+#endif
+ );
}
- // Write out what we've generated...and reset LFile
+ // Write out what we've generated...
if (ftcount >= 1) {
if (ftcount > 1) {
- LFile += "\\addtocounter{footnote}{-";
- LFile += tostr(ftcount - 1);
- LFile += '}';
+ ofs << "\\addtocounter{footnote}{-"
+ << ftcount - 1
+ << '}';
}
- LFile += ftnote;
+ ofs << ftnote.str();
texrow += ft_texrow;
- ftnote.clear();
+#ifdef HAVE_SSTREAM
+ // The extra .c_str() is needed when we use
+ // lyxstring instead of the STL string class.
+ ftnote.str(string().c_str());
+#else
+ delete [] ftnote.str();
+#endif
ft_texrow.reset();
ftcount = 0;
}
- if (loop_count == 2) {
- // fwrite()ing every second time through the loop
- // gains a few extra % of speed; going higher than
- // 2 will slow things down again. I'll look at
- // LFile.length() in a future revision. ARRae
- ofs << LFile;
- LFile.clear();
- loop_count = 0;
+#ifndef HAVE_SSTREAM
+ else {
+ // I hate strstreams
+ tmpholder = ftnote.str();
}
+#endif
}
-
+#ifndef HAVE_SSTREAM
+ delete [] tmpholder;
+#endif
// It might be that we only have a title in this document
if (was_title && !already_title) {
- LFile += "\\maketitle\n";
+ ofs << "\\maketitle\n";
texrow.newline();
}
-
- if (!only_body) {
- LFile += "\\end{document}\n";
- texrow.newline();
-
- lyxerr[Debug::LATEX] << "makeLaTeXFile...done" << endl;
- } else {
- lyxerr[Debug::LATEX] << "LaTeXFile for inclusion made."
- << endl;
- }
-
- // Just to be sure. (Asger)
- texrow.newline();
-
- // Write out what we've generated...and reset LFile
- ofs << LFile;
- LFile.clear();
-
- // tex_code_break_column's value is used to decide
- // if we are in batchmode or not (within mathed_write()
- // in math_write.C) so we must set it to a non-zero
- // value when we leave otherwise we save incorrect .lyx files.
- tex_code_break_column = lyxrc->ascii_linelen;
-
- // How to check if the close went ok when using fstreams
- ofs.close();
- lyxerr.debug() << "Finished making latex file." << endl;
}
}
-void Buffer::makeLinuxDocFile(string const & fname, int column)
+void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
{
LyXParagraph * par = paragraph;
+ niceFile = nice; // this will be used by Insetincludes.
+
string top_element = textclasslist.LatexnameOfClass(params.textclass);
string environment_stack[10];
string item_name;
- int depth = 0; /* paragraph depth */
+ int depth = 0; // paragraph depth
ofstream ofs(fname.c_str());
WriteAlert(_("LYX_ERROR:"), _("Cannot write file"), fname);
return;
}
-
- tex_code_break_column = column;
+
+ LyXTextClass const & tclass =
+ textclasslist.TextClass(params.textclass);
+
+ LaTeXFeatures features(params, tclass.numLayouts());
+ validate(features);
+
+ //if(nice)
+ tex_code_break_column = lyxrc.ascii_linelen;
+ //else
+ //tex_code_break_column = 0;
+
texrow.reset();
-
- if (params.preamble.empty()) {
- ofs << "<!doctype linuxdoc system>\n\n";
- }
- else {
- ofs << "<!doctype linuxdoc system \n [ "
- << params.preamble << " \n]>\n\n";
+
+ if (!body_only) {
+ string sgml_includedfiles=features.getIncludedFiles();
+
+ if (params.preamble.empty() && sgml_includedfiles.empty()) {
+ ofs << "<!doctype linuxdoc system>\n\n";
+ } else {
+ ofs << "<!doctype linuxdoc system [ "
+ << params.preamble << sgml_includedfiles << " \n]>\n\n";
+ }
+
+ if(params.options.empty())
+ sgmlOpenTag(ofs, 0, top_element);
+ else {
+ string top = top_element;
+ top += " ";
+ top += params.options;
+ sgmlOpenTag(ofs, 0, top);
+ }
}
ofs << "<!-- " << LYX_DOCVERSION
<< " created this file. For more info see http://www.lyx.org/"
<< " -->\n";
- if(params.options.empty())
- sgmlOpenTag(ofs, 0, top_element);
- else {
- string top = top_element;
- top += " ";
- top += params.options;
- sgmlOpenTag(ofs, 0, top);
- }
-
while (par) {
- int desc_on = 0; /* description mode*/
+ int desc_on = 0; // description mode
LyXLayout const & style =
- textclasslist.Style(users->buffer()->params.textclass,
+ textclasslist.Style(params.textclass,
par->layout);
- par->AutoDeleteInsets();
- /* treat <toc> as a special case for compatibility with old code */
+ // treat <toc> as a special case for compatibility with old code
if (par->GetChar(0) == LyXParagraph::META_INSET) {
Inset * inset = par->GetInset(0);
- char lyx_code = inset->LyxCode();
+ Inset::Code lyx_code = inset->LyxCode();
if (lyx_code == Inset::TOC_CODE){
string temp = "toc";
sgmlOpenTag(ofs, depth, temp);
par = par->next;
+#ifndef NEW_INSETS
linuxDocHandleFootnote(ofs, par, depth);
+#endif
continue;
}
}
// environment tag closing
for( ; depth > par->depth; --depth) {
sgmlCloseTag(ofs, depth, environment_stack[depth]);
- environment_stack[depth].clear();
+ environment_stack[depth].erase();
}
// write opening SGML tags
if(depth == par->depth
&& !environment_stack[depth].empty()) {
sgmlCloseTag(ofs, depth, environment_stack[depth]);
- environment_stack[depth].clear();
+ environment_stack[depth].erase();
if(depth)
--depth;
else
case LATEX_COMMAND:
if (depth!= 0)
- LinuxDocError(par, 0, _("Error : Wrong depth for LatexType Command.\n"));
+ LinuxDocError(par, 0,
+ _("Error : Wrong depth for"
+ " LatexType Command.\n"));
if (!environment_stack[depth].empty()){
sgmlCloseTag(ofs, depth,
ofs << "</p>";
}
- environment_stack[depth].clear();
+ environment_stack[depth].erase();
sgmlOpenTag(ofs, depth, style.latexname());
break;
sgmlCloseTag(ofs, depth,
environment_stack[depth]);
- environment_stack[depth].clear();
+ environment_stack[depth].erase();
}
if (depth < par->depth) {
depth = par->depth;
- environment_stack[depth].clear();
+ environment_stack[depth].erase();
}
if (environment_stack[depth] != style.latexname()) {
if(depth == 0) {
sgmlOpenTag(ofs, depth, temp);
}
environment_stack[depth] = style.latexname();
- sgmlOpenTag(ofs, depth, environment_stack[depth]);
+ sgmlOpenTag(ofs, depth,
+ environment_stack[depth]);
}
if(style.latextype == LATEX_ENVIRONMENT) break;
break;
}
+#ifndef NEW_INSETS
do {
+#endif
SimpleLinuxDocOnePar(ofs, par, desc_on, depth);
par = par->next;
+#ifndef NEW_INSETS
linuxDocHandleFootnote(ofs, par, depth);
}
while(par && par->IsDummy());
+#endif
ofs << "\n";
- /* write closing SGML tags */
+ // write closing SGML tags
switch(style.latextype) {
case LATEX_COMMAND:
case LATEX_ENVIRONMENT:
}
}
- /* Close open tags */
+ // Close open tags
for(; depth > 0; --depth)
sgmlCloseTag(ofs, depth, environment_stack[depth]);
if(!environment_stack[depth].empty())
sgmlCloseTag(ofs, depth, environment_stack[depth]);
- ofs << "\n\n";
- sgmlCloseTag(ofs, 0, top_element);
+ if (!body_only) {
+ ofs << "\n\n";
+ sgmlCloseTag(ofs, 0, top_element);
+ }
ofs.close();
// How to check for successful close
}
+#ifndef NEW_INSETS
void Buffer::linuxDocHandleFootnote(ostream & os, LyXParagraph * & par,
int const depth)
{
par = par->next;
}
}
+#endif
void Buffer::DocBookHandleCaption(ostream & os, string & inner_tag,
LyXParagraph * & par)
{
LyXParagraph * tpar = par;
- string tmp_par, extra_par;
- while (tpar && (tpar->footnoteflag != LyXParagraph::NO_FOOTNOTE) &&
- (tpar->layout != textclasslist.NumberOfLayout(params.textclass,
+ while (tpar
+#ifndef NEW_INSETS
+ && (tpar->footnoteflag != LyXParagraph::NO_FOOTNOTE)
+#endif
+ && (tpar->layout != textclasslist.NumberOfLayout(params.textclass,
"Caption").second))
tpar = tpar->next;
if (tpar &&
tpar->layout == textclasslist.NumberOfLayout(params.textclass,
"Caption").second) {
sgmlOpenTag(os, depth + 1, inner_tag);
- SimpleDocBookOnePar(tmp_par, extra_par, tpar,
+ string extra_par;
+ SimpleDocBookOnePar(os, extra_par, tpar,
desc_on, depth + 2);
- tmp_par = strip(tmp_par);
- tmp_par = frontStrip(tmp_par);
- os << tmp_par;
sgmlCloseTag(os, depth+1, inner_tag);
if(!extra_par.empty())
os << extra_par;
}
+#ifndef NEW_INSETS
void Buffer::DocBookHandleFootnote(ostream & os, LyXParagraph * & par,
int const depth)
{
bool inner_span = false;
int desc_on = 4;
- // This is not how I like to see enums. They should not be anonymous
- // and variables of its type should not be declared right after the
- // last brace. (Lgb)
- enum {
+ // Someone should give this enum a proper name (Lgb)
+ enum SOME_ENUM {
NO_ONE,
FOOTNOTE_LIKE,
MARGIN_LIKE,
FIG_LIKE,
TAB_LIKE
- } last = NO_ONE, present = FOOTNOTE_LIKE;
+ };
+ SOME_ENUM last = NO_ONE;
+ SOME_ENUM present = FOOTNOTE_LIKE;
while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
if(last == present) {
if(inner_span) {
if(!tmp_par.empty()) {
os << tmp_par;
- tmp_par.clear();
- sgmlCloseTag(os, depth+1, inner_tag);
- sgmlOpenTag(os, depth+1, inner_tag);
+ tmp_par.erase();
+ sgmlCloseTag(os, depth + 1, inner_tag);
+ sgmlOpenTag(os, depth + 1, inner_tag);
}
- }
- else
+ } else {
os << "\n";
+ }
} else {
os << tmp_par;
- if(!inner_tag.empty()) sgmlCloseTag(os, depth+1, inner_tag);
+ if(!inner_tag.empty()) sgmlCloseTag(os, depth + 1,
+ inner_tag);
if(!extra_par.empty()) os << extra_par;
if(!tag.empty()) sgmlCloseTag(os, depth, tag);
- extra_par.clear();
+ extra_par.erase();
switch (par->footnotekind) {
case LyXParagraph::FOOTNOTE:
if ((present == TAB_LIKE) || (present == FIG_LIKE)) {
DocBookHandleCaption(os, inner_tag, depth,
desc_on, par);
- inner_tag.clear();
+ inner_tag.erase();
} else {
sgmlOpenTag(os, depth + 1, inner_tag);
}
}
// ignore all caption here, we processed them above!!!
- if (par->layout != textclasslist.NumberOfLayout(params.textclass,
- "Caption").second) {
- SimpleDocBookOnePar(tmp_par, extra_par, par,
+ if (par->layout != textclasslist
+ .NumberOfLayout(params.textclass,
+ "Caption").second) {
+#ifdef HAVE_SSTREAM
+ std::ostringstream ost;
+#else
+ ostrstream ost;
+#endif
+ SimpleDocBookOnePar(ost, extra_par, par,
desc_on, depth + 2);
+#ifdef HAVE_SSTREAM
+ tmp_par += ost.str().c_str();
+#else
+ ost << '\0';
+ char * ctmp = ost.str();
+ tmp_par += ctmp;
+ delete [] ctmp;
+#endif
}
tmp_par = frontStrip(strip(tmp_par));
par = par->next;
}
os << tmp_par;
- if(!inner_tag.empty()) sgmlCloseTag(os, depth+1, inner_tag);
+ if(!inner_tag.empty()) sgmlCloseTag(os, depth + 1, inner_tag);
if(!extra_par.empty()) os << extra_par;
if(!tag.empty()) sgmlCloseTag(os, depth, tag);
}
+#endif
-/* push a tag in a style stack */
+// push a tag in a style stack
void Buffer::push_tag(ostream & os, char const * tag,
int & pos, char stack[5][3])
{
- /* pop all previous tags */
+ // pop all previous tags
for (int j = pos; j >= 0; --j)
os << "</" << stack[j] << ">";
- /* add new tag */
+ // add new tag
sprintf(stack[++pos], "%s", tag);
- /* push all tags */
+ // push all tags
for (int i = 0; i <= pos; ++i)
os << "<" << stack[i] << ">";
}
-// pop a tag from a style stack
void Buffer::pop_tag(ostream & os, char const * tag,
- int & pos, char stack[5][3])
+ int & pos, char stack[5][3])
{
- // pop all tags till specified one
- for (int j = pos; (j >= 0) && (strcmp(stack[j], tag)); --j)
- os << "</" << stack[j] << ">";
+ int j;
- // closes the tag
- os << "</" << tag << ">";
+ // pop all tags till specified one
+ for (j = pos; (j >= 0) && (strcmp(stack[j], tag)); --j)
+ os << "</" << stack[j] << ">";
- // push all tags, but the specified one
- for (int i = 0; i <= pos; ++i) {
- os << "<" << stack[i] << ">";
- strcpy(stack[i - 1], stack[i]);
- }
- --pos;
+ // closes the tag
+ os << "</" << tag << ">";
+
+ // push all tags, but the specified one
+ for (j = j + 1; j <= pos; ++j) {
+ os << "<" << stack[j] << ">";
+ strcpy(stack[j-1], stack[j]);
+ }
+ --pos;
}
-/* handle internal paragraph parsing -- layout already processed */
+// Handle internal paragraph parsing -- layout already processed.
// checks, if newcol chars should be put into this line
// writes newline, if necessary.
const unsigned int newcol)
{
colcount += newcol;
- if (colcount > lyxrc->ascii_linelen) {
+ if (colcount > lyxrc.ascii_linelen) {
os << "\n";
colcount = newcol; // assume write after this call
}
char shape_type = 0; // shape font flag
bool is_em = false; // emphasis (italic) font flag
- int stack_num = -1; // style stack position
+ int stack_num = -1; // style stack position
+ // Can this be rewritten to use a std::stack, please. (Lgb)
char stack[5][3]; // style stack
unsigned int char_line_count = 5; // Heuristic choice ;-)
else
main_body = par->BeginningOfMainBody();
- /* gets paragraph main font */
+ // gets paragraph main font
if (main_body > 0)
font1 = style.labelfont;
else
font1 = style.font;
- /* parsing main loop */
+ // parsing main loop
for (LyXParagraph::size_type i = 0;
i < par->size(); ++i) {
- /* handle quote tag */
- if (i == main_body && !par->IsDummy()) {
+ // handle quote tag
+ if (i == main_body
+#ifndef NEW_INSETS
+ && !par->IsDummy()
+#endif
+ ) {
if (main_body > 0)
font1 = style.font;
}
- font2 = par->getFont(i);
+ font2 = par->getFont(params, i);
if (font1.family() != font2.family()) {
switch(family_type) {
case 0:
if (font2.family() == LyXFont::TYPEWRITER_FAMILY) {
push_tag(os, "tt", stack_num, stack);
- family_type= 1;
+ family_type = 1;
}
else if (font2.family() == LyXFont::SANS_FAMILY) {
push_tag(os, "sf", stack_num, stack);
- family_type= 2;
+ family_type = 2;
}
break;
case 1:
pop_tag(os, "tt", stack_num, stack);
if (font2.family() == LyXFont::SANS_FAMILY) {
push_tag(os, "sf", stack_num, stack);
- family_type= 2;
- }
- else {
- family_type= 0;
+ family_type = 2;
+ } else {
+ family_type = 0;
}
break;
case 2:
pop_tag(os, "sf", stack_num, stack);
if (font2.family() == LyXFont::TYPEWRITER_FAMILY) {
push_tag(os, "tt", stack_num, stack);
- family_type= 1;
- }
- else {
- family_type= 0;
+ family_type = 1;
+ } else {
+ family_type = 0;
}
}
}
- /* handle bold face */
+ // handle bold face
if (font1.series() != font2.series()) {
if (font2.series() == LyXFont::BOLD_SERIES) {
push_tag(os, "bf", stack_num, stack);
is_bold = true;
- }
- else if (is_bold) {
+ } else if (is_bold) {
pop_tag(os, "bf", stack_num, stack);
is_bold = false;
}
}
- /* handle italic and slanted fonts */
+ // handle italic and slanted fonts
if (font1.shape() != font2.shape()) {
switch(shape_type) {
case 0:
if (font2.shape() == LyXFont::ITALIC_SHAPE) {
push_tag(os, "it", stack_num, stack);
- shape_type= 1;
- }
- else if (font2.shape() == LyXFont::SLANTED_SHAPE) {
+ shape_type = 1;
+ } else if (font2.shape() == LyXFont::SLANTED_SHAPE) {
push_tag(os, "sl", stack_num, stack);
- shape_type= 2;
+ shape_type = 2;
}
break;
case 1:
pop_tag(os, "it", stack_num, stack);
if (font2.shape() == LyXFont::SLANTED_SHAPE) {
push_tag(os, "sl", stack_num, stack);
- shape_type= 2;
- }
- else {
- shape_type= 0;
+ shape_type = 2;
+ } else {
+ shape_type = 0;
}
break;
case 2:
pop_tag(os, "sl", stack_num, stack);
if (font2.shape() == LyXFont::ITALIC_SHAPE) {
push_tag(os, "it", stack_num, stack);
- shape_type= 1;
- }
- else {
- shape_type= 0;
+ shape_type = 1;
+ } else {
+ shape_type = 0;
}
}
}
- /* handle <em> tag */
+ // handle <em> tag
if (font1.emph() != font2.emph()) {
if (font2.emph() == LyXFont::ON) {
push_tag(os, "em", stack_num, stack);
}
c = par->GetChar(i);
-
+
+ if (c == LyXParagraph::META_INSET) {
+ inset = par->GetInset(i);
+ inset->Linuxdoc(this, os);
+ }
+
if (font2.latex() == LyXFont::ON) {
// "TeX"-Mode on == > SGML-Mode on.
- if (c!= '\0')
+ if (c != '\0')
os << c; // see LaTeX-Generation...
- char_line_count++;
- } else if (c == LyXParagraph::META_INSET) {
- inset = par->GetInset(i);
- string tmp_out;
- inset->Linuxdoc(tmp_out);
- os << tmp_out;
- }
- else {
+ ++char_line_count;
+ } else {
string sgml_string;
if (par->linuxDocConvertChar(c, sgml_string)
&& !style.free_spacing) { // in freespacing
// non-breaking characters
// char is ' '
if (desc_on == 1) {
- char_line_count++;
+ ++char_line_count;
linux_doc_line_break(os, char_line_count, 6);
os << "</tag>";
desc_on = 2;
- }
- else {
+ } else {
linux_doc_line_break(os, char_line_count, 1);
os << c;
}
- }
- else {
+ } else {
os << sgml_string;
char_line_count += sgml_string.length();
}
font1 = font2;
}
- /* needed if there is an optional argument but no contents */
+ // needed if there is an optional argument but no contents
if (main_body > 0 && main_body == par->size()) {
font1 = style.font;
}
- /* pop all defined Styles */
+ // pop all defined Styles
for (j = stack_num; j >= 0; --j) {
linux_doc_line_break(os,
char_line_count,
os << "</" << stack[j] << ">";
}
- /* resets description flag correctly */
+ // resets description flag correctly
switch(desc_on){
case 1:
- /* <tag> not closed... */
+ // <tag> not closed...
linux_doc_line_break(os, char_line_count, 6);
os << "</tag>";
break;
case 2:
- /* fprintf(file, "</p>");*/
+ // fprintf(file, "</p>");
break;
}
}
-/* print an error message */
+// Print an error message.
void Buffer::LinuxDocError(LyXParagraph * par, int pos,
char const * message)
{
- InsetError * new_inset;
-
- /* insert an error marker in text */
- new_inset = new InsetError(message);
- par->InsertChar(pos, LyXParagraph::META_INSET);
+ // insert an error marker in text
+ InsetError * new_inset = new InsetError(message);
par->InsertInset(pos, new_inset);
}
enum { MAX_NEST_LEVEL = 25};
-void Buffer::makeDocBookFile(string const & fname, int column)
+void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
{
LyXParagraph * par = paragraph;
+ niceFile = nice; // this will be used by Insetincludes.
+
string top_element= textclasslist.LatexnameOfClass(params.textclass);
+ // Please use a real stack.
string environment_stack[MAX_NEST_LEVEL];
string environment_inner[MAX_NEST_LEVEL];
+ // Please use a real stack.
string command_stack[MAX_NEST_LEVEL];
bool command_flag= false;
int command_depth= 0, command_base= 0, cmd_depth= 0;
string item_name, command_name;
string c_depth, c_params, tmps;
- int depth= 0; /* paragraph depth */
+ int depth = 0; // paragraph depth
+ LyXTextClass const & tclass =
+ textclasslist.TextClass(params.textclass);
+
+ LaTeXFeatures features(params, tclass.numLayouts());
+ validate(features);
- tex_code_break_column = column;
+ //if(nice)
+ tex_code_break_column = lyxrc.ascii_linelen;
+ //else
+ //tex_code_break_column = 0;
ofstream ofs(fname.c_str());
if (!ofs) {
texrow.reset();
- ofs << "<!doctype " << top_element
- << " public \"-//OASIS//DTD DocBook V3.1//EN\"";
+ if(!only_body) {
+ string sgml_includedfiles=features.getIncludedFiles();
- if (params.preamble.empty())
- ofs << ">\n\n";
- else
- ofs << "\n [ " << params.preamble << " \n]>\n\n";
+ ofs << "<!doctype " << top_element
+ << " public \"-//OASIS//DTD DocBook V3.1//EN\"";
- ofs << "<!-- DocBook file was created by " << LYX_DOCVERSION
- << "\n See http://www.lyx.org/ for more information -->\n";
+ if (params.preamble.empty() && sgml_includedfiles.empty())
+ ofs << ">\n\n";
+ else
+ ofs << "\n [ " << params.preamble
+ << sgml_includedfiles << " \n]>\n\n";
- if(params.options.empty())
- sgmlOpenTag(ofs, 0, top_element);
- else {
- string top = top_element;
- top += " ";
- top += params.options;
- sgmlOpenTag(ofs, 0, top);
+ if(params.options.empty())
+ sgmlOpenTag(ofs, 0, top_element);
+ else {
+ string top = top_element;
+ top += " ";
+ top += params.options;
+ sgmlOpenTag(ofs, 0, top);
+ }
}
+ ofs << "<!-- DocBook file was created by " << LYX_DOCVERSION
+ << "\n See http://www.lyx.org/ for more information -->\n";
+
while (par) {
- int desc_on= 0; /* description mode*/
- LyXLayout const & style = textclasslist.Style(users->buffer()->params.textclass,
- par->layout);
- par->AutoDeleteInsets();
+ int desc_on = 0; // description mode
+ LyXLayout const & style =
+ textclasslist.Style(params.textclass,
+ par->layout);
- /* environment tag closing */
+ // environment tag closing
for( ; depth > par->depth; --depth) {
if(environment_inner[depth] != "!-- --") {
item_name= "listitem";
}
sgmlCloseTag(ofs, depth + command_depth,
environment_stack[depth]);
- environment_stack[depth].clear();
- environment_inner[depth].clear();
+ environment_stack[depth].erase();
+ environment_inner[depth].erase();
}
if(depth == par->depth
sgmlCloseTag(ofs, depth + command_depth,
environment_stack[depth]);
- environment_stack[depth].clear();
- environment_inner[depth].clear();
+ environment_stack[depth].erase();
+ environment_inner[depth].erase();
}
// Write opening SGML tags.
if(!command_stack[j].empty())
sgmlCloseTag(ofs, j, command_stack[j]);
command_depth= command_base= cmd_depth;
- }
- else if(cmd_depth <= command_depth) {
+ } else if(cmd_depth <= command_depth) {
for(int j = command_depth;
j >= cmd_depth; --j)
if(!command_stack[j].empty())
sgmlCloseTag(ofs, j, command_stack[j]);
command_depth= cmd_depth;
- }
- else
+ } else
command_depth= cmd_depth;
- }
- else {
+ } else {
command_depth = command_base = cmd_depth;
command_flag = true;
}
// more WYSIWYM handling.
if (par->GetChar(0) == LyXParagraph::META_INSET) {
Inset * inset = par->GetInset(0);
- char lyx_code = inset->LyxCode();
+ Inset::Code lyx_code = inset->LyxCode();
if (lyx_code == Inset::LABEL_CODE){
command_name += " id=\"";
command_name += (static_cast<InsetCommand *>(inset))->getContents();
}
}
- sgmlOpenTag(ofs, depth+command_depth, command_name);
+ sgmlOpenTag(ofs, depth + command_depth, command_name);
item_name = "title";
sgmlOpenTag(ofs, depth + 1 + command_depth, item_name);
break;
case LATEX_ITEM_ENVIRONMENT:
if (depth < par->depth) {
depth = par->depth;
- environment_stack[depth].clear();
+ environment_stack[depth].erase();
}
if (environment_stack[depth] != style.latexname()) {
item_name= "term";
sgmlOpenTag(ofs, depth + 1 + command_depth,
item_name);
- }
- else {
+ } else {
item_name= "para";
sgmlOpenTag(ofs, depth + 1 + command_depth,
item_name);
break;
}
+#ifndef NEW_INSETS
do {
- string tmp_par, extra_par;
-
- SimpleDocBookOnePar(tmp_par, extra_par, par, desc_on,
+#endif
+ string extra_par;
+ SimpleDocBookOnePar(ofs, extra_par, par, desc_on,
depth + 1 + command_depth);
- ofs << tmp_par;
-
par = par->next;
+#ifndef NEW_INSETS
DocBookHandleFootnote(ofs, par,
depth + 1 + command_depth);
}
while(par && par->IsDummy());
-
+#endif
string end_tag;
- /* write closing SGML tags */
+ // write closing SGML tags
switch(style.latextype) {
case LATEX_COMMAND:
end_tag = "title";
if(!command_stack[j].empty())
sgmlCloseTag(ofs, j, command_stack[j]);
- ofs << "\n\n";
- sgmlCloseTag(ofs, 0, top_element);
+ if (!only_body) {
+ ofs << "\n\n";
+ sgmlCloseTag(ofs, 0, top_element);
+ }
ofs.close();
// How to check for successful close
}
-void Buffer::SimpleDocBookOnePar(string & file, string & extra,
+void Buffer::SimpleDocBookOnePar(ostream & os, string & extra,
LyXParagraph * par, int & desc_on,
int const depth)
{
+#ifndef NEW_TABULAR
if (par->table) {
- par->SimpleDocBookOneTablePar(file, extra, desc_on, depth);
+ par->SimpleDocBookOneTablePar(this,
+ os, extra, desc_on, depth);
return;
}
- LyXFont font1, font2;
- char c;
- Inset *inset;
- LyXParagraph::size_type main_body;
- int j;
- string emph= "emphasis";
- bool emph_flag= false;
- int char_line_count= 0;
+#endif
+
+ bool emph_flag = false;
LyXLayout const & style = textclasslist.Style(params.textclass,
par->GetLayout());
+ LyXParagraph::size_type main_body;
if (style.labeltype != LABEL_MANUAL)
main_body = 0;
else
main_body = par->BeginningOfMainBody();
- /* gets paragraph main font */
- if (main_body > 0)
- font1 = style.labelfont;
- else
- font1 = style.font;
-
- char_line_count = depth;
+ // gets paragraph main font
+ LyXFont font1 = main_body > 0 ? style.labelfont : style.font;
+
+ int char_line_count = depth;
if(!style.free_spacing)
- for (j= 0;j< depth;j++)
- file += ' ';
+ for (int j = 0; j < depth; ++j)
+ os << ' ';
- /* parsing main loop */
+ // parsing main loop
for (LyXParagraph::size_type i = 0;
i < par->size(); ++i) {
- font2 = par->getFont(i);
+ LyXFont font2 = par->getFont(params, i);
- /* handle <emphasis> tag */
+ // handle <emphasis> tag
if (font1.emph() != font2.emph() && i) {
if (font2.emph() == LyXFont::ON) {
- file += "<emphasis>";
- emph_flag= true;
+ os << "<emphasis>";
+ emph_flag = true;
}else {
- file += "</emphasis>";
- emph_flag= false;
+ os << "</emphasis>";
+ emph_flag = false;
}
}
- c = par->GetChar(i);
+ char c = par->GetChar(i);
if (c == LyXParagraph::META_INSET) {
- inset = par->GetInset(i);
- string tmp_out;
- inset->DocBook(tmp_out);
+ Inset * inset = par->GetInset(i);
+#ifdef HAVE_SSTREAM
+ std::ostringstream ost;
+ inset->DocBook(this, ost);
+ string tmp_out = ost.str().c_str();
+#else
+ ostrstream ost;
+ inset->DocBook(this, ost);
+ ost << '\0';
+ char * ctmp = ost.str();
+ string tmp_out(ctmp);
+ delete [] ctmp;
+#endif
//
// This code needs some explanation:
// Two insets are treated specially
if(desc_on == 4)
extra += frontStrip(tmp_out, '@');
else
- file += frontStrip(tmp_out, '@');
+ os << frontStrip(tmp_out, '@');
}
else
- file += tmp_out;
+ os << tmp_out;
}
} else if (font2.latex() == LyXFont::ON) {
// "TeX"-Mode on ==> SGML-Mode on.
- if (c!= '\0')
- file += c;
- char_line_count++;
- }
- else {
+ if (c != '\0')
+ os << c;
+ ++char_line_count;
+ } else {
string sgml_string;
if (par->linuxDocConvertChar(c, sgml_string)
&& !style.free_spacing) { // in freespacing
// non-breaking characters
// char is ' '
if (desc_on == 1) {
- char_line_count++;
- file += '\n';
- file += "</term><listitem><para>";
+ ++char_line_count;
+ os << "\n</term><listitem><para>";
desc_on = 2;
+ } else {
+ os << c;
}
- else {
- file += c;
- }
- }
- else {
- file += sgml_string;
+ } else {
+ os << sgml_string;
}
}
font1 = font2;
}
- /* needed if there is an optional argument but no contents */
+ // needed if there is an optional argument but no contents
if (main_body > 0 && main_body == par->size()) {
font1 = style.font;
}
if (emph_flag) {
- file += "</emphasis>";
+ os << "</emphasis>";
}
- /* resets description flag correctly */
+ // resets description flag correctly
switch(desc_on){
case 1:
- /* <term> not closed... */
- file += "</term>";
+ // <term> not closed...
+ os << "</term>";
break;
}
- file += '\n';
-}
-
-
-bool BufferView::removeAutoInsets()
-{
- LyXParagraph * par = buffer()->paragraph;
-
- LyXCursor cursor = text->cursor;
- LyXCursor tmpcursor = cursor;
- cursor.par = tmpcursor.par->ParFromPos(tmpcursor.pos);
- cursor.pos = tmpcursor.par->PositionInParFromPos(tmpcursor.pos);
-
- bool a = false;
- while (par) {
- if (par->AutoDeleteInsets()){
- a = true;
- if (par->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE){
- // this is possible now, since SetCursor takes
- // care about footnotes
- text->SetCursorIntern(par, 0);
- text->RedoParagraphs(text->cursor,
- text->cursor.par->Next());
- text->FullRebreak();
- }
- }
- par = par->next;
- }
- // avoid forbidden cursor positions caused by error removing
- if (cursor.pos > cursor.par->Last())
- cursor.pos = cursor.par->Last();
- text->SetCursorIntern(cursor.par, cursor.pos);
-
- return a;
+ os << '\n';
}
{
if (!users->text) return 0;
- ProhibitInput();
+ ProhibitInput(users);
// get LaTeX-Filename
string name = getLatexName();
string path = OnlyPath(filename);
string org_path = path;
- if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)) {
+ if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) {
path = tmppath;
}
// Always generate the LaTeX file
makeLaTeXFile(name, org_path, false);
- markDviDirty();
// do the LaTex run(s)
TeXErrors terr;
- string latex_command = lyxrc->pdf_mode ?
- lyxrc->pdflatex_command : lyxrc->latex_command;
+ string latex_command = lyxrc.pdf_mode ?
+ lyxrc.pdflatex_command : lyxrc.latex_command;
LaTeX latex(latex_command, name, filepath);
int res = latex.run(terr,
users->owner()->getMiniBuffer()); // running latex
} else {
//no errors or any other things to think about so:
users->owner()->getMiniBuffer()->Set(_("Done"));
- markDviClean();
}
// if we removed error insets before we ran LaTeX or if we inserted
if (a || (res & LaTeX::ERRORS)){
users->redraw();
users->fitCursor();
- users->updateScrollbar();
+ //users->updateScrollbar();
}
- AllowInput();
+ AllowInput(users);
return latex.getNumErrors();
}
{
if (!users->text) return 0;
- ProhibitInput();
+ ProhibitInput(users);
// get LaTeX-Filename
string name = getLatexName();
// get Literate-Filename
- string lit_name = ChangeExtension (getLatexName(),
- lyxrc->literate_extension, true);
+ string lit_name = OnlyFilename(ChangeExtension (getLatexName(),
+ lyxrc.literate_extension));
string path = OnlyPath(filename);
string org_path = path;
- if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)) {
+ if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) {
path = tmppath;
}
users->owner()->getMiniBuffer()->Set(_("Running Literate..."));
// Remove all error insets
- bool a = users->removeAutoInsets();
+ bool removedErrorInsets = users->removeAutoInsets();
// generate the Literate file if necessary
- if (!isDviClean() || a) {
- makeLaTeXFile(lit_name, org_path, false);
- markDviDirty();
- }
+ makeLaTeXFile(lit_name, org_path, false);
- string latex_command = lyxrc->pdf_mode ?
- lyxrc->pdflatex_command : lyxrc->latex_command;
+ string latex_command = lyxrc.pdf_mode ?
+ lyxrc.pdflatex_command : lyxrc.latex_command;
Literate literate(latex_command, name, filepath,
lit_name,
- lyxrc->literate_command, lyxrc->literate_error_filter,
- lyxrc->build_command, lyxrc->build_error_filter);
+ lyxrc.literate_command, lyxrc.literate_error_filter,
+ lyxrc.build_command, lyxrc.build_error_filter);
TeXErrors terr;
int res = literate.weave(terr, users->owner()->getMiniBuffer());
} else {
//no errors or any other things to think about so:
users->owner()->getMiniBuffer()->Set(_("Done"));
- markDviClean();
}
// if we removed error insets before we ran LaTeX or if we inserted
// error insets after we ran LaTeX this must be run:
- if (a || (res & Literate::ERRORS)){
+ if (removedErrorInsets || (res & Literate::ERRORS)){
users->redraw();
users->fitCursor();
- users->updateScrollbar();
+ //users->updateScrollbar();
}
- AllowInput();
+ AllowInput(users);
return literate.getNumErrors();
}
{
if (!users->text) return 0;
- ProhibitInput();
+ ProhibitInput(users);
// get LaTeX-Filename
string name = getLatexName();
// get Literate-Filename
- string lit_name = ChangeExtension(getLatexName(),
- lyxrc->literate_extension, true);
+ string lit_name = OnlyFilename(ChangeExtension(getLatexName(),
+ lyxrc.literate_extension));
string path = OnlyPath(filename);
string org_path = path;
- if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)) {
+ if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) {
path = tmppath;
}
users->owner()->getMiniBuffer()->Set(_("Building Program..."));
// Remove all error insets
- bool a = users->removeAutoInsets();
+ bool removedErrorInsets = users->removeAutoInsets();
// generate the LaTeX file if necessary
- if (!isNwClean() || a) {
+ if (!isNwClean() || removedErrorInsets) {
makeLaTeXFile(lit_name, org_path, false);
markNwDirty();
}
- string latex_command = lyxrc->pdf_mode ?
- lyxrc->pdflatex_command : lyxrc->latex_command;
+ string latex_command = lyxrc.pdf_mode ?
+ lyxrc.pdflatex_command : lyxrc.latex_command;
Literate literate(latex_command, name, filepath,
lit_name,
- lyxrc->literate_command, lyxrc->literate_error_filter,
- lyxrc->build_command, lyxrc->build_error_filter);
+ lyxrc.literate_command, lyxrc.literate_error_filter,
+ lyxrc.build_command, lyxrc.build_error_filter);
TeXErrors terr;
int res = literate.build(terr, users->owner()->getMiniBuffer());
markNwClean();
}
- // if we removed error insets before we ran Literate/Build or if we inserted
- // error insets after we ran Literate/Build this must be run:
- if (a || (res & Literate::ERRORS)){
+ // if we removed error insets before we ran Literate/Build or
+ // if we inserted error insets after we ran Literate/Build this
+ // must be run:
+ if (removedErrorInsets || (res & Literate::ERRORS)){
users->redraw();
users->fitCursor();
- users->updateScrollbar();
+ //users->updateScrollbar();
}
- AllowInput();
+ AllowInput(users);
return literate.getNumErrors();
}
{
if (!users->text) return 0;
- ProhibitInput();
+ ProhibitInput(users);
// get LaTeX-Filename
string name = getLatexName();
string path = OnlyPath(filename);
string org_path = path;
- if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)) {
+ if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) {
path = tmppath;
}
users->owner()->getMiniBuffer()->Set(_("Running chktex..."));
// Remove all error insets
- bool a = users->removeAutoInsets();
+ bool removedErrorInsets = users->removeAutoInsets();
// Generate the LaTeX file if neccessary
- if (!isDviClean() || a) {
- makeLaTeXFile(name, org_path, false);
- markDviDirty();
- }
+ makeLaTeXFile(name, org_path, false);
TeXErrors terr;
- Chktex chktex(lyxrc->chktex_command, name, filepath);
+ Chktex chktex(lyxrc.chktex_command, name, filepath);
int res = chktex.run(terr); // run chktex
if (res == -1) {
// if we removed error insets before we ran chktex or if we inserted
// error insets after we ran chktex, this must be run:
- if (a || res){
+ if (removedErrorInsets || res){
users->redraw();
users->fitCursor();
- users->updateScrollbar();
+ //users->updateScrollbar();
}
- AllowInput();
+ AllowInput(users);
return res;
}
-void BufferView::insertErrors(TeXErrors & terr)
-{
- // Save the cursor position
- LyXCursor cursor = text->cursor;
-
- // This is drastic, but it's the only fix, I could find. (Asger)
- allFloats(1, 0);
- allFloats(1, 1);
-
- for (TeXErrors::Errors::const_iterator cit = terr.begin();
- cit != terr.end();
- ++cit) {
- string desctext((*cit).error_desc);
- string errortext((*cit).error_text);
- string msgtxt = desctext + '\n' + errortext;
- int errorrow = (*cit).error_in_line;
-
- // Insert error string for row number
- int tmpid = -1;
- int tmppos = -1;
-
- buffer()->texrow.getIdFromRow(errorrow, tmpid, tmppos);
-
- LyXParagraph * texrowpar = 0;
-
- if (tmpid == -1) {
- texrowpar = text->FirstParagraph();
- tmppos = 0;
- } else {
- texrowpar = text->GetParFromID(tmpid);
- }
-
- if (texrowpar == 0)
- continue;
-
- InsetError * new_inset = new InsetError(msgtxt);
- text->SetCursorIntern(texrowpar, tmppos);
- text->InsertInset(new_inset);
- text->FullRebreak();
- }
- // Restore the cursor position
- text->SetCursorIntern(cursor.par, cursor.pos);
-}
-
-
-void BufferView::setCursorFromRow(int row)
-{
- int tmpid = -1;
- int tmppos = -1;
-
- buffer()->texrow.getIdFromRow(row, tmpid, tmppos);
-
- LyXParagraph * texrowpar;
-
- if (tmpid == -1) {
- texrowpar = text->FirstParagraph();
- tmppos = 0;
- } else {
- texrowpar = text->GetParFromID(tmpid);
- }
- text->SetCursor(texrowpar, tmppos);
-}
-
-
-void Buffer::RoffAsciiTable(ostream & os, LyXParagraph * par)
-{
- LyXFont font1 = LyXFont(LyXFont::ALL_INHERIT);
- LyXFont font2;
- Inset * inset;
- LyXParagraph::size_type i;
- int j, cell = 0;
- char c;
-
- string fname1 = TmpFileName(string(), "RAT1");
- string fname2 = TmpFileName(string(), "RAT2");
-
- ofstream ofs(fname1.c_str());
- if (!ofs) {
- WriteAlert(_("LYX_ERROR:"),
- _("Cannot open temporary file:"), fname1);
- return;
- }
- par->table->RoffEndOfCell(ofs, -1);
- for (i = 0; i < par->size(); ++i) {
- c = par->GetChar(i);
- if (par->table->IsContRow(cell)) {
- if (c == LyXParagraph::META_NEWLINE)
- cell++;
- continue;
- }
- font2 = par->GetFontSettings(i);
- if (font1.latex() != font2.latex()) {
- if (font2.latex() != LyXFont::OFF)
- continue;
- }
- switch (c) {
- case LyXParagraph::META_INSET:
- if ((inset = par->GetInset(i))) {
- fstream fs(fname2.c_str(), ios::in|ios::out);
- if (!fs) {
- WriteAlert(_("LYX_ERROR:"),
- _("Cannot open temporary file:"), fname2);
- ofs.close();
- remove(fname1.c_str());
- return;
- }
- inset->Latex(fs, -1);
- fs.seekp(0);
- fs.get(c);
- while(!fs) {
- if (c == '\\')
- ofs << "\\\\";
- else
- ofs << c;
- fs >> c;
- }
- fs.close();
- }
- break;
- case LyXParagraph::META_NEWLINE:
- if (par->table->CellHasContRow(cell)>= 0)
- par->RoffContTableRows(ofs, i+1, cell);
- par->table->RoffEndOfCell(ofs, cell);
- cell++;
- break;
- case LyXParagraph::META_HFILL:
- break;
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- break;
- case '\\':
- ofs << "\\\\";
- break;
- default:
- if (c != '\0')
- ofs << c;
- else if (c == '\0')
- lyxerr.debug()
- << "RoffAsciiTable:"
- " NULL char in structure." << endl;
- break;
- }
- }
- par->table->RoffEndOfCell(ofs, cell);
- ofs.close();
- string cmd = lyxrc->ascii_roff_command + " >" + fname2;
- cmd = subst(cmd, "$$FName", fname1);
- Systemcalls one(Systemcalls::System, cmd);
- if (!(lyxerr.debugging(Debug::ROFF))) {
- remove(fname1.c_str());
- }
- ifstream ifs(fname2.c_str());
- if (!ifs) {
- WriteFSAlert(_("Error! Can't open temporary file:"), fname2);
- return;
- }
- // now output the produced file
- os << "\n\n";
- ifs.get(c);
- if (!ifs)
- WriteAlert(_("Error!"),
- _("Error executing *roff command on table"));
- // overread leading blank lines
- while(!ifs && (c == '\n'))
- ifs.get(c);
- while(!ifs) {
- for(j = 0; j < par->depth; ++j)
- os << " ";
- while(!ifs && (c != '\n')) {
- os << c;
- ifs.get(c);
- }
- os << '\n';
- // overread trailing blank lines
- while(!ifs && (c == '\n'))
- ifs.get(c);
- }
- ifs.close();
- remove(fname2.c_str());
-}
-
-
-/// changed Heinrich Bauer, 23/03/98
-bool Buffer::isDviClean()
-{
- if (lyxrc->use_tempdir)
- return dvi_clean_tmpd;
- else
- return dvi_clean_orgd;
-}
-
-
-/// changed Heinrich Bauer, 23/03/98
-void Buffer::markDviClean()
-{
- if (lyxrc->use_tempdir)
- dvi_clean_tmpd = true;
- else
- dvi_clean_orgd = true;
-}
-
-
-/// changed Heinrich Bauer, 23/03/98
-void Buffer::markDviDirty()
-{
- if (lyxrc->use_tempdir)
- dvi_clean_tmpd = false;
- else
- dvi_clean_orgd = false;
-}
-
-
-void Buffer::validate(LaTeXFeatures & features)
+void Buffer::validate(LaTeXFeatures & features) const
{
LyXParagraph * par = paragraph;
LyXTextClass const & tclass =
}
if (lyxerr.debugging(Debug::LATEX)) {
- features.showStruct(params);
+ features.showStruct();
}
}
}
-#if 0
-void Buffer::setOldPaperStuff()
-{
- char c = params.papersize = params.papersize2;
- params.papersize2 = BufferParams::VM_PAPER_DEFAULT;
- params.paperpackage = BufferParams::PACKAGE_NONE;
- if (c == OLD_PAPER_A4PAPER)
- params.papersize2 = BufferParams::VM_PAPER_A4;
- else if (c == OLD_PAPER_A4)
- params.paperpackage = BufferParams::PACKAGE_A4;
- else if (c == OLD_PAPER_A4WIDE)
- params.paperpackage = BufferParams::PACKAGE_A4WIDE;
- else if (c == OLD_PAPER_WIDEMARGINSA4)
- params.paperpackage = BufferParams::PACKAGE_WIDEMARGINSA4;
- else if (c == OLD_PAPER_USLETTER)
- params.papersize2 = BufferParams::VM_PAPER_USLETTER;
- else if (c == OLD_PAPER_A5PAPER)
- params.papersize2 = BufferParams::VM_PAPER_A5;
- else if (c == OLD_PAPER_B5PAPER)
- params.papersize2 = BufferParams::VM_PAPER_B5;
- else if (c == OLD_PAPER_EXECUTIVEPAPER)
- params.papersize2 = BufferParams::VM_PAPER_USEXECUTIVE;
- else if (c == OLD_PAPER_LEGALPAPER)
- params.papersize2 = BufferParams::VM_PAPER_USLEGAL;
- setPaperStuff();
-}
-#endif
-
-
-void BufferView::insertInset(Inset * inset, string const & lout,
- bool no_table)
-{
- // check for table/list in tables
- if (no_table && text->cursor.par->table){
- WriteAlert(_("Impossible Operation!"),
- _("Cannot insert table/list in table."),
- _("Sorry."));
- return;
- }
- // not quite sure if we want this...
- text->SetCursorParUndo();
- text->FreezeUndo();
-
- beforeChange();
- if (!lout.empty()) {
- update(-2);
- text->BreakParagraph();
- update(-1);
-
- if (text->cursor.par->Last()) {
- text->CursorLeft();
-
- text->BreakParagraph();
- update(-1);
- }
-
- int lay = textclasslist.NumberOfLayout(buffer()->params.textclass,
- lout).second;
- if (lay == -1) // layout not found
- // use default layout "Standard" (0)
- lay = 0;
-
- text->SetLayout(lay);
-
- text->SetParagraph(0, 0,
- 0, 0,
- VSpace(VSpace::NONE), VSpace(VSpace::NONE),
- LYX_ALIGN_LAYOUT,
- string(),
- 0);
- update(-1);
-
- text->current_font.setLatex(LyXFont::OFF);
- }
-
- text->InsertInset(inset);
- update(-1);
-
- text->UnFreezeUndo();
-}
-
-
-// Open and lock an updatable inset
-void BufferView::open_new_inset(UpdatableInset * new_inset)
-{
- beforeChange();
- text->FinishUndo();
- insertInset(new_inset);
- text->CursorLeft();
- update(1);
- new_inset->Edit(0, 0);
-}
-
-
// This function should be in Buffer because it's a buffer's property (ale)
string Buffer::getIncludeonlyList(char delim)
{
string lst;
- LyXParagraph * par = paragraph;
- LyXParagraph::size_type pos;
- Inset * inset;
- while (par){
- pos = -1;
- while ((inset = par->ReturnNextInsetPointer(pos))){
- if (inset->LyxCode() == Inset::INCLUDE_CODE) {
- InsetInclude * insetinc =
- static_cast<InsetInclude*>(inset);
- if (insetinc->isInclude()
- && insetinc->isNoLoad()) {
- if (!lst.empty())
- lst += delim;
- lst += ChangeExtension(insetinc->getContents(), string(), true);
- }
+ for (inset_iterator it = inset_iterator_begin();
+ it != inset_iterator_end(); ++it) {
+ if ((*it)->LyxCode() == Inset::INCLUDE_CODE) {
+ InsetInclude * insetinc =
+ static_cast<InsetInclude *>(*it);
+ if (insetinc->isInclude()
+ && insetinc->isNoLoad()) {
+ if (!lst.empty())
+ lst += delim;
+ lst += OnlyFilename(ChangeExtension(insetinc->getContents(), string()));
}
- pos++;
- }
- par = par->next;
+ }
}
lyxerr.debug() << "Includeonly(" << lst << ')' << endl;
return lst;
}
-// This is also a buffer property (ale)
-string Buffer::getReferenceList(char delim)
+vector<string> Buffer::getLabelList()
{
/// if this is a child document and the parent is already loaded
/// Use the parent's list instead [ale990407]
- if (!params.parentname.empty() && bufferlist.exists(params.parentname)) {
+ if (!params.parentname.empty()
+ && bufferlist.exists(params.parentname)) {
Buffer * tmp = bufferlist.getBuffer(params.parentname);
if (tmp)
- return tmp->getReferenceList(delim);
+ return tmp->getLabelList();
+ }
+
+ vector<string> label_list;
+ for (inset_iterator it = inset_iterator_begin();
+ it != inset_iterator_end(); ++it) {
+ vector<string> l = (*it)->getLabelList();
+ label_list.insert(label_list.end(), l.begin(), l.end());
}
+ return label_list;
+}
+
+vector<vector<Buffer::TocItem> > Buffer::getTocList()
+{
+ vector<vector<TocItem> > l(4);
LyXParagraph * par = paragraph;
- LyXParagraph::size_type pos;
- Inset * inset;
- string lst;
- while (par){
- pos = -1;
- while ((inset = par->ReturnNextInsetPointer(pos))){
- for (int i = 0; i < inset->GetNumberOfLabels(); i++) {
- if (!lst.empty())
- lst += delim;
- lst += inset->getLabel(i);
+ while (par) {
+#ifndef NEW_INSETS
+ if (par->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
+ if (textclasslist.Style(params.textclass,
+ par->GetLayout()).labeltype
+ == LABEL_SENSITIVE) {
+ TocItem tmp;
+ tmp.par = par;
+ tmp.depth = 0;
+ tmp.str = par->String(this, false);
+ switch (par->footnotekind) {
+ case LyXParagraph::FIG:
+ case LyXParagraph::WIDE_FIG:
+ l[TOC_LOF].push_back(tmp);
+ break;
+ case LyXParagraph::TAB:
+ case LyXParagraph::WIDE_TAB:
+ l[TOC_LOT].push_back(tmp);
+ break;
+ case LyXParagraph::ALGORITHM:
+ l[TOC_LOA].push_back(tmp);
+ break;
+ case LyXParagraph::FOOTNOTE:
+ case LyXParagraph::MARGIN:
+ break;
+ }
}
- pos++;
- }
+ } else if (!par->IsDummy()) {
+#endif
+ char labeltype = textclasslist.Style(params.textclass,
+ par->GetLayout()).labeltype;
+
+ if (labeltype >= LABEL_COUNTER_CHAPTER
+ && labeltype <= LABEL_COUNTER_CHAPTER + params.tocdepth) {
+ // insert this into the table of contents
+ TocItem tmp;
+ tmp.par = par;
+ tmp.depth = max(0,
+ labeltype -
+ textclasslist.TextClass(params.textclass).maxcounter());
+ tmp.str = par->String(this, true);
+ l[TOC_TOC].push_back(tmp);
+ }
+#ifndef NEW_INSETS
+ }
+#endif
par = par->next;
}
- lyxerr.debug() << "References(" << lst << ")" << endl;
- return lst;
+ return l;
}
-
// This is also a buffer property (ale)
-string Buffer::getBibkeyList(char delim)
+vector<pair<string,string> > Buffer::getBibkeyList()
{
/// if this is a child document and the parent is already loaded
/// Use the parent's list instead [ale990412]
if (!params.parentname.empty() && bufferlist.exists(params.parentname)) {
Buffer * tmp = bufferlist.getBuffer(params.parentname);
if (tmp)
- return tmp->getBibkeyList(delim);
+ return tmp->getBibkeyList();
}
- string bibkeys;
+ vector<pair<string, string> > keys;
LyXParagraph * par = paragraph;
while (par) {
- if (par->bibkey) {
- if (!bibkeys.empty())
- bibkeys += delim;
- bibkeys += par->bibkey->getContents();
- }
+ if (par->bibkey)
+ keys.push_back(pair<string, string>(par->bibkey->getContents(),
+ par->String(this, false)));
par = par->next;
}
// Might be either using bibtex or a child has bibliography
- if (bibkeys.empty()) {
- par = paragraph;
- while (par) {
- Inset * inset;
- LyXParagraph::size_type pos = -1;
-
+ if (keys.empty()) {
+ for (inset_iterator it = inset_iterator_begin();
+ it != inset_iterator_end(); ++it) {
// Search for Bibtex or Include inset
- while ((inset = par->ReturnNextInsetPointer(pos))) {
- if (inset-> LyxCode() == Inset::BIBTEX_CODE) {
- if (!bibkeys.empty())
- bibkeys += delim;
- bibkeys += static_cast<InsetBibtex*>(inset)->getKeys(delim);
- } else if (inset-> LyxCode() == Inset::INCLUDE_CODE) {
- string bk = static_cast<InsetInclude*>(inset)->getKeys(delim);
- if (!bk.empty()) {
- if (!bibkeys.empty())
- bibkeys += delim;
- bibkeys += bk;
- }
- }
- pos++;
+ if ((*it)->LyxCode() == Inset::BIBTEX_CODE) {
+ vector<pair<string,string> > tmp =
+ static_cast<InsetBibtex*>(*it)->getKeys();
+ keys.insert(keys.end(), tmp.begin(), tmp.end());
+ } else if ((*it)->LyxCode() == Inset::INCLUDE_CODE) {
+ vector<pair<string,string> > tmp =
+ static_cast<InsetInclude*>(*it)->getKeys();
+ keys.insert(keys.end(), tmp.begin(), tmp.end());
}
- par = par->next;
}
}
- lyxerr.debug() << "Bibkeys(" << bibkeys << ")" << endl;
- return bibkeys;
-}
-
-
-/* This is also a buffer property (ale) */
-// Not so sure about that. a goto Label function can not be buffer local, just
-// think how this will work in a multiwindo/buffer environment, all the
-// cursors in all the views showing this buffer will move. (Lgb)
-// OK, then no cursor action should be allowed in buffer. (ale)
-bool BufferView::gotoLabel(string const & label)
-
-{
- LyXParagraph * par = buffer()->paragraph;
- LyXParagraph::size_type pos;
- Inset * inset;
- while (par) {
- pos = -1;
- while ((inset = par->ReturnNextInsetPointer(pos))){
- for (int i = 0; i < inset->GetNumberOfLabels(); i++) {
- if (label == inset->getLabel(i)) {
- beforeChange();
- text->SetCursor(par, pos);
- text->sel_cursor = text->cursor;
- update(0);
- return true;
- }
- }
- pos++;
- }
- par = par->next;
- }
- return false;
+ return keys;
}
item = new DEPCLEAN;
item->clean = true;
item->master = name;
- item->next = 0;;
+ item->next = 0;
}
}
}
-void Buffer::Dispatch(string const & command)
+bool Buffer::Dispatch(string const & command)
{
// Split command string into command and argument
string cmd, line = frontStrip(command);
string arg = strip(frontStrip(split(line, cmd, ' ')));
- Dispatch(lyxaction.LookupFunc(cmd.c_str()), arg.c_str());
+ return Dispatch(lyxaction.LookupFunc(cmd.c_str()), arg.c_str());
}
-void Buffer::Dispatch(int action, string const & argument)
+bool Buffer::Dispatch(int action, string const & argument)
{
+ bool dispatched = true;
switch (action) {
case LFUN_EXPORT:
MenuExport(this, argument);
break;
default:
- lyxerr << "A truly unknown func!" << endl;
- break;
+ dispatched = false;
+ }
+ return dispatched;
+}
+
+
+void Buffer::resize()
+{
+ /// resize the BufferViews!
+ if (users)
+ users->resize();
+}
+
- } // end of switch
+void Buffer::resizeInsets(BufferView * bv)
+{
+ /// then remove all LyXText in text-insets
+ LyXParagraph * par = paragraph;
+ for(;par;par = par->next) {
+ par->resizeInsetsLyXText(bv);
+ }
+}
+
+void Buffer::ChangeLanguage(Language const * from, Language const * to)
+{
+
+ LyXParagraph * par = paragraph;
+ while (par) {
+ par->ChangeLanguage(params, from, to);
+ par = par->next;
+ }
+}
+
+
+bool Buffer::isMultiLingual()
+{
+
+ LyXParagraph * par = paragraph;
+ while (par) {
+ if (par->isMultiLingual(params))
+ return true;
+ par = par->next;
+ }
+ return false;
+}
+
+
+Buffer::inset_iterator::inset_iterator(LyXParagraph * paragraph,
+ LyXParagraph::size_type pos)
+ : par(paragraph) {
+ it = par->InsetIterator(pos);
+ if (it == par->inset_iterator_end()) {
+ par = par->next;
+ SetParagraph();
+ }
+}
+
+
+void Buffer::inset_iterator::SetParagraph() {
+ while (par) {
+ it = par->inset_iterator_begin();
+ if (it != par->inset_iterator_end())
+ return;
+ par = par->next;
+ }
+ //it = 0;
+ // We maintain an invariant that whenever par = 0 then it = 0
}
projects / lyx.git / blobdiff