#include "support/filetools.h"
#include "support/path.h"
#include "LaTeX.h"
-#include "Literate.h"
#include "Chktex.h"
#include "LyXView.h"
#include "debug.h"
#include "support/syscall.h"
#include "support/lyxlib.h"
#include "support/FileInfo.h"
+#include "support/lyxmanip.h"
#include "lyxtext.h"
#include "gettext.h"
#include "language.h"
#include "frontends/Dialogs.h"
#include "encoding.h"
#include "exporter.h"
+#include "Lsstream.h"
using std::ostream;
using std::ofstream;
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;
-#ifndef NEW_EXPORT
-extern void MenuExport(Buffer *, string const &);
-#endif
extern LyXAction lyxaction;
if (read_only != flag) {
read_only = flag;
updateTitles();
- users->owner()->getDialogs()->updateBufferDependent();
+ users->owner()->getDialogs()->updateBufferDependent(false);
}
if (read_only) {
WarnReadonly(filename);
}
-bool Buffer::saveParamsAsDefaults()
+bool Buffer::saveParamsAsDefaults() // const
{
- string fname = AddName(AddPath(user_lyxdir, "templates/"),
+ string const fname = AddName(AddPath(user_lyxdir, "templates/"),
"defaults.lyx");
Buffer defaults = Buffer(fname);
}
-void Buffer::fileName(string const & newfile)
+void Buffer::setFileName(string const & newfile)
{
filename = MakeAbsPath(newfile);
filepath = OnlyPath(filename);
// Returns false if "\the_end" is not read for formats >= 2.13. (Asger)
bool Buffer::readLyXformat2(LyXLex & lex, LyXParagraph * par)
{
- string tmptok;
int pos = 0;
char depth = 0; // signed or unsigned?
#ifndef NEW_INSETS
bool the_end_read = false;
LyXParagraph * return_par = 0;
- LyXFont font(LyXFont::ALL_INHERIT, params.language_info);
- if (format < 2.16 && params.language == "hebrew")
+ LyXFont font(LyXFont::ALL_INHERIT, params.language);
+ if (format < 2.16 && params.language->lang() == "hebrew")
font.setLanguage(default_language);
// If we are inserting, we cheat and get a token in advance
bool has_token = false;
string pretoken;
- if(!par) {
+ if (!par) {
par = new LyXParagraph;
} else {
users->text->BreakParagraph(users);
pretoken = lex.GetString();
}
- // Profiling show this should give a lot: (Asger)
- string const token = pretoken;
-
- if (token.empty())
- continue;
- the_end_read = parseSingleLyXformat2Token(lex, par, return_par,
- token, pos, depth,
- font
+ if (pretoken.empty()) continue;
+
+ the_end_read =
+ parseSingleLyXformat2Token(lex, par, return_par,
+ pretoken, pos, depth,
+ font
#ifndef NEW_INSETS
- , footnoteflag,
- footnotekind
+ , footnoteflag,
+ footnotekind
#endif
- );
+ );
}
if (!return_par)
}
pos = 0;
lex.EatLine();
- string layoutname = lex.GetString();
+ string const layoutname = lex.GetString();
pair<bool, LyXTextClass::LayoutList::size_type> pp
= textclasslist.NumberOfLayout(params.textclass,
layoutname);
par->footnotekind = footnotekind;
#endif
par->depth = depth;
- font = LyXFont(LyXFont::ALL_INHERIT, params.language_info);
- if (format < 2.16 && params.language == "hebrew")
+ font = LyXFont(LyXFont::ALL_INHERIT, params.language);
+ if (format < 2.16 && params.language->lang() == "hebrew")
font.setLanguage(default_language);
#ifndef NEW_INSETS
} else if (token == "\\end_float") {
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 = LyXFont(LyXFont::ALL_INHERIT, params.language);
+ if (format < 2.16 && params.language->lang() == "hebrew")
font.setLanguage(default_language);
} else if (token == "\\begin_float") {
int tmpret = lex.FindToken(string_footnotekinds);
// This is the compability reader, unfinished but tested.
// (Lgb)
lex.next();
- string tmptok = lex.GetString();
+ string const tmptok = lex.GetString();
//lyxerr << "old float: " << tmptok << endl;
Inset * inset = 0;
// This _is_ a hack! (Lgb)
while(true) {
lex.next();
- string tmp = lex.GetString();
+ string const tmp = lex.GetString();
if (tmp == "\\end_deeper") {
lyxerr << "\\end_deeper caught!" << endl;
if (!depth) {
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);
if (tmpret != LYX_LAYOUT_DEFAULT) {
InsetQuotes::quote_language tmpl =
InsetQuotes::EnglishQ;
- switch(tmpret) {
+ switch (tmpret) {
case 0:
tmpl = InsetQuotes::EnglishQ;
break;
}
} else if (token == "\\quotes_times") {
lex.nextToken();
- switch(lex.GetInteger()) {
+ switch (lex.GetInteger()) {
case 1:
params.quotes_times = InsetQuotes::SingleQ;
break;
params.columns = lex.GetInteger();
} else if (token == "\\papersides") {
lex.nextToken();
- switch(lex.GetInteger()) {
+ switch (lex.GetInteger()) {
default:
case 1: params.sides = LyXTextClass::OneSide; break;
case 2: params.sides = LyXTextClass::TwoSides; break;
params.pagestyle = strip(lex.GetString());
} else if (token == "\\bullet") {
lex.nextToken();
- int index = lex.GetInteger();
+ int const index = lex.GetInteger();
lex.nextToken();
int temp_int = lex.GetInteger();
params.user_defined_bullets[index].setFont(temp_int);
params.user_defined_bullets[index].setSize(temp_int);
params.temp_bullets[index].setSize(temp_int);
lex.nextToken();
- string temp_str = lex.GetString();
+ string const temp_str = lex.GetString();
if (temp_str != "\\end_bullet") {
// this element isn't really necessary for
// parsing but is easier for humans
}
} else if (token == "\\bulletLaTeX") {
lex.nextToken();
- int index = lex.GetInteger();
+ int const index = lex.GetInteger();
lex.next();
- string temp_str = lex.GetString(), sum_str;
+ string temp_str = lex.GetString();
+ string sum_str;
while (temp_str != "\\end_bullet") {
// this loop structure is needed when user
// enters an empty string since the first
params.tocdepth = lex.GetInteger();
} else if (token == "\\spacing") {
lex.next();
- string tmp = strip(lex.GetString());
+ string const tmp = strip(lex.GetString());
Spacing::Space tmp_space = Spacing::Default;
float tmp_val = 0.0;
if (tmp == "single") {
}
} else if (token == "\\paragraph_spacing") {
lex.next();
- string tmp = strip(lex.GetString());
+ string const tmp = strip(lex.GetString());
if (tmp == "single") {
par->spacing.set(Spacing::Single);
} else if (tmp == "onehalf") {
font.setLyXSize(lex.GetString());
} else if (token == "\\latex") {
lex.next();
- string tok = lex.GetString();
+ string const tok = lex.GetString();
// This is dirty, but gone with LyX3. (Asger)
if (tok == "no_latex")
font.setLatex(LyXFont::OFF);
"`$$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);
+ string const tok = lex.GetString();
+ Language const * lang = languages.getLanguage(tok);
+ if (lang) {
+ font.setLanguage(lang);
} else {
- font.setLanguage(params.language_info);
+ font.setLanguage(params.language);
lex.printError("Unknown language `$$Token'");
}
+ } else if (token == "\\numeric") {
+ lex.next();
+ font.setNumber(font.setLyXMisc(lex.GetString()));
} else if (token == "\\emph") {
lex.next();
font.setEmph(font.setLyXMisc(lex.GetString()));
} else if (token == "\\bar") {
lex.next();
- string tok = lex.GetString();
+ string const tok = lex.GetString();
// This is dirty, but gone with LyX3. (Asger)
if (tok == "under")
font.setUnderbar(LyXFont::ON);
par->InsertChar(pos, LyXParagraph::META_NEWLINE, font);
++pos;
} else if (token == "\\LyXTable") {
-#ifdef NEW_TABULAR
- Inset * inset = new InsetTabular(this);
+ 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, font);
++pos;
"Inserting as text.");
string::const_iterator cit = token.begin();
string::const_iterator end = token.end();
- for(; cit != end; ++cit) {
+ for (; cit != end; ++cit) {
par->InsertChar(pos, (*cit), font);
++pos;
}
<< endl;
}
+ Inset * inset = 0;
+
lex.next();
- string tmptok = lex.GetString();
+ string const 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") {
+ 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);
+ inset = new InsetBibtex(inscmd);
} else if (inscmd.getCmdName() == "index") {
inset = new InsetIndex(inscmd);
} else if (inscmd.getCmdName() == "include") {
- inset = new InsetInclude(inscmd, this);
+ inset = new InsetInclude(inscmd, *this);
} else if (inscmd.getCmdName() == "label") {
inset = new InsetLabel(inscmd);
} else if (inscmd.getCmdName() == "url"
|| inscmd.getCmdName() == "prettyref") {
if (!inscmd.getOptions().empty()
|| !inscmd.getContents().empty()) {
- inset = new InsetRef(inscmd);
+ inset = new InsetRef(inscmd, *this);
}
} else if (inscmd.getCmdName() == "tableofcontents"
|| inscmd.getCmdName() == "listofalgorithms"
} else if (inscmd.getCmdName() == "printindex") {
inset = new InsetPrintIndex(inscmd);
} else if (inscmd.getCmdName() == "lyxparent") {
- inset = new InsetParent(inscmd, this);
+ inset = new InsetParent(inscmd, *this);
}
-
- if (inset) {
- par->InsertInset(pos, inset, font);
- ++pos;
+ } else {
+ if (tmptok == "Quotes") {
+ inset = new InsetQuotes;
+ } else if (tmptok == "External") {
+ inset = new InsetExternal;
+ } else if (tmptok == "FormulaMacro") {
+ inset = new InsetFormulaMacro;
+ } else if (tmptok == "Formula") {
+ inset = new InsetFormula;
+ } else if (tmptok == "Figure") {
+ inset = new InsetFig(100, 100, *this);
+ } else if (tmptok == "Info") {
+ inset = new InsetInfo;
+ } else if (tmptok == "Include") {
+ InsetCommandParams p( "Include" );
+ inset = new InsetInclude(p, *this);
+ } else if (tmptok == "ERT") {
+ inset = new InsetERT;
+ } else if (tmptok == "Tabular") {
+ inset = new InsetTabular(*this);
+ } else if (tmptok == "Text") {
+ inset = new InsetText;
+ } else if (tmptok == "Foot") {
+ inset = new InsetFoot;
+ } else if (tmptok == "Marginal") {
+ inset = new InsetMarginal;
+ } else if (tmptok == "Minipage") {
+ inset = new InsetMinipage;
+ } else if (tmptok == "Float") {
+ lex.next();
+ string tmptok = lex.GetString();
+ inset = new InsetFloat(tmptok);
+ } else if (tmptok == "List") {
+ inset = new InsetList;
+ } else if (tmptok == "Theorem") {
+ inset = new InsetList;
+ } else if (tmptok == "Caption") {
+ inset = new InsetCaption;
+ } else if (tmptok == "GRAPHICS") {
+ inset = new InsetGraphics;
}
+
+ if (inset) inset->Read(this, lex);
+ }
+
+ if (inset) {
+ par->InsertInset(pos, inset, font);
+ ++pos;
}
}
{
if (lex.IsOK()) {
lex.next();
- string token(lex.GetString());
+ string const token(lex.GetString());
if (token == "\\lyxformat") { // the first token _must_ be...
- lex.next();
+ lex.EatLine();
format = lex.GetFloat();
- if (format > 1) {
+ if (format > 1.0) {
if (LYX_FORMAT - format > 0.05) {
-
- printf(_("Warning: need lyxformat %.2f but found %.2f\n"),
- LYX_FORMAT, format);
+ lyxerr << fmt(_("Warning: need lyxformat %.2f but found %.2f"),
+ LYX_FORMAT, format) << endl;
}
if (format - LYX_FORMAT > 0.05) {
- printf(_("ERROR: need lyxformat %.2f but found %.2f\n"),
- LYX_FORMAT, format);
+ lyxerr << fmt(_("ERROR: need lyxformat %.2f but found %.2f"),
+ LYX_FORMAT, format) << endl;
}
bool the_end = readLyXformat2(lex, par);
// Formats >= 2.13 support "\the_end" marker
// We simulate a safe reading anyways to allow
// users to take the chance... (Asger)
return true;
- } // format < 1
+ } // format < 1.0
else {
WriteAlert(_("ERROR!"),
_("Old LyX file format found. "
} else {
// Saving failed, so backup is not backup
if (lyxrc.make_backup) {
- ::rename(s.c_str(), fileName().c_str());
+ lyx::rename(s, fileName());
}
return false;
}
#ifdef HAVE_LOCALE
// Use the standard "C" locale for file output.
- ofs.imbue(locale::classic());
+ ofs.imbue(std::locale::classic());
#endif
// The top of the file should not be written by params.
// Write marker that shows file is complete
ofs << "\n\\the_end" << endl;
+
ofs.close();
+
// how to check if close went ok?
- return true;
+ // Following is an attempt... (BE 20001011)
+
+ // good() returns false if any error occured, including some
+ // formatting error.
+ // bad() returns true if something bad happened in the buffer,
+ // which should include file system full errors.
+
+ bool status = true;
+ if (!ofs.good()) {
+ status = false;
+#if 0
+ if (ofs.bad()) {
+ lyxerr << "Buffer::writeFile: BAD ERROR!" << endl;
+ } else {
+ lyxerr << "Buffer::writeFile: NOT SO BAD ERROR!"
+ << endl;
+ }
+#endif
+ }
+
+ return status;
}
+#if 0
void Buffer::writeFileAscii(string const & fname, int linelen)
{
- LyXFont font1, font2;
Inset * inset;
- char c, footnoteflag = 0, depth = 0;
+ char c;
+ char footnoteflag = 0;
+ char depth = 0;
string tmp;
LyXParagraph::size_type i;
int j;
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;
+ int fpos = 0;
bool ref_printed = false;
ofstream ofs(fname.c_str());
return;
}
- string fname1 = TmpFileName();
+ string const fname1 = lyx::tempName(); //TmpFileName();
LyXParagraph * par = paragraph;
while (par) {
int noparbreak = 0;
} else if (tmp == "Enumerate") {
ltype = 2;
ltype_depth = depth+1;
- } else if (strstr(tmp.c_str(), "ection")) {
+ } else if (contains(tmp, "ection")) {
ltype = 3;
ltype_depth = depth+1;
- } else if (strstr(tmp.c_str(), "aragraph")) {
+ } else if (contains(tmp, "aragraph")) {
ltype = 4;
ltype_depth = depth+1;
} else if (tmp == "Description") {
#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){
- 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))) {
-//#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)
- clen[j] = h;
- h = 0;
- j = (++j) % par->table->NumberOfCellsInRow(actcell);
- ++actcell;
- }
- }
- if (clen[j] < h)
- clen[j] = h;
- }
-#endif
- font1 = LyXFont(LyXFont::ALL_INHERIT, params.language_info);
+ LyXFont font1 =
+ LyXFont(LyXFont::ALL_INHERIT, params.language);
actcell = 0;
for (i = 0, actpos = 1; i < par->size(); ++i, ++actpos) {
if (!i && !footnoteflag && !noparbreak){
ofs << "\n\n";
- for(j = 0; j < depth; ++j)
+ for (j = 0; j < depth; ++j)
ofs << " ";
currlinelen = depth * 2;
- switch(ltype) {
+ switch (ltype) {
case 0: /* Standard */
case 4: /* (Sub)Paragraph */
case 5: /* Description */
break;
}
if (ltype_depth > depth) {
- for(j = ltype_depth - 1; j > depth; --j)
+ for (j = ltype_depth - 1; j > depth; --j)
ofs << " ";
currlinelen += (ltype_depth-depth)*2;
}
-#ifndef NEW_TABULAR
- if (par->table) {
- for(j = 0; j < cells; ++j) {
- ofs << '+';
- for(h = 0; h < (clen[j] + 1);
- ++h)
- ofs << '-';
- }
- ofs << "+\n";
- for(j = 0; j < depth; ++j)
- ofs << " ";
- currlinelen = depth * 2;
- if (ltype_depth > depth) {
- for(j = ltype_depth;
- j > depth; --j)
- ofs << " ";
- currlinelen += (ltype_depth-depth)*2;
- }
- ofs << "| ";
- }
-#endif
}
- font2 = par->GetFontSettings(params, i);
+ LyXFont font2 = par->GetFontSettings(params, i);
if (font1.latex() != font2.latex()) {
if (font2.latex() == LyXFont::OFF)
islatex = 0;
}
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)
- ofs << ' ';
- ofs << " |\n";
- for(j = 0; j < depth; ++j)
- ofs << " ";
- currlinelen = depth*2;
- if (ltype_depth > depth) {
- for(j = ltype_depth; j > depth; --j)
- ofs << " ";
- currlinelen += (ltype_depth-depth) * 2;
- }
- for(j = 0; j < cells; ++j) {
- ofs << '+';
- for(h = 0; h < (clen[j] + 1); ++h)
- ofs << '-';
- }
- ofs << "+\n";
- for(j = 0; j < depth; ++j)
- ofs << " ";
- currlinelen = depth * 2;
- if (ltype_depth > depth) {
- for(j = ltype_depth;
- j > depth; --j)
- ofs << " ";
- currlinelen += (ltype_depth-depth)*2;
- }
- ofs << "| ";
- cell = 1;
- } else {
- for(j = actpos;
- j < clen[cell - 1]; ++j)
- ofs << ' ';
- ofs << " | ";
- ++cell;
- }
- ++actcell;
- currlinelen = actpos = 0;
- } else {
-#endif
- ofs << "\n";
- for(j = 0; j < depth; ++j)
+ ofs << "\n";
+ for (j = 0; j < depth; ++j)
+ ofs << " ";
+ currlinelen = depth * 2;
+ if (ltype_depth > depth) {
+ for (j = ltype_depth;
+ j > depth; --j)
ofs << " ";
- currlinelen = depth * 2;
- if (ltype_depth > depth) {
- for(j = ltype_depth;
- j > depth; --j)
- ofs << " ";
- currlinelen += (ltype_depth - depth) * 2;
- }
-#ifndef NEW_TABULAR
+ currlinelen += (ltype_depth - depth) * 2;
}
-#endif
break;
case LyXParagraph::META_HFILL:
ofs << "\t";
if (currlinelen > linelen - 10
&& c == ' ' && i + 2 < par->size()) {
ofs << "\n";
- for(j = 0; j < depth; ++j)
+ for (j = 0; j < depth; ++j)
ofs << " ";
currlinelen = depth * 2;
if (ltype_depth > depth) {
- for(j = ltype_depth;
+ for (j = ltype_depth;
j > depth; --j)
ofs << " ";
currlinelen += (ltype_depth-depth)*2;
break;
}
}
-#ifndef NEW_TABULAR
- if (par->table) {
- for(j = actpos; j < clen[cell - 1]; ++j)
- ofs << ' ';
- ofs << " |\n";
- for(j = 0; j < depth; ++j)
- ofs << " ";
+ par = par->next;
+ }
+
+ ofs << "\n";
+}
+//----------------------------------------------------------------------------
+#else
+//----------------------------------------------------------------------------
+string const Buffer::asciiParagraph(LyXParagraph const * par,
+ unsigned int linelen) const
+{
+ ostringstream buffer;
+ LyXFont font1;
+ LyXFont font2;
+ Inset const * inset;
+ char c;
+ LyXParagraph::footnote_flag footnoteflag = LyXParagraph::NO_FOOTNOTE;
+ char depth = 0;
+ int ltype = 0;
+ int ltype_depth = 0;
+ unsigned int currlinelen = 0;
+ bool ref_printed = false;
+
+ int noparbreak = 0;
+ int islatex = 0;
+ 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;
+ if (footnoteflag) {
+ size_t const j = strlen(string_footnotekinds[par->footnotekind]) + 4;
+ if ((linelen > 0) &&
+ ((currlinelen + j) > linelen)) {
+ buffer << "\n";
+ currlinelen = 0;
+ }
+ buffer << "(["
+ << string_footnotekinds[par->footnotekind]
+ << "] ";
+ currlinelen += j;
+ }
+ }
+#endif
+ /* begins or ends a deeper area ?*/
+ if (depth != par->depth) {
+ if (par->depth > depth) {
+ while (par->depth > depth) {
+ ++depth;
+ }
+ }
+ else {
+ while (par->depth < depth) {
+ --depth;
+ }
+ }
+ }
+
+ /* First write the layout */
+ string const tmp = textclasslist.NameOfLayout(params.textclass, par->layout);
+ if (tmp == "Itemize") {
+ ltype = 1;
+ ltype_depth = depth+1;
+ } else if (tmp == "Enumerate") {
+ ltype = 2;
+ ltype_depth = depth+1;
+ } else if (strstr(tmp.c_str(), "ection")) {
+ ltype = 3;
+ ltype_depth = depth+1;
+ } else if (strstr(tmp.c_str(), "aragraph")) {
+ ltype = 4;
+ ltype_depth = depth+1;
+ } else if (tmp == "Description") {
+ ltype = 5;
+ ltype_depth = depth+1;
+ } else if (tmp == "Abstract") {
+ ltype = 6;
+ ltype_depth = 0;
+ } else if (tmp == "Bibliography") {
+ ltype = 7;
+ ltype_depth = 0;
+ } else {
+ ltype = 0;
+ ltype_depth = 0;
+ }
+
+ /* maybe some vertical spaces */
+
+ /* the labelwidthstring used in lists */
+
+ /* some lines? */
+
+ /* some pagebreaks? */
+
+ /* noindent ? */
+
+ /* what about the alignment */
+ } else {
+#ifndef NEW_INSETS
+ /* dummy layout, that means a footnote ended */
+ footnoteflag = LyXParagraph::NO_FOOTNOTE;
+ buffer << ") ";
+ noparbreak = 1;
+#else
+ lyxerr << "Should this ever happen?" << endl;
+#endif
+ }
+
+ font1 = LyXFont(LyXFont::ALL_INHERIT, params.language);
+ for (LyXParagraph::size_type i = 0; i < par->size(); ++i) {
+ if (!i && !footnoteflag && !noparbreak){
+ if (linelen > 0)
+ buffer << "\n\n";
+ for (char j = 0; j < depth; ++j)
+ buffer << " ";
currlinelen = depth * 2;
+ switch (ltype) {
+ case 0: /* Standard */
+ case 4: /* (Sub)Paragraph */
+ case 5: /* Description */
+ break;
+ case 6: /* Abstract */
+ if (linelen > 0)
+ buffer << "Abstract\n\n";
+ else
+ buffer << "Abstract: ";
+ break;
+ case 7: /* Bibliography */
+ if (!ref_printed) {
+ if (linelen > 0)
+ buffer << "References\n\n";
+ else
+ buffer << "References: ";
+ ref_printed = true;
+ }
+ break;
+ default:
+ buffer << par->labelstring << " ";
+ break;
+ }
if (ltype_depth > depth) {
- for(j = ltype_depth; j > depth; --j)
- ofs << " ";
- currlinelen += (ltype_depth - depth) * 2;
+ for (char j = ltype_depth - 1; j > depth; --j)
+ buffer << " ";
+ currlinelen += (ltype_depth-depth)*2;
}
- for(j = 0; j < cells; ++j) {
- ofs << '+';
- for(h = 0; h < (clen[j] + 1); ++h)
- ofs << '-';
+ }
+ font2 = par->GetFontSettings(params, i);
+ if (font1.latex() != font2.latex()) {
+ if (font2.latex() == LyXFont::OFF)
+ islatex = 0;
+ else
+ islatex = 1;
+ } else {
+ islatex = 0;
+ }
+ c = par->GetChar(i);
+ if (islatex)
+ continue;
+ switch (c) {
+ case LyXParagraph::META_INSET:
+ if ((inset = par->GetInset(i))) {
+ if (!inset->Ascii(this, buffer)) {
+ string dummy;
+ string s = rsplit(buffer.str().c_str(),
+ dummy, '\n');
+ currlinelen += s.length();
+ } else {
+ // to be sure it breaks paragraph
+ currlinelen += linelen;
+ }
}
- ofs << "+\n";
- delete [] clen;
+ break;
+ case LyXParagraph::META_NEWLINE:
+ if (linelen > 0) {
+ buffer << "\n";
+ for (char j = 0; j < depth; ++j)
+ buffer << " ";
+ }
+ currlinelen = depth * 2;
+ if (ltype_depth > depth) {
+ for (char j = ltype_depth;
+ j > depth; --j)
+ buffer << " ";
+ currlinelen += (ltype_depth - depth) * 2;
+ }
+ break;
+ case LyXParagraph::META_HFILL:
+ buffer << "\t";
+ break;
+ case '\\':
+ buffer << "\\";
+ break;
+ default:
+ if ((linelen > 0) && (currlinelen > (linelen - 10)) &&
+ (c == ' ') && ((i + 2) < par->size()))
+ {
+ buffer << "\n";
+ for (char j = 0; j < depth; ++j)
+ buffer << " ";
+ currlinelen = depth * 2;
+ if (ltype_depth > depth) {
+ for (char j = ltype_depth;
+ j > depth; --j)
+ buffer << " ";
+ currlinelen += (ltype_depth-depth)*2;
+ }
+ } else if (c != '\0')
+ buffer << c;
+ else if (c == '\0')
+ lyxerr.debug() << "writeAsciiFile: NULL char in structure." << endl;
+ ++currlinelen;
+ break;
}
-#endif
+ }
+ return buffer.str().c_str();
+}
+
+
+void Buffer::writeFileAscii(string const & fname, int linelen)
+{
+ ofstream ofs(fname.c_str());
+ if (!ofs) {
+ WriteFSAlert(_("Error: Cannot write file:"), fname);
+ return;
+ }
+ writeFileAscii(ofs, linelen);
+}
+
+
+void Buffer::writeFileAscii(ostream & ofs, int linelen)
+{
+ LyXParagraph * par = paragraph;
+ while (par) {
+ ofs << asciiParagraph(par, linelen);
par = par->next;
}
-
ofs << "\n";
}
-
+#endif
void Buffer::makeLaTeXFile(string const & fname,
string const & original_path,
// language should be a parameter to \documentclass
bool use_babel = false;
- if (params.language_info->lang() == "hebrew") // This seems necessary
+ if (params.language->babel() == "hebrew") // This seems necessary
features.UsedLanguages.insert(default_language);
- if (params.language != "default" ||
- !features.UsedLanguages.empty() ) {
+#ifdef DO_USE_DEFAULT_LANGUAGE
+ if (params.language->lang() != "default" ||
+ !features.UsedLanguages.empty()) {
+#endif
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() + ',';
+ options += (*cit)->babel() + ",";
+ options += params.language->babel() + ',';
+#ifdef DO_USE_DEFAULT_LANGUAGE
}
+#endif
// the user-defined options
if (!params.options.empty()) {
}
if (params.inputenc == "auto") {
- string doc_encoding =
- params.language_info->encoding()->LatexName();
+ string const doc_encoding =
+ params.language->encoding()->LatexName();
// Create a list with all the input encodings used
// in the document
encodings.insert((*it)->encoding()->LatexName());
ofs << "\\usepackage[";
- for (set<string>::const_iterator it = encodings.begin();
- it != encodings.end(); ++it)
- ofs << *it << ",";
+ std::copy(encodings.begin(), encodings.end(),
+ std::ostream_iterator<string>(ofs, ","));
ofs << doc_encoding << "]{inputenc}\n";
texrow.newline();
} else if (params.inputenc != "default") {
texrow.newline();
} // only_body
lyxerr.debug() << "preamble finished, now the body." << endl;
- if (!lyxrc.language_auto_begin && params.language != "default") {
+#ifdef DO_USE_DEFAULT_LANGUAGE
+ if (!lyxrc.language_auto_begin && params.language->lang() != "default") {
+#else
+ if (!lyxrc.language_auto_begin) {
+#endif
ofs << subst(lyxrc.language_command_begin, "$$lang",
- params.language)
+ params.language->babel())
<< endl;
texrow.newline();
}
ofs << endl;
texrow.newline();
- if (!lyxrc.language_auto_end && params.language != "default") {
+#ifdef DO_USE_DEFAULT_LANGUAGE
+ if (!lyxrc.language_auto_end && params.language->lang() != "default") {
+#else
+ if (!lyxrc.language_auto_end) {
+#endif
ofs << subst(lyxrc.language_command_end, "$$lang",
- params.language)
+ params.language->babel())
<< endl;
texrow.newline();
}
{
bool was_title = false;
bool already_title = false;
-//#ifdef HAVE_SSTREAM
std::ostringstream ftnote;
-//#else
-// char * tmpholder = 0;
-//#endif
TexRow ft_texrow;
int ftcount = 0;
// if only_body
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 latexParagraphs."
}
ofs << ftnote.str();
texrow += ft_texrow;
-//#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;
}
-//#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) {
ofs << "\\maketitle\n";
LaTeXFeatures features(params, tclass.numLayouts());
validate(features);
- //if(nice)
+ //if (nice)
tex_code_break_column = lyxrc.ascii_linelen;
//else
//tex_code_break_column = 0;
<< params.preamble << sgml_includedfiles << " \n]>\n\n";
}
- if(params.options.empty())
+ if (params.options.empty())
sgmlOpenTag(ofs, 0, top_element);
else {
string top = top_element;
Inset * inset = par->GetInset(0);
Inset::Code lyx_code = inset->LyxCode();
if (lyx_code == Inset::TOC_CODE){
- string temp = "toc";
+ string const temp = "toc";
sgmlOpenTag(ofs, depth, temp);
par = par->next;
}
// environment tag closing
- for( ; depth > par->depth; --depth) {
+ for (; depth > par->depth; --depth) {
sgmlCloseTag(ofs, depth, environment_stack[depth]);
environment_stack[depth].erase();
}
// write opening SGML tags
- switch(style.latextype) {
+ switch (style.latextype) {
case LATEX_PARAGRAPH:
- if(depth == par->depth
+ if (depth == par->depth
&& !environment_stack[depth].empty()) {
sgmlCloseTag(ofs, depth, environment_stack[depth]);
environment_stack[depth].erase();
- if(depth)
+ if (depth)
--depth;
else
ofs << "</p>";
case LATEX_ENVIRONMENT:
case LATEX_ITEM_ENVIRONMENT:
- if(depth == par->depth
+ if (depth == par->depth
&& environment_stack[depth] != style.latexname()
&& !environment_stack[depth].empty()) {
environment_stack[depth].erase();
}
if (environment_stack[depth] != style.latexname()) {
- if(depth == 0) {
- string temp = "p";
+ if (depth == 0) {
+ string const temp = "p";
sgmlOpenTag(ofs, depth, temp);
}
environment_stack[depth] = style.latexname();
sgmlOpenTag(ofs, depth,
environment_stack[depth]);
}
- if(style.latextype == LATEX_ENVIRONMENT) break;
+ if (style.latextype == LATEX_ENVIRONMENT) break;
desc_on = (style.labeltype == LABEL_MANUAL);
- if(desc_on)
+ if (desc_on)
item_name = "tag";
else
item_name = "item";
ofs << "\n";
// write closing SGML tags
- switch(style.latextype) {
+ switch (style.latextype) {
case LATEX_COMMAND:
case LATEX_ENVIRONMENT:
case LATEX_ITEM_ENVIRONMENT:
}
// Close open tags
- for(; depth > 0; --depth)
+ for (; depth > 0; --depth)
sgmlCloseTag(ofs, depth, environment_stack[depth]);
- if(!environment_stack[depth].empty())
+ if (!environment_stack[depth].empty())
sgmlCloseTag(ofs, depth, environment_stack[depth]);
if (!body_only) {
#ifndef NEW_INSETS
void Buffer::linuxDocHandleFootnote(ostream & os, LyXParagraph * & par,
- int const depth)
+ int depth)
{
- string tag = "footnote";
+ string const tag = "footnote";
while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
sgmlOpenTag(os, depth + 1, tag);
void Buffer::DocBookHandleCaption(ostream & os, string & inner_tag,
- int const depth, int desc_on,
+ int depth, int desc_on,
LyXParagraph * & par)
{
LyXParagraph * tpar = par;
SimpleDocBookOnePar(os, extra_par, tpar,
desc_on, depth + 2);
sgmlCloseTag(os, depth+1, inner_tag);
- if(!extra_par.empty())
+ if (!extra_par.empty())
os << extra_par;
}
}
#ifndef NEW_INSETS
void Buffer::DocBookHandleFootnote(ostream & os, LyXParagraph * & par,
- int const depth)
+ int depth)
{
string tag, inner_tag;
string tmp_par, extra_par;
SOME_ENUM present = FOOTNOTE_LIKE;
while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
- if(last == present) {
- if(inner_span) {
- if(!tmp_par.empty()) {
+ if (last == present) {
+ if (inner_span) {
+ if (!tmp_par.empty()) {
os << tmp_par;
tmp_par.erase();
sgmlCloseTag(os, depth + 1, inner_tag);
}
} else {
os << tmp_par;
- if(!inner_tag.empty()) sgmlCloseTag(os, depth + 1,
+ if (!inner_tag.empty()) sgmlCloseTag(os, depth + 1,
inner_tag);
- if(!extra_par.empty()) os << extra_par;
- if(!tag.empty()) sgmlCloseTag(os, depth, tag);
+ if (!extra_par.empty()) os << extra_par;
+ if (!tag.empty()) sgmlCloseTag(os, depth, tag);
extra_par.erase();
switch (par->footnotekind) {
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(!extra_par.empty()) os << extra_par;
- if(!tag.empty()) sgmlCloseTag(os, depth, 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
void Buffer::push_tag(ostream & os, string const & tag,
int & pos, char stack[5][3])
{
+#ifdef WITH_WARNINGS
#warning Use a real stack! (Lgb)
+#endif
// pop all previous tags
for (int j = pos; j >= 0; --j)
os << "</" << stack[j] << ">";
void Buffer::pop_tag(ostream & os, string const & tag,
int & pos, char stack[5][3])
{
+#ifdef WITH_WARNINGS
#warning Use a real stack! (Lgb)
+#endif
+ // Please, Lars, do not remove the global variable. I already
+ // had to reintroduce it twice! (JMarc)
+ int j;
+
// pop all tags till specified one
- for (int j = pos; (j >= 0) && (strcmp(stack[j], tag.c_str())); --j)
+ for (j = pos; (j >= 0) && (strcmp(stack[j], tag.c_str())); --j)
os << "</" << stack[j] << ">";
// closes the tag
os << "</" << tag << ">";
-
+
// push all tags, but the specified one
- for (int j = j + 1; j <= pos; ++j) {
+ for (j = j + 1; j <= pos; ++j) {
os << "<" << stack[j] << ">";
strcpy(stack[j-1], stack[j]);
}
// checks, if newcol chars should be put into this line
// writes newline, if necessary.
static
-void linux_doc_line_break(ostream & os, unsigned int & colcount,
- const unsigned int newcol)
+void linux_doc_line_break(ostream & os, string::size_type & colcount,
+ string::size_type newcol)
{
colcount += newcol;
if (colcount > lyxrc.ascii_linelen) {
void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par,
- int desc_on, int const /*depth*/)
+ int desc_on, int /*depth*/)
{
- LyXFont font1, font2;
+ LyXFont font1;
char c;
Inset * inset;
LyXParagraph::size_type main_body;
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 ;-)
+ string::size_type char_line_count = 5; // Heuristic choice ;-)
if (style.labeltype != LABEL_MANUAL)
main_body = 0;
font1 = style.font;
}
- font2 = par->getFont(params, i);
+ LyXFont const font2 = par->getFont(params, i);
if (font1.family() != font2.family()) {
- switch(family_type) {
+ switch (family_type) {
case 0:
if (font2.family() == LyXFont::TYPEWRITER_FAMILY) {
push_tag(os, "tt", stack_num, stack);
// handle italic and slanted fonts
if (font1.shape() != font2.shape()) {
- switch(shape_type) {
+ switch (shape_type) {
case 0:
if (font2.shape() == LyXFont::ITALIC_SHAPE) {
push_tag(os, "it", stack_num, stack);
}
// resets description flag correctly
- switch(desc_on){
+ switch (desc_on){
case 1:
// <tag> not closed...
linux_doc_line_break(os, char_line_count, 6);
LaTeXFeatures features(params, tclass.numLayouts());
validate(features);
- //if(nice)
+ //if (nice)
tex_code_break_column = lyxrc.ascii_linelen;
//else
//tex_code_break_column = 0;
texrow.reset();
- if(!only_body) {
+ if (!only_body) {
string sgml_includedfiles=features.getIncludedFiles();
ofs << "<!doctype " << top_element
ofs << "\n [ " << params.preamble
<< sgml_includedfiles << " \n]>\n\n";
- if(params.options.empty())
+ if (params.options.empty())
sgmlOpenTag(ofs, 0, top_element);
else {
string top = top_element;
par->layout);
// environment tag closing
- for( ; depth > par->depth; --depth) {
- if(environment_inner[depth] != "!-- --") {
+ for (; depth > par->depth; --depth) {
+ if (environment_inner[depth] != "!-- --") {
item_name= "listitem";
sgmlCloseTag(ofs, command_depth + depth,
item_name);
- if( environment_inner[depth] == "varlistentry")
+ if (environment_inner[depth] == "varlistentry")
sgmlCloseTag(ofs, depth+command_depth,
environment_inner[depth]);
}
environment_inner[depth].erase();
}
- if(depth == par->depth
+ if (depth == par->depth
&& environment_stack[depth] != style.latexname()
&& !environment_stack[depth].empty()) {
- if(environment_inner[depth] != "!-- --") {
+ if (environment_inner[depth] != "!-- --") {
item_name= "listitem";
sgmlCloseTag(ofs, command_depth+depth,
item_name);
- if( environment_inner[depth] == "varlistentry")
+ if (environment_inner[depth] == "varlistentry")
sgmlCloseTag(ofs,
depth + command_depth,
environment_inner[depth]);
}
// Write opening SGML tags.
- switch(style.latextype) {
+ switch (style.latextype) {
case LATEX_PARAGRAPH:
- if(style.latexname() != "dummy")
+ if (style.latexname() != "dummy")
sgmlOpenTag(ofs, depth+command_depth,
style.latexname());
break;
tmps = style.latexparam();
c_params = split(tmps, c_depth,'|');
- cmd_depth= atoi(c_depth.c_str());
+ cmd_depth= lyx::atoi(c_depth);
- if(command_flag) {
- if(cmd_depth<command_base) {
- for(int j = command_depth;
+ if (command_flag) {
+ if (cmd_depth<command_base) {
+ for (int j = command_depth;
j >= command_base; --j)
- if(!command_stack[j].empty())
+ if (!command_stack[j].empty())
sgmlCloseTag(ofs, j, command_stack[j]);
command_depth= command_base= cmd_depth;
- } else if(cmd_depth <= command_depth) {
- for(int j = command_depth;
+ } else if (cmd_depth <= command_depth) {
+ for (int j = command_depth;
j >= cmd_depth; --j)
- if(!command_stack[j].empty())
+ if (!command_stack[j].empty())
sgmlCloseTag(ofs, j, command_stack[j]);
command_depth= cmd_depth;
} else
sgmlOpenTag(ofs, depth + command_depth,
environment_stack[depth]);
} else {
- if(environment_inner[depth] != "!-- --") {
+ if (environment_inner[depth] != "!-- --") {
item_name= "listitem";
sgmlCloseTag(ofs,
command_depth + depth,
}
}
- if(style.latextype == LATEX_ENVIRONMENT) {
- if(!style.latexparam().empty())
+ if (style.latextype == LATEX_ENVIRONMENT) {
+ if (!style.latexparam().empty())
sgmlOpenTag(ofs, depth + command_depth,
style.latexparam());
break;
desc_on = (style.labeltype == LABEL_MANUAL);
- if(desc_on)
+ if (desc_on)
environment_inner[depth]= "varlistentry";
else
environment_inner[depth]= "listitem";
sgmlOpenTag(ofs, depth + 1 + command_depth,
environment_inner[depth]);
- if(desc_on) {
+ if (desc_on) {
item_name= "term";
sgmlOpenTag(ofs, depth + 1 + command_depth,
item_name);
#endif
string end_tag;
// write closing SGML tags
- switch(style.latextype) {
+ switch (style.latextype) {
case LATEX_COMMAND:
end_tag = "title";
sgmlCloseTag(ofs, depth + command_depth, end_tag);
break;
case LATEX_ENVIRONMENT:
- if(!style.latexparam().empty())
+ if (!style.latexparam().empty())
sgmlCloseTag(ofs, depth + command_depth,
style.latexparam());
break;
case LATEX_ITEM_ENVIRONMENT:
- if(desc_on == 1) break;
+ if (desc_on == 1) break;
end_tag= "para";
sgmlCloseTag(ofs, depth + 1 + command_depth, end_tag);
break;
case LATEX_PARAGRAPH:
- if(style.latexname() != "dummy")
+ if (style.latexname() != "dummy")
sgmlCloseTag(ofs, depth + command_depth,
style.latexname());
break;
}
// Close open tags
- for(; depth >= 0; --depth) {
- if(!environment_stack[depth].empty()) {
- if(environment_inner[depth] != "!-- --") {
+ for (; depth >= 0; --depth) {
+ if (!environment_stack[depth].empty()) {
+ if (environment_inner[depth] != "!-- --") {
item_name= "listitem";
sgmlCloseTag(ofs, command_depth + depth,
item_name);
- if( environment_inner[depth] == "varlistentry")
+ if (environment_inner[depth] == "varlistentry")
sgmlCloseTag(ofs, depth + command_depth,
environment_inner[depth]);
}
}
}
- for(int j = command_depth; j >= command_base; --j)
- if(!command_stack[j].empty())
+ for (int j = command_depth; j >= command_base; --j)
+ if (!command_stack[j].empty())
sgmlCloseTag(ofs, j, command_stack[j]);
if (!only_body) {
void Buffer::SimpleDocBookOnePar(ostream & os, string & extra,
LyXParagraph * par, int & desc_on,
- int const depth)
+ int depth) const
{
-#ifndef NEW_TABULAR
- if (par->table) {
- par->SimpleDocBookOneTablePar(this,
- os, extra, desc_on, depth);
- return;
- }
-#endif
-
bool emph_flag = false;
LyXLayout const & style = textclasslist.Style(params.textclass,
LyXFont font1 = main_body > 0 ? style.labelfont : style.font;
int char_line_count = depth;
- if(!style.free_spacing)
+ if (!style.free_spacing)
for (int j = 0; j < depth; ++j)
os << ' ';
if (c == LyXParagraph::META_INSET) {
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
// and title should come first
// desc_on == 4
//
- if(desc_on!= 3 || i!= 0) {
- if(!tmp_out.empty() && tmp_out[0] == '@') {
- if(desc_on == 4)
+ if (desc_on!= 3 || i!= 0) {
+ if (!tmp_out.empty() && tmp_out[0] == '@') {
+ if (desc_on == 4)
extra += frontStrip(tmp_out, '@');
else
os << frontStrip(tmp_out, '@');
}
// resets description flag correctly
- switch(desc_on){
+ switch (desc_on){
case 1:
// <term> not closed...
os << "</term>";
}
-int Buffer::runLaTeX()
-{
-#ifndef NEW_EXPORT
-
- if (!users->text) return 0;
-
- ProhibitInput(users);
-
- // get LaTeX-Filename
- string name = getLatexName();
-
- string path = OnlyPath(filename);
-
- string org_path = path;
- if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) {
- path = tmppath;
- }
-
- Path p(path); // path to LaTeX file
- users->owner()->getMiniBuffer()->Set(_("Running LaTeX..."));
-
- // Remove all error insets
- bool a = users->removeAutoInsets();
-
- // Always generate the LaTeX file
- makeLaTeXFile(name, org_path, false);
-
- // do the LaTex run(s)
- TeXErrors terr;
- 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
-
- // check return value from latex.run().
- if ((res & LaTeX::NO_LOGFILE)) {
- WriteAlert(_("LaTeX did not work!"),
- _("Missing log file:"), name);
- } else if ((res & LaTeX::ERRORS)) {
- users->owner()->getMiniBuffer()->Set(_("Done"));
- // Insert all errors as errors boxes
- users->insertErrors(terr);
-
- // Dvi should also be kept dirty if the latex run
- // ends up with errors. However it should be possible
- // to view a dirty dvi too.
- } else {
- //no errors or any other things to think about so:
- users->owner()->getMiniBuffer()->Set(_("Done"));
- }
-
- // 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 & LaTeX::ERRORS)){
- users->redraw();
- users->fitCursor();
- //users->updateScrollbar();
- }
- AllowInput(users);
-
- return latex.getNumErrors();
-#else
- return 0;
-#endif
-}
-
-
-int Buffer::runLiterate()
-{
- if (!users->text) return 0;
-
- ProhibitInput(users);
-
- // get LaTeX-Filename
- string name = getLatexName();
- // get Literate-Filename
- string lit_name = OnlyFilename(ChangeExtension (getLatexName(),
- lyxrc.literate_extension));
-
- string path = OnlyPath(filename);
-
- string org_path = path;
- if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) {
- path = tmppath;
- }
-
- Path p(path); // path to Literate file
- users->owner()->getMiniBuffer()->Set(_("Running Literate..."));
-
- // Remove all error insets
- bool removedErrorInsets = users->removeAutoInsets();
-
- // generate the Literate file if necessary
- makeLaTeXFile(lit_name, org_path, false);
-
- 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);
- TeXErrors terr;
- int res = literate.weave(terr, users->owner()->getMiniBuffer());
-
- // check return value from literate.weave().
- if ((res & Literate::NO_LOGFILE)) {
- WriteAlert(_("Literate command did not work!"),
- _("Missing log file:"), name);
- } else if ((res & Literate::ERRORS)) {
- users->owner()->getMiniBuffer()->Set(_("Done"));
- // Insert all errors as errors boxes
- users->insertErrors(terr);
-
- // Dvi should also be kept dirty if the latex run
- // ends up with errors. However it should be possible
- // to view a dirty dvi too.
- } else {
- //no errors or any other things to think about so:
- users->owner()->getMiniBuffer()->Set(_("Done"));
- }
-
- // if we removed error insets before we ran LaTeX or if we inserted
- // error insets after we ran LaTeX this must be run:
- if (removedErrorInsets || (res & Literate::ERRORS)){
- users->redraw();
- users->fitCursor();
- //users->updateScrollbar();
- }
- AllowInput(users);
-
- return literate.getNumErrors();
-}
-
-
-int Buffer::buildProgram()
-{
- if (!users->text) return 0;
-
- ProhibitInput(users);
-
- // get LaTeX-Filename
- string name = getLatexName();
- // get Literate-Filename
- string lit_name = OnlyFilename(ChangeExtension(getLatexName(),
- lyxrc.literate_extension));
-
- string path = OnlyPath(filename);
-
- string org_path = path;
- if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) {
- path = tmppath;
- }
-
- Path p(path); // path to Literate file
- users->owner()->getMiniBuffer()->Set(_("Building Program..."));
-
- // Remove all error insets
- bool removedErrorInsets = users->removeAutoInsets();
-
- // generate the LaTeX file if necessary
- if (!isNwClean() || removedErrorInsets) {
- makeLaTeXFile(lit_name, org_path, false);
- markNwDirty();
- }
-
- 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);
- TeXErrors terr;
- int res = literate.build(terr, users->owner()->getMiniBuffer());
-
- // check return value from literate.build().
- if ((res & Literate::NO_LOGFILE)) {
- WriteAlert(_("Build did not work!"),
- _("Missing log file:"), name);
- } else if ((res & Literate::ERRORS)) {
- users->owner()->getMiniBuffer()->Set(_("Done"));
- // Insert all errors as errors boxes
- users->insertErrors(terr);
-
- // Literate files should also be kept dirty if the literate
- // command run ends up with errors.
- } else {
- //no errors or any other things to think about so:
- users->owner()->getMiniBuffer()->Set(_("Done"));
- 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 (removedErrorInsets || (res & Literate::ERRORS)){
- users->redraw();
- users->fitCursor();
- //users->updateScrollbar();
- }
- AllowInput(users);
-
- return literate.getNumErrors();
-}
-
-
// This should be enabled when the Chktex class is implemented. (Asger)
// chktex should be run with these flags disabled: 3, 22, 25, 30, 38(?)
// Other flags: -wall -v0 -x
ProhibitInput(users);
// get LaTeX-Filename
- string name = getLatexName();
+ string const name = getLatexName();
string path = OnlyPath(filename);
- string org_path = path;
+ string const org_path = path;
if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) {
path = tmppath;
}
users->owner()->getMiniBuffer()->Set(_("Running chktex..."));
// Remove all error insets
- bool removedErrorInsets = users->removeAutoInsets();
+ bool const removedErrorInsets = users->removeAutoInsets();
// Generate the LaTeX file if neccessary
makeLaTeXFile(name, org_path, false);
// error insets after we ran chktex, this must be run:
if (removedErrorInsets || res){
users->redraw();
- users->fitCursor();
- //users->updateScrollbar();
+ users->fitCursor(users->text);
}
AllowInput(users);
// so they are tested here
for (int i = 0; i < 4; ++i) {
if (params.user_defined_bullets[i] != ITEMIZE_DEFAULTS[i]) {
- int font = params.user_defined_bullets[i].getFont();
+ int const font = params.user_defined_bullets[i].getFont();
if (font == 0) {
- int c = params
+ int const c = params
.user_defined_bullets[i]
.getCharacter();
if (c == 16
|| c == 31) {
features.latexsym = true;
}
- }
- if (font == 1) {
+ } else if (font == 1) {
features.amssymb = true;
- }
- else if ((font >= 2 && font <= 5)) {
+ } else if ((font >= 2 && font <= 5)) {
features.pifont = true;
}
}
void Buffer::setPaperStuff()
{
params.papersize = BufferParams::PAPER_DEFAULT;
- char c1 = params.paperpackage;
+ char const c1 = params.paperpackage;
if (c1 == BufferParams::PACKAGE_NONE) {
- char c2 = params.papersize2;
+ char const c2 = params.papersize2;
if (c2 == BufferParams::VM_PAPER_USLETTER)
params.papersize = BufferParams::PAPER_USLETTER;
else if (c2 == BufferParams::VM_PAPER_USLEGAL)
vector<string> label_list;
for (inset_iterator it = inset_iterator_begin();
it != inset_iterator_end(); ++it) {
- vector<string> l = (*it)->getLabelList();
+ vector<string> const l = (*it)->getLabelList();
label_list.insert(label_list.end(), l.begin(), l.end());
}
return label_list;
}
} else if (!par->IsDummy()) {
#endif
- char labeltype = textclasslist.Style(params.textclass,
- par->GetLayout()).labeltype;
+ char const labeltype =
+ textclasslist.Style(params.textclass,
+ par->GetLayout()).labeltype;
if (labeltype >= LABEL_COUNTER_CHAPTER
&& labeltype <= LABEL_COUNTER_CHAPTER + params.tocdepth) {
// Search for Bibtex or Include inset
if ((*it)->LyxCode() == Inset::BIBTEX_CODE) {
vector<pair<string,string> > tmp =
- static_cast<InsetBibtex*>(*it)->getKeys();
+ static_cast<InsetBibtex*>(*it)->getKeys(this);
keys.insert(keys.end(), tmp.begin(), tmp.end());
} else if ((*it)->LyxCode() == Inset::INCLUDE_CODE) {
- vector<pair<string,string> > tmp =
+ vector<pair<string,string> > const tmp =
static_cast<InsetInclude*>(*it)->getKeys();
keys.insert(keys.end(), tmp.begin(), tmp.end());
}
dep_clean->master = name;
dep_clean->next = 0;
} else {
- DEPCLEAN* item = dep_clean;
+ DEPCLEAN * item = dep_clean;
while (item && item->master != name)
item = item->next;
if (item) {
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, ' ')));
+ string cmd;
+ string line = frontStrip(command);
+ string const arg = strip(frontStrip(split(line, cmd, ' ')));
- return Dispatch(lyxaction.LookupFunc(cmd.c_str()), arg.c_str());
+ return Dispatch(lyxaction.LookupFunc(cmd), arg);
}
bool dispatched = true;
switch (action) {
case LFUN_EXPORT:
-#ifdef NEW_EXPORT
Exporter::Export(this, argument, false);
-#else
- MenuExport(this, argument);
-#endif
break;
default:
{
/// then remove all LyXText in text-insets
LyXParagraph * par = paragraph;
- for(;par;par = par->next) {
+ for (; par; par = par->next) {
par->resizeInsetsLyXText(bv);
}
}
bool Buffer::isMultiLingual()
{
-
LyXParagraph * par = paragraph;
while (par) {
if (par->isMultiLingual(params))
Buffer::inset_iterator::inset_iterator(LyXParagraph * paragraph,
LyXParagraph::size_type pos)
- : par(paragraph) {
+ : par(paragraph)
+{
it = par->InsetIterator(pos);
if (it == par->inset_iterator_end()) {
par = par->next;
}
-void Buffer::inset_iterator::SetParagraph() {
+void Buffer::inset_iterator::SetParagraph()
+{
while (par) {
it = par->inset_iterator_begin();
if (it != par->inset_iterator_end())
projects / lyx.git / blobdiff