* ======================================================
*/
-// 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 <sys/types.h>
#include <utime.h>
+#include <algorithm>
+
#ifdef __GNUG__
#pragma implementation "buffer.h"
#endif
#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/insetquotes.h"
#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/insetspecialchar.h"
#include "insets/figinset.h"
#include "insets/insettext.h"
-//#include "insets/insetnumber.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 "support/filetools.h"
#include "support/path.h"
#include "LaTeX.h"
#include "lyxtext.h"
#include "gettext.h"
#include "language.h"
+#include "lyx_gui_misc.h" // WarnReadonly()
+#include "frontends/Dialogs.h"
using std::ostream;
using std::ofstream;
using std::setw;
using std::endl;
using std::pair;
-
-// 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::vector;
+using std::max;
// all these externs should eventually be removed.
extern BufferList bufferlist;
extern int tex_code_break_column;
-extern void FreeUpdateTimer();
-
Buffer::Buffer(string const & file, bool ronly)
{
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;
users = 0;
lyxvc.buffer(this);
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
// else insert behavior
// Returns false if "\the_end" is not read for formats >= 2.13. (Asger)
#define USE_PARSE_FUNCTION 1
+//#define USE_TABULAR_INSETS 1
bool Buffer::readLyXformat2(LyXLex & lex, LyXParagraph * par)
{
string tmptok;
bool the_end_read = false;
LyXParagraph * return_par = 0;
- LyXFont font(LyXFont::ALL_INHERIT,params.language_info);
+ LyXFont font(LyXFont::ALL_INHERIT, params.language_info);
if (format < 2.16 && params.language == "hebrew")
font.setLanguage(default_language);
if(!par) {
par = new LyXParagraph;
} else {
- users->text->BreakParagraph();
+ users->text->BreakParagraph(users);
return_par = users->text->FirstParagraph();
pos = 0;
markDirty();
}
-bool Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
- LyXParagraph *& return_par,
- const string & token, int & pos,
- char & depth, LyXFont & font,
- LyXParagraph::footnote_flag & footnoteflag,
- LyXParagraph::footnote_kind & footnotekind)
+bool
+Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
+ LyXParagraph *& return_par,
+ string const & token, int & pos,
+ char & depth, LyXFont & font,
+ LyXParagraph::footnote_flag & footnoteflag,
+ LyXParagraph::footnote_kind & footnotekind)
{
- Inset * inset = 0;
- int tmpret, tmpret2;
- string tmptok;
bool the_end_read = false;
-
+
if (token[0] != '\\') {
- int n = token.length();
- for (int i = 0; i < n; ++i) {
- par->InsertChar(pos, token[i]);
- par->SetFont(pos, font);
+ for (string::const_iterator cit = token.begin();
+ cit != token.end(); ++cit) {
+ par->InsertChar(pos, (*cit), 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);
+ Inset * inset = new InsetLatexAccent;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
++pos;
} else if (token == "\\layout") {
if (!return_par)
if (pp.first) {
par->layout = pp.second;
} else { // layout not found
- // use default layout "Standard" (0)
+ // use default layout "Standard" (0)
par->layout = 0;
}
// Test whether the layout is obsolete.
par->footnoteflag = footnoteflag;
par->footnotekind = footnotekind;
par->depth = depth;
- font = LyXFont(LyXFont::ALL_INHERIT,params.language_info);
+ 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;
pos = 0;
lex.EatLine();
par->layout = LYX_DUMMY_LAYOUT;
- font = LyXFont(LyXFont::ALL_INHERIT,params.language_info);
+ font = LyXFont(LyXFont::ALL_INHERIT, params.language_info);
if (format < 2.16 && params.language == "hebrew")
font.setLanguage(default_language);
} else if (token == "\\begin_float") {
- tmpret = lex.FindToken(string_footnotekinds);
+ int tmpret = lex.FindToken(string_footnotekinds);
if (tmpret == -1) ++tmpret;
if (tmpret != LYX_LAYOUT_DEFAULT)
footnotekind = static_cast<LyXParagraph::footnote_kind>(tmpret); // bad
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;
+
+ if (tmptok == "footnote") {
+ inset = new InsetFoot;
+ } else if (tmptok == "margin") {
+ inset = new InsetMarginal;
+ } else if (tmptok == "fig") {
+ //inset = new InsetFigure;
+ } else if (tmptok == "tab") {
+ //inset = new InsetTable;
+ } else if (tmptok == "alg") {
+ //inset = new InsetAlgorithm;
+ } else if (tmptok == "wide-fig") {
+ //inset = new InsetFigure(true);
+ } else if (tmptok == "wide-tab") {
+ //inset = new InsetTable(true);
+ }
+
+ if (!inset) return false; // no end read yet
+
+ string old_float = "\ncollapsed true\n";
+ old_float += lex.getLongString("\\end_float");
+ old_float += "\n\\end_inset\n";
+ lyxerr << "float body: " << old_float << endl;
+
+ istrstream istr(old_float.c_str());
+ 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") {
} else if (token == "\\start_of_appendix") {
par->start_of_appendix = true;
} else if (token == "\\paragraph_separation") {
- tmpret = lex.FindToken(string_paragraph_separation);
+ int tmpret = lex.FindToken(string_paragraph_separation);
if (tmpret == -1) ++tmpret;
if (tmpret != LYX_LAYOUT_DEFAULT)
params.paragraph_separation =
} else if (token == "\\defskip") {
lex.nextToken();
params.defskip = VSpace(lex.GetString());
-#if 0
- } else if (token == "\\no_isolatin1") { // obsolete
- lex.nextToken();
- } else if (token == "\\no_babel") { // obsolete
- lex.nextToken();
- } else if (token == "\\no_epsfig") { // obsolete
- lex.nextToken();
-#endif
} 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);
+ int tmpret = lex.FindToken(string_quotes_language);
if (tmpret == -1) ++tmpret;
if (tmpret != LYX_LAYOUT_DEFAULT) {
InsetQuotes::quote_language tmpl =
break;
}
} else if (token == "\\papersize") {
- tmpret = lex.FindToken(string_papersize);
+ int tmpret = lex.FindToken(string_papersize);
if (tmpret == -1)
++tmpret;
else
params.papersize2 = tmpret;
} else if (token == "\\paperpackage") {
- tmpret = lex.FindToken(string_paperpackages);
+ int tmpret = lex.FindToken(string_paperpackages);
if (tmpret == -1) {
++tmpret;
params.paperpackage = BufferParams::PACKAGE_NONE;
lex.nextToken();
params.use_amsmath = lex.GetInteger();
} else if (token == "\\paperorientation") {
- tmpret = lex.FindToken(string_orientation);
+ 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 == "\\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());
+ 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();
+ 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") {
- params.spacing.set(Spacing::Single);
+ par->spacing.set(Spacing::Single);
} else if (tmp == "onehalf") {
- params.spacing.set(Spacing::Onehalf);
+ par->spacing.set(Spacing::Onehalf);
} else if (tmp == "double") {
- params.spacing.set(Spacing::Double);
+ par->spacing.set(Spacing::Double);
} else if (tmp == "other") {
lex.next();
- params.spacing.set(Spacing::Other,
- lex.GetFloat());
+ 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 == "\\cursor") { // obsolete
- // this is obsolete, so we just skip it.
- lex.nextToken();
} else if (token == "\\family") {
lex.next();
font.setLyXFamily(lex.GetString());
font.setLanguage(params.language_info);
lex.printError("Unknown language `$$Token'");
}
- } else if (token == "\\direction") { // obsolete
- if (format >= 2.16)
- lex.printError("Command \\direction is obsolete");
- lex.next();
- string tok = lex.GetString();
- if (tok == "rtl")
- font.setLanguage(&languages["hebrew"]);
- else if (tok == "default")
- if (params.language == "hebrew")
- font.setLanguage(default_language);
- else
- font.setLanguage(params.language_info);
- else
- lex.printError("Unknown direction `$$Token'");
} else if (token == "\\emph") {
lex.next();
font.setEmph(font.setLyXMisc(lex.GetString()));
lex.next();
font.setLyXColor(lex.GetString());
} else if (token == "\\align") {
- tmpret = lex.FindToken(string_align);
+ int tmpret = lex.FindToken(string_align);
if (tmpret == -1) ++tmpret;
if (tmpret != LYX_LAYOUT_DEFAULT) { // tmpret != 99 ???
- tmpret2 = 1;
+ 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 = lex.GetString();
+ par->added_space_top = VSpace(lex.GetString());
} else if (token == "\\added_space_bottom") {
lex.nextToken();
- par->added_space_bottom = lex.GetString();
+ par->added_space_bottom = VSpace(lex.GetString());
} else if (token == "\\pextra_type") {
lex.nextToken();
par->pextra_type = lex.GetInteger();
} else if (token == "\\labelwidthstring") {
lex.EatLine();
par->labelwidthstring = lex.GetString();
- /* do not delete this token, it is still needed! */
+ // 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.
+ // 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") {
+ // Should be moved out into its own function/method. (Lgb)
lex.next();
- tmptok = lex.GetString();
- /* test the different insets */
+ string 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);
+ Inset * inset = new InsetQuotes;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
++pos;
- } else if (tmptok == "\\i") {
- inset = new InsetLatexAccent;
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
+ } else if (tmptok == "External") {
+ Inset * inset = new InsetExternal;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, 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);
+ Inset * inset = new InsetFormulaMacro;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, 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);
+ Inset * inset = new InsetFormula;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, 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);
+ Inset * inset = new InsetFig(100, 100, this);
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
++pos;
} else if (tmptok == "Info") {
- inset = new InsetInfo;
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
+ Inset * inset = new InsetInfo;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, 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);
+ Inset * inset = new InsetInclude(string(), this);
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
++pos;
} else if (tmptok == "ERT") {
- inset = new InsetERT(this);
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
+ Inset * inset = new InsetERT;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
++pos;
- } else if (tmptok == "Text") {
- inset = new InsetText(this);
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
+ } else if (tmptok == "Tabular") {
+ Inset * inset = new InsetTabular(this);
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
++pos;
-#if 0
- } else if (tmptok == "Number") {
- inset = new InsetNumber(this);
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
+ } else if (tmptok == "Text") {
+ Inset * inset = new InsetText;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
++pos;
-#endif
} else if (tmptok == "Foot") {
- inset = new InsetFoot(this);
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
+ 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") {
+ Inset * inset = new InsetFloat;
+ 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 == "GRAPHICS") {
- inset = new InsetGraphics;
- //inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
+ Inset * inset = new InsetGraphics;
+ //inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
} else if (tmptok == "LatexCommand") {
InsetCommand inscmd;
- inscmd.Read(lex);
+ inscmd.Read(this, lex);
+ Inset * inset = 0;
if (inscmd.getCmdName() == "cite") {
inset = new InsetCitation(inscmd.getContents(), inscmd.getOptions());
} else if (inscmd.getCmdName() == "bibitem") {
|| inscmd.getCmdName() == "htmlurl") {
inset = new InsetUrl(inscmd.getCommand());
} else if (inscmd.getCmdName() == "ref"
- || inscmd.getCmdName() == "pageref") {
+ || inscmd.getCmdName() == "pageref"
+ || inscmd.getCmdName() == "vref"
+ || inscmd.getCmdName() == "vpageref"
+ || inscmd.getCmdName() == "prettyref") {
if (!inscmd.getOptions().empty() || !inscmd.getContents().empty()) {
inset = new InsetRef(inscmd, this);
}
-#warning Check if this else clause is still needed. (Lgb)
-#if 0
- // 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);
- }
-#endif
} else if (inscmd.getCmdName() == "tableofcontents") {
inset = new InsetTOC(this);
} else if (inscmd.getCmdName() == "listoffigures") {
}
if (inset) {
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
+ par->InsertInset(pos, inset, font);
++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;
- } 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") {
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 (layout.free_spacing) {
if (lex.IsOK()) {
string next_token;
lex.next();
next_token = lex.GetString();
if (next_token == "\\-") {
- par->InsertChar(pos, '-');
- par->SetFont(pos, font);
- } else if (next_token == "\\protected_separator") {
- par->InsertChar(pos, ' ');
- par->SetFont(pos, font);
+ par->InsertChar(pos, '-', font);
+ } else if (next_token == "\\protected_separator"
+ || next_token == "~") {
+ par->InsertChar(pos, ' ', font);
} else {
lex.printError("Token `$$Token' "
"is in free space "
"paragraph layout!");
- pos--;
+ --pos;
}
}
- }
- else
- {
- inset = new InsetSpecialChar;
- inset->Read(lex);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
+ } else {
+ Inset * inset = new InsetSpecialChar;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, 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") { // soon obsolete
-#if 1
- par->InsertChar(pos, LyXParagraph::META_NEWLINE);
- par->SetFont(pos, font);
-#else
- inset = new InsetSpecialChar(InsetSpecialChar::NEWLINE);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
-#endif
+ } else if (token == "\\newline") {
+ par->InsertChar(pos, LyXParagraph::META_NEWLINE, font);
++pos;
} else if (token == "\\LyXTable") {
+#ifdef USE_TABULAR_INSETS
+ 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 == "\\hfill") {
- par->InsertChar(pos, LyXParagraph::META_HFILL);
- par->SetFont(pos, font);
+ par->InsertChar(pos, LyXParagraph::META_HFILL, font);
++pos;
} else if (token == "\\protected_separator") { // obsolete
-#if 1
+ // 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, ' ');
- par->SetFont(pos, font);
+ par->InsertChar(pos, ' ', font);
} else {
- inset = new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, inset);
- par->SetFont(pos, font);
+ Inset * inset = new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
+ par->InsertInset(pos, inset, font);
}
-#else
- par->InsertChar(pos, LyXParagraph::META_PROTECTED_SEPARATOR);
- par->SetFont(pos, font);
-#endif
++pos;
} else if (token == "\\bibitem") { // ale970302
if (!par->bibkey)
par->bibkey = new InsetBibKey;
- par->bibkey->Read(lex);
+ par->bibkey->Read(this, lex);
}else if (token == "\\backslash") {
- par->InsertChar(pos, '\\');
- par->SetFont(pos, font);
+ par->InsertChar(pos, '\\', font);
++pos;
}else if (token == "\\the_end") {
the_end_read = true;
// 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);
+ for(string::const_iterator cit = token.begin();
+ cit != token.end(); ++cit) {
+ par->InsertChar(pos, (*cit), font);
++pos;
}
}
// 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;
/* noindent ? */
/* what about the alignment */
- }
- else {
+ } else {
/* dummy layout, that means a footnote ended */
footnoteflag = LyXParagraph::NO_FOOTNOTE;
ofs << ") ";
noparbreak = 1;
}
- LyXLayout const & layout =
- textclasslist.Style(params.textclass,
- par->GetLayout());
- bool free_spc = layout.free_spacing;
+ //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;
c = par->GetChar(i);
if (c == LyXParagraph::META_INSET) {
if ((inset = par->GetInset(i))) {
-#if 1
#ifdef HAVE_SSTREAM
std::ostringstream ost;
- inset->Latex(ost, -1, free_spc);
+ inset->Ascii(this, ost);
h += ost.str().length();
#else
ostrstream ost;
- inset->Latex(ost, -1, free_spc);
+ inset->Ascii(this, ost);
ost << '\0';
char * tmp = ost.str();
string tstr(tmp);
h += tstr.length();
delete [] tmp;
-#endif
-#else
- ofstream fs(fname1.c_str());
- if (!fs) {
- WriteFSAlert(_("Error: Cannot open temporary file:"), fname1);
- return;
- }
- inset->Latex(fs, -1, free_spc);
- h += fs.tellp() - 1;
- ::remove(fname1.c_str());
#endif
}
} else if (c == LyXParagraph::META_NEWLINE) {
if (clen[j] < h)
clen[j] = h;
}
-
- font1 = LyXFont(LyXFont::ALL_INHERIT,params.language_info);
+#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 += (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, free_spc);
+ 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)
++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;
-#if 0
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- ofs << " ";
- break;
-#endif
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;
}
// 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;
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,";
// language should be a parameter to \documentclass
bool use_babel = false;
+ if (params.language_info->RightToLeft()) // 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 + ",";
- }
- if (default_language != params.language_info)
- options += default_language ->lang + ',';
- options += params.language_info->lang + ',';
+ cit != features.UsedLanguages.end(); ++cit)
+ options += (*cit)->lang() + ",";
+ options += params.language_info->lang() + ',';
}
// the user-defined options
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:
texrow.newline();
}
if (params.use_amsmath
- && !prefixIs(textclasslist.LatexnameOfClass(params.textclass), "ams")) {
+ && !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") {
ofs << "\\usepackage{fancyhdr}\n";
texrow.newline();
}
// 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.
- ofs << "\\begin{document}\n\n";
- texrow.newline();
+ ofs << "\\begin{document}\n";
texrow.newline();
} // only_body
lyxerr.debug() << "preamble finished, now the body." << 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;
#ifdef HAVE_SSTREAM
TexRow ft_texrow;
int ftcount = 0;
- LyXParagraph * par = paragraph;
-
// if only_body
- while (par) {
+ while (par != endpar) {
#ifndef HAVE_SSTREAM
ostrstream ftnote;
if (tmpholder) {
}
#endif
if (par->IsDummy())
- lyxerr[Debug::LATEX] << "Error in MakeLateXFile."
+ lyxerr[Debug::LATEX] << "Error in latexParagraphs."
<< endl;
LyXLayout const & layout =
textclasslist.Style(params.textclass,
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
ftcount = -1;
if (layout.isEnvironment()
|| par->pextra_type != LyXParagraph::PEXTRA_NONE) {
- par = par->TeXEnvironment(ofs, texrow,
+ par = par->TeXEnvironment(this, params, ofs, texrow,
ftnote, ft_texrow, ftcount);
} else {
- par = par->TeXOnePar(ofs, texrow,
+ par = par->TeXOnePar(this, params, ofs, texrow, false,
ftnote, ft_texrow, ftcount);
}
ofs << "\\maketitle\n";
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;
}
}
-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);
// 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;
while(par && par->IsDummy());
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
if(inner_span) {
if(!tmp_par.empty()) {
os << tmp_par;
- tmp_par.clear();
+ 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(!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);
}
}
-/* 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] << ">";
}
}
-/* 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.
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 */
+ // handle quote tag
if (i == main_body && !par->IsDummy()) {
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')
os << c; // see LaTeX-Generation...
++char_line_count;
- } else if (c == LyXParagraph::META_INSET) {
- inset = par->GetInset(i);
- inset->Linuxdoc(os);
} else {
string sgml_string;
if (par->linuxDocConvertChar(c, sgml_string)
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);
- tex_code_break_column = column;
+ LaTeXFeatures features(params, tclass.numLayouts());
+ validate(features);
+
+ //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*/
+ int desc_on = 0; // description mode
LyXLayout const & style =
- textclasslist.Style(users->buffer()->params.textclass,
+ textclasslist.Style(params.textclass,
par->layout);
- par->AutoDeleteInsets();
- /* 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);
while(par && par->IsDummy());
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
LyXParagraph * par, int & desc_on,
int const depth)
{
+#ifndef NEW_TABULAR
if (par->table) {
- par->SimpleDocBookOneTablePar(os, extra, desc_on, depth);
+ par->SimpleDocBookOneTablePar(this,
+ os, extra, desc_on, depth);
return;
}
+#endif
bool emph_flag = false;
main_body = par->BeginningOfMainBody();
// gets paragraph main font
- //if (main_body > 0)
- // font1 = style.labelfont;
- //else
- // font1 = style.font;
LyXFont font1 = main_body > 0 ? style.labelfont : style.font;
int char_line_count = depth;
// parsing main loop
for (LyXParagraph::size_type i = 0;
i < par->size(); ++i) {
- LyXFont font2 = par->getFont(i);
+ LyXFont font2 = par->getFont(params, i);
// handle <emphasis> tag
if (font1.emph() != font2.emph() && i) {
Inset * inset = par->GetInset(i);
#ifdef HAVE_SSTREAM
std::ostringstream ost;
- inset->DocBook(ost);
+ inset->DocBook(this, ost);
string tmp_out = ost.str().c_str();
#else
ostrstream ost;
- inset->DocBook(ost);
+ inset->DocBook(this, ost);
ost << '\0';
char * ctmp = ost.str();
string tmp_out(ctmp);
if (c != '\0')
os << c;
++char_line_count;
- }
- else {
+ } else {
string sgml_string;
if (par->linuxDocConvertChar(c, sgml_string)
&& !style.free_spacing) { // in freespacing
++char_line_count;
os << "\n</term><listitem><para>";
desc_on = 2;
- }
- else {
+ } else {
os << c;
}
- }
- else {
+ } 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;
}
os << "</emphasis>";
}
- /* resets description flag correctly */
+ // resets description flag correctly
switch(desc_on){
case 1:
- /* <term> not closed... */
+ // <term> not closed...
os << "</term>";
break;
}
{
if (!users->text) return 0;
- ProhibitInput();
+ ProhibitInput(users);
// get LaTeX-Filename
string name = getLatexName();
// Always generate the LaTeX file
makeLaTeXFile(name, org_path, false);
- markDviDirty();
// do the LaTex run(s)
TeXErrors terr;
} 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);
bool a = 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;
} 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 & 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);
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 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)){
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();
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);
// 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;
}
-#if 0
-void Buffer::RoffAsciiTable(ostream & os, LyXParagraph * par)
-{
- LyXFont font1(LyXFont::ALL_INHERIT,params.language_info);
- 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))) {
-#if 1
-#ifdef HAVE_SSTREAM
- stringstresm ss(ios::in | ios::out);
- inset->Latex(ss, -1);
- ss.seekp(0);
- ss.get(c);
- while (!ss) {
- if (c == '\\')
- ofs << "\\\\";
- else
- ofs << c;
- ss.get(c);
- }
-#else
- strstream ss;
- inset->Latex(ss, -1);
- ss.seekp(0);
- ss.get(c);
- while (!ss) {
- if (c == '\\')
- ofs << "\\\\";
- else
- ofs << c;
- ss.get(c);
- }
- delete [] ss.str();
-#endif
-#else
- 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();
-#endif
- }
- 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;
-#if 0
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- break;
-#endif
- 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());
-}
-#endif
-
-
-/// changed Heinrich Bauer, 23/03/98
-bool Buffer::isDviClean() const
-{
- 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) const
{
LyXParagraph * par = paragraph;
}
if (lyxerr.debugging(Debug::LATEX)) {
- features.showStruct(params);
+ features.showStruct();
}
}
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]
&& 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);
+ 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;
+ }
+ }
+ } else if (!par->IsDummy()) {
+ 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);
}
- ++pos;
}
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;
+ 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()
+{
+ /// first resize the BufferViews!
+ if (users) {
+ users->resize();
+ }
+ /// then remove all LyXText in text-insets
+ LyXParagraph * par = paragraph;
+ for(;par;par = par->next) {
+ par->deleteInsetsLyXText(users);
+ }
+}
+
+
+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;
+}
- } // end of switch
+
+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
}