#pragma implementation "lyxparagraph.h"
#endif
+#include <algorithm>
#include <fstream>
-using std::fstream;
-using std::ios;
#include "lyxparagraph.h"
#include "support/textutils.h"
#include "texrow.h"
#include "support/lyxmanip.h"
+using std::ostream;
+using std::endl;
+using std::fstream;
+using std::ios;
+using std::lower_bound;
+using std::upper_bound;
int tex_code_break_column = 72; // needs non-zero initialization. set later.
// this is a bad idea, but how can LyXParagraph find its buffer to get
/* table stuff -- begin*/
table = 0;
/* table stuff -- end*/
+ inset_owner = 0;
id_ = paragraph_id++;
bibkey = 0; // ale970302
Clear();
/* table stuff -- begin*/
table = 0;
/* table stuff -- end*/
+ inset_owner = 0;
id_ = paragraph_id++;
bibkey = 0; // ale970302
if (added_space_bottom.kind() != VSpace::NONE)
os << "\\added_space_bottom "
<< added_space_bottom.asLyXCommand() << " ";
-
+
+ // Maybe the paragraph has special spacing
+ spacing.writeFile(os, true);
+
// The labelwidth string used in lists.
if (!labelwidthstring.empty())
os << "\\labelwidthstring "
if (bibkey)
bibkey->Write(os);
- font1 = LyXFont(LyXFont::ALL_INHERIT);
+ font1 = LyXFont(LyXFont::ALL_INHERIT,params.language_info);
column = 0;
for (size_type i = 0; i < size(); ++i) {
os << "\n\\hfill \n";
column = 0;
break;
-#if 0
- case META_PROTECTED_SEPARATOR:
- os << "\n\\protected_separator \n";
- column = 0;
- break;
-#endif
case '\\':
os << "\n\\backslash \n";
column = 0;
void LyXParagraph::validate(LaTeXFeatures & features) const
{
+ BufferParams const & params = features.bufferParams();
+
// this will be useful later
LyXLayout const & layout =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(params.textclass,
GetLayout());
// check the params.
if (line_top || line_bottom)
features.lyxline = true;
+ if (!spacing.isDefault())
+ features.setspace = true;
// then the layouts
features.layout[GetLayout()] = true;
// then the fonts
+ Language const * doc_language = params.language_info;
+
for (FontList::const_iterator cit = fontlist.begin();
cit != fontlist.end(); ++cit) {
if ((*cit).font.noun() == LyXFont::ON) {
<< (*cit).font.stateText()
<< endl;
}
+ Language const * language = (*cit).font.language();
+ if (language != doc_language && language != default_language) {
+ features.UsedLanguages.insert(language);
+ lyxerr[Debug::LATEX] << "Found language "
+ << language->lang << endl;
+ }
}
// then the insets
if (layout.needprotect
&& next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
features.NeedLyXFootnoteCode = true;
- if ((current_view->buffer()->params.paragraph_separation == BufferParams::PARSEP_INDENT) &&
- (pextra_type == LyXParagraph::PEXTRA_MINIPAGE))
+ if (params.paragraph_separation == BufferParams::PARSEP_INDENT
+ && pextra_type == LyXParagraph::PEXTRA_MINIPAGE)
features.NeedLyXMinipageIndent = true;
if (table && table->NeedRotating())
features.rotating = true;
// the inset, not just a clone. Otherwise
// the inset would be deleted when calling Erase(pos)
// find the entry
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).pos == pos) {
- (*it).inset = 0;
- break;
- }
-
- }
+ InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ if (it != insetlist.end() && (*it).pos == pos)
+ (*it).inset = 0;
} else {
minibuffer_inset = 0;
minibuffer_char = ' ';
}
-void LyXParagraph::InsertFromMinibuffer(LyXParagraph::size_type pos)
+bool LyXParagraph::InsertFromMinibuffer(LyXParagraph::size_type pos)
{
+ if ((minibuffer_char == LyXParagraph::META_INSET) &&
+ !InsertInsetAllowed(minibuffer_inset))
+ return false;
InsertChar(pos, minibuffer_char);
SetFont(pos, minibuffer_font);
if (minibuffer_char == LyXParagraph::META_INSET)
InsertInset(pos, minibuffer_inset);
+ return true;
}
// end of minibuffer
added_space_top = VSpace(VSpace::NONE);
added_space_bottom = VSpace(VSpace::NONE);
-
+ spacing.set(Spacing::Default);
+
align = LYX_ALIGN_LAYOUT;
depth = 0;
noindent = false;
pextra_type = PEXTRA_NONE;
- pextra_width.clear();
- pextra_widthp.clear();
+ pextra_width.erase();
+ pextra_widthp.erase();
pextra_alignment = MINIPAGE_ALIGN_TOP;
pextra_hfill = false;
pextra_start_minipage = false;
- labelstring.clear();
- labelwidthstring.clear();
+ labelstring.erase();
+ labelwidthstring.erase();
layout = 0;
bibkey = 0;
// ale970302
delete bibkey;
+ //
+ //lyxerr << "LyXParagraph::paragraph_id = "
+ // << LyXParagraph::paragraph_id << endl;
}
// if it is an inset, delete the inset entry
if (text[pos] == LyXParagraph::META_INSET) {
// find the entry
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).pos == pos) {
- delete (*it).inset;
- insetlist.erase(it);
- break;
- }
+ InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ if (it != insetlist.end() && (*it).pos == pos) {
+ delete (*it).inset;
+ insetlist.erase(it);
}
}
text.erase(text.begin() + pos);
}
// Update the inset table.
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).pos > pos)
- (*it).pos--;
- }
+ for (InsetList::iterator it = upper_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ it != insetlist.end(); ++it)
+ --(*it).pos;
} else {
lyxerr << "ERROR (LyXParagraph::Erase): "
"can't erase non-existant char." << endl;
}
// Update the inset table.
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).pos >= pos)
- (*it).pos++;
- }
+ for (InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ it != insetlist.end(); ++it)
+ ++(*it).pos;
}
if (inset) {
// Add a new entry in the inset table.
- InsetList::iterator it =
- insetlist.insert(insetlist.begin(), InsetTable());
- (*it).inset = inset;
- (*it).pos = pos;
+ InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ if (it != insetlist.end() && (*it).pos == pos)
+ lyxerr << "ERROR (LyXParagraph::InsertInset): "
+ "there is an inset in position: " << pos << endl;
+ else
+ insetlist.insert(it, InsetTable(pos,inset));
+ if (inset_owner)
+ inset->setOwner(inset_owner);
}
}
+bool LyXParagraph::InsertInsetAllowed(Inset *inset)
+{
+ if (inset_owner) {
+ printf("CODE:%d\n",inset->LyxCode());
+ return inset_owner->InsertInsetAllowed(inset);
+ }
+ return true;
+}
+
Inset * LyXParagraph::GetInset(LyXParagraph::size_type pos)
{
if (pos >= size()) {
return 0;
}
// Find the inset.
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).pos == pos) {
- return (*it).inset;
- }
- }
+ InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ if (it != insetlist.end() && (*it).pos == pos)
+ return (*it).inset;
+
lyxerr << "ERROR (LyXParagraph::GetInset): "
"Inset does not exist: " << pos << endl;
- text[pos] = ' '; // WHY!!! does this set the pos to ' '????
+ // text[pos] = ' '; // WHY!!! does this set the pos to ' '????
// Did this commenting out introduce a bug? So far I have not
// see any, please enlighten me. (Lgb)
// My guess is that since the inset does not exist, we might
return 0;
}
// Find the inset.
- for (InsetList::const_iterator cit = insetlist.begin();
- cit != insetlist.end(); ++cit) {
- if ((*cit).pos == pos) {
- return (*cit).inset;
- }
- }
+ InsetList::const_iterator cit = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ if (cit != insetlist.end() && (*cit).pos == pos)
+ return (*cit).inset;
+
lyxerr << "ERROR (LyXParagraph::GetInset): "
"Inset does not exist: " << pos << endl;
//text[pos] = ' '; // WHY!!! does this set the pos to ' '????
LyXFont LyXParagraph::GetFontSettings(LyXParagraph::size_type pos) const
{
if (pos < size()) {
+#ifdef SORTED_FONT_LIST
for (FontList::const_iterator cit = fontlist.begin();
- cit != fontlist.end(); ++cit) {
+ cit != fontlist.end() && pos <= (*cit).pos_end; ++cit)
+ if (pos >= (*cit).pos)
+ return (*cit).font;
+#else
+ for (FontList::const_iterator cit = fontlist.begin();
+ cit != fontlist.end(); ++cit)
if (pos >= (*cit).pos && pos <= (*cit).pos_end)
return (*cit).font;
- }
+#endif
}
// > because last is the next unused position, and you can
// use it if you want
<< pos << " (" << static_cast<int>(pos)
<< ")" << endl;
}
- } else if (pos) {
+ } else if (pos > 0) {
return GetFontSettings(pos - 1);
- }
+ } else // pos = size() = 0
+ return LyXFont(LyXFont::ALL_INHERIT,getParLanguage());
+
return LyXFont(LyXFont::ALL_INHERIT);
}
+// Gets uninstantiated font setting at position 0
+LyXFont LyXParagraph::GetFirstFontSettings() const
+{
+ if (size() > 0) {
+#ifdef SORTED_FONT_LIST
+ if (!fontlist.empty() && fontlist.front().pos == 0)
+ return fontlist.front().font;
+#else
+ for (FontList::const_iterator cit = fontlist.begin();
+ cit != fontlist.end(); ++cit)
+ if (0 >= (*cit).pos && 0 <= (*cit).pos_end)
+ return (*cit).font;
+#endif
+ } else if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
+ return NextAfterFootnote()->GetFirstFontSettings();
+ return LyXFont(LyXFont::ALL_INHERIT);
+}
// Gets the fully instantiated font at a given position in a paragraph
// This is basically the same function as LyXText::GetFont() in text2.C.
tmpfont = layout.font;
else
tmpfont = layout.labelfont;
- if (getParDirection() == LYX_DIR_RIGHT_TO_LEFT)
- tmpfont.setDirection(LyXFont::RTL_DIR);
+ tmpfont.setLanguage(getParLanguage());
}
// check for environment font information
{
LyXParagraph * tmp;
if (previous && previous->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
- tmp = next;
+ tmp = previous;
while (tmp && tmp->footnoteflag != LyXParagraph::NO_FOOTNOTE)
tmp = tmp->previous;
if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
void LyXParagraph::BreakParagraph(LyXParagraph::size_type pos,
int flag)
{
- size_type i, pos_end, pos_first;
+ size_type i, j, pos_end, pos_first;
// create a new paragraph
LyXParagraph * par = ParFromPos(pos);
LyXParagraph * firstpar = FirstPhysicalPar();
++pos_first;
pos_end = pos_first + par->text.size() - 1;
- // The constructor has already reserved 500 elements
- //if (pos_end > pos)
- // tmp->text.reserve(pos_end - pos);
- for (i = pos; i <= pos_end; ++i) {
+ for (i = j = pos; i <= pos_end; ++i) {
par->CutIntoMinibuffer(i - pos_first);
- tmp->InsertFromMinibuffer(i - pos);
+ if (tmp->InsertFromMinibuffer(j - pos))
+ ++j;
}
tmp->text.resize(tmp->text.size());
for (i = pos_end; i >= pos; --i)
pagebreak_top = par->pagebreak_top;
added_space_top = par->added_space_top;
+ spacing = par->spacing;
+
pextra_type = par->pextra_type;
pextra_width = par->pextra_width;
pextra_widthp = par->pextra_widthp;
else
result->table = 0;
/* table stuff -- end*/
+
+ result->inset_owner = inset_owner;
// ale970302
result->bibkey = (bibkey) ? new InsetBibKey(bibkey): 0;
// copy everything behind the break-position to the new paragraph
-
- for (size_type i = 0; i < size(); ++i) {
- CopyIntoMinibuffer(i);
- result->InsertFromMinibuffer(i);
- }
- result->text.resize(result->text.size());
+
+ result->text = text;
+ result->fontlist = fontlist;
+ result->insetlist = insetlist;
+ for (InsetList::iterator it = result->insetlist.begin();
+ it != result->insetlist.end(); ++it)
+ (*it).inset = (*it).inset->Clone();
return result;
}
par->pagebreak_top == pagebreak_top &&
par->added_space_top == added_space_top &&
+ par->spacing == spacing &&
+
par->pextra_type == pextra_type &&
par->pextra_width == pextra_width &&
par->pextra_widthp == pextra_widthp &&
while (ParFromPos(pos_first) != par)
++pos_first;
size_type pos_end = pos_first + par->text.size() - 1;
- // make sure there is enough memory for the now larger
- // paragraph. This is not neccessary, because
- // InsertFromMinibuffer will enlarge the memory (it uses
- // InsertChar of course). But doing it by hand
- // is MUCH faster! (only one time, not thousend times!!)
- // Not needed since the constructor aleady have
- // reserved 500 elements in text.
- //if (pos_end > pos)
- // tmp->text.reserve(pos_end - pos);
-
- for (size_type i = pos; i <= pos_end; ++i) {
+
+ size_type i, j;
+ for (i = j = pos; i <= pos_end; ++i) {
par->CutIntoMinibuffer(i - pos_first);
- tmp->InsertFromMinibuffer(i - pos);
+ if (tmp->InsertFromMinibuffer(j - pos))
+ ++j;
}
tmp->text.resize(tmp->text.size());
for (size_type i = pos_end; i >= pos; --i)
size_type pos_insert = Last();
// ok, now copy the paragraph
- for (size_type i = 0; i <= pos_end; ++i) {
+ size_type i, j;
+ for (i = j = 0; i <= pos_end; ++i) {
the_next->CutIntoMinibuffer(i);
- InsertFromMinibuffer(pos_insert + i);
+ if (InsertFromMinibuffer(pos_insert + j))
+ ++j;
}
// delete the next paragraph
textclasslist.Style(current_view->buffer()->params.textclass,
layout).endlabeltype;
if (endlabeltype != END_LABEL_NO_LABEL) {
- LyXParagraph const * last = LastPhysicalPar();
+ LyXParagraph const * last = this;
+ if( footnoteflag == NO_FOOTNOTE)
+ last = LastPhysicalPar();
+ else if (next->footnoteflag == NO_FOOTNOTE)
+ return endlabeltype;
+
if (!last || !last->next)
return endlabeltype;
return END_LABEL_NO_LABEL;
}
+
LyXTextClass::size_type LyXParagraph::GetLayout() const
{
return FirstPhysicalPar()->layout;
}
-string LyXParagraph::GetLabestring() const
+string LyXParagraph::GetLabelstring() const
{
return FirstPhysicalPar()->labelstring;
}
* npar = 0;
par->layout = new_layout;
- par->labelwidthstring.clear();
+ par->labelwidthstring.erase();
par->align = LYX_ALIGN_LAYOUT;
par->added_space_top = VSpace(VSpace::NONE);
par->added_space_bottom = VSpace(VSpace::NONE);
+ par->spacing.set(Spacing::Default);
+
/* table stuff -- begin*/
if (table)
par->layout = 0;
int LyXParagraph::AutoDeleteInsets()
{
- vector<size_type> tmpvec;
- int i = 0;
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).inset && (*it).inset->AutoDelete()) {
- tmpvec.push_back((*it).pos);
- ++i;
- }
- }
- for (vector<size_type>::const_iterator cit = tmpvec.begin();
- cit != tmpvec.end(); ++cit) {
- Erase((*cit));
+ int count = 0;
+ InsetList::size_type index = 0;
+ while (index < insetlist.size()) {
+ if (insetlist[index].inset && insetlist[index].inset->AutoDelete()) {
+ Erase(insetlist[index].pos);
+ // Erase() calls to insetlist.erase(&insetlist[index])
+ // so index shouldn't be increased.
+ ++count;
+ } else
+ ++index;
}
- return i;
+ return count;
}
Inset * LyXParagraph::ReturnNextInsetPointer(LyXParagraph::size_type & pos)
{
- InsetList::iterator it2 = insetlist.end();
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).pos >= pos) {
- if (it2 == insetlist.end() || (*it).pos < (*it2).pos)
- it2 = it;
- }
- }
- if (it2 != insetlist.end()) {
- pos = (*it2).pos;
- return (*it2).inset;
+ InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ if (it != insetlist.end()) {
+ pos = (*it).pos;
+ return (*it).inset;
}
return 0;
}
int LyXParagraph::GetPositionOfInset(Inset * inset) const
{
// Find the entry.
+ // We could use lower_bound here too, we just need to add
+ // the approp. operator() to matchIT (and change the name
+ // of that struct). Code would then be:
+ // InsetList::const_iterator cit = lower_bound(insetlist.begin(),
+ // insetlist.end(),
+ // inset, matchIT());
+ // if ((*cit).inset == inset) {
+ // return (*cit).pos;
+ // }
for (InsetList::const_iterator cit = insetlist.begin();
cit != insetlist.end(); ++cit) {
if ((*cit).inset == inset) {
LyXParagraph * LyXParagraph::TeXOnePar(ostream & os, TexRow & texrow,
- ostream & foot, TexRow & foot_texrow,
+ ostream & foot,
+ TexRow & foot_texrow,
int & foot_count)
{
lyxerr[Debug::LATEX] << "TeXOnePar... " << this << endl;
- LyXParagraph * par = next;
LyXLayout const & style =
textclasslist.Style(current_view->buffer()->params.textclass,
layout);
texrow.newline();
}
+ if (!spacing.isDefault()
+ && (!Previous() || !Previous()->HasSameLayout(this))) {
+ os << spacing.writeEnvirBegin() << "\n";
+ texrow.newline();
+ }
+
if (tex_code_break_column && style.isCommand()){
os << '\n';
texrow.newline();
texrow.newline();
}
- LyXDirection direction = getParDirection();
- LyXDirection global_direction =
- current_view->buffer()->params.getDocumentDirection();
- if (direction != global_direction) {
- if (direction == LYX_DIR_LEFT_TO_RIGHT)
- os << lyxrc.language_command_ltr << '\n';
- else
- os << lyxrc.language_command_rtl << '\n';
+ Language const * language = getParLanguage();
+ Language const * doc_language = current_view->buffer()->params.language_info;
+ if (language != doc_language) {
+ os << subst(lyxrc.language_command_begin, "$$lang",
+ language->lang)
+ << endl;
texrow.newline();
}
-
switch (style.latextype) {
case LATEX_COMMAND:
os << '\\'
bool need_par = SimpleTeXOnePar(os, texrow);
// Spit out footnotes
- while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE
- && par->footnoteflag != footnoteflag) {
- par = par->TeXFootnote(os, texrow,
- foot, foot_texrow, foot_count,
- direction);
- par->SimpleTeXOnePar(os, texrow);
- par = par->next;
+ LyXParagraph * par = next;
+ if (lyxrc.rtl_support) {
+ if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE
+ && next->footnoteflag != footnoteflag) {
+ LyXParagraph * p = 0;
+ bool is_rtl = GetFontSettings(size()-1).isRightToLeft();
+ if ( (p = NextAfterFootnote()) != 0 &&
+ p->GetFontSettings(0).isRightToLeft() != is_rtl)
+ is_rtl = GetFontSettings(0).isRightToLeft();
+ while (par &&
+ par->footnoteflag != LyXParagraph::NO_FOOTNOTE &&
+ par->footnoteflag != footnoteflag) {
+ par = par->TeXFootnote(os, texrow, foot,
+ foot_texrow, foot_count,
+ is_rtl);
+ par->SimpleTeXOnePar(os, texrow);
+ is_rtl = par->GetFontSettings(par->size()-1).isRightToLeft();
+ if (par->next &&
+ par->next->footnoteflag != LyXParagraph::NO_FOOTNOTE &&
+ (p = par->NextAfterFootnote()) != 0 &&
+ p->GetFontSettings(0).isRightToLeft() != is_rtl)
+ is_rtl = GetFontSettings(0).isRightToLeft();
+ par = par->next;
+ }
+ }
+ } else {
+ while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE
+ && par->footnoteflag != footnoteflag) {
+ par = par->TeXFootnote(os, texrow,
+ foot, foot_texrow, foot_count,
+ false);
+ par->SimpleTeXOnePar(os, texrow);
+ par = par->next;
+ }
}
// Make sure that \\par is done with the font of the last
os << "{\\" << font.latexSize() << " \\par}";
}
- if (direction != global_direction)
- if (direction == LYX_DIR_LEFT_TO_RIGHT)
- os << '\n' << lyxrc.language_command_rtl;
- else
- os << '\n' << lyxrc.language_command_ltr;
+ if (language != doc_language) {
+ os << endl
+ << subst(lyxrc.language_command_end, "$$lang",
+ doc_language->lang);
+ }
switch (style.latextype) {
case LATEX_ITEM_ENVIRONMENT:
|| par->pextra_type != pextra_type))
break;
default:
- if (!(footnoteflag != LyXParagraph::NO_FOOTNOTE
+ // we don't need it for the last paragraph!!!
+ if (next && !(footnoteflag != LyXParagraph::NO_FOOTNOTE
&& footnotekind != LyXParagraph::FOOTNOTE
&& footnotekind != LyXParagraph::MARGIN
&& (table
texrow.newline();
}
- if (!(footnoteflag != LyXParagraph::NO_FOOTNOTE && par &&
+ if (!spacing.isDefault()
+ && (!par || !par->HasSameLayout(this))) {
+ os << spacing.writeEnvirEnd() << "\n";
+ texrow.newline();
+ }
+
+ // we don't need it for the last paragraph!!!
+ if (next && !(footnoteflag != LyXParagraph::NO_FOOTNOTE && par &&
par->footnoteflag == LyXParagraph::NO_FOOTNOTE)) {
os << '\n';
texrow.newline();
case LYX_ALIGN_NONE:
case LYX_ALIGN_BLOCK:
case LYX_ALIGN_LAYOUT:
- case LYX_ALIGN_SPECIAL: break;
+ case LYX_ALIGN_SPECIAL:
+ break;
case LYX_ALIGN_LEFT:
- os << "\\raggedright ";
- column+= 13;
+ if (getParLanguage()->lang != "hebrew") {
+ os << "\\raggedright ";
+ column+= 13;
+ } else {
+ os << "\\raggedleft ";
+ column+= 12;
+ }
break;
case LYX_ALIGN_RIGHT:
- os << "\\raggedleft ";
- column+= 12;
+ if (getParLanguage()->lang != "hebrew") {
+ os << "\\raggedleft ";
+ column+= 12;
+ } else {
+ os << "\\raggedright ";
+ column+= 13;
+ }
break;
case LYX_ALIGN_CENTER:
os << "\\centering ";
// Fully instantiated font
LyXFont font = getFont(i);
- last_font = running_font;
+ LyXParagraph * p = 0;
+ if (i == 0 && previous &&
+ previous->footnoteflag != LyXParagraph::NO_FOOTNOTE &&
+ (p = PreviousBeforeFootnote()) != 0)
+ last_font = p->getFont(p->size()-1);
+ else
+ last_font = running_font;
// Spaces at end of font change are simulated to be
// outside font change, i.e. we write "\textXX{text} "
// If we have an open font definition, we have to close it
if (open_font) {
- running_font.latexWriteEndChanges(os, basefont, basefont);
+ LyXParagraph * p = 0;
+ if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE
+ && (p = NextAfterFootnote()) != 0)
+ running_font.latexWriteEndChanges(os, basefont,
+ p->getFont(0));
+ else
+ running_font.latexWriteEndChanges(os, basefont, basefont);
}
// Needed if there is an optional argument but no contents.
texrow.start(this, 0);
+ bool is_rtl = getParLanguage()->RightToLeft;
+ bool first_in_cell = true;
+
for (size_type i = 0; i < size(); ++i) {
char c = GetChar(i);
if (table->IsContRow(current_cell_number + 1)) {
continue;
}
++column;
-
+
+ if (first_in_cell && is_rtl) {
+ os << "\\R{";
+ column += 3;
+ first_in_cell = false;
+ }
+
// Fully instantiated font
LyXFont font = getFont(i);
last_font = running_font;
current_cell_number,
column, texrow);
}
+ if (is_rtl && !first_in_cell) {
+ os << "}";
+ first_in_cell = true;
+ }
+
// if this cell follow only ContRows till end don't
// put the EndOfCell because it is put after the
// for(...)
running_font.latexWriteEndChanges(os, basefont, basefont);
}
++current_cell_number;
+ if (is_rtl && !first_in_cell)
+ os << "}";
tmp = table->TexEndOfCell(os, current_cell_number);
for (; tmp > 0; --tmp)
texrow.newline();
bool retval = false;
switch (c) {
case LyXParagraph::META_HFILL:
- sgml_string.clear();
- break;
-#if 0
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- sgml_string = ' ';
+ sgml_string.erase();
break;
-#endif
case LyXParagraph::META_NEWLINE:
sgml_string = '\n';
break;
sgml_string = ' ';
break;
case '\0': // Ignore :-)
- sgml_string.clear();
+ sgml_string.erase();
break;
default:
sgml_string = c;
} else if (c == LyXParagraph::META_INSET) {
inset = GetInset(i);
#ifdef HAVE_SSTREAM
- ostringstream ost;
+ std::ostringstream ost;
inset->DocBook(ost);
string tmp_out = ost.str().c_str();
#else
if (c == LyXParagraph::META_INSET) {
inset = GetInset(i);
#ifdef HAVE_SSTREAM
- ostringstream ost;
+ std::ostringstream ost;
inset->DocBook(ost);
string tmp_out = ost.str().c_str();
#else
if ((inset->LyxCode() == Inset::GRAPHICS_CODE
|| inset->LyxCode() == Inset::MATH_CODE
|| inset->LyxCode() == Inset::URL_CODE)
- && running_font.getFontDirection()
- == LYX_DIR_RIGHT_TO_LEFT) {
+ && running_font.isRightToLeft()) {
os << "\\L{";
close = true;
}
if (close)
os << "}";
-
+
if (tmp) {
column = 0;
} else {
// but I'll leave it as a switch statement
// so its simpler to extend. (ARRae)
switch (c) {
-#if 0
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- os << ' ';
- break;
-#endif
default:
// make sure that we will not print
// error generating chars to the tex
} else {
// Plain mode (i.e. not LaTeX)
switch (c) {
-#if 0
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- os << '~';
- break;
-#endif
case '\\':
os << "\\textbackslash{}";
column += 15;
switch (c) {
case LyXParagraph::META_INSET:
if ((inset = GetInset(i))) {
-#if 1
#ifdef HAVE_SSTREAM
stringstream ss(ios::in | ios::out);
- inset->Latex(ss, -1);
+ inset->Ascii(ss);
ss.seekp(0);
ss.get(c);
while (!ss) {
}
#else
strstream ss;
- inset->Latex(ss, -1);
+ inset->Ascii(ss);
ss.seekp(0);
ss.get(c);
while (!ss) {
ss.get(c);
}
delete [] ss.str();
-#endif
-#else
- fstream fs(fname2.c_str(),
- ios::in|ios::out);
- if (!fs) {
- WriteAlert(_("LYX_ERROR:"),
- _("Cannot open temporary file:"),
- fname2);
- return false;
- }
- inset->Latex(fs, -1);
- fs.seekp(0);
- fs.get(c);
- while (!fs) {
- if (c == '\\')
- os << "\\\\";
- else
- os << c;
- fs.get(c);
- }
- fs.close();
#endif
}
break;
break;
case LyXParagraph::META_HFILL:
break;
-#if 0
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- break;
-#endif
case '\\':
os << "\\\\";
break;
LyXParagraph * LyXParagraph::TeXDeeper(ostream & os, TexRow & texrow,
- ostream & foot, TexRow & foot_texrow,
+ ostream & foot,
+ TexRow & foot_texrow,
int & foot_count)
{
lyxerr[Debug::LATEX] << "TeXDeeper... " << this << endl;
LyXParagraph * par = this;
- while (par && par->depth == depth) {
+ while (par &&
+ (par->depth == depth) &&
+ (par->footnoteflag == footnoteflag)) {
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXDeeper)" << endl;
if (textclasslist.Style(current_view->buffer()->params.textclass,
} while (par
&& par->layout == layout
&& par->depth == depth
- && par->pextra_type == pextra_type);
+ && par->pextra_type == pextra_type
+ && par->footnoteflag == footnoteflag);
if (style.isEnvironment()) {
os << "\\end{" << style.latexname() << '}';
LyXParagraph * LyXParagraph::TeXFootnote(ostream & os, TexRow & texrow,
ostream & foot, TexRow & foot_texrow,
int & foot_count,
- LyXDirection par_direction)
+ bool parent_is_rtl)
{
lyxerr[Debug::LATEX] << "TeXFootnote... " << this << endl;
if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
os << '\n';
texrow.newline();
}
+
+ bool need_closing = false;
+ bool is_rtl = isRightToLeftPar();
+ if (is_rtl != parent_is_rtl) {
+ if (is_rtl)
+ os << "\\R{";
+ else
+ os << "\\L{";
+ need_closing = true;
+ }
BufferParams * params = ¤t_view->buffer()->params;
bool footer_in_body = true;
}
texrow.newline();
-
- LyXDirection direction = getParDirection();
- if (direction != par_direction) {
- if (direction == LYX_DIR_LEFT_TO_RIGHT)
- os << lyxrc.language_command_ltr << '\n';
- else
- os << lyxrc.language_command_rtl << '\n';
- texrow.newline();
- }
-
- if (footnotekind != LyXParagraph::FOOTNOTE
+ if (footnotekind != LyXParagraph::FOOTNOTE
|| !footer_in_body) {
// Process text for all floats except footnotes in body
do {
// NOTE: Currently don't support footnotes within footnotes
// even though that is possible using the \footnotemark
#ifdef HAVE_SSTREAM
- ostringstream dummy;
+ std::ostringstream dummy;
#else
ostrstream dummy;
#endif
break;
}
+ if (need_closing)
+ os << "}";
+
if (footnotekind != LyXParagraph::FOOTNOTE
&& footnotekind != LyXParagraph::MARGIN) {
// we need to ensure that real floats like tables and figures
}
+bool LyXParagraph::IsDummy() const
+{
+ return (footnoteflag == LyXParagraph::NO_FOOTNOTE && previous
+ && previous->footnoteflag != LyXParagraph::NO_FOOTNOTE);
+}
+
+
void LyXParagraph::SetPExtraType(int type, char const * width,
char const * widthp)
{
return;
pextra_type = PEXTRA_NONE;
- pextra_width.clear();
- pextra_widthp.clear();
+ pextra_width.erase();
+ pextra_widthp.erase();
if (textclasslist.Style(current_view->buffer()->params.textclass,
layout).isEnvironment()) {
while (par && (par->layout == layout)
&& (par->depth == depth)) {
par->pextra_type = PEXTRA_NONE;
- par->pextra_width.clear();
- par->pextra_widthp.clear();
+ par->pextra_width.erase();
+ par->pextra_widthp.erase();
par = par->NextAfterFootnote();
if (par && (par->depth > depth))
par->UnsetPExtraType();
bool LyXParagraph::IsNewline(size_type pos) const
{
- bool tmp = false;
- if (pos >= 0)
- tmp = IsNewlineChar(GetChar(pos));
- return tmp;
+ return pos >= 0 && IsNewlineChar(GetChar(pos));
}
}
-LyXDirection LyXParagraph::getParDirection() const
+Language const * LyXParagraph::getParLanguage() const
{
- if (!lyxrc.rtl_support || table)
- return LYX_DIR_LEFT_TO_RIGHT;
-
if (size() > 0)
- return (getFont(0).direction() == LyXFont::RTL_DIR)
- ? LYX_DIR_RIGHT_TO_LEFT : LYX_DIR_LEFT_TO_RIGHT;
+ if (!table)
+ return FirstPhysicalPar()->GetFirstFontSettings()
+ .language();
+ else {
+ for (size_type pos = 0; pos < size(); ++pos)
+ if (IsNewline(pos))
+ return GetFontSettings(pos).language();
+ return GetFirstFontSettings().language();
+ }
+ else if (previous)
+ return previous->getParLanguage();
else
- return current_view->buffer()->params.getDocumentDirection();
+ return current_view->buffer()->params.language_info;
}
-LyXDirection
-LyXParagraph::getLetterDirection(LyXParagraph::size_type pos) const
+bool LyXParagraph::isRightToLeftPar() const
{
- if (!lyxrc.rtl_support)
- return LYX_DIR_LEFT_TO_RIGHT;
-
- LyXDirection direction = getFont(pos).getFontDirection();
- if (IsLineSeparator(pos) && 0 < pos && pos < Last() - 1
- && !IsLineSeparator(pos + 1)
- && !(table && IsNewline(pos + 1))
- && (getFont(pos - 1).getFontDirection() != direction
- || getFont(pos + 1).getFontDirection() != direction))
- return getParDirection();
- else
- return direction;
+ return lyxrc.rtl_support && !table && getParLanguage()->RightToLeft;
+}
+
+
+void LyXParagraph::ChangeLanguage(Language const * from, Language const * to)
+{
+ for(size_type i = 0; i < size(); ++i) {
+ LyXFont font = GetFontSettings(i);
+ if (font.language() == from) {
+ font.setLanguage(to);
+ SetFont(i, font);
+ }
+ }
+}
+
+
+bool LyXParagraph::isMultiLingual()
+{
+ Language const * doc_language =
+ current_view->buffer()->params.language_info;
+ for(size_type i = 0; i < size(); ++i) {
+ LyXFont font = GetFontSettings(i);
+ if (font.language() != doc_language)
+ return true;
+ }
+ return false;
}
projects / features.git / blobdiff