+2001-05-10 Lars Gullik Bjønnes <larsbj@birdstep.com>
+
+ * buffer.C (makeLaTeXFile): use stringstream on language_optons.
+
2001-05-09 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* bufferlist.C (emergencyWrite): fix assert() call
makeidx = false;
verbatim = false;
longtable = false;
- algorithm = false;
+ //algorithm = false;
rotating = false;
amssymb = false;
latexsym = false;
verbatim = true;
} else if (name == "longtable") {
longtable = true;
- } else if (name == "algorithm") {
- algorithm = true;
+ //} else if (name == "algorithm") {
+ //algorithm = true;
} else if (name == "rotating") {
rotating = true;
} else if (name == "amssymb") {
if (verbatim)
packages << "\\usepackage{verbatim}\n";
- if (algorithm) {
- packages << "\\usepackage{algorithm}\n";
- }
+ //if (algorithm) {
+ // packages << "\\usepackage{algorithm}\n";
+ //}
// lyxchess.sty
if (chess) {
///
bool longtable; // longtable.sty
///
- bool algorithm; // algorithm.sty
+ //bool algorithm; // algorithm.sty
///
bool rotating; // rotating.sty
///
// language should be a parameter to \documentclass
use_babel = false;
- string language_options;
+ ostringstream language_options;
if (params.language->babel() == "hebrew"
&& default_language->babel() != "hebrew")
// This seems necessary
for (LaTeXFeatures::LanguageList::const_iterator cit =
features.UsedLanguages.begin();
cit != features.UsedLanguages.end(); ++cit)
- language_options += (*cit)->babel() + ',';
- language_options += params.language->babel();
+ language_options << (*cit)->babel() << ',';
+ language_options << params.language->babel();
if (lyxrc.language_global_options)
- options << language_options << ',';
+ options << language_options.str() << ',';
}
// the user-defined options
string tmp = lyxrc.language_package;
if (!lyxrc.language_global_options
&& tmp == "\\usepackage{babel}")
- tmp = "\\usepackage[" +
- language_options + "]{babel}";
+ tmp = string("\\usepackage[") +
+ language_options.str().c_str() +
+ "]{babel}";
ofs << tmp << "\n";
texrow.newline();
}
if (align==LYX_ALIGN_LAYOUT)
align = textclasslist.Style(buf->params.textclass, par->GetLayout()).align;
+#if 0
+ // Just remove this and change physpar to par
LyXParagraph const * physpar = par;
if (physpar->params.spaceTop().kind() == VSpace::LENGTH) {
physpar->params.spaceBottom().kind(),
physpar->params.spaceTop().keep(),
physpar->params.spaceBottom().keep());
+#else
+ if (par->params.spaceTop().kind() == VSpace::LENGTH) {
+ LyXGlueLength above = par->params.spaceTop().length();
+ lyxerr[Debug::GUI] << "Reading above space : \""
+ << par->params.spaceTop().length().asString() << "\"" << endl;
+
+ dialog_->setAboveLength(above.value(), above.plusValue(),
+ above.minusValue(),
+ above.unit(), above.plusUnit(),
+ above.minusUnit());
+ } else
+ dialog_->setAboveLength(0.0, 0.0, 0.0,
+ LyXLength::UNIT_NONE,
+ LyXLength::UNIT_NONE,
+ LyXLength::UNIT_NONE);
+
+ if (par->params.spaceBottom().kind() == VSpace::LENGTH) {
+ LyXGlueLength below = par->params.spaceBottom().length();
+ lyxerr[Debug::GUI] << "Reading below space : \""
+ << below.asString() << "\"" << endl;
+
+ dialog_->setBelowLength(below.value(),
+ below.plusValue(),
+ below.minusValue(),
+ below.unit(),
+ below.plusUnit(),
+ below.minusUnit());
+ } else
+ dialog_->setBelowLength(0.0, 0.0, 0.0,
+ LyXLength::UNIT_NONE,
+ LyXLength::UNIT_NONE,
+ LyXLength::UNIT_NONE);
+
+ dialog_->setLabelWidth(text->cursor.par()->GetLabelWidthString());
+ dialog_->setAlign(align);
+
+ dialog_->setChecks(par->params.lineTop(),
+ par->params.lineBottom(),
+ par->params.pagebreakTop(),
+ par->params.pagebreakBottom(),
+ par->params.noindent());
+
+ dialog_->setSpace(par->params.spaceTop().kind(),
+ par->params.spaceBottom().kind(),
+ par->params.spaceTop().keep(),
+ par->params.spaceBottom().keep());
+#endif
}
if (align==LYX_ALIGN_LAYOUT)
align = textclasslist.Style(buf->params.textclass, par->GetLayout()).align;
- ParagraphParameters *params = &(par->params);
+ ParagraphParameters * params = &(par->params);
if (params->spaceTop().kind() == VSpace::LENGTH) {
LyXGlueLength above = params->spaceTop().length();
+2001-05-10 Lars Gullik Bjønnes <larsbj@birdstep.com>
+
+ * insetfoot.C (Latex): don't use % after footnote.
+
2001-05-08 Lars Gullik Bjønnes <larsbj@birdstep.com>
* insettext.C (Read): use clear
os << "\\footnote{%\n";
int const i = inset.Latex(buf, os, fragile, fp);
- os << "}%\n";
+ os << "}\n";
return i + 2;
}
class BufferView;
class Language;
-// I dare you to enable this and help me find all the bugs that then show
-// up. (Lgb)
-#define NEW_INSETS 1
-#define NO_PEXTRA 1
+// After 1.2.0 is released, during 1.3.0cvs, we enable this. And after
+// a while we verify that reading of 1.2.x files work perfectly we remove
+// this code completely. (Lgb)
+//#define NO_PEXTRA_REALLY 1
+
+// Define this if you want to try out the new storage container for
+// paragraphs. std::container instead of obfuscated homegrown
+// linked list. (Lgb)
+// This is non working and far from finished.
+// #define NO_NEXT 1
/// A LyXParagraph holds all text, attributes and insets in a text paragraph
class LyXParagraph {