extern void addNewlineAndDepth(string & file, int const depth); // Jug 990923
-extern unsigned char GetCurrentTextClass(); // this should be fixed/removed
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
// parameters? (JMarc)
// ale970405
extern string bibitemWidthest();
-/* this is a minibuffer */
+// this is a minibuffer
static char minibuffer_char;
static LyXFont minibuffer_font;
static Inset * minibuffer_inset;
itemdepth = 0;
next = 0;
previous = 0;
-#ifndef NEW_TABLE
+#ifndef NEW_FONTTABLE // OK
fonttable = 0;
+#endif
+#ifndef NEW_INSETTABLE
insettable = 0;
#endif
footnoteflag = LyXParagraph::NO_FOOTNOTE;
-
+ footnotekind = LyXParagraph::FOOTNOTE; // should not be needed
+
align = LYX_ALIGN_BLOCK;
/* table stuff -- begin*/
}
-/* this konstruktor inserts the new paragraph in a list */
+// This konstruktor inserts the new paragraph in a list.
LyXParagraph::LyXParagraph(LyXParagraph * par)
{
text.reserve(500);
appendix = false;
enumdepth = 0;
itemdepth = 0;
+ // double linked list begin
next = par->next;
if (next)
next->previous = this;
previous = par;
previous->next = this;
-#ifndef NEW_TABLE
+ // end
+#ifndef NEW_FONTTABLE // OK
fonttable = 0;
+#endif
+#ifndef NEW_INSETTABLE
insettable = 0;
#endif
footnoteflag = LyXParagraph::NO_FOOTNOTE;
|| !previous
|| previous->footnoteflag == LyXParagraph::NO_FOOTNOTE){
- /* The beginning or the end of a footnote environment? */
+ // The beginning or the end of a footnote environment?
if (footflag != footnoteflag) {
footflag = footnoteflag;
if (footflag) {
os << "\n\\begin_float "
<< string_footnotekinds[footnotekind]
<< " ";
- }
- else {
+ } else {
os << "\n\\end_float ";
}
}
- /* The beginning or end of a deeper (i.e. nested) area? */
+ // The beginning or end of a deeper (i.e. nested) area?
if (dth != depth) {
if (depth > dth) {
while (depth > dth) {
os << "\n\\begin_deeper ";
- dth++;
+ ++dth;
}
- }
- else {
+ } else {
while (depth < dth) {
os << "\n\\end_deeper ";
- dth--;
+ --dth;
}
}
}
- /* First write the layout */
+ // First write the layout
os << "\n\\layout "
<< textclasslist.NameOfLayout(params.textclass, layout)
<< "\n";
- /* maybe some vertical spaces */
+ // Maybe some vertical spaces.
if (added_space_top.kind() != VSpace::NONE)
os << "\\added_space_top "
<< added_space_top.asLyXCommand() << " ";
os << "\\added_space_bottom "
<< added_space_bottom.asLyXCommand() << " ";
- /* The labelwidth string used in lists */
+ // The labelwidth string used in lists.
if (!labelwidthstring.empty())
os << "\\labelwidthstring "
<< labelwidthstring << '\n';
- /* Lines above or below? */
+ // Lines above or below?
if (line_top)
os << "\\line_top ";
if (line_bottom)
os << "\\line_bottom ";
- /* Pagebreaks above or below? */
+ // Pagebreaks above or below?
if (pagebreak_top)
os << "\\pagebreak_top ";
if (pagebreak_bottom)
os << "\\pagebreak_bottom ";
- /* Start of appendix? */
+ // Start of appendix?
if (start_of_appendix)
os << "\\start_of_appendix ";
- /* Noindent? */
+ // Noindent?
if (noindent)
os << "\\noindent ";
- /* Alignment? */
+ // Alignment?
if (align != LYX_ALIGN_LAYOUT) {
switch (align) {
case LYX_ALIGN_LEFT: h = 1; break;
}
os << '\n';
}
- }
- else {
- /* Dummy layout. This means that a footnote ended */
+ } else {
+ // Dummy layout. This means that a footnote ended.
os << "\n\\end_float ";
footflag = LyXParagraph::NO_FOOTNOTE;
}
- /* It might be a table */
+ // It might be a table.
if (table){
os << "\\LyXTable\n";
table->Write(os);
font1 = LyXFont(LyXFont::ALL_INHERIT);
column = 0;
- for (size_type i = 0; i < size(); i++) {
- if (!i){
+ for (size_type i = 0; i < size(); ++i) {
+ if (!i) {
os << "\n";
column = 0;
}
else
lyxerr << "ERROR (LyXParagraph::writeFile):"
" NULL char in structure." << endl;
- column++;
+ ++column;
break;
}
}
void LyXParagraph::validate(LaTeXFeatures & features)
{
// this will be useful later
- LyXLayout const & layout = textclasslist.Style(GetCurrentTextClass(),
- GetLayout());
+ LyXLayout const & layout =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
// check the params.
if (line_top || line_bottom)
// then the layouts
features.layout[GetLayout()] = true;
-#ifdef NEW_TABLE
+ // then the fonts
+#ifdef NEW_FONTTABLE // OK, but does not affect structure anyway
for (FontList::const_iterator cit = fontlist.begin();
cit != fontlist.end(); ++cit) {
if ((*cit).font.noun() == LyXFont::ON) {
switch ((*cit).font.color()) {
case LyXFont::NONE:
case LyXFont::INHERIT_COLOR:
- case LyXFont::IGNORE_COLOR: break;
+ case LyXFont::IGNORE_COLOR:
+ break;
default:
features.color = true;
lyxerr[Debug::LATEX] << "Color enabled. Font: "
}
}
#else
- // then the fonts
FontTable * tmpfonttable = fonttable;
while (tmpfonttable) {
if (tmpfonttable->font.noun() == LyXFont::ON) {
tmpfonttable = tmpfonttable->next;
}
#endif
-#ifdef NEW_TABLE
+ // then the insets
+#ifdef NEW_INSETTABLE
for (InsetList::const_iterator cit = insetlist.begin();
cit != insetlist.end(); ++cit) {
- (*cit).inset->Validate(features);
+ if ((*cit).inset)
+ (*cit).inset->Validate(features);
}
#else
- // then the insets
InsetTable * tmpinsettable = insettable;
while (tmpinsettable) {
if (tmpinsettable->inset) {
tmpinsettable = tmpinsettable->next;
}
#endif
+
if (table && table->IsLongTable())
features.longtable = true;
if (pextra_type == PEXTRA_INDENT)
}
-/* first few functions needed for cut and paste and paragraph breaking */
+// First few functions needed for cut and paste and paragraph breaking.
void LyXParagraph::CopyIntoMinibuffer(LyXParagraph::size_type pos) const
{
minibuffer_char = GetChar(pos);
}
}
+
void LyXParagraph::CutIntoMinibuffer(LyXParagraph::size_type pos)
{
minibuffer_char = GetChar(pos);
// This is a little hack since I want exactly
// the inset, not just a clone. Otherwise
// the inset would be deleted when calling Erase(pos)
-#ifdef NEW_TABLE
+ // find the entry
+#ifdef NEW_INSETTABLE
for (InsetList::iterator it = insetlist.begin();
it != insetlist.end(); ++it) {
if ((*it).pos == pos) {
(*it).inset = 0;
break;
}
+
}
#else
- /* find the entry */
InsetTable * tmpi = insettable;
while (tmpi && tmpi->pos != pos) {
tmpi= tmpi->next;
}
- if (tmpi) { /* This should always be true */
+ if (tmpi) { // This should always be true.
tmpi->inset = 0;
}
#endif
}
- /* Erase(pos); now the caller is responsible for that*/
+ // Erase(pos); now the caller is responsible for that.
}
InsertInset(pos, minibuffer_inset);
}
-/* end of minibuffer */
+// end of minibuffer
}
-/* the destructor removes the new paragraph from the list */
+// the destructor removes the new paragraph from the list
LyXParagraph::~LyXParagraph()
{
if (previous)
if (next)
next->previous = previous;
-#ifndef NEW_TABLE
+#ifdef NEW_INSETTABLE
+ for (InsetList::iterator it = insetlist.begin();
+ it != insetlist.end(); ++it) {
+ delete (*it).inset;
+ }
+#else
InsetTable * tmpinset;
while (insettable) {
tmpinset = insettable;
insettable = insettable->next;
- if (tmpinset->inset)
+ if (tmpinset->inset) // DEL LINE
delete tmpinset->inset;
delete tmpinset;
if (insettable && insettable->next == insettable) {
// somehow this recursion appears occasionally
// but I can't find where. This bandaid
// helps but isn't the best fix. (ARRae)
- if (insettable->inset) {
+ if (insettable->inset) { // DEL LINE
delete insettable->inset;
}
delete insettable;
break;
}
}
-
+#endif
+#ifndef NEW_FONTTABLE // OK
FontTable * tmpfont;
while (fonttable) {
tmpfont = fonttable;
#endif
/* table stuff -- begin*/
- if (table)
+ if (table) // DEL LINE
delete table;
/* table stuff -- end*/
// ale970302
- if (bibkey)
+ if (bibkey) // DEL LINE
delete bibkey;
}
void LyXParagraph::Erase(LyXParagraph::size_type pos)
{
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
if (pos > size()) {
if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
NextAfterFootnote()->Erase(pos - text.size() - 1);
return;
}
if (pos < size()) { // last is free for insertation, but should be empty
-#ifdef NEW_TABLE
- /* if it is an inset, delete the inset entry */
+ // 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) {
+ // find the entry
+#ifdef NEW_INSETTABLE
+ for (InsetList::iterator it = insetlist.begin();
+ it != insetlist.end(); ++it) {
if ((*it).pos == pos) {
delete (*it).inset;
insetlist.erase(it);
break;
}
}
- }
#else
- /* if it is an inset, delete the inset entry */
- if (text[pos] == LyXParagraph::META_INSET) {
- /* find the entry */
InsetTable *tmpi = insettable;
InsetTable *tmpi2 = tmpi;
while (tmpi && tmpi->pos != pos) {
- tmpi2= tmpi;
- tmpi= tmpi->next;
+ tmpi2 = tmpi;
+ tmpi = tmpi->next;
}
if (tmpi) { // this should always be true
- if (tmpi->inset) // delete the inset if it exists
+ if (tmpi->inset) // delete the inset if it exists // DEL LINE
delete tmpi->inset;
if (tmpi == insettable)
insettable = tmpi->next;
tmpi2->next = tmpi->next;
delete tmpi;
}
- }
#endif
+ }
text.erase(text.begin() + pos);
-#ifdef NEW_TABLE
- /* erase entries in the tables */
- for(FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
+ // Erase entries in the tables.
+#ifdef NEW_FONTTABLE // Seems OK
+ for (FontList::iterator it = fontlist.begin();
+ it != fontlist.end(); ++it) {
if (pos >= (*it).pos && pos <= (*it).pos_end) {
if ((*it).pos == (*it).pos_end) {
+ // If it is a multi-character font
+ // entry, we just make it smaller
+ // (see update below), otherwise we
+ // should delete it.
fontlist.erase(it);
break;
}
}
}
-
- /* update all other entries */
- for(FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
+ // Update all other entries.
+ for (FontList::iterator it = fontlist.begin();
+ it != fontlist.end(); ++it) {
if ((*it).pos > pos)
(*it).pos--;
if ((*it).pos_end >= pos)
(*it).pos_end--;
}
-
- /* update the inset table */
- for(InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).pos > pos)
- (*it).pos--;
- }
#else
- /* erase entries in the tables */
int found = 0;
FontTable * tmp = fonttable;
FontTable * prev = 0;
}
if (found && tmp->pos == tmp->pos_end) {
- /* if it is a multi-character font entry, we just make
- * it smaller (see update below), otherwise we should
- * delete it */
+ // if it is a multi-character font entry, we just make
+ // it smaller (see update below), otherwise we should
+ // delete it
if (prev)
prev->next = tmp->next;
else
delete tmp;
}
- /* update all other entries */
+ // Update all other entries.
tmp = fonttable;
while (tmp) {
tmp->pos_end--;
tmp = tmp->next;
}
-
- /* update the inset table */
+#endif
+ // Update the inset table.
+#ifdef NEW_INSETTABLE
+ for (InsetList::iterator it = insetlist.begin();
+ it != insetlist.end(); ++it) {
+ if ((*it).pos > pos)
+ (*it).pos--;
+ }
+#else
InsetTable * tmpi = insettable;
while (tmpi) {
if (tmpi->pos > pos)
tmpi->pos--;
tmpi= tmpi->next;
}
-#endif
+#endif
} else {
lyxerr << "ERROR (LyXParagraph::Erase): "
"can't erase non-existant char." << endl;
void LyXParagraph::InsertChar(LyXParagraph::size_type pos, char c)
{
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
if (pos > size()) {
if (next
&& next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
return;
}
text.insert(text.begin() + pos, c);
-#ifdef NEW_TABLE
- // update the font table
- for(FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
+ // Update the font table.
+#ifdef NEW_FONTTABLE // Seems OK
+ for (FontList::iterator it = fontlist.begin();
+ it != fontlist.end(); ++it) {
if ((*it).pos >= pos)
(*it).pos++;
if ((*it).pos_end >= pos)
(*it).pos_end++;
}
- // update the inset table
- for(InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).pos >= pos)
- (*it).pos++;
- }
#else
- /* update the font table */
FontTable * tmp = fonttable;
while (tmp) {
if (tmp->pos >= pos)
tmp->pos_end++;
tmp = tmp->next;
}
+#endif
- /* update the inset table */
+ // Update the inset table.
+#ifdef NEW_INSETTABLE
+ for (InsetList::iterator it = insetlist.begin();
+ it != insetlist.end(); ++it) {
+ if ((*it).pos >= pos)
+ (*it).pos++;
+ }
+#else
InsetTable * tmpi = insettable;
while (tmpi) {
if (tmpi->pos >= pos)
void LyXParagraph::InsertInset(LyXParagraph::size_type pos,
Inset * inset)
{
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
if (pos > size()) {
if (next
&& next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
return;
}
-#ifdef NEW_TABLE
if (inset) {
- InsetTable tmp;
- tmp.pos = pos;
- tmp.inset = inset;
- insetlist.push_back(tmp);
- }
-
+ // Add a new entry in the inset table.
+#ifdef NEW_INSETTABLE
+ InsetTable tmpi;
+ InsetList::iterator it =
+ insetlist.insert(insetlist.begin(), tmpi);
+ (*it).inset = inset;
+ (*it).pos = pos;
#else
- if (inset) {
- /* add a new entry in the inset table */
InsetTable * tmpi = new InsetTable;
tmpi->pos = pos;
tmpi->inset = inset;
tmpi->next = insettable;
insettable = tmpi;
- }
#endif
+ }
}
}
return 0;
}
-#ifdef NEW_TABLE
- /* find the inset */
- for(InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
+ // Find the inset.
+#ifdef NEW_INSETTABLE
+ for (InsetList::iterator it = insetlist.begin();
+ it != insetlist.end(); ++it) {
if ((*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
- // seen any, please enlighten me. (Lgb)
+ // see any, please enlighten me. (Lgb)
// My guess is that since the inset does not exist, we might
- // as well replace it with a space to prevent crashes. (Asger)
+ // as well replace it with a space to prevent craches. (Asger)
return 0;
#else
- /* find the inset */
InsetTable * tmpi = insettable;
while (tmpi && tmpi->pos != pos)
}
return 0;
}
-#ifdef NEW_TABLE
- /* find the inset */
- for(InsetList::const_iterator cit = insetlist.begin();
- cit != insetlist.end(); ++cit) {
+ // Find the inset.
+#ifdef NEW_INSETTABLE
+ for (InsetList::const_iterator cit = insetlist.begin();
+ cit != insetlist.end(); ++cit) {
if ((*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 ' '????
+ //text[pos] = ' '; // WHY!!! does this set the pos to ' '????
// Did this commenting out introduce a bug? So far I have not
- // seen any, please enlighten me. (Lgb)
+ // see any, please enlighten me. (Lgb)
// My guess is that since the inset does not exist, we might
- // as well replace it with a space to prevent crashes. (Asger)
+ // as well replace it with a space to prevent craches. (Asger)
return 0;
#else
- /* find the inset */
InsetTable * tmpi = insettable;
while (tmpi && tmpi->pos != pos)
LyXFont LyXParagraph::GetFontSettings(LyXParagraph::size_type pos) const
{
if (pos < size()) {
-#ifdef NEW_TABLE
- for(FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
- if (pos >= (*it).pos && pos <= (*it).pos_end)
- return (*it).font;
+#ifdef NEW_FONTTABLE // Seems OK
+ for (FontList::const_iterator cit = fontlist.begin();
+ cit != fontlist.end(); ++cit) {
+ if (pos >= (*cit).pos && pos <= (*cit).pos_end)
+ return (*cit).font;
}
#else
FontTable * tmp = fonttable;
}
#endif
}
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
else if (pos > size()) {
if (next
&& next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
else {
// Why is it an error to ask for the font of a
// position that does not exist? Would it be
- // enough for this to be anable on debug?
+ // enough for this to be enabled on debug?
// We want strict error checking, but it's ok to only
// have it when debugging. (Asger)
lyxerr << "ERROR (LyXParagraph::GetFontSettings): "
"position does not exist. "
<< pos << " (" << static_cast<int>(pos)
- << ")\n";
+ << ")" << endl;
}
} else if (pos) {
return GetFontSettings(pos - 1);
LyXFont LyXParagraph::getFont(LyXParagraph::size_type pos) const
{
LyXFont tmpfont;
- LyXLayout const & layout = textclasslist.Style(GetCurrentTextClass(),
- GetLayout());
+ LyXLayout const & layout =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
LyXParagraph::size_type main_body = 0;
if (layout.labeltype == LABEL_MANUAL)
main_body = BeginningOfMainBody();
par = par->DepthHook(par_depth - 1);
if (par) {
tmpfont.realize(textclasslist.
- Style(GetCurrentTextClass(),
+ Style(current_view->buffer()->params.textclass,
par->GetLayout()).font);
par_depth = par->GetDepth();
}
}
- tmpfont.realize(textclasslist.TextClass(GetCurrentTextClass()).defaultfont());
+ tmpfont.realize(textclasslist
+ .TextClass(current_view->buffer()->params.textclass)
+ .defaultfont());
return tmpfont;
}
/// Returns the height of the highest font in range
-LyXFont::FONT_SIZE LyXParagraph::HighestFontInRange(LyXParagraph::size_type startpos, LyXParagraph::size_type endpos) const
+LyXFont::FONT_SIZE
+LyXParagraph::HighestFontInRange(LyXParagraph::size_type startpos,
+ LyXParagraph::size_type endpos) const
{
LyXFont::FONT_SIZE maxsize = LyXFont::SIZE_TINY;
-#ifdef NEW_TABLE
- for(FontList::const_iterator cit = fontlist.begin();
- cit != fontlist.end(); ++cit) {
+#ifdef NEW_FONTTABLE // Seems OK
+ for (FontList::const_iterator cit = fontlist.begin();
+ cit != fontlist.end(); ++cit) {
if (startpos <= (*cit).pos_end && endpos >= (*cit).pos) {
LyXFont::FONT_SIZE size = (*cit).font.size();
if (size > maxsize && size <= LyXFont::SIZE_HUGER)
char LyXParagraph::GetChar(LyXParagraph::size_type pos)
{
- Assert(pos>=0);
+ Assert(pos >= 0);
if (pos < size()) {
return text[pos];
}
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
else if (pos > size()) {
if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
return NextAfterFootnote()
"position does not exist."
<< pos << " (" << static_cast<int>(pos)
<< ")\n";
+ Assert(false);
}
return '\0';
} else {
- /* we should have a footnote environment */
+ // We should have a footnote environment.
if (!next || next->footnoteflag == LyXParagraph::NO_FOOTNOTE) {
// Notice that LyX does request the
// last char from time to time. (Asger)
char LyXParagraph::GetChar(LyXParagraph::size_type pos) const
{
- Assert(pos>=0);
+ Assert(pos >= 0);
if (pos < size()) {
return text[pos];
}
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
else if (pos > size()) {
if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
return NextAfterFootnote()
->GetChar(pos - text.size() - 1);
else {
- lyxerr << "ERROR (LyXParagraph::GetChar): "
+ lyxerr << "ERROR (LyXParagraph::GetChar const): "
"position does not exist."
<< pos << " (" << static_cast<int>(pos)
<< ")\n";
+ Assert(false);
}
return '\0';
} else {
- /* we should have a footnote environment */
+ // We should have a footnote environment.
if (!next || next->footnoteflag == LyXParagraph::NO_FOOTNOTE) {
// Notice that LyX does request the
// last char from time to time. (Asger)
{
Assert(lastpos>=0);
- // the current word is defined as starting at the first character from
- // the immediate left of lastpospos which meets the definition of IsLetter(),
- // continuing to the last character to the right of this meeting
- // IsLetter.
+ // the current word is defined as starting at the first character
+ // from the immediate left of lastpospos which meets the definition
+ // of IsLetter(), continuing to the last character to the right
+ // of this meeting IsLetter.
string theword;
int firstpos = lastpos;
while ((firstpos >= 0) && !IsLetter(firstpos))
- firstpos--;
+ --firstpos;
// now find the beginning by looking for a nonletter
while ((firstpos>= 0) && IsLetter(firstpos))
- firstpos--;
+ --firstpos;
// the above is now pointing to the preceeding non-letter
- firstpos++;
- lastpos= firstpos;
+ ++firstpos;
+ lastpos = firstpos;
// so copy characters into theword until we get a nonletter
// note that this can easily exceed lastpos, wich means
while (IsLetter(lastpos)) theword += GetChar(lastpos++);
- return theword;
+ return theword;
}
{
if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
return text.size() + NextAfterFootnote()->Last() + 1;
- /* the 1 is the symbol
- for the footnote */
+ // the 1 is the symbol
+ // for the footnote
else
return text.size();
}
LyXParagraph * LyXParagraph::ParFromPos(LyXParagraph::size_type pos)
{
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
if (pos > size()) {
if (next
&& next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
lyxerr << "ERROR (LyXParagraph::ParFromPos): "
"position does not exist." << endl;
return this;
- }
- else
+ } else
return this;
}
int LyXParagraph::PositionInParFromPos(LyXParagraph::size_type pos) const
{
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
if (pos > size()) {
if (next
&& next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
void LyXParagraph::SetFont(LyXParagraph::size_type pos,
LyXFont const & font)
{
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
if (pos > size()) {
- if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
+ if (next &&
+ next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
NextAfterFootnote()->SetFont(pos - text.size() - 1,
font);
} else {
}
LyXFont patternfont(LyXFont::ALL_INHERIT);
-// First, reduce font against layout/label font
-// Update: The SetCharFont() routine in text2.C already reduces font, so
-// we don't need to do that here. (Asger)
-// No need to simplify this because it will disappear in a new kernel. (Asger)
-#ifdef NEW_TABLE
+ // First, reduce font against layout/label font
+ // Update: The SetCharFont() routine in text2.C already
+ // reduces font, so we don't need to do that here. (Asger)
+ // No need to simplify this because it will disappear
+ // in a new kernel. (Asger)
// Next search font table
- for(FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
- if (pos >= (*it).pos && pos <= (*it).pos_end) {
- // found it
- // we found a font entry. maybe we have to
- // split it and create a new one
-
- if ((*it).pos != (*it).pos_end) {
- // more than one character
- if (pos == (*it).pos) {
- // maybe we could enlarge
- // the left fonttable
- for(FontList::iterator fit = fontlist.begin();
- fit != fontlist.end(); ++fit) {
- if (pos - 1 >= (*fit).pos
- && pos - 1 <= (*fit).pos_end
- && (*fit).font == font) {
- // put the position
- // under the font
- (*fit).pos_end++;
- (*it).pos++;
- return;
- }
- }
- // Add a new entry in the
- // fonttable for the position
- FontTable tmp;
- tmp.pos = pos + 1;
- tmp.pos_end = (*it).pos_end;
- tmp.font = (*it).font;
- (*it).pos_end = pos;
- fontlist.push_back(tmp);
- } else if (pos == (*it).pos_end) {
- // Add a new entry in the
- // fonttable for the position
- FontTable tmp;
- tmp.pos = (*it).pos;
- tmp.pos_end = (*it).pos_end - 1;
- tmp.font = (*it).font;
- (*it).pos = (*it).pos_end;
- fontlist.push_back(tmp);
- } else {
- // Add a new entry in the
- // fonttable for the position
- FontTable tmp;
- tmp.pos = (*it).pos;
- tmp.pos_end = pos - 1;
- tmp.font = (*it).font;
- fontlist.push_back(tmp);
-
- tmp.pos = pos + 1;
- tmp.pos_end = (*it).pos_end;
- tmp.font = (*it).font;
- fontlist.push_back(tmp);
-
- (*it).pos = pos;
- (*it).pos_end = pos;
- }
- }
- (*it).font = font;
- return;
+#ifdef NEW_FONTTABLE
+ FontList::iterator tmp = fontlist.begin();
+ for (; tmp != fontlist.end(); ++tmp) {
+ if (pos >= (*tmp).pos && pos <= (*tmp).pos_end) {
+ break;
}
}
-
- // if we did not find a font entry, but if the font at hand
- // is the same as default, we just forget it
- if (font == patternfont) return;
-
- // ok, we did not find a font entry. But maybe there is exactly
- // the needed font entry one position left
- for(FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
- if (pos - 1 >= (*it).pos && pos - 1 <= (*it).pos_end
- && (*it).font == font) {
- (*it).pos_end++;
- return;
+ if (tmp == fontlist.end()) { // !found
+ // if we did not find a font entry, but if the font at hand
+ // is the same as default, we just forget it
+ if (font == patternfont) return;
+
+ // ok, we did not find a font entry. But maybe there is exactly
+ // the needed font ientry one position left
+ FontList::iterator tmp2 = fontlist.begin();
+ for (; tmp2 != fontlist.end(); ++tmp2) {
+ if (pos - 1 >= (*tmp2).pos
+ && pos - 1 <= (*tmp2).pos_end)
+ break;
+ }
+ if (tmp2 != fontlist.end()) {
+ // ok there is one, maybe it is exactly
+ // the needed font
+ if ((*tmp2).font == font) {
+ // put the position under the font
+ (*tmp2).pos_end++;
+ return;
+ }
}
+ // Add a new entry in the
+ // fontlist for the position
+ FontTable ft;
+ ft.pos = pos;
+ ft.pos_end = pos;
+ ft.font = font; // or patternfont
+ // It seems that using font instead of patternfont here
+ // fixes all the problems. This also surfaces a "bug" in
+ // the old code.
+ fontlist.insert(fontlist.begin(), ft);
+ } else if ((*tmp).pos != (*tmp).pos_end) { // we found a font entry. maybe we have to split it and create a new one.
+
+// more than one character
+ if (pos == (*tmp).pos) {
+ // maybe we should enlarge the left fonttable
+ FontList::iterator tmp2 = fontlist.begin();
+ for (; tmp2 != fontlist.end(); ++tmp2) {
+ if (pos - 1 >= (*tmp2).pos
+ && pos - 1 <= (*tmp2).pos_end)
+ break;
+ }
+ // Is there is one, and is it exactly
+ // the needed font?
+ if (tmp2 != fontlist.end() &&
+ (*tmp2).font == font) {
+ // Put the position under the font
+ (*tmp2).pos_end++;
+ (*tmp).pos++;
+ return;
+ }
+
+ // Add a new entry in the
+ // fontlist for the position
+ FontTable ft;
+ ft.pos = pos + 1;
+ ft.pos_end = (*tmp).pos_end;
+ ft.font = (*tmp).font;
+ (*tmp).pos_end = pos;
+ (*tmp).font = font;
+ fontlist.insert(fontlist.begin(), ft);
+ } else if (pos == (*tmp).pos_end) {
+ // Add a new entry in the
+ // fontlist for the position
+ FontTable ft;
+ ft.pos = (*tmp).pos;
+ ft.pos_end = (*tmp).pos_end - 1;
+ ft.font = (*tmp).font;
+ (*tmp).pos = (*tmp).pos_end;
+ (*tmp).font = font;
+ fontlist.insert(fontlist.begin(), ft);
+ } else {
+ // Add a new entry in the
+ // fontlist for the position
+ FontTable ft;
+ ft.pos = (*tmp).pos;
+ ft.pos_end = pos - 1;
+ ft.font = (*tmp).font;
+
+ FontTable ft2;
+ ft2.pos = pos + 1;
+ ft2.pos_end = (*tmp).pos_end;
+ ft2.font = (*tmp).font;
+
+ (*tmp).pos = pos;
+ (*tmp).pos_end = pos;
+ (*tmp).font = font;
+
+ fontlist.insert(fontlist.begin(), ft);
+ fontlist.insert(fontlist.begin(), ft2);
+ }
+ } else {
+ (*tmp).font = font;
}
- // Add a new entry in the
- // fonttable for the position
- FontTable tmp;
- tmp.pos = pos;
- tmp.pos_end = pos;
- tmp.font = patternfont;
- fontlist.push_back(tmp);
+
#else
- // Next search font table
FontTable * tmp2;
bool found = false;
}
if (!found) {
- /* if we did not find a font entry, but if the font at hand
- * is the same as default, we just forget it */
+ // if we did not find a font entry, but if the font at hand
+ // is the same as default, we just forget it
if (font == patternfont)
return;
- /* ok, we did not find a font entry. But maybe there is exactly
- * the needed font entry one position left */
+ // ok, we did not find a font entry. But maybe there is exactly
+ // the needed font entry one position left
found = false;
tmp2 = fonttable;
while (tmp2 && !found) {
tmp2 = tmp2->next;
}
if (found) {
- /* ok there is one. maybe it is exactly the needed font */
+ // ok there is one. maybe it is exactly
+ // the needed font
if (tmp2->font == font) {
- /* put the position under the font */
+ // put the position under the font
tmp2->pos_end++;
return;
}
}
- /* Add a new entry in the
- * fonttable for the position */
+ // Add a new entry in the
+ // fonttable for the position
tmp = new FontTable;
tmp->pos = pos;
tmp->pos_end = pos;
- tmp->font = patternfont;
+ tmp->font = patternfont; // It seems that is actually totally
+ // wrong to use patternfont here, the correct should be font
+ // lockily at the end of this function we have
+ // tmp->font = font, so this one setting it to patternfont
+ // is negated.
tmp->next = fonttable;
fonttable = tmp;
} else {
- /* we found a font entry. maybe we have to split it and create
- * a new one */
-
- if (tmp->pos != tmp->pos_end) { /* more than one character */
+ // we found a font entry. maybe we have
+ // to split it and create a new one
+ if (tmp->pos != tmp->pos_end) { // more than one character
if (pos == tmp->pos) {
- /* maybe we could enlarge the left fonttable */
-
+ // maybe we could enlarge the left fonttable
found = false;
tmp2 = fonttable;
while (tmp2 && !found) {
tmp2 = tmp2->next;
}
- /* Is there is one, and is it exactly the needed font? */
+ // Is there is one, and is it exactly
+ // the needed font?
if (found && tmp2->font == font) {
- /* put the position under the font */
+ // Put the position under the font
tmp2->pos_end++;
tmp->pos++;
return;
}
- /* Add a new entry in the
- * fonttable for the position */
+ // Add a new entry in the
+ // fonttable for the position
tmp2 = new FontTable;
tmp2->pos = pos + 1;
tmp2->pos_end = tmp->pos_end;
fonttable = tmp2;
}
else if (pos == tmp->pos_end) {
- /* Add a new entry in the
- * fonttable for the position */
+ // Add a new entry in the
+ // fonttable for the position
tmp2 = new FontTable;
tmp2->pos = tmp->pos;
tmp2->pos_end = tmp->pos_end - 1;
fonttable = tmp2;
}
else {
- /* Add a new entry in the
- * fonttable for the position */
+ // Add a new entry in the
+ // fonttable for the position
tmp2 = new FontTable;
tmp2->pos = tmp->pos;
tmp2->pos_end = pos - 1;
}
-/* this function is able to hide closed footnotes */
+// This function is able to hide closed footnotes.
LyXParagraph * LyXParagraph::Next()
{
if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
footnote in a logical
paragraph */
else
- return next; /* this should never happen! */
- }
- else
+ return next; // This should never happen!
+ } else
return next;
}
return tmp; /* there can be more than one footnote
in a logical paragraph */
else
- return next; /* this should never happen! */
- }
- else
+ return next; // This should never happen!
+ } else
return next;
}
return tmp; /* there can be more than one footnote
in a logical paragraph */
else
- return next; /* this should never happen! */
- }
- else
+ return next; // This should never happen!
+ } else
return next;
}
return tmp; /* there can be more than one footnote
in a logical paragraph */
else
- return previous; /* this should never happen! */
- }
- else
+ return previous; // This should never happen!
+ } else
return previous;
}
return this;
LyXParagraph * tmppar = this;
- while (tmppar && (tmppar->IsDummy()
- || tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE))
+ while (tmppar &&
+ (tmppar->IsDummy()
+ || tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE))
tmppar = tmppar->previous;
- if (!tmppar)
- return this; /* this should never happen! */
- else
+ if (!tmppar) {
+ return this;
+ } else
return tmppar;
}
return this;
LyXParagraph const * tmppar = this;
- while (tmppar && (tmppar->IsDummy()
- || tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE))
+ while (tmppar &&
+ (tmppar->IsDummy()
+ || tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE))
tmppar = tmppar->previous;
- if (!tmppar)
- return this; /* this should never happen! */
- else
+ if (!tmppar) {
+ return this;
+ } else
return tmppar;
}
-/* this function is able to hide closed footnotes */
+// This function is able to hide closed footnotes.
LyXParagraph * LyXParagraph::Previous()
{
LyXParagraph * tmp = previous;
else
return previous;
- }
- else
+ } else
return previous;
}
-/* this function is able to hide closed footnotes */
+// This function is able to hide closed footnotes.
LyXParagraph const * LyXParagraph::Previous() const
{
LyXParagraph * tmp = previous;
else
return previous;
- }
- else
+ } else
return previous;
}
int flag)
{
size_type i, pos_end, pos_first;
- /* create a new paragraph */
+ // create a new paragraph
LyXParagraph * par = ParFromPos(pos);
LyXParagraph * firstpar = FirstPhysicalPar();
LyXParagraph * tmp = new LyXParagraph(par);
-
+
tmp->footnoteflag = footnoteflag;
tmp->footnotekind = footnotekind;
- /* this is an idea for a more userfriendly layout handling, I will
- * see what the users say */
+ // this is an idea for a more userfriendly layout handling, I will
+ // see what the users say
- /* layout stays the same with latex-environments */
+ // layout stays the same with latex-environments
if (flag) {
tmp->SetOnlyLayout(firstpar->layout);
tmp->SetLabelWidthString(firstpar->labelwidthstring);
tmp->depth = firstpar->depth;
tmp->noindent = firstpar->noindent;
- /* copy everything behind the break-position
- to the new paragraph
- */
+ // copy everything behind the break-position
+ // to the new paragraph
pos_first = 0;
while (ParFromPos(pos_first) != par)
- pos_first++;
+ ++pos_first;
pos_end = pos_first + par->text.size() - 1;
- tmp->text.reserve(pos_end - pos);
+ // 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 = pos; i <= pos_end; ++i) {
par->CutIntoMinibuffer(i - pos_first);
tmp->InsertFromMinibuffer(i - pos);
}
-
- for (i = pos_end; i >= pos; i--)
+ tmp->text.resize(tmp->text.size());
+ for (i = pos_end; i >= pos; --i)
par->Erase(i - pos_first);
par->text.resize(par->text.size());
}
- /* just an idea of me */
+ // just an idea of me
if (!pos) {
tmp->line_top = firstpar->line_top;
tmp->pagebreak_top = firstpar->pagebreak_top;
tmp->added_space_top = firstpar->added_space_top;
tmp->bibkey = firstpar->bibkey;
firstpar->Clear();
- /* layout stays the same with latex-environments */
+ // layout stays the same with latex-environments
if (flag) {
firstpar->SetOnlyLayout(tmp->layout);
firstpar->SetLabelWidthString(tmp->labelwidthstring);
tmppar = tmppar->previous;
if (!tmppar)
- return this; /* this should never happen! */
+ return this; // This should never happen!
else
return tmppar;
}
LyXParagraph * LyXParagraph::Clone() const
{
- /* create a new paragraph */
+ // create a new paragraph
LyXParagraph * result = new LyXParagraph;
result->MakeSameLayout(this);
- /* this is because of the dummy layout of the paragraphs that
- follow footnotes */
+ // this is because of the dummy layout of the paragraphs that
+ // follow footnotes
result->layout = layout;
/* table stuff -- begin*/
result->bibkey = (bibkey) ? new InsetBibKey(bibkey): 0;
- /* copy everything behind the break-position to the new paragraph */
+ // copy everything behind the break-position to the new paragraph
- for (size_type i = 0; i < size(); i++) {
+ for (size_type i = 0; i < size(); ++i) {
CopyIntoMinibuffer(i);
result->InsertFromMinibuffer(i);
}
void LyXParagraph::BreakParagraphConservative(LyXParagraph::size_type pos)
{
- size_type i, pos_end, pos_first;
-
- /* create a new paragraph */
+ // create a new paragraph
LyXParagraph * par = ParFromPos(pos);
LyXParagraph * tmp = new LyXParagraph(par);
tmp->MakeSameLayout(par);
-
- if (Last() > pos) {
- /* copy everything behind the break-position to the new
- paragraph */
- pos_first = 0;
+
+ // When can pos < Last()?
+ // I guess pos == Last() is possible.
+ if (Last() > pos) {
+ // copy everything behind the break-position to the new
+ // paragraph
+ size_type pos_first = 0;
while (ParFromPos(pos_first) != par)
- pos_first++;
- pos_end = pos_first + par->text.size() - 1;
- /* make shure 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!!) */
- tmp->text.reserve(pos_end - pos);
-
- for (i = pos; i <= pos_end; i++) {
-
+ ++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) {
par->CutIntoMinibuffer(i - pos_first);
tmp->InsertFromMinibuffer(i - pos);
}
- for (i = pos_end; i >= pos; i--)
+ tmp->text.resize(tmp->text.size());
+ for (size_type i = pos_end; i >= pos; --i)
par->Erase(i - pos_first);
par->text.resize(par->text.size());
}
-/* be carefull, this does not make any check at all */
+// Be carefull, this does not make any check at all.
void LyXParagraph::PasteParagraph()
{
- /* copy the next paragraph to this one */
+ // copy the next paragraph to this one
LyXParagraph * the_next = Next();
LyXParagraph * firstpar = FirstPhysicalPar();
- /* first the DTP-stuff */
+ // first the DTP-stuff
firstpar->line_bottom = the_next->line_bottom;
firstpar->added_space_bottom = the_next->added_space_bottom;
firstpar->pagebreak_bottom = the_next->pagebreak_bottom;
size_type pos_end = the_next->text.size() - 1;
size_type pos_insert = Last();
- size_type i;
- /* ok, now copy the paragraph */
- for (i = 0; i <= pos_end; i++) {
+ // ok, now copy the paragraph
+ for (size_type i = 0; i <= pos_end; ++i) {
the_next->CutIntoMinibuffer(i);
InsertFromMinibuffer(pos_insert + i);
}
- /* delete the next paragraph */
+ // delete the next paragraph
delete the_next;
}
}
-/* the next two functions are for the manual labels */
+// the next two functions are for the manual labels
string LyXParagraph::GetLabelWidthString() const
{
if (!FirstPhysicalPar()->labelwidthstring.empty())
}
-/* if the layout of a paragraph contains a manual label, the beginning of the
-* main body is the beginning of the second word. This is what the par-
-* function returns. If the layout does not contain a label, the main
-* body always starts with position 0. This differentiation is necessary,
-* because there cannot be a newline or a blank <= the beginning of the
-* main body in TeX. */
+// if the layout of a paragraph contains a manual label, the beginning of the
+// main body is the beginning of the second word. This is what the par-
+// function returns. If the layout does not contain a label, the main
+// body always starts with position 0. This differentiation is necessary,
+// because there cannot be a newline or a blank <= the beginning of the
+// main body in TeX.
int LyXParagraph::BeginningOfMainBody() const
{
if (i == 0 && i == size() &&
!(footnoteflag == LyXParagraph::NO_FOOTNOTE
&& next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE))
- i++; /* the cursor should not jump
+ ++i; /* the cursor should not jump
* to the main body if there
* is nothing in! */
return i;
int LyXParagraph::AutoDeleteInsets()
{
-#ifdef NEW_TABLE
+#ifdef NEW_INSETTABLE
+ vector<size_type> tmpvec;
int i = 0;
for (InsetList::iterator it = insetlist.begin();
it != insetlist.end(); ++it) {
- if ((*it).inset->AutoDelete()) {
+ if ((*it).inset && (*it).inset->AutoDelete()) {
+ tmpvec.push_back((*it).pos);
++i;
- Erase((*it).pos);
}
}
+ for (vector<size_type>::const_iterator cit = tmpvec.begin();
+ cit != tmpvec.end(); ++cit) {
+ Erase((*cit));
+ }
return i;
#else
InsetTable * tmpi = insettable;
while (tmpi) {
tmpi2 = tmpi;
tmpi = tmpi->next;
- if (tmpi2->inset)
+ if (tmpi2->inset) {
if (tmpi2->inset->AutoDelete()) {
- i++;
+ ++i;
Erase(tmpi2->pos);
- } else {}
- else
+ }
+ } else {
lyxerr << "ERROR (LyXParagraph::AutoDeleteInsets): "
"cannot auto-delete insets" << endl;
+ }
}
return i;
#endif
Inset * LyXParagraph::ReturnNextInsetPointer(LyXParagraph::size_type & pos)
{
-#ifdef NEW_TABLE
- InsetTable * tmp = 0;
+#ifdef NEW_INSETTABLE
+ InsetList::iterator it2 = insetlist.end();
for (InsetList::iterator it = insetlist.begin();
it != insetlist.end(); ++it) {
- if ((*it).pos >= pos && (!tmp || (*it).pos < tmp->pos)) {
- tmp = &(*it);
+ if ((*it).pos >= pos) {
+ if (it2 == insetlist.end() || (*it).pos < (*it2).pos)
+ it2 = it;
}
}
- if (tmp) {
- pos = tmp->pos;
- return tmp->inset;
+ if (it2 != insetlist.end()) {
+ pos = (*it2).pos;
+ return (*it2).inset;
}
return 0;
-
#else
InsetTable * tmpi = insettable;
InsetTable * tmpi2 = 0;
}
-/* returns -1 if inset not found */
+// returns -1 if inset not found
int LyXParagraph::GetPositionOfInset(Inset * inset) const
{
-#ifdef NEW_TABLE
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).inset == inset) {
- return (*it).pos;
+ // Find the entry.
+#ifdef NEW_INSETTABLE
+ for (InsetList::const_iterator cit = insetlist.begin();
+ cit != insetlist.end(); ++cit) {
+ if ((*cit).inset == inset) {
+ return (*cit).pos;
}
}
- // Think about footnotes
- if (footnoteflag == LyXParagraph::NO_FOOTNOTE
- && next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
- int further = NextAfterFootnote()->GetPositionOfInset(inset);
- if (further != -1)
- return size() + 1 + further;
- }
- return -1;
#else
- /* find the entry */
InsetTable * tmpi = insettable;
while (tmpi && tmpi->inset != inset) {
tmpi = tmpi->next;
}
if (tmpi && tmpi->inset)
return tmpi->pos;
- else{
- /* think about footnotes */
- if (footnoteflag == LyXParagraph::NO_FOOTNOTE
- && next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
- int further =
- NextAfterFootnote()->GetPositionOfInset(inset);
- if (further != -1)
- return text.size() + 1 + further;
- }
- return -1;
- }
#endif
+ // Think about footnotes.
+ if (footnoteflag == LyXParagraph::NO_FOOTNOTE
+ && next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
+ int further =
+ NextAfterFootnote()->GetPositionOfInset(inset);
+ if (further != -1)
+ return text.size() + 1 + further;
+ }
+ return -1;
}
{
lyxerr[Debug::LATEX] << "TeXOnePar... " << this << endl;
LyXParagraph * par = next;
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(),
- layout);
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ layout);
bool further_blank_line = false;
if (IsDummy())
file += ' ';
}
file += "\\par}";
- } else if (textclasslist.Style(GetCurrentTextClass(),
+ } else if (textclasslist.Style(current_view->buffer()->params.textclass,
GetLayout()).isCommand()){
if (style.resfont.size() != font.size()) {
file += '\\';
bool return_value = false;
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(), GetLayout());
+ LyXLayout const & style = textclasslist.Style(current_view->buffer()->params.textclass, GetLayout());
LyXFont basefont;
- /* maybe we have to create a optional argument */
+ // Maybe we have to create a optional argument.
if (style.labeltype != LABEL_MANUAL)
main_body = 0;
else
&& !IsDummy()) {
if (style.isCommand()) {
file += '{';
- column++;
+ ++column;
} else if (align != LYX_ALIGN_LAYOUT) {
file += '{';
- column++;
+ ++column;
return_value = true;
}
}
texrow.start(this, 0);
for (size_type i = 0; i < size(); ++i) {
- column++;
+ ++column;
// First char in paragraph or after label?
if (i == main_body && !IsDummy()) {
if (main_body > 0) {
basefont = getFont(-1); // Now use the layout font
running_font = basefont;
file += ']';
- column++;
+ ++column;
}
if (style.isCommand()) {
file += '{';
- column++;
+ ++column;
} else if (align != LYX_ALIGN_LAYOUT) {
file += "{\\par";
column += 4;
if (open_font && c == ' ' && i <= size() - 2
&& !getFont(i+1).equalExceptLatex(running_font)
&& !getFont(i+1).equalExceptLatex(font)) {
- font = getFont(i+1);
+ font = getFont(i + 1);
}
// We end font definition before blanks
if (!font.equalExceptLatex(running_font) && open_font) {
file += "\\\\\n";
}
texrow.newline();
- texrow.start(this, i+1);
+ texrow.start(this, i + 1);
column = 0;
} else {
SimpleTeXSpecialChars(file, texrow,
running_font.latexWriteEndChanges(file, basefont);
}
- /* needed if there is an optional argument but no contents */
+ // Needed if there is an optional argument but no contents.
if (main_body > 0 && main_body == size()) {
file += "]~";
return_value = false;
bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
{
lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar... " << this << endl;
- char c;
- int tmp;
bool return_value = false;
- int current_cell_number = -1;
LyXLayout const & style =
- textclasslist.Style(GetCurrentTextClass(), GetLayout());
- LyXFont basefont = getFont(-1); // Get layout font
- // Which font is currently active?
- LyXFont running_font = basefont;
- // Do we have an open font change?
- bool open_font = false;
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
int column = 0;
if (!IsDummy()) { // it is dummy if it is in a float!!!
if (style.isCommand()) {
file += '{';
- column++;
+ ++column;
} else if (align != LYX_ALIGN_LAYOUT) {
file += '{';
- column++;
+ ++column;
return_value = true;
}
if (noindent) {
break;
}
}
- current_cell_number = -1;
- tmp = table->TexEndOfCell(file, current_cell_number);
+
+ LyXFont basefont = getFont(-1); // Get layout font
+ // Which font is currently active?
+ LyXFont running_font = basefont;
+ // Do we have an open font change?
+ bool open_font = false;
+ int current_cell_number = -1;
+ int tmp = table->TexEndOfCell(file, current_cell_number);
for (; tmp > 0 ; --tmp)
texrow.newline();
texrow.start(this, 0);
for (size_type i = 0; i < size(); ++i) {
- c = GetChar(i);
- if (table->IsContRow(current_cell_number+1)) {
+ char c = GetChar(i);
+ if (table->IsContRow(current_cell_number + 1)) {
if (c == LyXParagraph::META_NEWLINE)
- current_cell_number++;
+ ++current_cell_number;
continue;
}
++column;
}
basefont = getFont(-1);
running_font = basefont;
- current_cell_number++;
+ ++current_cell_number;
if (table->CellHasContRow(current_cell_number) >= 0) {
- TeXContTableRows(file, i+1,
+ TeXContTableRows(file, i + 1,
current_cell_number,
column, texrow);
}
// put the EndOfCell because it is put after the
// for(...)
if (table->ShouldBeVeryLastCell(current_cell_number)) {
- current_cell_number--;
+ --current_cell_number;
break;
}
int tmp = table->TexEndOfCell(file,
current_cell_number);
- if (tmp>0) {
+ if (tmp > 0) {
column = 0;
} else if (tmp < 0) {
tmp = -tmp;
}
- for (;tmp--;) {
+ for (; tmp--;) {
texrow.newline();
}
- texrow.start(this, i+1);
+ texrow.start(this, i + 1);
} else {
SimpleTeXSpecialChars(file, texrow,
font, running_font, basefont,
if (open_font) {
running_font.latexWriteEndChanges(file, basefont);
}
- current_cell_number++;
+ ++current_cell_number;
tmp = table->TexEndOfCell(file, current_cell_number);
for (; tmp > 0; --tmp)
texrow.newline();
char c;
bool return_value = false;
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(),
- GetLayout());
- LyXFont basefont;
-
- basefont = getFont(-1); // Get layout font
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
+ LyXFont basefont = getFont(-1); // Get layout font
// Which font is currently active?
LyXFont running_font = basefont;
// Do we have an open font change?
for (; (i < size()) && (current_cell_number<cell); ++i) {
c = GetChar(i);
if (c == LyXParagraph::META_NEWLINE)
- current_cell_number++;
+ ++current_cell_number;
}
lastpos = i;
c = GetChar(i);
retval = true;
sgml_string = ' ';
break;
- case '\0': /* Ignore :-) */
+ case '\0': // Ignore :-)
sgml_string.clear();
break;
default:
{
if (!table) return;
lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar... " << this << endl;
- int column;
+ int column = 0;
LyXFont font1, font2;
char c;
Inset * inset;
string emph = "emphasis";
bool emph_flag = false;
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(),
- GetLayout());
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
if (style.labeltype != LABEL_MANUAL)
main_body = 0;
else
main_body = BeginningOfMainBody();
- /* gets paragraph main font */
+ // Gets paragraph main font.
if (main_body > 0)
font1 = style.labelfont;
else
int current_cell_number = -1;
int tmp = table->DocBookEndOfCell(file, current_cell_number, depth);
- /* parsing main loop */
+ // Parsing main loop.
for (size_type i = 0; i < size(); ++i) {
c = GetChar(i);
if (table->IsContRow(current_cell_number+1)) {
// Fully instantiated font
font2 = getFont(i);
- /* handle <emphasis> tag */
+ // Handle <emphasis> tag.
if (font1.emph() != font2.emph() && i) {
if (font2.emph() == LyXFont::ON) {
file += "<emphasis>";
}
}
if (c == LyXParagraph::META_NEWLINE) {
- // we have only to control for emphasis open here!
+ // We have only to control for emphasis open here!
if (emph_flag) {
file += "</emphasis>";
emph_flag= false;
}
font1 = font2 = getFont(-1);
- current_cell_number++;
+ ++current_cell_number;
if (table->CellHasContRow(current_cell_number) >= 0) {
DocBookContTableRows(file, extra, desc_on, i+1,
current_cell_number,
// put the EndOfCell because it is put after the
// for(...)
if (table->ShouldBeVeryLastCell(current_cell_number)) {
- current_cell_number--;
+ --current_cell_number;
break;
}
- tmp= table->DocBookEndOfCell(file, current_cell_number,
- depth);
+ tmp = table->DocBookEndOfCell(file,
+ current_cell_number,
+ depth);
if (tmp > 0)
column = 0;
// "TeX"-Mode on == > SGML-Mode on.
if (c != '\0')
file += c;
- char_line_count++;
+ ++char_line_count;
} else {
string sgml_string;
if (linuxDocConvertChar(c, sgml_string)
// non-breaking characters
// char is ' '
if (desc_on == 1) {
- char_line_count++;
+ ++char_line_count;
file += '\n';
file += "</term><listitem><para>";
desc_on = 2;
font1 = font2;
}
- /* needed if there is an optional argument but no contents */
+ // Needed if there is an optional argument but no contents.
if (main_body > 0 && main_body == size()) {
font1 = style.font;
}
file += "</emphasis>";
}
- current_cell_number++;
+ ++current_cell_number;
tmp = table->DocBookEndOfCell(file, current_cell_number, depth);
- /* resets description flag correctly */
+ // Resets description flag correctly.
switch(desc_on){
case 1:
- /* <term> not closed... */
+ // <term> not closed...
file += "</term>";
break;
}
lyxerr[Debug::LATEX] << "DocBookContTableRows... " << this << endl;
- int cell;
- LyXFont font1, font2;
+ LyXFont font2;
char c;
Inset * inset;
- size_type main_body;
- size_type lastpos;
string emph= "emphasis";
bool emph_flag= false;
int char_line_count= 0;
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(),
- GetLayout());
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
+ size_type main_body;
if (style.labeltype != LABEL_MANUAL)
main_body = 0;
else
main_body = BeginningOfMainBody();
- /* gets paragraph main font */
+ // Gets paragraph main font.
+ LyXFont font1;
if (main_body > 0)
font1 = style.labelfont;
else
font1 = style.font;
- lastpos = i;
- cell = table->CellHasContRow(current_cell_number);
+ size_type lastpos = i;
+ int cell = table->CellHasContRow(current_cell_number);
++current_cell_number;
while(cell >= 0) {
// first find the right position
for (; i < size() && current_cell_number < cell; ++i) {
c = GetChar(i);
if (c == LyXParagraph::META_NEWLINE)
- current_cell_number++;
+ ++current_cell_number;
}
lastpos = i;
c = GetChar(i);
// Fully instantiated font
font2 = getFont(i);
- /* handle <emphasis> tag */
+ // Handle <emphasis> tag.
if (font1.emph() != font2.emph() && i) {
if (font2.emph() == LyXFont::ON) {
file += "<emphasis>";
//
// This code needs some explanation:
// Two insets are treated specially
- // label if it is the first element in a command paragraph
+ // label if it is the first element in a
+ // command paragraph
// desc_on == 3
- // graphics inside tables or figure floats can't go on
- // title (the equivalente in latex for this case is caption
- // and title should come first
+ // graphics inside tables or figure floats
+ // can't go on title (the equivalente in
+ // latex for this case is caption and title
+ // should come first
// desc_on == 4
//
if(desc_on != 3 || i != 0) {
// "TeX"-Mode on == > SGML-Mode on.
if (c!= '\0')
file += c;
- char_line_count++;
+ ++char_line_count;
} else {
string sgml_string;
if (linuxDocConvertChar(c, sgml_string)
&& !style.free_spacing) {
- // in freespacing mode, spaces are
- // non-breaking characters
- // char is ' '
+ // in freespacing mode, spaces are
+ // non-breaking characters
+ // char is ' '
if (desc_on == 1) {
- char_line_count++;
+ ++char_line_count;
file += '\n';
file += "</term><listitem><para>";
desc_on = 2;
} else {
column += file.length() - len;
}
- for (;tmp--;) {
+ for (; tmp--;) {
texrow.newline();
}
}
break;
case ' ':
- /* blanks are printed before font switching */
+ // Blanks are printed before font switching.
// Sure? I am not! (try nice-latex)
// I am sure it's correct. LyX might be smarter
// in the future, but for now, nothing wrong is
default:
/* idea for labels --- begin*/
- /* check for LyX */
+ // Check for "LyX"
if (c == 'L'
&& i <= size() - 3
&& font.family() != LyXFont::TYPEWRITER_FAMILY
i += 2;
column += 5;
}
- /* check for TeX */
+ // Check for "TeX"
else if (c == 'T'
&& i <= size() - 3
&& font.family() != LyXFont::TYPEWRITER_FAMILY
i += 2;
column += 5;
}
- /* check for LaTeX2e */
+ // Check for "LaTeX2e"
else if (c == 'L'
&& i <= size() - 7
&& font.family() != LyXFont::TYPEWRITER_FAMILY
i += 6;
column += 8;
}
- /* check for LaTeX */
+ // Check for "LaTeX"
else if (c == 'L'
&& i <= size() - 5
&& font.family() != LyXFont::TYPEWRITER_FAMILY
while (par && par->depth == depth) {
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXDeeper)" << endl;
- if (textclasslist.Style(GetCurrentTextClass(),
+ if (textclasslist.Style(current_view->buffer()->params.textclass,
par->layout).isEnvironment()
|| par->pextra_type != PEXTRA_NONE)
{
LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
- string & foot, TexRow & foot_texrow,
+ string & foot,
+ TexRow & foot_texrow,
int & foot_count)
{
bool eindent_open = false;
if (IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXEnvironment)" << endl;
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(),
- layout);
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ layout);
if (pextra_type == PEXTRA_INDENT) {
if (!pextra_width.empty()) {
minipage_open = false;
}
if (par && par->depth > depth) {
- if (textclasslist.Style(GetCurrentTextClass(),
+ if (textclasslist.Style(current_view->buffer()->params.textclass,
par->layout).isParagraph()
&& !par->table
&& !suffixIs(file, "\n\n")) {
"No footnote!" << endl;
LyXParagraph * par = this;
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(),
+ LyXLayout const & style = textclasslist.Style(current_view->buffer()->params.textclass,
previous->GetLayout());
if (style.needprotect && footnotekind != LyXParagraph::FOOTNOTE){
// Process text for all floats except footnotes in body
do {
LyXLayout const & style =
- textclasslist.Style(GetCurrentTextClass(),
+ textclasslist.Style(current_view->buffer()->params.textclass,
par->layout);
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
int dummy_count = 0;
do {
LyXLayout const & style =
- textclasslist.Style(GetCurrentTextClass(),
+ textclasslist.Style(current_view->buffer()->params.textclass,
par->layout);
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
pextra_width = width;
pextra_widthp = widthp;
- if (textclasslist.Style(GetCurrentTextClass(),
+ if (textclasslist.Style(current_view->buffer()->params.textclass,
layout).isEnvironment()) {
LyXParagraph
* par = this,
pextra_width.clear();
pextra_widthp.clear();
- if (textclasslist.Style(GetCurrentTextClass(),
+ if (textclasslist.Style(current_view->buffer()->params.textclass,
layout).isEnvironment()) {
LyXParagraph
* par = this,
projects / lyx.git / blobdiff