using std::upper_bound;
using std::reverse;
+using lyx::pos_type;
+using lyx::layout_type;
+
int tex_code_break_column = 72; // needs non-zero initialization. set later.
// this is a bad idea, but how can Paragraph find its buffer to get
// parameters? (JMarc)
Paragraph::Paragraph()
- : pimpl_(new Paragraph::Pimpl(this))
+ : layout(0), pimpl_(new Paragraph::Pimpl(this))
{
- for (int i = 0; i < 10; ++i) setCounter(i , 0);
+ for (int i = 0; i < 10; ++i)
+ setCounter(i, 0);
next_ = 0;
previous_ = 0;
enumdepth = 0;
itemdepth = 0;
- bibkey = 0; // ale970302
+ bibkey = 0; // ale970302
clear();
}
-// This konstruktor inserts the new paragraph in a list.
+// This constructor inserts the new paragraph in a list.
Paragraph::Paragraph(Paragraph * par)
- : pimpl_(new Paragraph::Pimpl(this))
+ : layout(0), pimpl_(new Paragraph::Pimpl(this))
{
for (int i = 0; i < 10; ++i)
setCounter(i, 0);
previous_->next_ = this;
// end
- bibkey = 0; // ale970302
-
+ bibkey = 0; // ale970302
+
clear();
}
Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
- : pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this, same_ids))
+ : layout(0), pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this, same_ids))
{
for (int i = 0; i < 10; ++i)
- setCounter(i , 0);
+ setCounter(i, 0);
enumdepth = 0;
itemdepth = 0;
- next_ = 0;
+ next_ = 0;
previous_ = 0;
// this is because of the dummy layout of the paragraphs that
// follow footnotes
layout = lp.layout;
- // ale970302
+ // ale970302
if (lp.bibkey) {
bibkey = static_cast<InsetBibKey *>
(lp.bibkey->clone(*current_view->buffer()));
}
// copy everything behind the break-position to the new paragraph
-
insetlist = lp.insetlist;
for (InsetList::iterator it = insetlist.begin();
it != insetlist.end(); ++it)
{
it->inset = it->inset->clone(*current_view->buffer(), same_ids);
+ // tell the new inset who is the boss now
+ it->inset->parOwner(this);
}
}
delete it->inset;
}
- // ale970302
+ // ale970302
delete bibkey;
delete pimpl_;
LyXFont font1(LyXFont::ALL_INHERIT, bparams.language);
int column = 0;
- for (size_type i = 0; i < size(); ++i) {
+ for (pos_type i = 0; i < size(); ++i) {
if (!i) {
os << "\n";
column = 0;
// Write font changes
LyXFont font2 = getFontSettings(bparams, i);
if (font2 != font1) {
+#ifndef INHERIT_LANGUAGE
+ font2.lyxWriteChanges(font1, os);
+#else
font2.lyxWriteChanges(font1, bparams.language, os);
+#endif
column = 0;
font1 = font2;
}
// check the params.
if (params().lineTop() || params().lineBottom())
- features.lyxline = true;
+ features.require("lyxline");
if (!params().spacing().isDefault())
- features.setspace = true;
+ features.require("setspace");
// then the layouts
- features.layout[getLayout()] = true;
+ features.useLayout(getLayout());
// then the fonts
Language const * doc_language = bparams.language;
lyxerr[Debug::LATEX] << "font.noun: "
<< cit->font().noun()
<< endl;
- features.noun = true;
+ features.require("noun");
lyxerr[Debug::LATEX] << "Noun enabled. Font: "
<< cit->font().stateText(0)
<< endl;
case LColor::note:
break;
default:
- features.color = true;
+ features.require("color");
lyxerr[Debug::LATEX] << "Color enabled. Font: "
<< cit->font().stateText(0)
<< endl;
}
Language const * language = cit->font().language();
- if (language != ignore_language &&
- language != inherit_language &&
- language->babel() != doc_language->babel())
+ if (language->babel() != doc_language->babel() &&
+ language != ignore_language &&
+#ifdef INHERIT_LANGUAGE
+ language != inherit_language &&
+#endif
+ language != latex_language)
{
- features.UsedLanguages.insert(language);
+ features.useLanguage(language);
lyxerr[Debug::LATEX] << "Found language "
<< language->babel() << endl;
}
}
// then the insets
+ LyXLayout const & layout =
+ textclasslist.Style(bparams.textclass, getLayout());
+
for (InsetList::const_iterator cit = insetlist.begin();
cit != insetlist.end(); ++cit) {
- if (cit->inset)
+ if (cit->inset) {
cit->inset->validate(features);
+ if (layout.needprotect &&
+ cit->inset->lyxCode() == Inset::FOOT_CODE)
+ features.require("NeedLyXFootnoteCode");
+ }
}
}
// First few functions needed for cut and paste and paragraph breaking.
-void Paragraph::copyIntoMinibuffer(Buffer const & buffer,
- Paragraph::size_type pos) const
+void Paragraph::copyIntoMinibuffer(Buffer const & buffer, pos_type pos) const
{
BufferParams bparams = buffer.params;
}
-void Paragraph::cutIntoMinibuffer(BufferParams const & bparams,
- Paragraph::size_type pos)
+void Paragraph::cutIntoMinibuffer(BufferParams const & bparams, pos_type pos)
{
minibuffer_char = getChar(pos);
minibuffer_font = getFontSettings(bparams, pos);
search_elem, Pimpl::matchIT());
if (it != insetlist.end() && it->pos == pos)
it->inset = 0;
+ // the inset is not in a paragraph anymore
+ minibuffer_inset->parOwner(0);
} else {
minibuffer_inset = 0;
minibuffer_char = ' ';
}
-bool Paragraph::insertFromMinibuffer(Paragraph::size_type pos)
+bool Paragraph::insertFromMinibuffer(pos_type pos)
{
- if ((minibuffer_char == Paragraph::META_INSET) &&
- !insetAllowed(minibuffer_inset->lyxCode()))
- return false;
- if (minibuffer_char == Paragraph::META_INSET)
+ if (minibuffer_char == Paragraph::META_INSET) {
+ if (!insetAllowed(minibuffer_inset->lyxCode())) {
+ return false;
+ }
insertInset(pos, minibuffer_inset, minibuffer_font);
- else {
+ } else {
LyXFont f = minibuffer_font;
- if (checkInsertChar(f))
- insertChar(pos, minibuffer_char, f);
+ if (!checkInsertChar(f)) {
+ return false;
+ }
+ insertChar(pos, minibuffer_char, f);
}
return true;
}
}
-void Paragraph::erase(Paragraph::size_type pos)
+void Paragraph::erase(pos_type pos)
{
pimpl_->erase(pos);
}
}
-void Paragraph::insertChar(Paragraph::size_type pos,
- Paragraph::value_type c)
+void Paragraph::insertChar(pos_type pos, Paragraph::value_type c)
{
LyXFont const f(LyXFont::ALL_INHERIT);
insertChar(pos, c, f);
}
-void Paragraph::insertChar(Paragraph::size_type pos,
- Paragraph::value_type c,
- LyXFont const & font)
+void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
+ LyXFont const & font)
{
pimpl_->insertChar(pos, c, font);
}
-void Paragraph::insertInset(Paragraph::size_type pos,
- Inset * inset)
+void Paragraph::insertInset(pos_type pos, Inset * inset)
{
LyXFont const f(LyXFont::ALL_INHERIT);
insertInset(pos, inset, f);
}
-void Paragraph::insertInset(Paragraph::size_type pos,
- Inset * inset, LyXFont const & font)
+void Paragraph::insertInset(pos_type pos, Inset * inset, LyXFont const & font)
{
pimpl_->insertInset(pos, inset, font);
}
}
-Inset * Paragraph::getInset(Paragraph::size_type pos)
+Inset * Paragraph::getInset(pos_type pos)
{
lyx::Assert(pos < size());
if (it != insetlist.end() && it->pos == pos)
return it->inset;
- lyxerr << "ERROR (Paragraph::GetInset): "
+ lyxerr << "ERROR (Paragraph::getInset): "
"Inset does not exist: " << pos << endl;
//::raise(SIGSTOP);
}
-Inset const * Paragraph::getInset(Paragraph::size_type pos) const
+Inset const * Paragraph::getInset(pos_type pos) const
{
lyx::Assert(pos < size());
// Gets uninstantiated font setting at position.
LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
- Paragraph::size_type pos) const
+ pos_type pos) const
{
lyx::Assert(pos <= size());
retfont = getFontSettings(bparams, pos - 1);
} else
retfont = LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams));
+#ifdef INHERIT_LANGUAGE
if (retfont.language() == inherit_language)
retfont.setLanguage(bparams.language);
+#endif
return retfont;
}
// Gets uninstantiated font setting at position 0
LyXFont const Paragraph::getFirstFontSettings() const
{
- if (size() > 0) {
- if (!pimpl_->fontlist.empty())
- return pimpl_->fontlist[0].font();
- }
+ if (size() > 0 && !pimpl_->fontlist.empty())
+ return pimpl_->fontlist[0].font();
return LyXFont(LyXFont::ALL_INHERIT);
}
// If position is -1, we get the layout font of the paragraph.
// If position is -2, we get the font of the manual label of the paragraph.
LyXFont const Paragraph::getFont(BufferParams const & bparams,
- Paragraph::size_type pos) const
+ pos_type pos) const
{
- LyXFont tmpfont;
+ lyx::Assert(pos >= 0);
+
LyXLayout const & layout =
textclasslist.Style(bparams.textclass,
getLayout());
- Paragraph::size_type main_body = 0;
+ pos_type main_body = 0;
if (layout.labeltype == LABEL_MANUAL)
main_body = beginningOfMainBody();
- if (pos >= 0) {
- LyXFont layoutfont;
- if (pos < main_body)
- layoutfont = layout.labelfont;
- else
- layoutfont = layout.font;
- tmpfont = getFontSettings(bparams, pos);
- tmpfont.realize(layoutfont, bparams.language);
- } else {
- // process layoutfont for pos == -1 and labelfont for pos < -1
- if (pos == -1)
- tmpfont = layout.font;
- else
- tmpfont = layout.labelfont;
- tmpfont.setLanguage(getParLanguage(bparams));
- }
+ LyXFont layoutfont;
+ if (pos < main_body)
+ layoutfont = layout.labelfont;
+ else
+ layoutfont = layout.font;
+
+ LyXFont tmpfont = getFontSettings(bparams, pos);
+#ifndef INHERIT_LANGUAGE
+ tmpfont.realize(layoutfont);
+#else
+ tmpfont.realize(layoutfont, bparams.language);
+#endif
+
+ return pimpl_->realizeFont(tmpfont, bparams);
+}
- // check for environment font information
- char par_depth = getDepth();
- Paragraph const * par = this;
- while (par && par->getDepth() && !tmpfont.resolved()) {
- par = par->outerHook();
- if (par) {
- tmpfont.realize(textclasslist.
- Style(bparams.textclass,
- par->getLayout()).font, bparams.language);
- par_depth = par->getDepth();
- }
- }
- tmpfont.realize(textclasslist
- .TextClass(bparams.textclass)
- .defaultfont(), bparams.language);
- return tmpfont;
+LyXFont const Paragraph::getLabelFont(BufferParams const & bparams) const
+{
+ LyXLayout const & layout =
+ textclasslist.Style(bparams.textclass, getLayout());
+
+ LyXFont tmpfont = layout.labelfont;
+ tmpfont.setLanguage(getParLanguage(bparams));
+
+ return pimpl_->realizeFont(tmpfont, bparams);
+}
+
+
+LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams) const
+{
+ LyXLayout const & layout =
+ textclasslist.Style(bparams.textclass,
+ getLayout());
+
+ LyXFont tmpfont = layout.font;
+ tmpfont.setLanguage(getParLanguage(bparams));
+
+ return pimpl_->realizeFont(tmpfont, bparams);
}
/// Returns the height of the highest font in range
LyXFont::FONT_SIZE
-Paragraph::highestFontInRange(Paragraph::size_type startpos,
- Paragraph::size_type endpos,
- LyXFont::FONT_SIZE const def_size) const
+Paragraph::highestFontInRange(pos_type startpos, pos_type endpos,
+ LyXFont::FONT_SIZE const def_size) const
{
if (pimpl_->fontlist.empty())
return def_size;
++end_it;
Pimpl::FontTable start_search(startpos, LyXFont());
- for (Pimpl::FontList::const_iterator cit =
- lower_bound(pimpl_->fontlist.begin(),
- pimpl_->fontlist.end(),
- start_search, Pimpl::matchFT());
- cit != end_it; ++cit)
- {
+ Pimpl::FontList::const_iterator cit =
+ lower_bound(pimpl_->fontlist.begin(),
+ pimpl_->fontlist.end(),
+ start_search, Pimpl::matchFT());
+
+ for (; cit != end_it; ++cit) {
LyXFont::FONT_SIZE size = cit->font().size();
if (size == LyXFont::INHERIT_SIZE)
size = def_size;
Paragraph::value_type
Paragraph::getUChar(BufferParams const & bparams,
- Paragraph::size_type pos) const
+ pos_type pos) const
{
value_type c = getChar(pos);
if (!lyxrc.rtl_support)
}
-void Paragraph::setFont(Paragraph::size_type pos,
+void Paragraph::setFont(pos_type pos,
LyXFont const & font)
{
lyx::Assert(pos <= size());
void Paragraph::breakParagraph(BufferParams const & bparams,
- Paragraph::size_type pos,
+ pos_type pos,
int flag)
{
// create a new paragraph
// copy everything behind the break-position
// to the new paragraph
- size_type pos_end = pimpl_->size() - 1;
- size_type i = pos;
- size_type j = pos;
+ pos_type pos_end = pimpl_->size() - 1;
+ pos_type i = pos;
+ pos_type j = pos;
for (; i <= pos_end; ++i) {
cutIntoMinibuffer(bparams, i);
if (tmp->insertFromMinibuffer(j - pos))
}
-int Paragraph::stripLeadingSpaces(LyXTextClassList::size_type tclass)
+int Paragraph::stripLeadingSpaces(lyx::textclass_type tclass)
{
- if (textclasslist.Style(tclass, getLayout()).free_spacing)
+ if (textclasslist.Style(tclass, getLayout()).free_spacing ||
+ isFreeSpacing())
+ {
return 0;
+ }
int i = 0;
- while (size()
- && (isNewline(0) || isLineSeparator(0))){
+ while (size() && (isNewline(0) || isLineSeparator(0))) {
erase(0);
++i;
}
void Paragraph::breakParagraphConservative(BufferParams const & bparams,
- Paragraph::size_type pos)
+ pos_type pos)
{
// create a new paragraph
Paragraph * tmp = new Paragraph(this);
if (size() > pos) {
// copy everything behind the break-position to the new
// paragraph
- size_type pos_end = pimpl_->size() - 1;
+ pos_type pos_end = pimpl_->size() - 1;
- //size_type i = pos;
- //size_type j = pos;
- for (size_type i = pos, j = pos; i <= pos_end; ++i) {
+ //pos_type i = pos;
+ //pos_type j = pos;
+ for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
cutIntoMinibuffer(bparams, i);
if (tmp->insertFromMinibuffer(j - pos))
++j;
}
- for (size_type k = pos_end; k >= pos; --k) {
+ for (pos_type k = pos_end; k >= pos; --k) {
erase(k);
}
}
}
-
+
// Be carefull, this does not make any check at all.
// This method has wrong name, it combined this par with the next par.
{
// copy the next paragraph to this one
Paragraph * the_next = next();
-
+
// first the DTP-stuff
params().lineBottom(the_next->params().lineBottom());
params().spaceBottom(the_next->params().spaceBottom());
params().pagebreakBottom(the_next->params().pagebreakBottom());
- size_type pos_end = the_next->pimpl_->size() - 1;
- size_type pos_insert = size();
+ pos_type pos_end = the_next->pimpl_->size() - 1;
+ pos_type pos_insert = size();
// ok, now copy the paragraph
- for (size_type i = 0, j = 0; i <= pos_end; ++i) {
+ for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
the_next->cutIntoMinibuffer(bparams, i);
if (insertFromMinibuffer(pos_insert + j))
++j;
}
-
+
// delete the next paragraph
Paragraph * ppar = the_next->previous_;
Paragraph * npar = the_next->next_;
Paragraph const * par = this;
depth_type par_depth = getDepth();
while (par) {
- LyXTextClass::LayoutList::size_type layout = par->getLayout();
+ layout_type layout = par->getLayout();
int const endlabeltype =
textclasslist.Style(bparams.textclass,
layout).endlabeltype;
}
-void Paragraph::setOnlyLayout(LyXTextClass::size_type new_layout)
+void Paragraph::setOnlyLayout(layout_type new_layout)
{
layout = new_layout;
}
-void Paragraph::setLayout(LyXTextClass::size_type new_layout)
+void Paragraph::setLayout(layout_type new_layout)
{
- layout = new_layout;
+ layout = new_layout;
params().labelWidthString(string());
params().align(LYX_ALIGN_LAYOUT);
params().spaceTop(VSpace(VSpace::NONE));
// Unroll the first two cycles of the loop
// and remember the previous character to
// remove unnecessary GetChar() calls
- size_type i = 0;
+ pos_type i = 0;
if (i < size()
&& getChar(i) != Paragraph::META_NEWLINE) {
++i;
Paragraph * Paragraph::depthHook(depth_type depth)
{
Paragraph * newpar = this;
-
+
do {
newpar = newpar->previous();
} while (newpar && newpar->getDepth() > depth);
-
+
if (!newpar) {
if (previous() || getDepth())
lyxerr << "ERROR (Paragraph::DepthHook): "
Paragraph const * Paragraph::depthHook(depth_type depth) const
{
Paragraph const * newpar = this;
-
+
do {
newpar = newpar->previous();
} while (newpar && newpar->getDepth() > depth);
-
+
if (!newpar) {
if (previous() || getDepth())
lyxerr << "ERROR (Paragraph::DepthHook): "
while (index < insetlist.size()) {
if (insetlist[index].inset && insetlist[index].inset->autoDelete()) {
erase(insetlist[index].pos);
- // Erase() calls to insetlist.erase(&insetlist[index])
+ // erase() calls to insetlist.erase(&insetlist[index])
// so index shouldn't be increased.
++count;
} else
Paragraph::inset_iterator
-Paragraph::InsetIterator(Paragraph::size_type pos)
+Paragraph::InsetIterator(pos_type pos)
{
InsetTable search_inset(pos, 0);
InsetList::iterator it = lower_bound(insetlist.begin(),
// returns -1 if inset not found
-int Paragraph::getPositionOfInset(Inset * inset) const
+int Paragraph::getPositionOfInset(Inset const * inset) const
{
// Find the entry.
for (InsetList::const_iterator cit = insetlist.begin();
os << params().spaceTop().asLatexCommand(bparams);
further_blank_line = true;
}
-
+
if (params().lineTop()) {
os << "\\lyxline{\\" << getFont(bparams, 0).latexSize() << '}'
<< "\\vspace{-1\\parskip}";
Language const * language = getParLanguage(bparams);
Language const * doc_language = bparams.language;
- Language const * previous_language = previous_
- ? previous_->getParLanguage(bparams) : doc_language;
- if (language == ignore_language || language == inherit_language)
- lyxerr << "1:" << language->lang() << endl;
- if (language->babel() != doc_language->babel() &&
- language->babel() != previous_language->babel()) {
- os << subst(lyxrc.language_command_begin, "$$lang",
- language->babel())
- << endl;
- texrow.newline();
+ Language const * previous_language = previous()
+ ? previous()->getParLanguage(bparams) : doc_language;
+
+ if (language->babel() != previous_language->babel()
+ // check if we already put language command in TeXEnvironment()
+ && !(textclasslist.Style(bparams.textclass, layout).isEnvironment()
+ && (!previous() || previous()->layout != layout ||
+ previous()->params().depth() != params().depth()))) {
+
+ if (!lyxrc.language_command_end.empty() &&
+ previous_language->babel() != doc_language->babel()) {
+ os << subst(lyxrc.language_command_end, "$$lang",
+ previous_language->babel())
+ << endl;
+ texrow.newline();
+ }
+
+ if (lyxrc.language_command_end.empty() ||
+ language->babel() != doc_language->babel()) {
+ os << subst(lyxrc.language_command_begin, "$$lang",
+ language->babel())
+ << endl;
+ texrow.newline();
+ }
}
if (bparams.inputenc == "auto" &&
- language->encoding() != previous_language->encoding())
- {
+ language->encoding() != previous_language->encoding()) {
os << "\\inputencoding{"
<< language->encoding()->LatexName()
<< "}" << endl;
// Is this really needed ? (Dekel)
// We do not need to use to change the font for the last paragraph
// or for a command.
- LyXFont font = getFont(bparams, size() - 1);
+ LyXFont const font =
+ (size() == 0
+ ? getLayoutFont(bparams)
+ : getFont(bparams, size() - 1));
bool is_command = textclasslist.Style(bparams.textclass,
getLayout()).isCommand();
} else if (is_command)
os << "}";
- if (language->babel() != doc_language->babel() &&
- (!next_ ||
- next_->getParLanguage(bparams)->babel() != language->babel()))
- {
- os << endl
- << subst(lyxrc.language_command_end, "$$lang",
- doc_language->babel());
- }
-
switch (style.latextype) {
case LATEX_ITEM_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
- if (next_ && (params().depth() < next_->params().depth())) {
- os << '\n';
- texrow.newline();
- }
+ if (next_ && (params().depth() < next_->params().depth())) {
+ os << '\n';
+ texrow.newline();
+ }
break;
case LATEX_ENVIRONMENT:
// if its the last paragraph of the current environment
&& (next_->layout != layout
|| next_->params().depth() != params().depth()))
break;
+ // fall through possible
default:
// we don't need it for the last paragraph!!!
- // or for tables in floats
- // -- effectively creates a \par where there isn't one which
- // breaks a \subfigure or \subtable.
if (next_) {
os << '\n';
texrow.newline();
further_blank_line = false;
if (params().lineBottom()) {
- os << "\\lyxline{\\" << getFont(bparams,
- size() - 1).latexSize() << '}';
+ os << "\\lyxline{\\" << font.latexSize() << '}';
further_blank_line = true;
}
os << params().spaceBottom().asLatexCommand(bparams);
further_blank_line = true;
}
-
+
if (params().pagebreakBottom()) {
os << "\\newpage";
further_blank_line = true;
if (next_) {
os << '\n';
texrow.newline();
+ } else {
+ // Since \selectlanguage write the language to the aux file,
+ // we need to reset the language at the end of footnote or
+ // float.
+
+ if (language->babel() != doc_language->babel()) {
+ if (lyxrc.language_command_end.empty())
+ os << subst(lyxrc.language_command_begin,
+ "$$lang",
+ doc_language->babel())
+ << endl;
+ else
+ os << subst(lyxrc.language_command_end,
+ "$$lang",
+ language->babel())
+ << endl;
+ texrow.newline();
+ }
}
lyxerr[Debug::LATEX] << "TeXOnePar...done " << next_ << endl;
LyXFont basefont;
// Maybe we have to create a optional argument.
- size_type main_body;
+ pos_type main_body;
if (style.labeltype != LABEL_MANUAL)
main_body = 0;
else
if (main_body > 0) {
os << '[';
++column;
- basefont = getFont(bparams, -2); // Get label font
+ basefont = getLabelFont(bparams);
} else {
- basefont = getFont(bparams, -1); // Get layout font
+ basefont = getLayoutFont(bparams);
}
if (main_body >= 0
texrow.start(this, 0);
- for (size_type i = 0; i < size(); ++i) {
+ for (pos_type i = 0; i < size(); ++i) {
++column;
// First char in paragraph or after label?
if (i == main_body) {
column += running_font.latexWriteEndChanges(os, basefont, basefont);
open_font = false;
}
- basefont = getFont(bparams, -1); // Now use the layout font
+ basefont = getLayoutFont(bparams);
running_font = basefont;
os << ']';
++column;
case LYX_ALIGN_LEFT:
if (getParLanguage(bparams)->babel() != "hebrew") {
os << "\\begin{flushleft}";
- column+= 17;
+ column += 17;
} else {
os << "\\begin{flushright}";
- column+= 18;
+ column += 18;
}
break;
case LYX_ALIGN_RIGHT:
if (getParLanguage(bparams)->babel() != "hebrew") {
os << "\\begin{flushright}";
- column+= 18;
+ column += 18;
} else {
os << "\\begin{flushleft}";
- column+= 17;
+ column += 17;
}
break;
case LYX_ALIGN_CENTER:
os << "\\begin{center}";
- column+= 14;
+ column += 14;
break;
}
}
// Fully instantiated font
LyXFont font = getFont(bparams, i);
- LyXFont last_font = running_font;
+ LyXFont const last_font = running_font;
// Spaces at end of font change are simulated to be
// outside font change, i.e. we write "\textXX{text} "
// rather than "\textXX{text }". (Asger)
- if (open_font && c == ' ' && i <= size() - 2
- && !getFont(bparams, i + 1).equalExceptLatex(running_font)
- && !getFont(bparams, i + 1).equalExceptLatex(font)) {
- font = getFont(bparams, i + 1);
+ if (open_font && c == ' ' && i <= size() - 2) {
+ LyXFont const next_font = getFont(bparams, i + 1);
+ if (next_font != running_font
+ && next_font != font) {
+ font = next_font;
+ }
}
+
// We end font definition before blanks
- if (!font.equalExceptLatex(running_font) && open_font) {
+ if (font != running_font && open_font) {
column += running_font.latexWriteEndChanges(os,
basefont,
(i == main_body-1) ? basefont : font);
}
// Do we need to change font?
- if (!font.equalExceptLatex(running_font)
- && i != main_body-1) {
+ if (font != running_font && i != main_body - 1) {
column += font.latexWriteStartChanges(os, basefont,
last_font);
running_font = font;
if (c == Paragraph::META_NEWLINE) {
// newlines are handled differently here than
// the default in SimpleTeXSpecialChars().
- if (!style.newline_allowed
-#ifndef NO_LATEX
- || font.latex() == LyXFont::ON
-#endif
- ) {
+ if (!style.newline_allowed) {
os << '\n';
} else {
if (open_font) {
column += running_font.latexWriteEndChanges(os, basefont, basefont);
open_font = false;
}
- basefont = getFont(bparams, -1);
+ basefont = getLayoutFont(bparams);
running_font = basefont;
if (font.family() ==
LyXFont::TYPEWRITER_FAMILY) {
}
#else
#ifdef WITH_WARNINGS
-#warning For now we ALWAYS have to close the foreign font settings if they are
-#warning there as we start another \selectlanguage with the next paragraph if
-#warning we are in need of this. This should be fixed sometime (Jug)
+//#warning For now we ALWAYS have to close the foreign font settings if they are
+//#warning there as we start another \selectlanguage with the next paragraph if
+//#warning we are in need of this. This should be fixed sometime (Jug)
#endif
running_font.latexWriteEndChanges(os, basefont, basefont);
#endif
}
-bool Paragraph::linuxDocConvertChar(char c, string & sgml_string)
+bool Paragraph::sgmlConvertChar(char c, string & sgml_string)
{
bool retval = false;
switch (c) {
textclasslist.Style(bparams.textclass,
layout);
- if (style.isEnvironment()){
+ Language const * language = getParLanguage(bparams);
+ Language const * doc_language = bparams.language;
+ Language const * previous_language = previous_
+ ? previous_->getParLanguage(bparams) : doc_language;
+ if (language->babel() != previous_language->babel()) {
+
+ if (!lyxrc.language_command_end.empty() &&
+ previous_language->babel() != doc_language->babel()) {
+ os << subst(lyxrc.language_command_end, "$$lang",
+ previous_language->babel())
+ << endl;
+ texrow.newline();
+ }
+
+ if (lyxrc.language_command_end.empty() ||
+ language->babel() != doc_language->babel()) {
+ os << subst(lyxrc.language_command_begin, "$$lang",
+ language->babel())
+ << endl;
+ texrow.newline();
+ }
+ }
+
+ if (style.isEnvironment()) {
if (style.latextype == LATEX_LIST_ENVIRONMENT) {
os << "\\begin{" << style.latexname() << "}{"
<< params().labelWidthString() << "}\n";
if (style.isEnvironment()) {
os << "\\end{" << style.latexname() << "}\n";
+ texrow.newline();
}
lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
}
-bool Paragraph::isHfill(size_type pos) const
+bool Paragraph::isHfill(pos_type pos) const
{
return IsHfillChar(getChar(pos));
}
-bool Paragraph::isInset(size_type pos) const
+bool Paragraph::isInset(pos_type pos) const
{
return IsInsetChar(getChar(pos));
}
-bool Paragraph::isNewline(size_type pos) const
+bool Paragraph::isNewline(pos_type pos) const
{
return pos >= 0 && IsNewlineChar(getChar(pos));
}
-bool Paragraph::isSeparator(size_type pos) const
+bool Paragraph::isSeparator(pos_type pos) const
{
return IsSeparatorChar(getChar(pos));
}
-bool Paragraph::isLineSeparator(size_type pos) const
+bool Paragraph::isLineSeparator(pos_type pos) const
{
return IsLineSeparatorChar(getChar(pos));
}
-bool Paragraph::isKomma(size_type pos) const
+bool Paragraph::isKomma(pos_type pos) const
{
return IsKommaChar(getChar(pos));
}
/// Used by the spellchecker
-bool Paragraph::isLetter(Paragraph::size_type pos) const
+bool Paragraph::isLetter(pos_type pos) const
{
value_type const c = getChar(pos);
if (IsLetterChar(c))
return true;
- // '\0' is not a letter, allthough every string contains "" (below)
- if (c == '\0')
- return false;
+ if (isInset(pos))
+ return getInset(pos)->isLetter();
// We want to pass the ' and escape chars to ispell
string const extra = lyxrc.isp_esc_chars + '\'';
- char ch[2] = { c, 0 };
- return contains(extra, ch);
+ return contains(extra, c);
}
-bool Paragraph::isWord(size_type pos ) const
+bool Paragraph::isWord(pos_type pos ) const
{
return IsWordChar(getChar(pos)) ;
}
Paragraph::getParLanguage(BufferParams const & bparams) const
{
if (size() > 0) {
+#ifndef INHERIT_LANGUAGE
+ return getFirstFontSettings().language();
+#else
Language const * lang = getFirstFontSettings().language();
#warning We should make this somewhat better, any ideas? (Jug)
if (lang == inherit_language || lang == ignore_language)
lang = bparams.language;
return lang;
+#endif
} else if (previous_)
return previous_->getParLanguage(bparams);
else
void Paragraph::changeLanguage(BufferParams const & bparams,
Language const * from, Language const * to)
{
- for (size_type i = 0; i < size(); ++i) {
+ for (pos_type i = 0; i < size(); ++i) {
LyXFont font = getFontSettings(bparams, i);
if (font.language() == from) {
font.setLanguage(to);
Language const * doc_language = bparams.language;
for (Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
cit != pimpl_->fontlist.end(); ++cit)
- if (cit->font().language() != inherit_language &&
- cit->font().language() != ignore_language &&
+ if (cit->font().language() != ignore_language &&
+ cit->font().language() != latex_language &&
+#ifdef INHERIT_LANGUAGE
+ cit->font().language() != inherit_language &&
+#endif
cit->font().language() != doc_language)
return true;
return false;
s += params().labelString() + ' ';
string::size_type const len = s.size();
- for (Paragraph::size_type i = 0; i < size(); ++i) {
+ for (pos_type i = 0; i < size(); ++i) {
value_type c = getChar(i);
if (IsPrintable(c))
s += c;
string const Paragraph::asString(Buffer const * buffer,
- Paragraph::size_type beg,
- Paragraph::size_type end)
+ pos_type beg, pos_type end, bool label)
{
ostringstream ost;
- if (beg == 0 && !params().labelString().empty())
+ if (beg == 0 && label && !params().labelString().empty())
ost << params().labelString() << ' ';
- for (Paragraph::size_type i = beg; i < end; ++i) {
+ for (pos_type i = beg; i < end; ++i) {
value_type const c = getUChar(buffer->params, i);
if (IsPrintable(c))
ost << c;
+ else if (c == META_NEWLINE)
+ ost << '\n';
+ else if (c == META_HFILL)
+ ost << '\t';
else if (c == META_INSET) {
getInset(i)->ascii(buffer, ost);
}
{
// then the insets
for (InsetList::const_iterator cit = insetlist.begin();
- cit != insetlist.end(); ++cit) {
+ cit != insetlist.end(); ++cit)
+ {
if (cit->inset) {
if (cit->inset->isTextInset()) {
static_cast<UpdatableInset *>
}
-Paragraph::size_type Paragraph::size() const
+lyx::pos_type Paragraph::size() const
{
return pimpl_->size();
}
-Paragraph::value_type
-Paragraph::getChar(Paragraph::size_type pos) const
+Paragraph::value_type Paragraph::getChar(pos_type pos) const
{
return pimpl_->getChar(pos);
}
}
-LyXTextClass::LayoutList::size_type Paragraph::getLayout() const
+layout_type Paragraph::getLayout() const
{
return layout;
}
}
-void Paragraph::setChar(size_type pos, value_type c)
+void Paragraph::setChar(pos_type pos, value_type c)
{
pimpl_->setChar(pos, c);
}
{
return pimpl_->getParFromID(id);
}
+
+
+bool Paragraph::isFreeSpacing() const
+{
+ // for now we just need this, later should we need this in some
+ // other way we can always add a function to Inset::() too.
+ if (pimpl_->inset_owner && pimpl_->inset_owner->owner())
+ return (pimpl_->inset_owner->owner()->lyxCode() == Inset::ERT_CODE);
+ return false;
+}