/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
* This file is Copyright 1996-2001
* Lars Gullik Bjønnes
*
- * ======================================================
+ * ======================================================
*/
#include <config.h>
#include "version.h"
#include "LaTeX.h"
#include "Chktex.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "debug.h"
#include "LaTeXFeatures.h"
#include "lyxtext.h"
#include "insets/insetnote.h"
#include "insets/insetquotes.h"
#include "insets/insetlatexaccent.h"
-#include "insets/insetbib.h"
-#include "insets/insetcite.h"
+#include "insets/insetbib.h"
+#include "insets/insetcite.h"
#include "insets/insetexternal.h"
-#include "insets/insetindex.h"
+#include "insets/insetindex.h"
#include "insets/insetinclude.h"
#include "insets/insettoc.h"
#include "insets/insetparent.h"
#include "frontends/Dialogs.h"
#include "frontends/Alert.h"
+#include "graphics/Previews.h"
+
#include "support/textutils.h"
#include "support/filetools.h"
#include "support/path.h"
#include <locale>
#endif
+#ifndef CXX_GLOBAL_CSTD
+using std::pow;
+#endif
using std::ostream;
using std::ofstream;
Buffer::Buffer(string const & file, bool ronly)
- : paragraph(0), lyx_clean(true), bak_clean(true),
+ : paragraph(0), niceFile(true), lyx_clean(true), bak_clean(true),
unnamed(false), dep_clean(0), read_only(ronly),
filename_(file), users(0)
{
// forgets it.
if (users)
users->buffer(0);
-
+
if (!tmppath.empty()) {
DestroyBufferTmpDir(tmppath);
}
-
+
Paragraph * par = paragraph;
Paragraph * tmppar;
while (par) {
par = tmppar;
}
paragraph = 0;
+
+ // Remove any previewed LaTeX snippets assocoated with this buffer.
+ grfx::Previews::get().removeLoader(this);
}
void Buffer::setReadonly(bool flag)
{
if (read_only != flag) {
- read_only = flag;
+ read_only = flag;
updateTitles();
users->owner()->getDialogs()->updateBufferDependent(false);
}
string last_inset_read;
#ifndef NO_COMPABILITY
-struct ErtComp
+struct ErtComp
{
- ErtComp() : active(false), in_tabular(false) {
+ ErtComp() : active(false), fromlayout(false), in_tabular(false) {
}
string contents;
bool active;
+ bool fromlayout;
bool in_tabular;
LyXFont font;
};
#ifndef NO_COMPABILITY
ert_comp.contents.erase();
ert_comp.active = false;
+ ert_comp.fromlayout = false;
ert_comp.in_tabular = false;
#endif
int pos = 0;
- Paragraph::depth_type depth = 0;
+ Paragraph::depth_type depth = 0;
bool the_end_read = false;
Paragraph * first_par = 0;
LyXFont font(LyXFont::ALL_INHERIT, params.language);
+
+#if 0
if (file_format < 216 && params.language->lang() == "hebrew")
font.setLanguage(default_language);
+#endif
if (!par) {
par = new Paragraph;
+ par->layout(textclasslist[params.textclass].defaultLayout());
} else {
// We are inserting into an existing document
users->text->breakParagraph(users);
lyxerr[Debug::PARSER] << "Handling token: `"
<< token << "'" << endl;
-
+
the_end_read =
parseSingleLyXformat2Token(lex, par, first_par,
token, pos, depth,
font);
}
-
+
if (!first_par)
first_par = par;
#ifndef NO_COMPABILITY
-void Buffer::insertErtContents(Paragraph * par, int & pos, bool set_inactive)
+
+Inset * Buffer::isErtInset(Paragraph * par, int pos) const
+{
+ Inset * inset;
+ if ((par->getChar(pos) == Paragraph::META_INSET) &&
+ (inset = par->getInset(pos)) &&
+ (inset->lyxCode() == Inset::ERT_CODE))
+ {
+ return inset;
+ }
+ return 0;
+}
+
+void Buffer::insertErtContents(Paragraph * par, int & pos, bool set_inactive)
{
- if (!ert_comp.contents.empty()) {
+ if (ert_comp.contents.find_first_not_of(' ') != string::npos) {
+ // we only skip completely empty ERT (only spaces) otherwise
+ // we have to insert it as is.
+ string str(ert_comp.contents);
lyxerr[Debug::INSETS] << "ERT contents:\n'"
- << ert_comp.contents << "'" << endl;
- Inset * inset = new InsetERT(params, params.language,
- ert_comp.contents, true);
- par->insertInset(pos++, inset, ert_comp.font);
- ert_comp.contents.erase();
+ << str << "'" << endl;
+ // check if we have already an ert inset a position earlier
+ // if this is the case then we should insert the contents
+ // inside the other ertinset as it is stupid to have various
+ // ert in a row.
+ Inset * inset;
+ if ((pos > 0) && (inset=isErtInset(par, pos-1))) {
+ // get the last paragraph from the inset before
+ Paragraph * last = inset->firstParagraph();
+ while(last->next())
+ last = last->next();
+ // create the new paragraph after the last one
+ Paragraph * par = new Paragraph(last);
+ par->layout(textclasslist[params.textclass].defaultLayoutName());
+ par->setInsetOwner(last->inInset());
+ // set the contents
+ LyXFont font(LyXFont::ALL_INHERIT, params.language);
+ string::const_iterator cit = str.begin();
+ string::const_iterator end = str.end();
+ pos_type pos = 0;
+ for (; cit != end; ++cit) {
+ par->insertChar(pos++, *cit, font);
+ }
+ } else {
+ Inset * inset =
+ new InsetERT(params, params.language, str, true);
+ par->insertInset(pos++, inset, ert_comp.font);
+ }
}
+ ert_comp.contents.erase();
+ ert_comp.fromlayout = false;
if (set_inactive) {
ert_comp.active = false;
}
Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
Paragraph *& first_par,
string const & token, int & pos,
- Paragraph::depth_type & depth,
+ Paragraph::depth_type & depth,
LyXFont & font
)
{
static int call_depth;
++call_depth;
bool checkminipage = false;
- static Paragraph * minipar;
+ static Paragraph * minipar = 0;
static Paragraph * parBeforeMinipage;
#endif
#endif
+
+ // The order of the tags tested may seem unnatural, but this
+ // has been done in order to reduce the number of string
+ // comparisons needed to recognize a given token. This leads
+ // on large documents like UserGuide to a reduction of a
+ // factor 5! (JMarc)
if (token[0] != '\\') {
#ifndef NO_COMPABILITY
if (ert_comp.active) {
#ifndef NO_COMPABILITY
}
#endif
- } else if (token == "\\i") {
- Inset * inset = new InsetLatexAccent;
- inset->read(this, lex);
- par->insertInset(pos, inset, font);
- ++pos;
} else if (token == "\\layout") {
#ifndef NO_COMPABILITY
+ bool old_fromlayout = ert_comp.fromlayout;
+ bool create_new_par = true;
ert_comp.in_tabular = false;
// Do the insetert.
- insertErtContents(par, pos);
+ if (!par->size() && par->previous() &&
+ (par->previous()->size() == 1) &&
+ isErtInset(par->previous(), par->previous()->size()-1))
+ {
+ int p = par->previous()->size();
+ insertErtContents(par->previous(), p);
+ create_new_par = false;
+ } else {
+ insertErtContents(par, pos);
+ }
+#endif
+ // reset the font as we start a new layout and if the font is
+ // not ALL_INHERIT,document_language then it will be set to the
+ // right values after this tag (Jug 20020420)
+ font = LyXFont(LyXFont::ALL_INHERIT, params.language);
+
+#if 0
+ if (file_format < 216 && params.language->lang() == "hebrew")
+ font.setLanguage(default_language);
#endif
+
lex.eatLine();
- string const layoutname = lex.getString();
+ string layoutname = lex.getString();
+
LyXTextClass const & tclass = textclasslist[params.textclass];
- bool hasLayout = tclass.hasLayout(layoutname);
- if (!hasLayout) {
- lyxerr << "Layout '" << layoutname << "' does not"
- << " exist in textclass '" << tclass.name()
- << "'." << endl;
+
+ if (layoutname.empty()) {
+ layoutname = tclass.defaultLayoutName();
}
-
#ifndef NO_COMPABILITY
if (compare_no_case(layoutname, "latex") == 0) {
ert_comp.active = true;
+ ert_comp.fromlayout = true;
ert_comp.font = font;
+ if (old_fromlayout)
+ create_new_par = false;
}
#endif
+ bool hasLayout = tclass.hasLayout(layoutname);
+ if (!hasLayout) {
+ lyxerr << "Layout '" << layoutname << "' does not"
+ << " exist in textclass '" << tclass.name()
+ << "'." << endl;
+ lyxerr << "Trying to use default layout instead."
+ << endl;
+ layoutname = tclass.defaultLayoutName();
+ }
+
#ifdef USE_CAPTION
// The is the compability reading of layout caption.
// It can be removed in LyX version 1.3.0. (Lgb)
// really inside a InsetText inside a InsetFloat.
// We also know that captions can only be
// one paragraph. (Lgb)
-
+
// We should now read until the next "\layout"
// is reached.
// This is probably not good enough, what if the
break;
}
}
-
+
ss << line << '\n';
}
// Now we should have the whole layout in ss
// we should now be able to give this to the
// caption inset.
ss << "\\end_inset\n";
-
+
// This seems like a bug in stringstream.
// We really should be able to use ss
// directly. (Lgb)
par->InsertInset(pos, inset, font);
++pos;
} else {
+#endif
+#ifndef NO_COMPABILITY
+ if (create_new_par) {
#endif
if (!first_par)
first_par = par;
else {
par = new Paragraph(par);
+ par->layout(textclasslist[params.textclass].defaultLayout());
}
pos = 0;
+ par->layout(textclasslist[params.textclass][layoutname]);
+ // Test whether the layout is obsolete.
+ LyXLayout_ptr const & layout = par->layout();
+ if (!layout->obsoleted_by().empty())
+ par->layout(textclasslist[params.textclass][layout->obsoleted_by()]);
+ par->params().depth(depth);
+#ifndef NO_COMPABILITY
+ } else {
+ // we duplicate code here because it's easier to remove
+ // the code then of NO_COMPATIBILITY
par->layout(layoutname);
// Test whether the layout is obsolete.
- LyXLayout const & layout =
+ LyXLayout_ptr const & layout =
textclasslist[params.textclass][par->layout()];
- if (!layout.obsoleted_by().empty())
- par->layout(layout.obsoleted_by());
+ if (!layout->obsoleted_by().empty())
+ par->layout(layout->obsoleted_by());
par->params().depth(depth);
- font = LyXFont(LyXFont::ALL_INHERIT, params.language);
- if (file_format < 216
- && params.language->lang() == "hebrew")
- font.setLanguage(default_language);
+ }
+#endif
#if USE_CAPTION
- }
+ }
#endif
+ } else if (token == "\\end_inset") {
+ lyxerr << "Solitary \\end_inset. Missing \\begin_inset?.\n"
+ << "Last inset read was: " << last_inset_read
+ << endl;
+ // Simply ignore this. The insets do not have
+ // to read this.
+ // But insets should read it, it is a part of
+ // the inset isn't it? Lgb.
+ } else if (token == "\\begin_inset") {
+#ifndef NO_COMPABILITY
+ insertErtContents(par, pos, false);
+ ert_stack.push(ert_comp);
+ ert_comp = ErtComp();
+#endif
+ readInset(lex, par, pos, font);
+#ifndef NO_COMPABILITY
+ ert_comp = ert_stack.top();
+ ert_stack.pop();
+ insertErtContents(par, pos);
+#endif
+ } else if (token == "\\family") {
+ lex.next();
+ font.setLyXFamily(lex.getString());
+ } else if (token == "\\series") {
+ lex.next();
+ font.setLyXSeries(lex.getString());
+ } else if (token == "\\shape") {
+ lex.next();
+ font.setLyXShape(lex.getString());
+ } else if (token == "\\size") {
+ lex.next();
+ font.setLyXSize(lex.getString());
+#ifndef NO_COMPABILITY
+ } else if (token == "\\latex") {
+ lex.next();
+ string const tok = lex.getString();
+ if (tok == "no_latex") {
+ // Do the insetert.
+ insertErtContents(par, pos);
+ } else if (tok == "latex") {
+ ert_comp.active = true;
+ ert_comp.font = font;
+ } else if (tok == "default") {
+ // Do the insetert.
+ insertErtContents(par, pos);
+ } else {
+ lex.printError("Unknown LaTeX font flag "
+ "`$$Token'");
+ }
+#endif
+ } else if (token == "\\lang") {
+ lex.next();
+ string const tok = lex.getString();
+ Language const * lang = languages.getLanguage(tok);
+ if (lang) {
+ font.setLanguage(lang);
+ } else {
+ 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 const tok = lex.getString();
+ // This is dirty, but gone with LyX3. (Asger)
+ if (tok == "under")
+ font.setUnderbar(LyXFont::ON);
+ else if (tok == "no")
+ font.setUnderbar(LyXFont::OFF);
+ else if (tok == "default")
+ font.setUnderbar(LyXFont::INHERIT);
+ else
+ lex.printError("Unknown bar font flag "
+ "`$$Token'");
+ } else if (token == "\\noun") {
+ lex.next();
+ font.setNoun(font.setLyXMisc(lex.getString()));
+ } else if (token == "\\color") {
+ lex.next();
+ font.setLyXColor(lex.getString());
+ } else if (token == "\\SpecialChar") {
+ LyXLayout_ptr const & layout = par->layout();
+
+ // Insets don't make sense in a free-spacing context! ---Kayvan
+ if (layout->free_spacing || par->isFreeSpacing()) {
+ if (lex.isOK()) {
+ lex.next();
+ string next_token = lex.getString();
+ if (next_token == "\\-") {
+ par->insertChar(pos, '-', font);
+ } else if (next_token == "\\protected_separator"
+ || next_token == "~") {
+ par->insertChar(pos, ' ', font);
+ } else {
+ lex.printError("Token `$$Token' "
+ "is in free space "
+ "paragraph layout!");
+ --pos;
+ }
+ }
+ } else {
+ Inset * inset = new InsetSpecialChar;
+ inset->read(this, lex);
+ par->insertInset(pos, inset, font);
+ }
+ ++pos;
+ } else if (token == "\\i") {
+ Inset * inset = new InsetLatexAccent;
+ inset->read(this, lex);
+ par->insertInset(pos, inset, font);
+ ++pos;
+ } else if (token == "\\backslash") {
+#ifndef NO_COMPABILITY
+ if (ert_comp.active) {
+ ert_comp.contents += "\\";
+ } else {
+#endif
+ par->insertChar(pos, '\\', font);
+ ++pos;
+#ifndef NO_COMPABILITY
+ }
+#endif
#ifndef NO_COMPABILITY
} else if (token == "\\begin_float") {
insertErtContents(par, pos);
//insertErtContents(par, pos, false);
//ert_stack.push(ert_comp);
//ert_comp = ErtComp();
-
+
// This is the compability reader. It can be removed in
// LyX version 1.3.0. (Lgb)
lex.next();
string const tmptok = lex.getString();
//lyxerr << "old float: " << tmptok << endl;
-
+
Inset * inset = 0;
stringstream old_float;
-
+
if (tmptok == "footnote") {
inset = new InsetFoot(params);
old_float << "collapsed true\n";
"depth is already null");
} else
--depth;
-
+
} else {
old_float << tmp << ' ';
break;
}
}
-
+
old_float << lex.getLongString("\\end_float")
<< "\n\\end_inset\n";
//lyxerr << "Float Body:\n" << old_float.str() << endl;
par->insertInset(pos, inset, font);
++pos;
insertErtContents(par, pos);
+
+ // we have to reset the font as in the old format after a float
+ // the font was automatically reset!
+ font = LyXFont(LyXFont::ALL_INHERIT, params.language);
#endif
} else if (token == "\\begin_deeper") {
++depth;
params.readPreamble(lex);
} else if (token == "\\textclass") {
lex.eatLine();
- pair<bool, textclass_type> pp =
+ pair<bool, textclass_type> pp =
textclasslist.NumberOfClass(lex.getString());
if (pp.first) {
params.textclass = pp.second;
} else {
- Alert::alert(string(_("Textclass error")),
- string(_("The document uses an unknown textclass \"")) +
+ Alert::alert(string(_("Textclass error")),
+ string(_("The document uses an unknown textclass \"")) +
lex.getString() + string("\"."),
string(_("LyX will not be able to produce output correctly.")));
params.textclass = 0;
lex.eatLine();
params.options = lex.getString();
} else if (token == "\\language") {
- params.readLanguage(lex);
+ params.readLanguage(lex);
} else if (token == "\\fontencoding") {
lex.eatLine();
} else if (token == "\\inputencoding") {
params.fonts = lex.getString();
} else if (token == "\\noindent") {
par->params().noindent(true);
+ } else if (token == "\\leftindent") {
+ lex.nextToken();
+ LyXLength value(lex.getString());
+ par->params().leftIndent(value);
} else if (token == "\\fill_top") {
par->params().spaceTop(VSpace(VSpace::VFILL));
} else if (token == "\\fill_bottom") {
int tmpret = lex.findToken(string_paragraph_separation);
if (tmpret == -1)
++tmpret;
- if (tmpret != LYX_LAYOUT_DEFAULT)
+ if (tmpret != LYX_LAYOUT_DEFAULT)
params.paragraph_separation =
static_cast<BufferParams::PARSEP>(tmpret);
} else if (token == "\\defskip") {
if (tmpret == -1)
++tmpret;
if (tmpret != LYX_LAYOUT_DEFAULT) {
- InsetQuotes::quote_language tmpl =
+ InsetQuotes::quote_language tmpl =
InsetQuotes::EnglishQ;
switch (tmpret) {
case 0:
break;
case 5:
tmpl = InsetQuotes::DanishQ;
- break;
+ break;
}
params.quotes_language = tmpl;
}
} else if (token == "\\quotes_times") {
lex.nextToken();
switch (lex.getInteger()) {
- case 1:
- params.quotes_times = InsetQuotes::SingleQ;
+ case 1:
+ params.quotes_times = InsetQuotes::SingleQ;
break;
- case 2:
- params.quotes_times = InsetQuotes::DoubleQ;
+ case 2:
+ params.quotes_times = InsetQuotes::DoubleQ;
break;
}
} else if (token == "\\papersize") {
int tmpret = lex.findToken(string_orientation);
if (tmpret == -1)
++tmpret;
- if (tmpret != LYX_LAYOUT_DEFAULT)
+ if (tmpret != LYX_LAYOUT_DEFAULT)
params.orientation = static_cast<BufferParams::PAPER_ORIENTATION>(tmpret);
} else if (token == "\\paperwidth") {
lex.next();
} else if (token == "\\float_placement") {
lex.nextToken();
params.float_placement = lex.getString();
- } else if (token == "\\family") {
- lex.next();
- font.setLyXFamily(lex.getString());
- } else if (token == "\\series") {
- lex.next();
- font.setLyXSeries(lex.getString());
- } else if (token == "\\shape") {
- lex.next();
- font.setLyXShape(lex.getString());
- } else if (token == "\\size") {
- lex.next();
- font.setLyXSize(lex.getString());
-#ifndef NO_COMPABILITY
- } else if (token == "\\latex") {
- lex.next();
- string const tok = lex.getString();
- if (tok == "no_latex") {
- // Do the insetert.
- insertErtContents(par, pos);
- } else if (tok == "latex") {
- ert_comp.active = true;
- ert_comp.font = font;
- } else if (tok == "default") {
- // Do the insetert.
- insertErtContents(par, pos);
- } else {
- lex.printError("Unknown LaTeX font flag "
- "`$$Token'");
- }
-#endif
- } else if (token == "\\lang") {
- lex.next();
- string const tok = lex.getString();
- Language const * lang = languages.getLanguage(tok);
- if (lang) {
- font.setLanguage(lang);
- } else {
- 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 const tok = lex.getString();
- // This is dirty, but gone with LyX3. (Asger)
- if (tok == "under")
- font.setUnderbar(LyXFont::ON);
- else if (tok == "no")
- font.setUnderbar(LyXFont::OFF);
- else if (tok == "default")
- font.setUnderbar(LyXFont::INHERIT);
- else
- lex.printError("Unknown bar font flag "
- "`$$Token'");
- } else if (token == "\\noun") {
- lex.next();
- font.setNoun(font.setLyXMisc(lex.getString()));
- } else if (token == "\\color") {
- lex.next();
- font.setLyXColor(lex.getString());
} else if (token == "\\align") {
int tmpret = lex.findToken(string_align);
if (tmpret == -1) ++tmpret;
} else if (token == "\\added_space_top") {
lex.nextToken();
VSpace value = VSpace(lex.getString());
+ // only add the length when value > 0 or
+ // with option keep
if ((value.length().len().value() != 0) ||
+ value.keep() ||
(value.kind() != VSpace::LENGTH))
- par->params().spaceTop(value);
+ par->params().spaceTop(value);
} else if (token == "\\added_space_bottom") {
lex.nextToken();
VSpace value = VSpace(lex.getString());
+ // only add the length when value > 0 or
+ // with option keep
if ((value.length().len().value() != 0) ||
+ value.keep() ||
(value.kind() != VSpace::LENGTH))
- par->params().spaceBottom(value);
+ par->params().spaceBottom(value);
#ifndef NO_COMPABILITY
#ifndef NO_PEXTRA_REALLY
} else if (token == "\\pextra_type") {
par->params().pextraWidthp(lex.getString());
} else if (token == "\\pextra_alignment") {
lex.nextToken();
- par->params().pextraAlignment(lex.getInteger());
- } else if (token == "\\pextra_hfill") {
- lex.nextToken();
- par->params().pextraHfill(lex.getInteger());
- } else if (token == "\\pextra_start_minipage") {
- lex.nextToken();
- par->params().pextraStartMinipage(lex.getInteger());
-#endif
-#endif
- } else if (token == "\\labelwidthstring") {
- lex.eatLine();
- par->params().labelWidthString(lex.getString());
- // do not delete this token, it is still needed!
- } else if (token == "\\end_inset") {
- lyxerr << "Solitary \\end_inset. Missing \\begin_inset?.\n"
- << "Last inset read was: " << last_inset_read
- << endl;
- // Simply ignore this. The insets do not have
- // to read this.
- // But insets should read it, it is a part of
- // the inset isn't it? Lgb.
- } else if (token == "\\begin_inset") {
-#ifndef NO_COMPABILITY
- insertErtContents(par, pos, false);
- ert_stack.push(ert_comp);
- ert_comp = ErtComp();
-#endif
- readInset(lex, par, pos, font);
-#ifndef NO_COMPABILITY
- ert_comp = ert_stack.top();
- ert_stack.pop();
- insertErtContents(par, pos);
-#endif
- } else if (token == "\\SpecialChar") {
- LyXLayout const & layout =
- textclasslist[params.textclass][par->layout()];
-
- // Insets don't make sense in a free-spacing context! ---Kayvan
- if (layout.free_spacing || par->isFreeSpacing()) {
- if (lex.isOK()) {
- lex.next();
- string next_token = lex.getString();
- if (next_token == "\\-") {
- par->insertChar(pos, '-', font);
- } else if (next_token == "\\protected_separator"
- || next_token == "~") {
- par->insertChar(pos, ' ', font);
- } else {
- lex.printError("Token `$$Token' "
- "is in free space "
- "paragraph layout!");
- --pos;
- }
- }
- } else {
- Inset * inset = new InsetSpecialChar;
- inset->read(this, lex);
- par->insertInset(pos, inset, font);
- }
- ++pos;
+ par->params().pextraAlignment(lex.getInteger());
+ } else if (token == "\\pextra_hfill") {
+ lex.nextToken();
+ par->params().pextraHfill(lex.getInteger());
+ } else if (token == "\\pextra_start_minipage") {
+ lex.nextToken();
+ par->params().pextraStartMinipage(lex.getInteger());
+#endif
+#endif
+ } else if (token == "\\labelwidthstring") {
+ lex.eatLine();
+ par->params().labelWidthString(lex.getString());
+ // do not delete this token, it is still needed!
} else if (token == "\\newline") {
#ifndef NO_COMPABILITY
if (!ert_comp.in_tabular && ert_comp.active) {
// This is a backward compability thingie. (Lgb)
// Remove it later some time...introduced with fileformat
// 2.16. (Lgb)
- LyXLayout const & layout =
- textclasslist[params.textclass][par->layout()];
+ LyXLayout_ptr const & layout = par->layout();
- if (layout.free_spacing || par->isFreeSpacing()) {
+ if (layout->free_spacing || par->isFreeSpacing()) {
par->insertChar(pos, ' ', font);
} else {
Inset * inset = new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
InsetCommandParams p("bibitem", "dummy");
par->bibkey = new InsetBibKey(p);
}
- par->bibkey->read(this, lex);
- } else if (token == "\\backslash") {
-#ifndef NO_COMPABILITY
- if (ert_comp.active) {
- ert_comp.contents += "\\";
- } else {
-#endif
- par->insertChar(pos, '\\', font);
- ++pos;
-#ifndef NO_COMPABILITY
- }
-#endif
+ par->bibkey->read(this, lex);
} else if (token == "\\the_end") {
#ifndef NO_COMPABILITY
// If we still have some ert active here we have to insert
the_end_read = true;
#ifndef NO_COMPABILITY
#ifndef NO_PEXTRA_REALLY
+ if (minipar == par)
+ par = 0;
minipar = parBeforeMinipage = 0;
#endif
#endif
lex.eatLine();
string const s = _("Unknown token: ") + token
+ " " + lex.text() + "\n";
-
+ // we can do this here this way because we're actually reading
+ // the buffer and don't care about LyXText right now.
InsetError * new_inset = new InsetError(s);
par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT,
- params.language));
+ params.language));
#ifndef NO_COMPABILITY
}
// Only a speed issue.
checkminipage = true;
}
-
+
// now check if we have a minipage paragraph as at this
// point we already read all the necessary data!
// this cannot be done in layout because there we did
// BEGIN pextra_minipage compability
// This should be removed in 1.3.x (Lgb)
// I don't think we should remove this so fast (Jug)
-
+
// This compability code is not perfect. In a couple
// of rand cases it fails. When the minipage par is
// the first par in the document, and when there are
// minipage. Currently I am not investing any effort
// in fixing those cases.
- //lyxerr << "Call depth: " << call_depth << endl;
+// lyxerr << "Call depth: " << call_depth << endl;
+// lyxerr << "Checkminipage: " << checkminipage << endl;
+
if (checkminipage && (call_depth == 1)) {
- checkminipage = false;
- if (minipar && (minipar != par) &&
- (par->params().pextraType() == Paragraph::PEXTRA_MINIPAGE)) {
- lyxerr << "minipages in a row" << endl;
- if (par->params().pextraStartMinipage()) {
- lyxerr << "start new minipage" << endl;
- // minipages in a row
- par->previous()->next(0);
- par->previous(0);
-
+ checkminipage = false;
+ if (minipar && (minipar != par) &&
+ (par->params().pextraType() == Paragraph::PEXTRA_MINIPAGE)) {
+ lyxerr << "minipages in a row" << endl;
+ if (par->params().pextraStartMinipage()) {
+ lyxerr << "start new minipage" << endl;
+ // minipages in a row
+ par->previous()->next(0);
+ par->previous(0);
+
+ Paragraph * tmp = minipar;
+ while (tmp) {
+ tmp->params().pextraType(0);
+ tmp->params().pextraWidth(string());
+ tmp->params().pextraWidthp(string());
+ tmp->params().pextraAlignment(0);
+ tmp->params().pextraHfill(false);
+ tmp->params().pextraStartMinipage(false);
+ tmp = tmp->next();
+ }
+ // create a new paragraph to insert the
+ // minipages in the following case
+ if (par->params().pextraStartMinipage() &&
+ !par->params().pextraHfill()) {
+ Paragraph * p = new Paragraph;
+ p->layout(textclasslist[params.textclass].defaultLayoutName());
+
+ p->previous(parBeforeMinipage);
+ parBeforeMinipage->next(p);
+ p->next(0);
+ p->params().depth(parBeforeMinipage->params().depth());
+ parBeforeMinipage = p;
+ }
+ InsetMinipage * mini = new InsetMinipage(params);
+ mini->pos(static_cast<InsetMinipage::Position>(par->params().pextraAlignment()));
+ mini->pageWidth(LyXLength(par->params().pextraWidth()));
+ if (!par->params().pextraWidthp().empty()) {
+ lyxerr << "WP:" << mini->pageWidth().asString() << endl;
+ mini->pageWidth(LyXLength((par->params().pextraWidthp())+"col%"));
+ }
+ Paragraph * op = mini->firstParagraph();
+ mini->inset.paragraph(par);
+ //
+ // and free the old ones!
+ //
+ while(op) {
+ Paragraph * pp = op->next();
+ delete op;
+ op = pp;
+ }
+ // Insert the minipage last in the
+ // previous paragraph.
+ if (par->params().pextraHfill()) {
+ parBeforeMinipage->insertChar
+ (parBeforeMinipage->size(),
+ Paragraph::META_HFILL, font);
+ }
+ parBeforeMinipage->insertInset
+ (parBeforeMinipage->size(), mini, font);
+
+ minipar = par;
+ } else {
+ lyxerr << "new minipage par" << endl;
+ //nothing to do just continue reading
+ }
+
+ } else if (minipar && (minipar != par)) {
+ lyxerr << "last minipage par read" << endl;
+ // The last paragraph read was not part of a
+ // minipage but the par linked list is...
+ // So we need to remove the last par from the
+ // rest
+ if (par->previous())
+ par->previous()->next(0);
+ par->previous(parBeforeMinipage);
+ parBeforeMinipage->next(par);
Paragraph * tmp = minipar;
while (tmp) {
tmp->params().pextraType(0);
tmp->params().pextraStartMinipage(false);
tmp = tmp->next();
}
- // create a new paragraph to insert the
- // minipages in the following case
- if (par->params().pextraStartMinipage() &&
- !par->params().pextraHfill()) {
- Paragraph * p = new Paragraph;
- p->layout(textclasslist[params.textclass].defaultLayoutName());
-
- p->previous(parBeforeMinipage);
- parBeforeMinipage->next(p);
- p->next(0);
- p->params().depth(parBeforeMinipage->params().depth());
- parBeforeMinipage = p;
- }
+ depth = parBeforeMinipage->params().depth();
+ // and set this depth on the par as it has not been set already
+ par->params().depth(depth);
+ minipar = parBeforeMinipage = 0;
+ } else if (!minipar &&
+ (par->params().pextraType() == Paragraph::PEXTRA_MINIPAGE)) {
+ // par is the first paragraph in a minipage
+ lyxerr << "begin minipage" << endl;
+ // To minimize problems for
+ // the users we will insert
+ // the first minipage in
+ // a sequence of minipages
+ // in its own paragraph.
+ Paragraph * p = new Paragraph;
+ p->layout(textclasslist[params.textclass].defaultLayoutName());
+ p->previous(par->previous());
+ p->next(0);
+ p->params().depth(depth);
+ par->params().depth(0);
+ depth = 0;
+ if (par->previous())
+ par->previous()->next(p);
+ par->previous(0);
+ parBeforeMinipage = p;
+ minipar = par;
+ if (!first_par || (first_par == par))
+ first_par = p;
+
InsetMinipage * mini = new InsetMinipage(params);
- mini->pos(static_cast<InsetMinipage::Position>(par->params().pextraAlignment()));
- mini->pageWidth(LyXLength(par->params().pextraWidth()));
+ mini->pos(static_cast<InsetMinipage::Position>(minipar->params().pextraAlignment()));
+ mini->pageWidth(LyXLength(minipar->params().pextraWidth()));
if (!par->params().pextraWidthp().empty()) {
- lyxerr << "WP:" << mini->pageWidth().asString() << endl;
- mini->pageWidth(LyXLength((par->params().pextraWidthp())+"%"));
+ lyxerr << "WP:" << mini->pageWidth().asString() << endl;
+ mini->pageWidth(LyXLength((par->params().pextraWidthp())+"col%"));
}
+
Paragraph * op = mini->firstParagraph();
- mini->inset.paragraph(par);
+ mini->inset.paragraph(minipar);
//
// and free the old ones!
//
delete op;
op = pp;
}
+
// Insert the minipage last in the
// previous paragraph.
- if (par->params().pextraHfill()) {
+ if (minipar->params().pextraHfill()) {
parBeforeMinipage->insertChar
- (parBeforeMinipage->size(), Paragraph::META_HFILL);
+ (parBeforeMinipage->size(),
+ Paragraph::META_HFILL, font);
}
parBeforeMinipage->insertInset
- (parBeforeMinipage->size(), mini);
-
- minipar = par;
- } else {
- lyxerr << "new minipage par" << endl;
- //nothing to do just continue reading
- }
-
- } else if (minipar && (minipar != par)) {
- lyxerr << "last minipage par read" << endl;
- // The last paragraph read was not part of a
- // minipage but the par linked list is...
- // So we need to remove the last par from the
- // rest
- if (par->previous())
- par->previous()->next(0);
- par->previous(parBeforeMinipage);
- parBeforeMinipage->next(par);
- Paragraph * tmp = minipar;
- while (tmp) {
- tmp->params().pextraType(0);
- tmp->params().pextraWidth(string());
- tmp->params().pextraWidthp(string());
- tmp->params().pextraAlignment(0);
- tmp->params().pextraHfill(false);
- tmp->params().pextraStartMinipage(false);
- tmp = tmp->next();
- }
- depth = parBeforeMinipage->params().depth();
- // and set this depth on the par as it has not been set already
- par->params().depth(depth);
- minipar = parBeforeMinipage = 0;
- } else if (!minipar &&
- (par->params().pextraType() == Paragraph::PEXTRA_MINIPAGE))
- {
- // par is the first paragraph in a minipage
- lyxerr << "begin minipage" << endl;
- // To minimize problems for
- // the users we will insert
- // the first minipage in
- // a sequence of minipages
- // in its own paragraph.
- Paragraph * p = new Paragraph;
- p->layout(textclasslist[params.textclass].defaultLayoutName());
- p->previous(par->previous());
- p->next(0);
- p->params().depth(depth);
- par->params().depth(0);
- depth = 0;
- if (par->previous())
- par->previous()->next(p);
- par->previous(0);
- parBeforeMinipage = p;
- minipar = par;
- if (!first_par || (first_par == par))
- first_par = p;
-
- InsetMinipage * mini = new InsetMinipage(params);
- mini->pos(static_cast<InsetMinipage::Position>(minipar->params().pextraAlignment()));
- mini->pageWidth(LyXLength(minipar->params().pextraWidth()));
- if (!par->params().pextraWidthp().empty()) {
- lyxerr << "WP:" << mini->pageWidth().asString() << endl;
- mini->pageWidth(LyXLength((par->params().pextraWidthp())+"%"));
- }
- mini->inset.paragraph(minipar);
-
- // Insert the minipage last in the
- // previous paragraph.
- if (minipar->params().pextraHfill()) {
- parBeforeMinipage->insertChar
- (parBeforeMinipage->size(),Paragraph::META_HFILL);
- }
- parBeforeMinipage->insertInset
- (parBeforeMinipage->size(), mini);
- }
+ (parBeforeMinipage->size(), mini, font);
+ } else if (par->params().pextraType() == Paragraph::PEXTRA_INDENT) {
+ par->params().leftIndent(LyXLength(par->params().pextraWidth()));
+ if (!par->params().pextraWidthp().empty()) {
+ par->params().leftIndent(LyXLength((par->params().pextraWidthp())+"col%"));
+ }
+ }
}
// End of pextra_minipage compability
--call_depth;
// needed to insert the selection
void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos,
- LyXFont const & fn,string const & str) const
+ LyXFont const & fn,string const & str) const
{
- LyXLayout const & layout =
- textclasslist[params.textclass][par->layout()];
+ LyXLayout_ptr const & layout = par->layout();
+
LyXFont font = fn;
-
+
par->checkInsertChar(font);
// insert the string, don't insert doublespace
bool space_inserted = true;
- for(string::const_iterator cit = str.begin();
+ bool autobreakrows = !par->inInset() ||
+ static_cast<InsetText *>(par->inInset())->getAutoBreakRows();
+ for(string::const_iterator cit = str.begin();
cit != str.end(); ++cit) {
if (*cit == '\n') {
- if (par->size() || layout.keepempty) {
- par->breakParagraph(params, pos,
- layout.isEnvironment());
+ if (autobreakrows && (par->size() || layout->keepempty)) {
+ par->breakParagraph(params, pos,
+ layout->isEnvironment());
par = par->next();
pos = 0;
space_inserted = true;
}
// do not insert consecutive spaces if !free_spacing
} else if ((*cit == ' ' || *cit == '\t') &&
- space_inserted && !layout.free_spacing &&
+ space_inserted && !layout->free_spacing &&
!par->isFreeSpacing())
{
continue;
} else if (*cit == '\t') {
- if (!layout.free_spacing && !par->isFreeSpacing()) {
+ if (!layout->free_spacing && !par->isFreeSpacing()) {
// tabs are like spaces here
par->insertChar(pos, ' ', font);
++pos;
space_inserted = (*cit == ' ');
}
- }
+ }
}
lyxerr << "Buffer::readInset: Consistency check failed."
<< endl;
}
-
+
Inset * inset = 0;
lex.next();
inscmd.read(lex);
string const cmdName = inscmd.getCmdName();
-
+
// This strange command allows LyX to recognize "natbib" style
// citations: citet, citep, Citet etc.
if (compare_no_case(cmdName, "cite", 4) == 0) {
} else if (tmptok == "FloatList") {
inset = new InsetFloatList;
}
-
+
if (inset && !alreadyread) inset->read(this, lex);
}
-
+
if (inset) {
par->insertInset(pos, inset, font);
++pos;
Alert::alert(_("Warning!"),
_("LyX file format is newer that what"),
_("is supported in this LyX version. Expect some problems."));
-
+
} else if (file_format < LYX_FORMAT) {
// old formats
if (file_format < 200) {
_("Old LyX file format found. "
"Use LyX 0.10.x to read this!"));
return false;
+ } else if (file_format < 220) {
+ Alert::alert(_("ERROR!"),
+ _("Old LyX file format found. "
+ "Use LyX 1.2.x to read this!"));
+ return false;
}
}
bool the_end = readLyXformat2(lex, par);
params.setPaperStuff();
+
+#if 0
// the_end was added in 213
if (file_format < 213)
the_end = true;
+#endif
if (!the_end) {
Alert::alert(_("Warning!"),
Alert::alert(_("ERROR!"), _("Unable to read file!"));
return false;
}
-
+
// Should probably be moved to somewhere else: BufferView? LyXView?
bool Buffer::save() const
*/
// Should probably have some more error checking here.
- // Should be cleaned up in 0.13, at least a bit.
// Doing it this way, also makes the inodes stay the same.
// This is still not a very good solution, in particular we
// might loose the owner of the backup.
ifs.close();
ofs.close();
::chmod(s.c_str(), fmode);
-
+
if (::utime(s.c_str(), ×)) {
lyxerr << "utime error." << endl;
}
}
}
}
-
+
if (writeFile(fileName(), false)) {
markLyxClean();
removeAutosaveFile(fileName());
// The top of the file should not be written by params.
// write out a comment in the top of the file
- ofs << '#' << lyx_docversion
+ ofs << '#' << lyx_docversion
<< " created this file. For more info see http://www.lyx.org/\n"
<< "\\lyxformat " << LYX_FORMAT << "\n";
// how to check if close went ok?
// 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,
}
#endif
}
-
+
return status;
}
+namespace {
+
+pair<int, string> const addDepth(int depth, int ldepth)
+{
+ int d = depth * 2;
+ if (ldepth > depth)
+ d += (ldepth - depth) * 2;
+ return make_pair(d, string(d, ' '));
+}
+
+}
+
+
string const Buffer::asciiParagraph(Paragraph const * par,
- unsigned int linelen,
- bool noparbreak) const
+ unsigned int linelen,
+ bool noparbreak) const
{
ostringstream buffer;
- ostringstream word;
Paragraph::depth_type depth = 0;
int ltype = 0;
Paragraph::depth_type ltype_depth = 0;
- string::size_type currlinelen = 0;
bool ref_printed = false;
// if (!par->previous()) {
#if 0
#else
depth = par->params().depth();
#endif
-
+
// First write the layout
- string const & tmp = par->layout();
+ string const & tmp = par->layout()->name();
if (compare_no_case(tmp, "itemize") == 0) {
ltype = 1;
ltype_depth = depth + 1;
ltype = 0;
ltype_depth = 0;
}
-
- /* maybe some vertical spaces */
-
- /* the labelwidthstring used in lists */
-
- /* some lines? */
-
- /* some pagebreaks? */
-
- /* noindent ? */
-
- /* what about the alignment */
+
+ /* maybe some vertical spaces */
+
+ /* the labelwidthstring used in lists */
+
+ /* some lines? */
+
+ /* some pagebreaks? */
+
+ /* noindent ? */
+
+ /* what about the alignment */
// } else {
// lyxerr << "Should this ever happen?" << endl;
// }
// linelen <= 0 is special and means we don't have pargraph breaks
+
+ string::size_type currlinelen = 0;
+
if (!noparbreak) {
if (linelen > 0)
buffer << "\n\n";
- for (Paragraph::depth_type j = 0; j < depth; ++j)
- buffer << " ";
- currlinelen = depth * 2;
+
+ buffer << string(depth * 2, ' ');
+ currlinelen += depth * 2;
+
//--
// we should probably change to the paragraph language in the
// gettext here (if possible) so that strings are outputted in
// the correct language! (20012712 Jug)
- //--
+ //--
switch (ltype) {
case 0: // Standard
case 4: // (Sub)Paragraph
case 5: // Description
break;
case 6: // Abstract
- if (linelen > 0)
+ if (linelen > 0) {
buffer << _("Abstract") << "\n\n";
- else
- buffer << _("Abstract: ");
+ currlinelen = 0;
+ } else {
+ string const abst = _("Abstract: ");
+ buffer << abst;
+ currlinelen += abst.length();
+ }
break;
case 7: // Bibliography
if (!ref_printed) {
- if (linelen > 0)
+ if (linelen > 0) {
buffer << _("References") << "\n\n";
- else
- buffer << _("References: ");
+ currlinelen = 0;
+ } else {
+ string const refs = _("References: ");
+ buffer << refs;
+ currlinelen += refs.length();
+ }
+
ref_printed = true;
}
break;
default:
- buffer << par->params().labelString() << " ";
- break;
+ {
+ string const parlab = par->params().labelString();
+ buffer << parlab << " ";
+ currlinelen += parlab.length() + 1;
+ }
+ break;
+
}
}
- string s = buffer.str();
- if (s.rfind('\n') != string::npos) {
- string dummy;
- s = rsplit(buffer.str().c_str(), dummy, '\n');
- }
- currlinelen = s.length();
+
if (!currlinelen) {
- for (Paragraph::depth_type j = 0; j < depth; ++j)
- buffer << " ";
- currlinelen = depth * 2;
- if (ltype_depth > depth) {
- for (Paragraph::depth_type j = ltype_depth;
- j > depth; --j)
- {
- buffer << " ";
- }
- currlinelen += (ltype_depth-depth)*2;
- }
+ pair<int, string> p = addDepth(depth, ltype_depth);
+ buffer << p.second;
+ currlinelen += p.first;
}
- // this is to change the linebreak to do it by word a bit more intelligent
- // hopefully! (only in the case where we have a max linelenght!) (Jug)
+
+ // this is to change the linebreak to do it by word a bit more
+ // intelligent hopefully! (only in the case where we have a
+ // max linelenght!) (Jug)
+
+ string word;
+
for (pos_type i = 0; i < par->size(); ++i) {
char c = par->getUChar(params, i);
switch (c) {
Inset const * inset = par->getInset(i);
if (inset) {
if (linelen > 0) {
- buffer << word.str();
- word.str("");
+ buffer << word;
+ currlinelen += word.length();
+ word.erase();
}
if (inset->ascii(this, buffer, linelen)) {
// to be sure it breaks paragraph
currlinelen += linelen;
}
-#if 0
- else {
- string dummy;
- string const s =
- rsplit(buffer.str().c_str(),
- dummy, '\n');
- currlinelen = s.length();
- }
-#endif
}
}
break;
-
+
case Paragraph::META_NEWLINE:
if (linelen > 0) {
- buffer << word.str() << "\n";
- word.str("");
- for (Paragraph::depth_type j = 0;
- j < depth; ++j)
- buffer << " ";
- currlinelen = depth * 2;
- if (ltype_depth > depth) {
- for (Paragraph::depth_type j = ltype_depth;
- j > depth; --j)
- buffer << " ";
- currlinelen += (ltype_depth - depth) * 2;
- }
+ buffer << word << "\n";
+ word.erase();
+
+ pair<int, string> p = addDepth(depth,
+ ltype_depth);
+ buffer << p.second;
+ currlinelen = p.first;
}
break;
-
+
case Paragraph::META_HFILL:
- buffer << word.str() << "\t";
- currlinelen += word.str().length() + 1;
- word.str("");
+ buffer << word << "\t";
+ currlinelen += word.length() + 1;
+ word.erase();
break;
default:
if (c == ' ') {
- buffer << word.str() << ' ';
- currlinelen += word.str().length() + 1;
- word.str("");
+ if (linelen > 0 &&
+ currlinelen + word.length() > linelen - 10) {
+ buffer << "\n";
+ pair<int, string> p =
+ addDepth(depth, ltype_depth);
+ buffer << p.second;
+ currlinelen = p.first;
+ }
+
+ buffer << word << ' ';
+ currlinelen += word.length() + 1;
+ word.erase();
+
} else {
if (c != '\0') {
- word << c;
+ word += c;
} else {
lyxerr[Debug::INFO] <<
"writeAsciiFile: NULL char in structure." << endl;
}
if ((linelen > 0) &&
- (currlinelen+word.str().length()) > linelen)
+ (currlinelen + word.length()) > linelen)
{
buffer << "\n";
- for (Paragraph::depth_type j = 0; j < depth; ++j)
- buffer << " ";
- currlinelen = depth * 2;
- if (ltype_depth > depth) {
- for (Paragraph::depth_type j = ltype_depth;
- j > depth; --j)
- {
- buffer << " ";
- }
- currlinelen += (ltype_depth-depth)*2;
- }
+
+ pair<int, string> p =
+ addDepth(depth, ltype_depth);
+ buffer << p.second;
+ currlinelen = p.first;
}
}
break;
}
}
- buffer << word.str();
+ buffer << word;
return buffer.str().c_str();
}
-void Buffer::writeFileAscii(string const & fname, int linelen)
+void Buffer::writeFileAscii(string const & fname, int linelen)
{
ofstream ofs(fname.c_str());
if (!ofs) {
}
-void Buffer::writeFileAscii(ostream & ofs, int linelen)
+void Buffer::writeFileAscii(ostream & ofs, int linelen)
{
Paragraph * par = paragraph;
while (par) {
bool use_babel;
-void Buffer::makeLaTeXFile(string const & fname,
+void Buffer::makeLaTeXFile(string const & fname,
string const & original_path,
- bool nice, bool only_body)
+ bool nice, bool only_body, bool only_preamble)
{
lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl;
-
- niceFile = nice; // this will be used by Insetincludes.
-
- tex_code_break_column = lyxrc.ascii_linelen;
ofstream ofs(fname.c_str());
if (!ofs) {
Alert::err_alert(_("Error: Cannot open file: "), fname);
return;
}
-
+
+ makeLaTeXFile(ofs, original_path, nice, only_body, only_preamble);
+
+ ofs.close();
+ if (ofs.fail()) {
+ lyxerr << "File was not closed properly." << endl;
+ }
+}
+
+
+void Buffer::makeLaTeXFile(ostream & os,
+ string const & original_path,
+ bool nice, bool only_body, bool only_preamble)
+{
+ niceFile = nice; // this will be used by Insetincludes.
+
+ tex_code_break_column = lyxrc.ascii_linelen;
+
// validate the buffer.
lyxerr[Debug::LATEX] << " Validating buffer..." << endl;
LaTeXFeatures features(params);
validate(features);
lyxerr[Debug::LATEX] << " Buffer validation done." << endl;
-
+
texrow.reset();
- // The starting paragraph of the coming rows is the
+ // The starting paragraph of the coming rows is the
// first paragraph of the document. (Asger)
texrow.start(paragraph, 0);
if (!only_body && nice) {
- ofs << "%% " << lyx_docversion << " created this file. "
+ os << "%% " << lyx_docversion << " created this file. "
"For more info, see http://www.lyx.org/.\n"
"%% Do not edit unless you really know what "
"you are doing.\n";
}
lyxerr[Debug::INFO] << "lyx header finished" << endl;
// There are a few differences between nice LaTeX and usual files:
- // usual is \batchmode and has a
+ // usual is \batchmode and has a
// special input@path to allow the including of figures
// with either \input or \includegraphics (what figinsets do).
// batchmode is not set if there is a tex_code_break_column.
if (!only_body) {
if (!nice) {
// code for usual, NOT nice-latex-file
- ofs << "\\batchmode\n"; // changed
+ os << "\\batchmode\n"; // changed
// from \nonstopmode
texrow.newline();
}
if (!original_path.empty()) {
- ofs << "\\makeatletter\n"
+ string inputpath = os::external_path(original_path);
+ subst(inputpath, "~", "\\string~");
+ os << "\\makeatletter\n"
<< "\\def\\input@path{{"
- << os::external_path(original_path) << "/}}\n"
+ << inputpath << "/}}\n"
<< "\\makeatother\n";
texrow.newline();
texrow.newline();
texrow.newline();
}
-
- ofs << "\\documentclass";
-
- LyXTextClass const & tclass = textclasslist[params.textclass];
-
+
+ os << "\\documentclass";
+
+ LyXTextClass const & tclass = textclasslist[params.textclass];
+
ostringstream options; // the document class options.
-
+
if (tokenPos(tclass.opt_fontsize(),
'|', params.fontsize) >= 0) {
// only write if existing in list (and not default)
options << params.fontsize << "pt,";
}
-
-
+
+
if (!params.use_geometry &&
(params.paperpackage == BufferParams::PACKAGE_NONE)) {
switch (params.papersize) {
options << "onecolumn,";
}
- if (!params.use_geometry
+ if (!params.use_geometry
&& params.orientation == BufferParams::ORIENTATION_LANDSCAPE)
options << "landscape,";
-
+
// language should be a parameter to \documentclass
use_babel = false;
ostringstream language_options;
if (lyxrc.language_use_babel ||
params.language->lang() != lyxrc.default_language ||
- !features.hasLanguages()) {
+ features.hasLanguages()) {
use_babel = true;
language_options << features.getLanguages();
language_options << params.language->babel();
string strOptions(options.str().c_str());
if (!strOptions.empty()) {
strOptions = strip(strOptions, ',');
- ofs << '[' << strOptions << ']';
+ os << '[' << strOptions << ']';
}
-
- ofs << '{' << tclass.latexname() << "}\n";
+
+ os << '{' << tclass.latexname() << "}\n";
texrow.newline();
// end of \documentclass defs
-
+
// font selection must be done before loading fontenc.sty
// The ae package is not needed when using OT1 font encoding.
if (params.fonts != "default" &&
(params.fonts != "ae" || lyxrc.fontenc != "default")) {
- ofs << "\\usepackage{" << params.fonts << "}\n";
+ os << "\\usepackage{" << params.fonts << "}\n";
texrow.newline();
if (params.fonts == "ae") {
- ofs << "\\usepackage{aecompl}\n";
+ os << "\\usepackage{aecompl}\n";
texrow.newline();
}
}
// this one is not per buffer
if (lyxrc.fontenc != "default") {
- ofs << "\\usepackage[" << lyxrc.fontenc
+ os << "\\usepackage[" << lyxrc.fontenc
<< "]{fontenc}\n";
texrow.newline();
}
string const doc_encoding =
params.language->encoding()->LatexName();
- // Create a list with all the input encodings used
+ // Create a list with all the input encodings used
// in the document
set<string> encodings = features.getEncodingSet(doc_encoding);
- ofs << "\\usepackage[";
+ os << "\\usepackage[";
std::copy(encodings.begin(), encodings.end(),
- std::ostream_iterator<string>(ofs, ","));
- ofs << doc_encoding << "]{inputenc}\n";
+ std::ostream_iterator<string>(os, ","));
+ os << doc_encoding << "]{inputenc}\n";
texrow.newline();
} else if (params.inputenc != "default") {
- ofs << "\\usepackage[" << params.inputenc
+ os << "\\usepackage[" << params.inputenc
<< "]{inputenc}\n";
texrow.newline();
}
if (params.paperpackage != BufferParams::PACKAGE_NONE) {
switch (params.paperpackage) {
case BufferParams::PACKAGE_A4:
- ofs << "\\usepackage{a4}\n";
+ os << "\\usepackage{a4}\n";
texrow.newline();
break;
case BufferParams::PACKAGE_A4WIDE:
- ofs << "\\usepackage{a4wide}\n";
+ os << "\\usepackage{a4wide}\n";
texrow.newline();
break;
case BufferParams::PACKAGE_WIDEMARGINSA4:
- ofs << "\\usepackage[widemargins]{a4}\n";
+ os << "\\usepackage[widemargins]{a4}\n";
texrow.newline();
break;
}
}
if (params.use_geometry) {
- ofs << "\\usepackage{geometry}\n";
+ os << "\\usepackage{geometry}\n";
texrow.newline();
- ofs << "\\geometry{verbose";
+ os << "\\geometry{verbose";
if (params.orientation == BufferParams::ORIENTATION_LANDSCAPE)
- ofs << ",landscape";
+ os << ",landscape";
switch (params.papersize2) {
case BufferParams::VM_PAPER_CUSTOM:
if (!params.paperwidth.empty())
- ofs << ",paperwidth="
+ os << ",paperwidth="
<< params.paperwidth;
if (!params.paperheight.empty())
- ofs << ",paperheight="
+ os << ",paperheight="
<< params.paperheight;
break;
case BufferParams::VM_PAPER_USLETTER:
- ofs << ",letterpaper";
+ os << ",letterpaper";
break;
case BufferParams::VM_PAPER_USLEGAL:
- ofs << ",legalpaper";
+ os << ",legalpaper";
break;
case BufferParams::VM_PAPER_USEXECUTIVE:
- ofs << ",executivepaper";
+ os << ",executivepaper";
break;
case BufferParams::VM_PAPER_A3:
- ofs << ",a3paper";
+ os << ",a3paper";
break;
case BufferParams::VM_PAPER_A4:
- ofs << ",a4paper";
+ os << ",a4paper";
break;
case BufferParams::VM_PAPER_A5:
- ofs << ",a5paper";
+ os << ",a5paper";
break;
case BufferParams::VM_PAPER_B3:
- ofs << ",b3paper";
+ os << ",b3paper";
break;
case BufferParams::VM_PAPER_B4:
- ofs << ",b4paper";
+ os << ",b4paper";
break;
case BufferParams::VM_PAPER_B5:
- ofs << ",b5paper";
+ os << ",b5paper";
break;
default:
// default papersize ie BufferParams::VM_PAPER_DEFAULT
switch (lyxrc.default_papersize) {
case BufferParams::PAPER_DEFAULT: // keep compiler happy
case BufferParams::PAPER_USLETTER:
- ofs << ",letterpaper";
+ os << ",letterpaper";
break;
case BufferParams::PAPER_LEGALPAPER:
- ofs << ",legalpaper";
+ os << ",legalpaper";
break;
case BufferParams::PAPER_EXECUTIVEPAPER:
- ofs << ",executivepaper";
+ os << ",executivepaper";
break;
case BufferParams::PAPER_A3PAPER:
- ofs << ",a3paper";
+ os << ",a3paper";
break;
case BufferParams::PAPER_A4PAPER:
- ofs << ",a4paper";
+ os << ",a4paper";
break;
case BufferParams::PAPER_A5PAPER:
- ofs << ",a5paper";
+ os << ",a5paper";
break;
case BufferParams::PAPER_B5PAPER:
- ofs << ",b5paper";
+ os << ",b5paper";
break;
}
}
if (!params.topmargin.empty())
- ofs << ",tmargin=" << params.topmargin;
+ os << ",tmargin=" << params.topmargin;
if (!params.bottommargin.empty())
- ofs << ",bmargin=" << params.bottommargin;
+ os << ",bmargin=" << params.bottommargin;
if (!params.leftmargin.empty())
- ofs << ",lmargin=" << params.leftmargin;
+ os << ",lmargin=" << params.leftmargin;
if (!params.rightmargin.empty())
- ofs << ",rmargin=" << params.rightmargin;
+ os << ",rmargin=" << params.rightmargin;
if (!params.headheight.empty())
- ofs << ",headheight=" << params.headheight;
+ os << ",headheight=" << params.headheight;
if (!params.headsep.empty())
- ofs << ",headsep=" << params.headsep;
+ os << ",headsep=" << params.headsep;
if (!params.footskip.empty())
- ofs << ",footskip=" << params.footskip;
- ofs << "}\n";
+ os << ",footskip=" << params.footskip;
+ os << "}\n";
texrow.newline();
}
if (tokenPos(tclass.opt_pagestyle(),
'|', params.pagestyle) >= 0) {
if (params.pagestyle == "fancy") {
- ofs << "\\usepackage{fancyhdr}\n";
+ os << "\\usepackage{fancyhdr}\n";
texrow.newline();
}
- ofs << "\\pagestyle{" << params.pagestyle << "}\n";
+ os << "\\pagestyle{" << params.pagestyle << "}\n";
texrow.newline();
}
if (params.secnumdepth != tclass.secnumdepth()) {
- ofs << "\\setcounter{secnumdepth}{"
+ os << "\\setcounter{secnumdepth}{"
<< params.secnumdepth
<< "}\n";
texrow.newline();
}
if (params.tocdepth != tclass.tocdepth()) {
- ofs << "\\setcounter{tocdepth}{"
+ os << "\\setcounter{tocdepth}{"
<< params.tocdepth
<< "}\n";
texrow.newline();
}
-
+
if (params.paragraph_separation) {
switch (params.defskip.kind()) {
- case VSpace::SMALLSKIP:
- ofs << "\\setlength\\parskip{\\smallskipamount}\n";
+ case VSpace::SMALLSKIP:
+ os << "\\setlength\\parskip{\\smallskipamount}\n";
break;
case VSpace::MEDSKIP:
- ofs << "\\setlength\\parskip{\\medskipamount}\n";
+ os << "\\setlength\\parskip{\\medskipamount}\n";
break;
case VSpace::BIGSKIP:
- ofs << "\\setlength\\parskip{\\bigskipamount}\n";
+ os << "\\setlength\\parskip{\\bigskipamount}\n";
break;
case VSpace::LENGTH:
- ofs << "\\setlength\\parskip{"
+ os << "\\setlength\\parskip{"
<< params.defskip.length().asLatexString()
<< "}\n";
break;
default: // should never happen // Then delete it.
- ofs << "\\setlength\\parskip{\\medskipamount}\n";
+ os << "\\setlength\\parskip{\\medskipamount}\n";
break;
}
texrow.newline();
-
- ofs << "\\setlength\\parindent{0pt}\n";
+
+ os << "\\setlength\\parindent{0pt}\n";
texrow.newline();
}
+ tmppreamble + '\n';
}
- // the text class specific preamble
+ // the text class specific preamble
tmppreamble = features.getTClassPreamble();
if (!tmppreamble.empty()) {
preamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
+ params.preamble + '\n';
}
- preamble += "\\makeatother\n";
-
// Itemize bullet settings need to be last in case the user
// defines their own bullets that use a package included
// in the user-defined preamble -- ARRae
// Actually it has to be done much later than that
// since some packages like frenchb make modifications
- // at \begin{document} time -- JMarc
+ // at \begin{document} time -- JMarc
string bullets_def;
for (int i = 0; i < 4; ++i) {
if (params.user_defined_bullets[i] != ITEMIZE_DEFAULTS[i]) {
bullets_def += 'v';
break;
}
- bullets_def += "}{" +
- params.user_defined_bullets[i].getText()
+ bullets_def += "}{" +
+ params.user_defined_bullets[i].getText()
+ "}\n";
}
}
texrow.newline();
}
- ofs << preamble;
-
// We try to load babel late, in case it interferes
// with other packages.
if (use_babel) {
tmp = string("\\usepackage[") +
language_options.str().c_str() +
"]{babel}";
- ofs << tmp << "\n";
- texrow.newline();
+ preamble += tmp + "\n";
+ preamble += features.getBabelOptions();
}
+ preamble += "\\makeatother\n";
+
+ os << preamble;
+
+ if (only_preamble)
+ return;
+
// make the body.
- ofs << "\\begin{document}\n";
+ os << "\\begin{document}\n";
texrow.newline();
} // only_body
lyxerr[Debug::INFO] << "preamble finished, now the body." << endl;
if (!lyxrc.language_auto_begin) {
- ofs << subst(lyxrc.language_command_begin, "$$lang",
+ os << subst(lyxrc.language_command_begin, "$$lang",
params.language->babel())
<< endl;
texrow.newline();
}
-
- latexParagraphs(ofs, paragraph, 0, texrow);
+
+ latexParagraphs(os, paragraph, 0, texrow);
// add this just in case after all the paragraphs
- ofs << endl;
+ os << endl;
texrow.newline();
if (!lyxrc.language_auto_end) {
- ofs << subst(lyxrc.language_command_end, "$$lang",
+ os << subst(lyxrc.language_command_end, "$$lang",
params.language->babel())
<< endl;
texrow.newline();
}
if (!only_body) {
- ofs << "\\end{document}\n";
+ os << "\\end{document}\n";
texrow.newline();
-
+
lyxerr[Debug::LATEX] << "makeLaTeXFile...done" << endl;
} else {
lyxerr[Debug::LATEX] << "LaTeXFile for inclusion made."
// 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::INFO] << "Finished making latex file." << endl;
lyxerr[Debug::INFO] << "Row count was " << texrow.rows()-1 << "." << endl;
+
+ // we want this to be true outside previews (for insetexternal)
+ niceFile = true;
}
// LaTeX all paragraphs from par to endpar, if endpar == 0 then to the end
//
void Buffer::latexParagraphs(ostream & ofs, Paragraph * par,
- Paragraph * endpar, TexRow & texrow) const
+ Paragraph * endpar, TexRow & texrow,
+ bool moving_arg) const
{
bool was_title = false;
bool already_title = false;
// any special options in the paragraph and also we don't allow
// any environment other then "Standard" to be valid!
if ((in == 0) || !in->forceDefaultParagraphs(in)) {
- LyXLayout const & layout =
- textclasslist[params.textclass][par->layout()];
-
- if (layout.intitle) {
+ LyXLayout_ptr const & layout = par->layout();
+
+ if (layout->intitle) {
if (already_title) {
lyxerr <<"Error in latexParagraphs: You"
" should not mix title layouts"
ofs << "\\maketitle\n";
texrow.newline();
already_title = true;
- was_title = false;
+ was_title = false;
}
-
- if (layout.isEnvironment()) {
+
+ if (layout->isEnvironment() ||
+ !par->params().leftIndent().zero())
+ {
par = par->TeXEnvironment(this, params, ofs, texrow);
} else {
- par = par->TeXOnePar(this, params, ofs, texrow, false);
+ par = par->TeXOnePar(this, params, ofs, texrow, moving_arg);
}
} else {
- par = par->TeXOnePar(this, params, ofs, texrow, false);
+ par = par->TeXOnePar(this, params, ofs, texrow, moving_arg);
}
}
// It might be that we only have a title in this document
bool Buffer::isSGML() const
{
LyXTextClass const & tclass = textclasslist[params.textclass];
-
+
return tclass.outputType() == LINUXDOC ||
tclass.outputType() == DOCBOOK;
}
-void Buffer::sgmlOpenTag(ostream & os, Paragraph::depth_type depth,
+int Buffer::sgmlOpenTag(ostream & os, Paragraph::depth_type depth, bool mixcont,
string const & latexname) const
{
- if (!latexname.empty() && latexname != "!-- --")
- //os << "<!-- " << depth << " -->" << "<" << latexname << ">";
- os << string(depth, ' ') << "<" << latexname << ">\n";
+ if (!latexname.empty() && latexname != "!-- --") {
+ if (!mixcont)
+ os << string(" ",depth);
+ os << "<" << latexname << ">";
+ }
+
+ if (!mixcont)
+ os << endl;
+
+ return mixcont?0:1;
}
-void Buffer::sgmlCloseTag(ostream & os, Paragraph::depth_type depth,
+int Buffer::sgmlCloseTag(ostream & os, Paragraph::depth_type depth, bool mixcont,
string const & latexname) const
{
- if (!latexname.empty() && latexname != "!-- --")
- //os << "<!-- " << depth << " -->" << "</" << latexname << ">\n";
- os << string(depth, ' ') << "</" << latexname << ">\n";
+ if (!latexname.empty() && latexname != "!-- --") {
+ if (!mixcont)
+ os << endl << string(" ",depth);
+ os << "</" << latexname << ">";
+ }
+
+ if (!mixcont)
+ os << endl;
+
+ return mixcont?0:1;
}
niceFile = nice; // this will be used by included files.
LaTeXFeatures features(params);
-
+
validate(features);
texrow.reset();
- LyXTextClass const & tclass = textclasslist[params.textclass];
+ LyXTextClass const & tclass = textclasslist[params.textclass];
string top_element = tclass.latexname();
ofs << "<!doctype linuxdoc system";
string preamble = params.preamble;
- preamble += features.getIncludedFiles(fname);
+ const string name = nice ? ChangeExtension(filename_, ".sgml")
+ : fname;
+ preamble += features.getIncludedFiles(name);
preamble += features.getLyXSGMLEntities();
if (!preamble.empty()) {
ofs << ">\n\n";
if (params.options.empty())
- sgmlOpenTag(ofs, 0, top_element);
+ sgmlOpenTag(ofs, 0, false, top_element);
else {
string top = top_element;
top += " ";
top += params.options;
- sgmlOpenTag(ofs, 0, top);
+ sgmlOpenTag(ofs, 0, false, top);
}
}
Paragraph::depth_type depth = 0; // paragraph depth
Paragraph * par = paragraph;
- string item_name;
+ string item_name;
vector<string> environment_stack(5);
while (par) {
- LyXLayout const & style = tclass[par->layout()];
-
+ LyXLayout_ptr const & style = par->layout();
// treat <toc> as a special case for compatibility with old code
if (par->isInset(0)) {
- Inset * inset = par->getInset(0);
+ Inset * inset = par->getInset(0);
Inset::Code lyx_code = inset->lyxCode();
if (lyx_code == Inset::TOC_CODE) {
string const temp = "toc";
- sgmlOpenTag(ofs, depth, temp);
+ sgmlOpenTag(ofs, depth, false, temp);
par = par->next();
continue;
// environment tag closing
for (; depth > par->params().depth(); --depth) {
- sgmlCloseTag(ofs, depth, environment_stack[depth]);
+ sgmlCloseTag(ofs, depth, false, environment_stack[depth]);
environment_stack[depth].erase();
}
// write opening SGML tags
- switch (style.latextype) {
+ switch (style->latextype) {
case LATEX_PARAGRAPH:
- if (depth == par->params().depth()
+ if (depth == par->params().depth()
&& !environment_stack[depth].empty()) {
- sgmlCloseTag(ofs, depth, environment_stack[depth]);
+ sgmlCloseTag(ofs, depth, false, environment_stack[depth]);
environment_stack[depth].erase();
- if (depth)
+ if (depth)
--depth;
else
- ofs << "</p>";
+ ofs << "</p>";
}
- sgmlOpenTag(ofs, depth, style.latexname());
+ sgmlOpenTag(ofs, depth, false, style->latexname());
break;
case LATEX_COMMAND:
" LatexType Command.\n"));
if (!environment_stack[depth].empty()) {
- sgmlCloseTag(ofs, depth,
- environment_stack[depth]);
+ sgmlCloseTag(ofs, depth, false, environment_stack[depth]);
ofs << "</p>";
}
environment_stack[depth].erase();
- sgmlOpenTag(ofs, depth, style.latexname());
+ sgmlOpenTag(ofs, depth, false, style->latexname());
break;
case LATEX_ENVIRONMENT:
case LATEX_ITEM_ENVIRONMENT:
- if (depth == par->params().depth()
- && environment_stack[depth] != style.latexname()) {
- sgmlCloseTag(ofs, depth,
+ {
+ string const & latexname = style->latexname();
+
+ if (depth == par->params().depth()
+ && environment_stack[depth] != latexname) {
+ sgmlCloseTag(ofs, depth, false,
environment_stack[depth]);
environment_stack[depth].erase();
}
depth = par->params().depth();
environment_stack[depth].erase();
}
- if (environment_stack[depth] != style.latexname()) {
+ if (environment_stack[depth] != latexname) {
if (depth == 0) {
- sgmlOpenTag(ofs, depth, "p");
+ sgmlOpenTag(ofs, depth, false, "p");
}
- sgmlOpenTag(ofs, depth, style.latexname());
+ sgmlOpenTag(ofs, depth, false, latexname);
if (environment_stack.size() == depth + 1)
environment_stack.push_back("!-- --");
- environment_stack[depth] = style.latexname();
+ environment_stack[depth] = latexname;
}
- if (style.latexparam() == "CDATA")
+ if (style->latexparam() == "CDATA")
ofs << "<![CDATA[";
- if (style.latextype == LATEX_ENVIRONMENT) break;
+ if (style->latextype == LATEX_ENVIRONMENT) break;
- if (style.labeltype == LABEL_MANUAL)
+ if (style->labeltype == LABEL_MANUAL)
item_name = "tag";
else
item_name = "item";
- sgmlOpenTag(ofs, depth + 1, item_name);
- break;
+ sgmlOpenTag(ofs, depth + 1, false, item_name);
+ }
+ break;
+
default:
- sgmlOpenTag(ofs, depth, style.latexname());
+ sgmlOpenTag(ofs, depth, false, style->latexname());
break;
}
ofs << "\n";
// write closing SGML tags
- switch (style.latextype) {
+ switch (style->latextype) {
case LATEX_COMMAND:
break;
case LATEX_ENVIRONMENT:
case LATEX_ITEM_ENVIRONMENT:
- if (style.latexparam() == "CDATA")
+ if (style->latexparam() == "CDATA")
ofs << "]]>";
break;
default:
- sgmlCloseTag(ofs, depth, style.latexname());
+ sgmlCloseTag(ofs, depth, false, style->latexname());
break;
}
}
-
+
// Close open tags
- for (int i=depth; i >= 0; --i)
- sgmlCloseTag(ofs, depth, environment_stack[i]);
+ for (int i = depth; i >= 0; --i)
+ sgmlCloseTag(ofs, depth, false, environment_stack[i]);
if (!body_only) {
ofs << "\n\n";
- sgmlCloseTag(ofs, 0, top_element);
+ sgmlCloseTag(ofs, 0, false, top_element);
}
ofs.close();
// How to check for successful close
+
+ // we want this to be true outside previews (for insetexternal)
+ niceFile = true;
}
inline
void operator|=(PAR_TAG & p1, PAR_TAG const & p2)
{
-
p1 = static_cast<PAR_TAG>(p1 | p2);
+ p1 = static_cast<PAR_TAG>(p1 | p2);
}
p1 = static_cast<PAR_TAG>(p1 & ~p2);
}
-} // namespace anon
+} // anon
// Handle internal paragraph parsing -- layout already processed.
void Buffer::simpleLinuxDocOnePar(ostream & os,
- Paragraph * par,
- Paragraph::depth_type /*depth*/)
+ Paragraph * par,
+ Paragraph::depth_type /*depth*/)
{
- LyXLayout const & style =
- textclasslist[params.textclass][par->layout()];
- string::size_type char_line_count = 5; // Heuristic choice ;-)
+ LyXLayout_ptr const & style = par->layout();
+
+ string::size_type char_line_count = 5; // Heuristic choice ;-)
// gets paragraph main font
LyXFont font_old;
bool desc_on;
- if (style.labeltype == LABEL_MANUAL) {
- font_old = style.labelfont;
+ if (style->labeltype == LABEL_MANUAL) {
+ font_old = style->labelfont;
desc_on = true;
} else {
- font_old = style.font;
+ font_old = style->font;
desc_on = false;
}
continue;
}
- if (style.latexparam() == "CDATA") {
+ if (style->latexparam() == "CDATA") {
// "TeX"-Mode on == > SGML-Mode on.
if (c != '\0')
os << c;
} else {
string sgml_string;
if (par->sgmlConvertChar(c, sgml_string)
- && !style.free_spacing && !par->isFreeSpacing())
- {
+ && !style->free_spacing && !par->isFreeSpacing())
+ {
// in freespacing mode, spaces are
// non-breaking characters
if (desc_on) {// if char is ' ' then...
// Print an error message.
-void Buffer::sgmlError(Paragraph * par, int pos,
- string const & message) const
+void Buffer::sgmlError(Paragraph * /*par*/, int /*pos*/,
+ string const & /*message*/) const
{
+#ifdef WITH_WARNINGS
+#warning This is wrong we cannot insert an inset like this!!!
+ // I guess this was Jose' so I explain you more or less why this
+ // is wrong. This way you insert something in the paragraph and
+ // don't tell it to LyXText (row rebreaking and undo handling!!!)
+ // I deactivate this code, have a look at BufferView::insertErrors
+ // how you should do this correctly! (Jug 20020315)
+#endif
+#if 0
// insert an error marker in text
InsetError * new_inset = new InsetError(message);
- par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT,
- params.language));
+ par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT,
+ params.language));
+#endif
}
LaTeXFeatures features(params);
validate(features);
-
+
texrow.reset();
- LyXTextClass const & tclass = textclasslist[params.textclass];
+ LyXTextClass const & tclass = textclasslist[params.textclass];
string top_element = tclass.latexname();
if (!only_body) {
<< " PUBLIC \"-//OASIS//DTD DocBook V4.1//EN\"";
string preamble = params.preamble;
- preamble += features.getIncludedFiles(fname);
+ const string name = nice ? ChangeExtension(filename_, ".sgml")
+ : fname;
+ preamble += features.getIncludedFiles(name);
preamble += features.getLyXSGMLEntities();
if (!preamble.empty()) {
ofs << ">\n\n";
}
- string top = top_element;
+ string top = top_element;
top += " lang=\"";
top += params.language->code();
top += "\"";
top += " ";
top += params.options;
}
- sgmlOpenTag(ofs, 0, top);
+ sgmlOpenTag(ofs, 0, false, top);
ofs << "<!-- DocBook file was created by " << lyx_docversion
<< "\n See http://www.lyx.org/ for more information -->\n";
Paragraph::depth_type cmd_depth = 0;
Paragraph::depth_type depth = 0; // paragraph depth
- string item_name;
+ string item_name;
string command_name;
while (par) {
string c_params;
int desc_on = 0; // description mode
- LyXLayout const & style = tclass[par->layout()];
+ LyXLayout_ptr const & style = par->layout();
// environment tag closing
for (; depth > par->params().depth(); --depth) {
if (environment_inner[depth] != "!-- --") {
item_name = "listitem";
- sgmlCloseTag(ofs, command_depth + depth,
- item_name);
+ sgmlCloseTag(ofs, command_depth + depth, false, item_name);
if (environment_inner[depth] == "varlistentry")
- sgmlCloseTag(ofs, depth+command_depth,
- environment_inner[depth]);
+ sgmlCloseTag(ofs, depth+command_depth, false, environment_inner[depth]);
}
- sgmlCloseTag(ofs, depth + command_depth,
- environment_stack[depth]);
+ sgmlCloseTag(ofs, depth + command_depth, false, environment_stack[depth]);
environment_stack[depth].erase();
environment_inner[depth].erase();
}
if (depth == par->params().depth()
- && environment_stack[depth] != style.latexname()
+ && environment_stack[depth] != style->latexname()
&& !environment_stack[depth].empty()) {
if (environment_inner[depth] != "!-- --") {
item_name= "listitem";
- sgmlCloseTag(ofs, command_depth+depth,
- item_name);
+ sgmlCloseTag(ofs, command_depth+depth, false, item_name);
if (environment_inner[depth] == "varlistentry")
- sgmlCloseTag(ofs,
- depth + command_depth,
- environment_inner[depth]);
+ sgmlCloseTag(ofs, depth + command_depth, false, environment_inner[depth]);
}
-
- sgmlCloseTag(ofs, depth + command_depth,
- environment_stack[depth]);
-
+
+ sgmlCloseTag(ofs, depth + command_depth, false, environment_stack[depth]);
+
environment_stack[depth].erase();
environment_inner[depth].erase();
- }
+ }
// Write opening SGML tags.
- switch (style.latextype) {
+ switch (style->latextype) {
case LATEX_PARAGRAPH:
sgmlOpenTag(ofs, depth + command_depth,
- style.latexname());
+ false, style->latexname());
break;
case LATEX_COMMAND:
sgmlError(par, 0,
_("Error : Wrong depth for "
"LatexType Command.\n"));
-
- command_name = style.latexname();
-
- sgmlparam = style.latexparam();
+
+ command_name = style->latexname();
+
+ sgmlparam = style->latexparam();
c_params = split(sgmlparam, c_depth,'|');
-
+
cmd_depth = lyx::atoi(c_depth);
-
+
if (command_flag) {
if (cmd_depth < command_base) {
- for (Paragraph::depth_type j = command_depth; j >= command_base; --j)
- sgmlCloseTag(ofs, j, command_stack[j]);
+ for (Paragraph::depth_type j = command_depth;
+ j >= command_base; --j) {
+ sgmlCloseTag(ofs, j, false, command_stack[j]);
+ ofs << endl;
+ }
command_depth = command_base = cmd_depth;
} else if (cmd_depth <= command_depth) {
- for (int j = command_depth; j >= int(cmd_depth); --j)
- sgmlCloseTag(ofs, j, command_stack[j]);
+ for (int j = command_depth;
+ j >= int(cmd_depth); --j) {
+ sgmlCloseTag(ofs, j, false, command_stack[j]);
+ ofs << endl;
+ }
command_depth = cmd_depth;
} else
command_depth = cmd_depth;
// This is a hack while paragraphs can't have
// attributes, like id in this case.
if (par->isInset(0)) {
- Inset * inset = par->getInset(0);
+ Inset * inset = par->getInset(0);
Inset::Code lyx_code = inset->lyxCode();
if (lyx_code == Inset::LABEL_CODE) {
command_name += " id=\"";
}
}
- sgmlOpenTag(ofs, depth + command_depth, command_name);
- if (c_params.empty())
- item_name = "title";
- else
- item_name = c_params;
- sgmlOpenTag(ofs, depth + 1 + command_depth, item_name);
+ sgmlOpenTag(ofs, depth + command_depth, false, command_name);
+
+ item_name = c_params.empty()?"title":c_params;
+ sgmlOpenTag(ofs, depth + 1 + command_depth, false, item_name);
break;
case LATEX_ENVIRONMENT:
environment_stack[depth].erase();
}
- if (environment_stack[depth] != style.latexname()) {
+ if (environment_stack[depth] != style->latexname()) {
if (environment_stack.size() == depth + 1) {
environment_stack.push_back("!-- --");
environment_inner.push_back("!-- --");
}
- environment_stack[depth] = style.latexname();
+ environment_stack[depth] = style->latexname();
environment_inner[depth] = "!-- --";
- sgmlOpenTag(ofs, depth + command_depth,
- environment_stack[depth]);
+ sgmlOpenTag(ofs, depth + command_depth, false, environment_stack[depth]);
} else {
if (environment_inner[depth] != "!-- --") {
item_name= "listitem";
- sgmlCloseTag(ofs,
- command_depth + depth,
- item_name);
+ sgmlCloseTag(ofs, command_depth + depth, false, item_name);
if (environment_inner[depth] == "varlistentry")
- sgmlCloseTag(ofs,
- depth + command_depth,
- environment_inner[depth]);
+ sgmlCloseTag(ofs, depth + command_depth, false, environment_inner[depth]);
}
}
-
- if (style.latextype == LATEX_ENVIRONMENT) {
- if (!style.latexparam().empty()) {
- if (style.latexparam() == "CDATA")
+
+ if (style->latextype == LATEX_ENVIRONMENT) {
+ if (!style->latexparam().empty()) {
+ if (style->latexparam() == "CDATA")
ofs << "<![CDATA[";
else
- sgmlOpenTag(ofs, depth + command_depth,
- style.latexparam());
+ sgmlOpenTag(ofs, depth + command_depth, false, style->latexparam());
}
break;
}
- desc_on = (style.labeltype == LABEL_MANUAL);
-
- if (desc_on)
- environment_inner[depth]= "varlistentry";
- else
- environment_inner[depth]= "listitem";
+ desc_on = (style->labeltype == LABEL_MANUAL);
+ environment_inner[depth] = desc_on ? "varlistentry" : "listitem";
sgmlOpenTag(ofs, depth + 1 + command_depth,
- environment_inner[depth]);
+ false, environment_inner[depth]);
- if (desc_on) {
- item_name= "term";
- sgmlOpenTag(ofs, depth + 1 + command_depth,
- item_name);
- } else {
- item_name= "para";
- sgmlOpenTag(ofs, depth + 1 + command_depth,
- item_name);
- }
+ item_name = desc_on ? "term" : "para";
+ sgmlOpenTag(ofs, depth + 1 + command_depth,
+ false, item_name);
break;
default:
sgmlOpenTag(ofs, depth + command_depth,
- style.latexname());
+ false, style->latexname());
break;
}
- simpleDocBookOnePar(ofs, par, desc_on, depth+1+command_depth);
+ simpleDocBookOnePar(ofs, par, desc_on,
+ depth + 1 + command_depth);
par = par->next();
string end_tag;
// write closing SGML tags
- switch (style.latextype) {
+ switch (style->latextype) {
case LATEX_COMMAND:
- if (c_params.empty())
- end_tag = "title";
- else
- end_tag = c_params;
- sgmlCloseTag(ofs, depth + command_depth, end_tag);
+ end_tag = c_params.empty() ? "title" : c_params;
+ sgmlCloseTag(ofs, depth + command_depth,
+ false, end_tag);
break;
case LATEX_ENVIRONMENT:
- if (!style.latexparam().empty()) {
- if (style.latexparam() == "CDATA")
+ if (!style->latexparam().empty()) {
+ if (style->latexparam() == "CDATA")
ofs << "]]>";
else
- sgmlCloseTag(ofs, depth + command_depth,
- style.latexparam());
+ sgmlCloseTag(ofs, depth + command_depth, false, style->latexparam());
}
break;
case LATEX_ITEM_ENVIRONMENT:
if (desc_on == 1) break;
end_tag= "para";
- sgmlCloseTag(ofs, depth + 1 + command_depth, end_tag);
+ sgmlCloseTag(ofs, depth + 1 + command_depth, false, end_tag);
break;
case LATEX_PARAGRAPH:
- sgmlCloseTag(ofs, depth + command_depth, style.latexname());
+ sgmlCloseTag(ofs, depth + command_depth, false, style->latexname());
break;
default:
- sgmlCloseTag(ofs, depth + command_depth, style.latexname());
+ sgmlCloseTag(ofs, depth + command_depth, false, style->latexname());
break;
}
}
if (!environment_stack[depth].empty()) {
if (environment_inner[depth] != "!-- --") {
item_name = "listitem";
- sgmlCloseTag(ofs, command_depth + depth,
- item_name);
- if (environment_inner[depth] == "varlistentry")
- sgmlCloseTag(ofs, depth + command_depth,
- environment_inner[depth]);
+ sgmlCloseTag(ofs, command_depth + depth, false, item_name);
+ if (environment_inner[depth] == "varlistentry")
+ sgmlCloseTag(ofs, depth + command_depth, false, environment_inner[depth]);
}
-
- sgmlCloseTag(ofs, depth + command_depth,
- environment_stack[depth]);
+
+ sgmlCloseTag(ofs, depth + command_depth, false, environment_stack[depth]);
}
}
-
+
for (int j = command_depth; j >= 0 ; --j)
- if (!command_stack[j].empty())
- sgmlCloseTag(ofs, j, command_stack[j]);
+ if (!command_stack[j].empty()) {
+ sgmlCloseTag(ofs, j, false, command_stack[j]);
+ ofs << endl;
+ }
ofs << "\n\n";
- sgmlCloseTag(ofs, 0, top_element);
+ sgmlCloseTag(ofs, 0, false, top_element);
ofs.close();
// How to check for successful close
+
+ // we want this to be true outside previews (for insetexternal)
+ niceFile = true;
}
{
bool emph_flag = false;
- LyXLayout const & style =
- textclasslist[params.textclass][par->layout()];
+ LyXLayout_ptr const & style = par->layout();
- LyXFont font_old = style.labeltype == LABEL_MANUAL ? style.labelfont : style.font;
+ LyXFont font_old = (style->labeltype == LABEL_MANUAL ? style->labelfont : style->font);
int char_line_count = depth;
//if (!style.free_spacing)
// handle <emphasis> tag
if (font_old.emph() != font.emph()) {
if (font.emph() == LyXFont::ON) {
+ if (style->latexparam() == "CDATA")
+ os << "]]>";
os << "<emphasis>";
+ if (style->latexparam() == "CDATA")
+ os << "<![CDATA[";
emph_flag = true;
} else if (i) {
+ if (style->latexparam() == "CDATA")
+ os << "]]>";
os << "</emphasis>";
+ if (style->latexparam() == "CDATA")
+ os << "<![CDATA[";
emph_flag = false;
}
}
-
+
if (par->isInset(i)) {
Inset * inset = par->getInset(i);
// don't print the inset in position 0 if desc_on == 3 (label)
- if ( i || desc_on != 3) {
- if(style.latexparam() == "CDATA")
+ if (i || desc_on != 3) {
+ if (style->latexparam() == "CDATA")
os << "]]>";
- inset->docbook(this, os);
- if(style.latexparam() == "CDATA")
+ inset->docbook(this, os, false);
+ if (style->latexparam() == "CDATA")
os << "<![CDATA[";
}
} else {
string sgml_string;
par->sgmlConvertChar(c, sgml_string);
- if (style.pass_thru) {
+ if (style->pass_thru) {
os << c;
- } else if (style.free_spacing || par->isFreeSpacing() || c != ' ') {
+ } else if (style->free_spacing || par->isFreeSpacing() || c != ' ') {
os << sgml_string;
} else if (desc_on ==1) {
++char_line_count;
}
if (emph_flag) {
+ if (style->latexparam() == "CDATA")
+ os << "]]>";
os << "</emphasis>";
+ if (style->latexparam() == "CDATA")
+ os << "<![CDATA[";
}
-
+
// resets description flag correctly
if (desc_on == 1) {
// <term> not closed...
- os << "</term>";
+ os << "</term>\n<listitem><para> </para>";
}
- if (style.free_spacing) os << '\n';
+ if (style->free_spacing)
+ os << '\n';
}
-// 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
int Buffer::runChktex()
string const org_path = path;
if (lyxrc.use_tempdir || !IsDirWriteable(path)) {
- path = tmppath;
+ path = tmppath;
}
Path p(path); // path to LaTeX file
// if we removed error insets before we ran chktex or if we inserted
// error insets after we ran chktex, this must be run:
if (removedErrorInsets || res) {
- users->redraw();
+#warning repaint needed here, or do you mean update() ?
+ users->repaint();
users->fitCursor();
}
users->owner()->allowInput();
void Buffer::validate(LaTeXFeatures & features) const
{
Paragraph * par = paragraph;
- LyXTextClass const & tclass = textclasslist[params.textclass];
-
- // AMS Style is at document level
- if (params.use_amsmath || tclass.provides(LyXTextClass::amsmath))
+ LyXTextClass const & tclass = textclasslist[params.textclass];
+
+ // AMS Style is at document level
+ if (params.use_amsmath || tclass.provides(LyXTextClass::amsmath))
features.require("amsmath");
-
+
while (par) {
// We don't use "lyxerr.debug" because of speed. (Asger)
if (lyxerr.debugging(Debug::LATEX))
}
}
}
-
+
if (lyxerr.debugging(Debug::LATEX)) {
features.showStruct();
}
for (inset_iterator it = inset_iterator_begin();
it != inset_iterator_end(); ++it) {
if ((*it)->lyxCode() == Inset::INCLUDE_CODE) {
- InsetInclude * insetinc =
+ InsetInclude * insetinc =
static_cast<InsetInclude *>(*it);
if (insetinc->isIncludeOnly()) {
if (!lst.empty())
Paragraph * par = paragraph;
LyXTextClass const & textclass = textclasslist[params.textclass];
- bool found = textclass.hasLayout("caption");
- string const layout("caption");
+ bool found = textclass.hasLayout("Caption");
+ string const layout("Caption");
while (par) {
- char const labeltype = textclass[par->layout()].labeltype;
-
+#warning bogus type (Lgb)
+ char const labeltype = par->layout()->labeltype;
+
if (labeltype >= LABEL_COUNTER_CHAPTER
&& labeltype <= LABEL_COUNTER_CHAPTER + params.tocdepth) {
// insert this into the table of contents
SingleList & item = l["TOC"];
int depth = max(0,
- labeltype -
+ labeltype -
textclass.maxcounter());
item.push_back(TocItem(par, depth, par->asString(this, true)));
}
// For each paragrph, traverse its insets and look for
// FLOAT_CODE
-
+
if (found) {
Paragraph::inset_iterator it =
par->inset_iterator_begin();
Paragraph::inset_iterator end =
par->inset_iterator_end();
-
+
for (; it != end; ++it) {
if ((*it)->lyxCode() == Inset::FLOAT_CODE) {
InsetFloat * il =
static_cast<InsetFloat*>(*it);
-
+
string const type = il->type();
-
+
// Now find the caption in the float...
// We now tranverse the paragraphs of
// the inset...
Paragraph * tmp = il->inset.paragraph();
while (tmp) {
- if (tmp->layout() == layout) {
+ if (tmp->layout()->name() == layout) {
SingleList & item = l[type];
string const str =
tostr(item.size()+1) + ". " + tmp->asString(this, false);
}
}
} else {
- lyxerr << "caption not found" << endl;
+ lyxerr << "Caption not found" << endl;
}
-
+
par = par->next();
}
return l;
// This is also a buffer property (ale)
-vector<pair<string, string> > const Buffer::getBibkeyList()
+vector<pair<string, string> > const Buffer::getBibkeyList() const
{
+ typedef pair<string, string> StringPair;
/// 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 (!params.parentname.empty() && bufferlist.exists(params.parentname)) {
+ Buffer const * tmp = bufferlist.getBuffer(params.parentname);
if (tmp)
return tmp->getBibkeyList();
}
- vector<pair<string, string> > keys;
+ vector<StringPair> keys;
Paragraph * par = paragraph;
while (par) {
- if (par->bibkey)
- keys.push_back(pair<string, string>(par->bibkey->getContents(),
- par->asString(this, false)));
+ if (par->bibkey) {
+ string const key = par->bibkey->getContents();
+ string const opt = par->bibkey->getOptions();
+ string const ref = par->asString(this, false);
+ string const info = opt + "TheBibliographyRef" + ref;
+
+ keys.push_back(StringPair(key, info));
+ }
par = par->next();
}
// Might be either using bibtex or a child has bibliography
if (keys.empty()) {
- for (inset_iterator it = inset_iterator_begin();
- it != inset_iterator_end(); ++it) {
+ for (inset_iterator it = inset_const_iterator_begin();
+ it != inset_const_iterator_end(); ++it) {
// Search for Bibtex or Include inset
if ((*it)->lyxCode() == Inset::BIBTEX_CODE) {
- vector<pair<string,string> > tmp =
+ vector<StringPair> tmp =
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> > const tmp =
+ vector<StringPair> const tmp =
static_cast<InsetInclude*>(*it)->getKeys();
keys.insert(keys.end(), tmp.begin(), tmp.end());
}
}
}
-
+
return keys;
}
}
-bool Buffer::dispatch(string const & command)
+bool Buffer::dispatch(string const & command, bool * result)
{
// Split command string into command and argument
string cmd;
string line = frontStrip(command);
string const arg = strip(frontStrip(split(line, cmd, ' ')));
- return dispatch(lyxaction.LookupFunc(cmd), arg);
+ return dispatch(lyxaction.LookupFunc(cmd), arg, result);
}
-bool Buffer::dispatch(int action, string const & argument)
+bool Buffer::dispatch(int action, string const & argument, bool * result)
{
bool dispatched = true;
+
switch (action) {
- case LFUN_EXPORT:
- Exporter::Export(this, argument, false);
+ case LFUN_EXPORT: {
+ bool const tmp = Exporter::Export(this, argument, false);
+ if (result)
+ *result = tmp;
break;
+ }
default:
dispatched = false;
void Buffer::redraw()
{
- users->redraw();
- users->fitCursor();
+#warning repaint needed here, or do you mean update() ?
+ users->repaint();
+ users->fitCursor();
}
ParIterator Buffer::par_iterator_begin()
{
- return ParIterator(paragraph);
+ return ParIterator(paragraph);
}
ParIterator Buffer::par_iterator_end()
{
- return ParIterator();
+ return ParIterator();
}
projects / lyx.git / blobdiff