#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 <locale>
#endif
+#ifndef CXX_GLOBAL_CSTD
+using std::pow;
+#endif
using std::ostream;
using std::ofstream;
#ifndef NO_COMPABILITY
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 * 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;
#ifndef NO_COMPABILITY
+
+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;
}
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 layoutname = lex.getString();
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"
layoutname = tclass.defaultLayoutName();
}
-#ifndef NO_COMPABILITY
- if (compare_no_case(layoutname, "latex") == 0) {
- ert_comp.active = true;
- ert_comp.font = font;
- }
-#endif
#ifdef USE_CAPTION
// The is the compability reading of layout caption.
// It can be removed in LyX version 1.3.0. (Lgb)
par->InsertInset(pos, inset, font);
++pos;
} else {
+#endif
+#ifndef NO_COMPABILITY
+ if (create_new_par) {
#endif
if (!first_par)
first_par = par;
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);
+#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 =
+ textclasslist[params.textclass][par->layout()];
+ if (!layout.obsoleted_by().empty())
+ par->layout(layout.obsoleted_by());
+ par->params().depth(depth);
+ }
+#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 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;
+ } 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);
return false; // no end read yet
}
- // 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);
-
// Here we need to check for \end_deeper and handle that
// before we do the footnote parsing.
// This _is_ a hack! (Lgb)
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.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") {
} 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") {
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;
} else if (token == "\\newline") {
#ifndef NO_COMPABILITY
if (!ert_comp.in_tabular && ert_comp.active) {
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
} else if (token == "\\the_end") {
#ifndef NO_COMPABILITY
//Â If we still have some ert active here we have to insert
// 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());
+ 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;
- 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()));
+ 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())+"p%"));
+ 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())+"p%"));
- }
-
- Paragraph * op = mini->firstParagraph();
- mini->inset.paragraph(minipar);
- //
- // and free the old ones!
- //
- while(op) {
- Paragraph * pp = op->next();
- delete op;
- op = pp;
- }
-
- // 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;
_("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. "
+ "User 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!"),
*/
// 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.
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();
+ 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
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";
+
+ ofs << preamble;
+
// make the body.
ofs << "\\begin{document}\n";
texrow.newline();
// 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;
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
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);
if (command_flag) {
if (cmd_depth < command_base) {
- for (Paragraph::depth_type j = command_depth; j >= command_base; --j)
+ for (Paragraph::depth_type j = command_depth;
+ j >= command_base; --j) {
sgmlCloseTag(ofs, j, 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)
+ for (int j = command_depth;
+ j >= int(cmd_depth); --j) {
sgmlCloseTag(ofs, j, command_stack[j]);
+ ofs << endl;
+ }
command_depth = cmd_depth;
} else
command_depth = cmd_depth;
}
for (int j = command_depth; j >= 0 ; --j)
- if (!command_stack[j].empty())
+ if (!command_stack[j].empty()) {
sgmlCloseTag(ofs, j, command_stack[j]);
+ ofs << endl;
+ }
ofs << "\n\n";
sgmlCloseTag(ofs, 0, top_element);
// 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 (emph_flag) {
+ if(style.latexparam() == "CDATA")
+ os << "]]>";
os << "</emphasis>";
+ if(style.latexparam() == "CDATA")
+ os << "<![CDATA[";
}
// resets description flag correctly
}
-// 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()
// 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);
+ 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());
}
}
-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;
projects / lyx.git / blobdiff