#include <algorithm>
#include <fstream>
+#include <csignal>
#include "lyxparagraph.h"
#include "support/textutils.h"
#include "lyxrc.h"
#include "layout.h"
#include "tex-strings.h"
+#include "buffer.h"
#include "bufferparams.h"
#include "support/FileInfo.h"
#include "support/LAssert.h"
#include "LaTeXFeatures.h"
#include "insets/insetinclude.h"
#include "insets/insetbib.h"
+#include "insets/insettext.h"
#include "support/filetools.h"
#include "lyx_gui_misc.h"
#include "texrow.h"
#include "support/lyxmanip.h"
+#include "BufferView.h"
+#include "encoding.h"
using std::ostream;
using std::endl;
// this is a bad idea, but how can LyXParagraph find its buffer to get
// parameters? (JMarc)
extern BufferView * current_view;
-
-
-// ale970405
-extern string bibitemWidthest(Painter &);
+extern string bibitemWidest(BufferView *);
// this is a minibuffer
static char minibuffer_char;
itemdepth = 0;
next = 0;
previous = 0;
+#ifndef NEW_INSETS
footnoteflag = LyXParagraph::NO_FOOTNOTE;
footnotekind = LyXParagraph::FOOTNOTE; // should not be needed
-
+#endif
align = LYX_ALIGN_BLOCK;
+#ifndef NEW_TABULAR
/* table stuff -- begin*/
table = 0;
- /* table stuff -- end*/
+ /* table stuff -- end*/
+#endif
inset_owner = 0;
id_ = paragraph_id++;
bibkey = 0; // ale970302
previous = par;
previous->next = this;
// end
+#ifndef NEW_INSETS
footnoteflag = LyXParagraph::NO_FOOTNOTE;
footnotekind = LyXParagraph::FOOTNOTE;
-
+#endif
+#ifndef NEW_TABULAR
/* table stuff -- begin*/
table = 0;
- /* table stuff -- end*/
+ /* table stuff -- end*/
+#endif
inset_owner = 0;
id_ = paragraph_id++;
}
-void LyXParagraph::writeFile(ostream & os, BufferParams const & params,
+void LyXParagraph::writeFile(Buffer const * buf, ostream & os,
+ BufferParams const & params,
char footflag, char dth) const
{
- LyXFont font1, font2;
- int column = 0;
- int h = 0;
- char c = 0;
-
- if (footnoteflag != LyXParagraph::NO_FOOTNOTE
- || !previous
- || previous->footnoteflag == LyXParagraph::NO_FOOTNOTE){
+#ifndef NEW_INSETS
+ if (
+ footnoteflag != LyXParagraph::NO_FOOTNOTE ||
+ !previous
+ || previous->footnoteflag == LyXParagraph::NO_FOOTNOTE
+ ) {
+#endif
+#ifndef NEW_INSETS
// The beginning or the end of a footnote environment?
if (footflag != footnoteflag) {
footflag = footnoteflag;
os << "\n\\end_float ";
}
}
-
+#endif
// The beginning or end of a deeper (i.e. nested) area?
if (dth != depth) {
if (depth > dth) {
// Alignment?
if (align != LYX_ALIGN_LAYOUT) {
+ int h = 0;
switch (align) {
case LYX_ALIGN_LEFT: h = 1; break;
case LYX_ALIGN_RIGHT: h = 2; break;
}
os << '\n';
}
+#ifndef NEW_INSETS
} else {
// Dummy layout. This means that a footnote ended.
os << "\n\\end_float ";
footflag = LyXParagraph::NO_FOOTNOTE;
}
-
+#endif
+#ifndef NEW_TABULAR
// It might be a table.
if (table){
os << "\\LyXTable\n";
table->Write(os);
}
-
+#endif
// bibitem ale970302
if (bibkey)
- bibkey->Write(os);
+ bibkey->Write(buf, os);
- font1 = LyXFont(LyXFont::ALL_INHERIT,params.language_info);
+ LyXFont font1(LyXFont::ALL_INHERIT, params.language_info);
- column = 0;
+ int column = 0;
for (size_type i = 0; i < size(); ++i) {
if (!i) {
os << "\n";
}
// Write font changes
- font2 = GetFontSettings(i);
+ LyXFont font2 = GetFontSettings(params, i);
if (font2 != font1) {
font2.lyxWriteChanges(font1, os);
column = 0;
font1 = font2;
}
- c = GetChar(i);
+ value_type c = GetChar(i);
switch (c) {
case META_INSET:
{
// international char, let it write
// code directly so it's shorter in
// the file
- inset->Write(os);
+ inset->Write(buf, os);
} else {
os << "\n\\begin_inset ";
- inset->Write(os);
+ inset->Write(buf, os);
os << "\n\\end_inset \n\n";
column = 0;
}
break;
}
}
-
+
// now write the next paragraph
if (next)
- next->writeFile(os, params, footflag, dth);
+ next->writeFile(buf, os, params, footflag, dth);
}
void LyXParagraph::validate(LaTeXFeatures & features) const
{
BufferParams const & params = features.bufferParams();
-
+
+#ifndef NEW_INSETS
// this will be useful later
LyXLayout const & layout =
textclasslist.Style(params.textclass,
GetLayout());
+#endif
// check the params.
if (line_top || line_bottom)
<< (*cit).font.stateText(0)
<< endl;
}
-#if 0
+
Language const * language = (*cit).font.language();
if (language != doc_language) {
features.UsedLanguages.insert(language);
lyxerr[Debug::LATEX] << "Found language "
- << language->lang << endl;
+ << language->lang() << endl;
}
-#endif
- }
-
- // This is not efficient. I plan to use the code above, after I
- // change the fontlist handling.
- for (size_type i = 0; i < size(); ++i) {
- Language const * language = GetFontSettings(i).language();
- if (language != doc_language)
- features.UsedLanguages.insert(language);
}
// then the insets
(*cit).inset->Validate(features);
}
+#ifndef NEW_TABULAR
if (table && table->IsLongTable())
features.longtable = true;
+#endif
if (pextra_type == PEXTRA_INDENT)
features.LyXParagraphIndent = true;
if (pextra_type == PEXTRA_FLOATFLT)
features.floatflt = true;
+#ifndef NEW_INSETS
if (layout.needprotect
&& next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
features.NeedLyXFootnoteCode = true;
+#endif
if (params.paragraph_separation == BufferParams::PARSEP_INDENT
&& pextra_type == LyXParagraph::PEXTRA_MINIPAGE)
features.NeedLyXMinipageIndent = true;
+#ifndef NEW_TABULAR
if (table && table->NeedRotating())
features.rotating = true;
+#endif
+#ifndef NEW_INSETS
if (footnoteflag != NO_FOOTNOTE && footnotekind == ALGORITHM)
features.algorithm = true;
+#endif
}
// First few functions needed for cut and paste and paragraph breaking.
-void LyXParagraph::CopyIntoMinibuffer(LyXParagraph::size_type pos) const
+void LyXParagraph::CopyIntoMinibuffer(BufferParams const & bparams,
+ LyXParagraph::size_type pos) const
{
minibuffer_char = GetChar(pos);
- minibuffer_font = GetFontSettings(pos);
+ minibuffer_font = GetFontSettings(bparams, pos);
minibuffer_inset = 0;
if (minibuffer_char == LyXParagraph::META_INSET) {
if (GetInset(pos)) {
}
-void LyXParagraph::CutIntoMinibuffer(LyXParagraph::size_type pos)
+void LyXParagraph::CutIntoMinibuffer(BufferParams const & bparams,
+ LyXParagraph::size_type pos)
{
minibuffer_char = GetChar(pos);
- minibuffer_font = GetFontSettings(pos);
+ minibuffer_font = GetFontSettings(bparams, pos);
minibuffer_inset = 0;
if (minibuffer_char == LyXParagraph::META_INSET) {
if (GetInset(pos)) {
// the inset, not just a clone. Otherwise
// the inset would be deleted when calling Erase(pos)
// find the entry
- InsetList::iterator it = lower_bound(insetlist.begin(),
- insetlist.end(),
- pos, matchIT());
+ InsetTable search_elem(pos, 0);
+ InsetList::iterator it =
+ lower_bound(insetlist.begin(),
+ insetlist.end(),
+ search_elem, matchIT());
if (it != insetlist.end() && (*it).pos == pos)
(*it).inset = 0;
} else {
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);
+ InsertInset(pos, minibuffer_inset, minibuffer_font);
+ else
+ InsertChar(pos, minibuffer_char, minibuffer_font);
return true;
}
it != insetlist.end(); ++it) {
delete (*it).inset;
}
-
+#ifndef NEW_TABULAR
/* table stuff -- begin*/
delete table;
- /* table stuff -- end*/
+ /* table stuff -- end*/
+#endif
// ale970302
delete bibkey;
void LyXParagraph::Erase(LyXParagraph::size_type pos)
{
+#ifndef NEW_INSETS
// > because last is the next unused position, and you can
// use it if you want
if (pos > size()) {
"position does not exist." << endl;
return;
}
+#else
+ Assert(pos < size());
+#endif
+#ifndef NEW_INSETS
if (pos < size()) { // last is free for insertation, but should be empty
+#endif
// if it is an inset, delete the inset entry
if (text[pos] == LyXParagraph::META_INSET) {
// find the entry
- InsetList::iterator it = lower_bound(insetlist.begin(),
- insetlist.end(),
- pos, matchIT());
+ InsetTable search_inset(pos, 0);
+ InsetList::iterator it =
+ lower_bound(insetlist.begin(),
+ insetlist.end(),
+ search_inset, matchIT());
if (it != insetlist.end() && (*it).pos == pos) {
delete (*it).inset;
insetlist.erase(it);
}
}
text.erase(text.begin() + pos);
+
// Erase entries in the tables.
- 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;
- }
+ FontTable search_font(pos, LyXFont());
+
+ FontList::iterator it =
+ lower_bound(fontlist.begin(),
+ fontlist.end(),
+ search_font, matchFT());
+ if (it != fontlist.end() && (*it).pos == pos &&
+ (pos == 0 ||
+ (it != fontlist.begin() && (*(it-1)).pos == pos - 1))) {
+ // If it is a multi-character font
+ // entry, we just make it smaller
+ // (see update below), otherwise we
+ // should delete it.
+ unsigned int i = it - fontlist.begin();
+ fontlist.erase(fontlist.begin() + i);
+ it = fontlist.begin() + i;
+ if (i > 0 && i < fontlist.size() &&
+ fontlist[i-1].font == fontlist[i].font) {
+ fontlist.erase(fontlist.begin() + i-1);
+ it = fontlist.begin() + i-1;
}
}
+
// 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--;
- }
+ FontList::iterator fend = fontlist.end();
+ for (; it != fend; ++it)
+ --(*it).pos;
// Update the inset table.
- for (InsetList::iterator it = upper_bound(insetlist.begin(),
- insetlist.end(),
- pos, matchIT());
- it != insetlist.end(); ++it)
+ InsetTable search_inset(pos, 0);
+ InsetList::iterator lend = insetlist.end();
+ for (InsetList::iterator it =
+ upper_bound(insetlist.begin(),
+ lend,
+ search_inset, matchIT());
+ it != lend; ++it)
--(*it).pos;
+#ifndef NEW_INSETS
} else {
lyxerr << "ERROR (LyXParagraph::Erase): "
"can't erase non-existant char." << endl;
}
+#endif
+}
+
+
+void LyXParagraph::InsertChar(LyXParagraph::size_type pos,
+ LyXParagraph::value_type c)
+{
+ LyXFont f(LyXFont::ALL_INHERIT);
+ InsertChar(pos, c, f);
}
-void LyXParagraph::InsertChar(LyXParagraph::size_type pos, char c)
+void LyXParagraph::InsertChar(LyXParagraph::size_type pos,
+ LyXParagraph::value_type c,
+ LyXFont const & font)
{
+#ifndef NEW_INSETS
// > because last is the next unused position, and you can
// use it if you want
if (pos > size()) {
"position does not exist." << endl;
return;
}
+#else
+ Assert(pos <= size());
+#endif
text.insert(text.begin() + pos, c);
// Update the font table.
- for (FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
- if ((*it).pos >= pos)
- (*it).pos++;
- if ((*it).pos_end >= pos)
- (*it).pos_end++;
- }
+ FontTable search_font(pos, LyXFont());
+ for (FontList::iterator it = lower_bound(fontlist.begin(),
+ fontlist.end(),
+ search_font, matchFT());
+ it != fontlist.end(); ++it)
+ ++(*it).pos;
// Update the inset table.
+ InsetTable search_inset(pos, 0);
for (InsetList::iterator it = lower_bound(insetlist.begin(),
insetlist.end(),
- pos, matchIT());
+ search_inset, matchIT());
it != insetlist.end(); ++it)
++(*it).pos;
+
+ SetFont(pos, font);
}
void LyXParagraph::InsertInset(LyXParagraph::size_type pos,
Inset * inset)
{
+ LyXFont f(LyXFont::ALL_INHERIT);
+ InsertInset(pos, inset, f);
+}
+
+
+void LyXParagraph::InsertInset(LyXParagraph::size_type pos,
+ Inset * inset, LyXFont const & font)
+{
+ Assert(inset);
+
+#ifndef NEW_INSETS
// > 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()
- ->InsertInset(pos - text.size() - 1, inset);
- else
+ ->InsertInset(pos - text.size() - 1,
+ inset, font);
+ else
lyxerr << "ERROR (LyXParagraph::InsertInset): "
"position does not exist: " << pos << endl;
return;
}
- if (text[pos] != LyXParagraph::META_INSET) {
+#else
+ Assert(pos <= size());
+#endif
+
+ InsertChar(pos, META_INSET, font);
+ Assert(text[pos] == META_INSET);
+
+ // Add a new entry in the inset table.
+ InsetTable search_inset(pos, 0);
+ InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ search_inset, matchIT());
+ if (it != insetlist.end() && (*it).pos == pos)
lyxerr << "ERROR (LyXParagraph::InsertInset): "
- "there is no LyXParagraph::META_INSET" << endl;
- return;
- }
-
- if (inset) {
- // Add a new entry in the inset table.
- 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);
- }
+ "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)
{
+ //lyxerr << "LyXParagraph::InsertInsetAllowed" << endl;
+
if (inset_owner)
return inset_owner->InsertInsetAllowed(inset);
return true;
Inset * LyXParagraph::GetInset(LyXParagraph::size_type pos)
{
+#ifndef NEW_INSETS
if (pos >= size()) {
if (next
&& next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
return NextAfterFootnote()
->GetInset(pos - text.size() - 1);
- else {
+ else
lyxerr << "ERROR (LyXParagraph::GetInset): "
"position does not exist: "
<< pos << endl;
- }
+
return 0;
}
+#else
+ Assert(pos < size());
+#endif
// Find the inset.
+ InsetTable search_inset(pos, 0);
InsetList::iterator it = lower_bound(insetlist.begin(),
insetlist.end(),
- pos, matchIT());
+ search_inset, matchIT());
if (it != insetlist.end() && (*it).pos == pos)
return (*it).inset;
lyxerr << "ERROR (LyXParagraph::GetInset): "
"Inset does not exist: " << pos << endl;
+ //::raise(SIGSTOP);
+
// 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)
Inset const * LyXParagraph::GetInset(LyXParagraph::size_type pos) const
{
+#ifndef NEW_INSETS
if (pos >= size()) {
if (next
&& next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
return NextAfterFootnote()
->GetInset(pos - text.size() - 1);
- else {
+ else
lyxerr << "ERROR (LyXParagraph::GetInset): "
"position does not exist: "
<< pos << endl;
- }
+
return 0;
}
+#else
+ Assert(pos < size());
+#endif
// Find the inset.
+ InsetTable search_inset(pos, 0);
InsetList::const_iterator cit = lower_bound(insetlist.begin(),
insetlist.end(),
- pos, matchIT());
+ search_inset, matchIT());
if (cit != insetlist.end() && (*cit).pos == pos)
return (*cit).inset;
lyxerr << "ERROR (LyXParagraph::GetInset): "
"Inset does not exist: " << pos << endl;
+ //::raise(SIGSTOP);
//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)
// Gets uninstantiated font setting at position.
// Optimized after profiling. (Asger)
-LyXFont LyXParagraph::GetFontSettings(LyXParagraph::size_type pos) const
+LyXFont LyXParagraph::GetFontSettings(BufferParams const & bparams,
+ LyXParagraph::size_type pos) const
{
+#ifdef NEW_INSETS
+ Assert(pos <= size());
+#endif
+#ifndef NEW_INSETS
if (pos < size()) {
-#ifdef SORTED_FONT_LIST
- for (FontList::const_iterator cit = fontlist.begin();
- 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
+ FontTable search_font(pos, LyXFont());
+ FontList::const_iterator cit = lower_bound(fontlist.begin(),
+ fontlist.end(),
+ search_font, matchFT());
+ if (cit != fontlist.end())
+ return (*cit).font;
+#ifndef NEW_INSETS
}
+#endif
+#ifndef NEW_INSETS
// > 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)
return NextAfterFootnote()
- ->GetFontSettings(pos - text.size() - 1);
- else {
+ ->GetFontSettings(bparams,
+ pos - text.size() - 1);
+ 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 enabled on debug?
"position does not exist. "
<< pos << " (" << static_cast<int>(pos)
<< ")" << endl;
- }
- } else if (pos > 0) {
- return GetFontSettings(pos - 1);
- } else // pos = size() = 0
- return LyXFont(LyXFont::ALL_INHERIT,getParLanguage());
+ }
+ else if (pos > 0) {
+ return GetFontSettings(bparams, pos - 1);
+ }
+#else
+ if (pos == size() && size())
+ return GetFontSettings(bparams, pos - 1);
+#endif
+ //else
+ // pos = size() = 0
+ return LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams));
- return LyXFont(LyXFont::ALL_INHERIT);
+ //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)
+ if (!fontlist.empty())
+ return fontlist[0].font;
+ }
+
+#ifndef NEW_INSETS
+ else if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
return NextAfterFootnote()->GetFirstFontSettings();
+#endif
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.
// The difference is that this one is used for generating the LaTeX file,
// the true picture of the buffer. (Asger)
// 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 LyXParagraph::getFont(LyXParagraph::size_type pos) const
+LyXFont LyXParagraph::getFont(BufferParams const & bparams,
+ LyXParagraph::size_type pos) const
{
LyXFont tmpfont;
LyXLayout const & layout =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
LyXParagraph::size_type main_body = 0;
if (layout.labeltype == LABEL_MANUAL)
main_body = BeginningOfMainBody();
- if (pos >= 0){
+ if (pos >= 0) {
LyXFont layoutfont;
if (pos < main_body)
layoutfont = layout.labelfont;
else
layoutfont = layout.font;
- tmpfont = GetFontSettings(pos);
+ tmpfont = GetFontSettings(bparams, pos);
tmpfont.realize(layoutfont);
} else {
// process layoutfont for pos == -1 and labelfont for pos < -1
tmpfont = layout.font;
else
tmpfont = layout.labelfont;
- tmpfont.setLanguage(getParLanguage());
+ tmpfont.setLanguage(getParLanguage(bparams));
}
// check for environment font information
par = par->DepthHook(par_depth - 1);
if (par) {
tmpfont.realize(textclasslist.
- Style(current_view->buffer()->params.textclass,
+ Style(bparams.textclass,
par->GetLayout()).font);
par_depth = par->GetDepth();
}
}
tmpfont.realize(textclasslist
- .TextClass(current_view->buffer()->params.textclass)
+ .TextClass(bparams.textclass)
.defaultfont());
return tmpfont;
}
LyXParagraph::size_type endpos) const
{
LyXFont::FONT_SIZE maxsize = LyXFont::SIZE_TINY;
- 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)
- maxsize = size;
- }
+ if (fontlist.empty())
+ return maxsize;
+
+ FontTable end_search(endpos, LyXFont());
+ FontList::const_iterator end_it = lower_bound(fontlist.begin(),
+ fontlist.end(),
+ end_search, matchFT());
+ if (end_it != fontlist.end())
+ ++end_it;
+
+ FontTable start_search(startpos, LyXFont());
+ for (FontList::const_iterator cit =
+ lower_bound(fontlist.begin(),
+ fontlist.end(),
+ start_search, matchFT());
+ cit != end_it; ++cit) {
+ LyXFont::FONT_SIZE size = (*cit).font.size();
+ if (size > maxsize && size <= LyXFont::SIZE_HUGER)
+ maxsize = size;
}
return maxsize;
}
-char LyXParagraph::GetChar(LyXParagraph::size_type pos)
-{
- Assert(pos >= 0);
-
- if (pos < size()) {
- return text[pos];
- }
- // > 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): "
- "position does not exist."
- << pos << " (" << static_cast<int>(pos)
- << ")\n";
- // Assert(false); // This triggers sometimes...
- // Why?
- }
- return '\0';
- } else {
- // 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)
- //lyxerr << "ERROR (LyXParagraph::GetChar): "
- // "expected footnote." << endl;
- return '\0';
- }
- switch (next->footnotekind) {
- case LyXParagraph::FOOTNOTE:
- return LyXParagraph::META_FOOTNOTE;
- case LyXParagraph::MARGIN:
- return LyXParagraph::META_MARGIN;
- case LyXParagraph::FIG:
- case LyXParagraph::WIDE_FIG:
- return LyXParagraph::META_FIG;
- case LyXParagraph::TAB:
- case LyXParagraph::WIDE_TAB:
- return LyXParagraph::META_TAB;
- case LyXParagraph::ALGORITHM:
- return LyXParagraph::META_ALGORITHM;
- }
- return '\0'; // to shut up gcc
- }
-}
-
-
-char LyXParagraph::GetChar(LyXParagraph::size_type pos) const
+LyXParagraph::value_type
+LyXParagraph::GetChar(LyXParagraph::size_type pos) const
{
+#ifndef NEW_INSETS
Assert(pos >= 0);
+#else
+ Assert(pos <= size());
+ if (!size() || pos == size()) return '\0';
+#endif
+#ifndef NEW_INSETS
if (pos < size()) {
+#endif
return text[pos];
+#ifndef NEW_INSETS
}
+#endif
+#ifndef NEW_INSETS
// > 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 {
+ else
+ {
lyxerr << "ERROR (LyXParagraph::GetChar const): "
"position does not exist."
<< pos << " (" << static_cast<int>(pos)
}
return '\0'; // to shut up gcc
}
+#endif
}
// return an string of the current word, and the end of the word in lastpos.
string LyXParagraph::GetWord(LyXParagraph::size_type & lastpos) const
{
- Assert(lastpos>=0);
+ Assert(lastpos >= 0);
// the current word is defined as starting at the first character
// from the immediate left of lastpospos which meets the definition
}
-
+
+#ifdef NEW_INSETS
+#warning Remember to get rid of this one. (Lgb)
+#endif
LyXParagraph::size_type LyXParagraph::Last() const
{
+#ifndef NEW_INSETS
if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
return text.size() + NextAfterFootnote()->Last() + 1;
// the 1 is the symbol
// for the footnote
else
+#endif
return text.size();
}
+#ifndef NEW_INSETS
LyXParagraph * LyXParagraph::ParFromPos(LyXParagraph::size_type pos)
{
// > because last is the next unused position, and you can
&& next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
return NextAfterFootnote()
->ParFromPos(pos - text.size() - 1);
- else
+ else
lyxerr << "ERROR (LyXParagraph::ParFromPos): "
"position does not exist." << endl;
return this;
} else
return this;
}
+#endif
+#ifndef NEW_INSETS
int LyXParagraph::PositionInParFromPos(LyXParagraph::size_type pos) const
{
// > because last is the next unused position, and you can
&& next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
return NextAfterFootnote()
->PositionInParFromPos(pos - text.size() - 1);
- else
+ else
lyxerr <<
"ERROR (LyXParagraph::PositionInParFromPos): "
"position does not exist." << endl;
else
return pos;
}
+#endif
void LyXParagraph::SetFont(LyXParagraph::size_type pos,
LyXFont const & font)
{
+#ifndef NEW_INSETS
// > because last is the next unused position, and you can
// use it if you want
if (pos > size()) {
next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
NextAfterFootnote()->SetFont(pos - text.size() - 1,
font);
- } else {
+ } else
lyxerr << "ERROR (LyXParagraph::SetFont): "
"position does not exist." << endl;
- }
+
return;
}
- LyXFont patternfont(LyXFont::ALL_INHERIT);
+#else
+ Assert(pos <= size());
+#endif
// First, reduce font against layout/label font
// Update: The SetCharFont() routine in text2.C already
// No need to simplify this because it will disappear
// in a new kernel. (Asger)
// Next search font table
- FontList::iterator tmp = fontlist.begin();
- for (; tmp != fontlist.end(); ++tmp) {
- if (pos >= (*tmp).pos && pos <= (*tmp).pos_end) {
- break;
- }
- }
- 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;
+ FontTable search_font(pos, LyXFont());
+ FontList::iterator it = lower_bound(fontlist.begin(),
+ fontlist.end(),
+ search_font, matchFT());
+ unsigned int i = it - fontlist.begin();
+ bool notfound = it == fontlist.end();
+
+ if (!notfound && fontlist[i].font == font)
+ return;
+
+ bool begin = pos == 0 || notfound ||
+ (i > 0 && fontlist[i-1].pos == pos - 1);
+ // Is position pos is a beginning of a font block?
+ bool end = !notfound && fontlist[i].pos == pos;
+ // Is position pos is the end of a font block?
+ if (begin && end) { // A single char block
+ if (i+1 < fontlist.size() &&
+ fontlist[i+1].font == font) {
+ // Merge the singleton block with the next block
+ fontlist.erase(fontlist.begin() + i);
+ if (i > 0 && fontlist[i-1].font == font)
+ fontlist.erase(fontlist.begin() + i-1);
+ } else if (i > 0 && fontlist[i-1].font == font) {
+ // Merge the singleton block with the previous block
+ fontlist[i-1].pos = pos;
+ fontlist.erase(fontlist.begin() + i);
+ } else
+ fontlist[i].font = font;
+ } else if (begin) {
+ if (i > 0 && fontlist[i-1].font == font)
+ fontlist[i-1].pos = pos;
+ else
+ fontlist.insert(fontlist.begin() + i,
+ FontTable(pos, font));
+ } else if (end) {
+ fontlist[i].pos = pos - 1;
+ if (!(i+1 < fontlist.size() &&
+ fontlist[i+1].font == font))
+ fontlist.insert(fontlist.begin() + i+1,
+ FontTable(pos, font));
+ } else { // The general case. The block is splitted into 3 blocks
+ fontlist.insert(fontlist.begin() + i,
+ FontTable(pos - 1, fontlist[i].font));
+ fontlist.insert(fontlist.begin() + i+1, FontTable(pos, font));
}
}
// This function is able to hide closed footnotes.
LyXParagraph * LyXParagraph::Next()
{
+#ifndef NEW_INSETS
if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
LyXParagraph * tmp = next;
while (tmp
else
return next; // This should never happen!
} else
+#endif
return next;
}
+#ifndef NEW_INSETS
LyXParagraph * LyXParagraph::NextAfterFootnote()
{
if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
} else
return next;
}
+#endif
+#ifndef NEW_INSETS
LyXParagraph const * LyXParagraph::NextAfterFootnote() const
{
if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
} else
return next;
}
+#endif
+#ifndef NEW_INSETS
LyXParagraph * LyXParagraph::PreviousBeforeFootnote()
{
LyXParagraph * tmp;
} else
return previous;
}
+#endif
+#ifndef NEW_INSETS
LyXParagraph * LyXParagraph::LastPhysicalPar()
{
if (footnoteflag != LyXParagraph::NO_FOOTNOTE)
return tmp;
}
+#endif
+
+#ifndef NEW_INSETS
LyXParagraph const * LyXParagraph::LastPhysicalPar() const
{
if (footnoteflag != LyXParagraph::NO_FOOTNOTE)
&& tmp->next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
tmp = tmp->NextAfterFootnote();
- return tmp;
+ return tmp;
}
+#endif
+
+#ifndef NEW_INSETS
LyXParagraph * LyXParagraph::FirstPhysicalPar()
{
if (!IsDummy())
} else
return tmppar;
}
+#endif
+#ifndef NEW_INSETS
LyXParagraph const * LyXParagraph::FirstPhysicalPar() const
{
if (!IsDummy())
} else
return tmppar;
}
+#endif
// This function is able to hide closed footnotes.
LyXParagraph * LyXParagraph::Previous()
{
+#ifndef NEW_INSETS
LyXParagraph * tmp = previous;
if (!tmp)
return tmp;
-
+
if (tmp->previous
&& tmp->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
tmp = tmp->previous;
else
return previous;
} else
+#endif
return previous;
}
// This function is able to hide closed footnotes.
LyXParagraph const * LyXParagraph::Previous() const
{
+#ifndef NEW_INSETS
LyXParagraph * tmp = previous;
if (!tmp)
return tmp;
-
if (tmp->previous
&& tmp->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
tmp = tmp->previous;
else
return previous;
} else
+#endif
return previous;
}
-void LyXParagraph::BreakParagraph(LyXParagraph::size_type pos,
+void LyXParagraph::BreakParagraph(BufferParams const & bparams,
+ LyXParagraph::size_type pos,
int flag)
{
- size_type i, j, pos_end, pos_first;
+ size_type i;
+ size_type j;
// create a new paragraph
+#ifndef NEW_INSETS
+ size_type pos_end;
+ size_type pos_first;
LyXParagraph * par = ParFromPos(pos);
LyXParagraph * firstpar = FirstPhysicalPar();
LyXParagraph * tmp = new LyXParagraph(par);
-
+#else
+ //LyXParagraph * par = this;
+ //LyXParagraph * firstpar = this;
+ LyXParagraph * tmp = new LyXParagraph(this);
+#endif
+
+#ifndef NEW_INSETS
tmp->footnoteflag = footnoteflag;
tmp->footnotekind = footnotekind;
-
+#endif
// this is an idea for a more userfriendly layout handling, I will
// see what the users say
-
+
+#ifndef NEW_INSETS
// layout stays the same with latex-environments
if (flag) {
- tmp->SetOnlyLayout(firstpar->layout);
+ tmp->SetOnlyLayout(bparams, firstpar->layout);
tmp->SetLabelWidthString(firstpar->labelwidthstring);
}
-
+#else
+ // layout stays the same with latex-environments
+ if (flag) {
+ tmp->SetOnlyLayout(bparams, layout);
+ tmp->SetLabelWidthString(labelwidthstring);
+ }
+#endif
+#ifndef NEW_INSETS
if (Last() > pos || !Last() || flag == 2) {
- tmp->SetOnlyLayout(firstpar->layout);
+ tmp->SetOnlyLayout(bparams, firstpar->layout);
tmp->align = firstpar->align;
tmp->SetLabelWidthString(firstpar->labelwidthstring);
tmp->depth = firstpar->depth;
tmp->noindent = firstpar->noindent;
-
+#else
+ if (Last() > pos || !Last() || flag == 2) {
+ tmp->SetOnlyLayout(bparams, layout);
+ tmp->align = align;
+ tmp->SetLabelWidthString(labelwidthstring);
+
+ tmp->line_bottom = line_bottom;
+ line_bottom = false;
+ tmp->pagebreak_bottom = pagebreak_bottom;
+ pagebreak_bottom = false;
+ tmp->added_space_bottom = added_space_bottom;
+ added_space_bottom = VSpace(VSpace::NONE);
+
+ tmp->depth = depth;
+ tmp->noindent = noindent;
+#endif
// copy everything behind the break-position
// to the new paragraph
+#ifndef NEW_INSETS
pos_first = 0;
while (ParFromPos(pos_first) != par)
++pos_first;
-
pos_end = pos_first + par->text.size() - 1;
+
for (i = j = pos; i <= pos_end; ++i) {
- par->CutIntoMinibuffer(i - pos_first);
+ par->CutIntoMinibuffer(bparams, i - pos_first);
if (tmp->InsertFromMinibuffer(j - pos))
++j;
}
par->Erase(i - pos_first);
par->text.resize(par->text.size());
+#else
+ size_type pos_end = text.size() - 1;
+
+ for (i = j = pos; i <= pos_end; ++i) {
+ CutIntoMinibuffer(bparams, i);
+ if (tmp->InsertFromMinibuffer(j - pos))
+ ++j;
+ }
+ tmp->fitToSize();
+ for (i = pos_end; i >= pos; --i)
+ Erase(i);
+
+ fitToSize();
+#endif
}
+#ifndef NEW_INSETS
// just an idea of me
if (!pos) {
tmp->line_top = firstpar->line_top;
firstpar->Clear();
// layout stays the same with latex-environments
if (flag) {
- firstpar->SetOnlyLayout(tmp->layout);
+ firstpar->SetOnlyLayout(bparams, tmp->layout);
firstpar->SetLabelWidthString(tmp->labelwidthstring);
firstpar->depth = tmp->depth;
}
}
+#else
+ // just an idea of me
+ if (!pos) {
+ tmp->line_top = line_top;
+ tmp->pagebreak_top = pagebreak_top;
+ tmp->added_space_top = added_space_top;
+ tmp->bibkey = bibkey;
+ Clear();
+ // layout stays the same with latex-environments
+ if (flag) {
+ SetOnlyLayout(bparams, tmp->layout);
+ SetLabelWidthString(tmp->labelwidthstring);
+ depth = tmp->depth;
+ }
+ }
+#endif
}
void LyXParagraph::MakeSameLayout(LyXParagraph const * par)
{
+#ifndef NEW_INSETS
par = par->FirstPhysicalPar();
footnoteflag = par->footnoteflag;
footnotekind = par->footnotekind;
-
+#endif
layout = par->layout;
align = par-> align;
SetLabelWidthString(par->labelwidthstring);
}
+#ifndef NEW_INSETS
LyXParagraph * LyXParagraph::FirstSelfrowPar()
{
LyXParagraph * tmppar = this;
else
return tmppar;
}
+#endif
+
int LyXParagraph::StripLeadingSpaces(LyXTextClassList::size_type tclass)
{
return 0;
int i = 0;
- if (!IsDummy() && !table){
+ if (
+#ifndef NEW_INSETS
+ !IsDummy() &&
+#endif
+#ifndef NEW_TABULAR
+ !table
+#else
+ true
+#endif
+ ){
while (Last()
&& (IsNewline(0) || IsLineSeparator(0))){
Erase(0);
// this is because of the dummy layout of the paragraphs that
// follow footnotes
result->layout = layout;
-
+
+#ifndef NEW_TABULAR
/* table stuff -- begin*/
if (table)
result->table = table->Clone();
else
result->table = 0;
/* table stuff -- end*/
-
+#endif
result->inset_owner = inset_owner;
// ale970302
- result->bibkey = (bibkey) ? new InsetBibKey(bibkey): 0;
-
+ if (bibkey)
+ result->bibkey = static_cast<InsetBibKey *>(bibkey->Clone());
+ else
+ result->bibkey = 0;
// copy everything behind the break-position to the new paragraph
bool LyXParagraph::HasSameLayout(LyXParagraph const * par) const
{
+#ifndef NEW_INSETS
par = par->FirstPhysicalPar();
+#endif
return (
+#ifndef NEW_INSETS
par->footnoteflag == footnoteflag &&
par->footnotekind == footnotekind &&
-
+#endif
par->layout == layout &&
par->align == align &&
par->pextra_alignment == pextra_alignment &&
par->pextra_hfill == pextra_hfill &&
par->pextra_start_minipage == pextra_start_minipage &&
-
- par->table == table && // what means: NO TABLE AT ALL
+#ifndef NEW_TABULAR
+ par->table == table && // what means: NO TABLE AT ALL
+#endif
par->noindent == noindent &&
par->depth == depth);
}
-void LyXParagraph::BreakParagraphConservative(LyXParagraph::size_type pos)
+void LyXParagraph::BreakParagraphConservative(BufferParams const & bparams,
+ LyXParagraph::size_type pos)
{
+#ifndef NEW_INSETS
// create a new paragraph
LyXParagraph * par = ParFromPos(pos);
size_type i, j;
for (i = j = pos; i <= pos_end; ++i) {
- par->CutIntoMinibuffer(i - pos_first);
+ par->CutIntoMinibuffer(bparams, i - pos_first);
if (tmp->InsertFromMinibuffer(j - pos))
++j;
}
par->text.resize(par->text.size());
}
+#else
+ // create a new paragraph
+ LyXParagraph * tmp = new LyXParagraph(this);
+ tmp->MakeSameLayout(this);
+
+ // 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_end = text.size() - 1;
+
+ size_type i, j;
+ for (i = j = pos; i <= pos_end; ++i) {
+ CutIntoMinibuffer(bparams, i);
+ if (tmp->InsertFromMinibuffer(j - pos))
+ ++j;
+ }
+
+ tmp->fitToSize();
+
+ for (size_type i = pos_end; i >= pos; --i)
+ Erase(i);
+
+ fitToSize();
+ }
+#endif
}
// Be carefull, this does not make any check at all.
-void LyXParagraph::PasteParagraph()
+// This method has wrong name, it combined this par with the next par.
+// In that sense it is the reverse of break paragraph. (Lgb)
+void LyXParagraph::PasteParagraph(BufferParams const & bparams)
{
// copy the next paragraph to this one
LyXParagraph * the_next = Next();
-
+#ifndef NEW_INSETS
LyXParagraph * firstpar = FirstPhysicalPar();
+#endif
// first the DTP-stuff
+#ifndef NEW_INSETS
firstpar->line_bottom = the_next->line_bottom;
firstpar->added_space_bottom = the_next->added_space_bottom;
firstpar->pagebreak_bottom = the_next->pagebreak_bottom;
+#else
+ line_bottom = the_next->line_bottom;
+ added_space_bottom = the_next->added_space_bottom;
+ pagebreak_bottom = the_next->pagebreak_bottom;
+#endif
size_type pos_end = the_next->text.size() - 1;
size_type pos_insert = Last();
// ok, now copy the paragraph
size_type i, j;
for (i = j = 0; i <= pos_end; ++i) {
- the_next->CutIntoMinibuffer(i);
+ the_next->CutIntoMinibuffer(bparams, i);
if (InsertFromMinibuffer(pos_insert + j))
++j;
}
// delete the next paragraph
- LyXParagraph *ppar = the_next->previous;
- LyXParagraph *npar = the_next->next;
+ LyXParagraph * ppar = the_next->previous;
+ LyXParagraph * npar = the_next->next;
delete the_next;
ppar->next = npar;
}
+#ifndef NEW_INSETS
void LyXParagraph::OpenFootnote(LyXParagraph::size_type pos)
{
LyXParagraph * par = ParFromPos(pos);
par = par->next;
}
}
+#endif
-int LyXParagraph::GetEndLabel() const
+
+int LyXParagraph::GetEndLabel(BufferParams const & bparams) const
{
LyXParagraph const * par = this;
int par_depth = GetDepth();
while (par) {
LyXTextClass::LayoutList::size_type layout = par->GetLayout();
int endlabeltype =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
layout).endlabeltype;
if (endlabeltype != END_LABEL_NO_LABEL) {
LyXParagraph const * last = this;
+#ifndef NEW_INSETS
if( footnoteflag == NO_FOOTNOTE)
last = LastPhysicalPar();
else if (next->footnoteflag == NO_FOOTNOTE)
return endlabeltype;
+#else
+ last = this;
+#endif
if (!last || !last->next)
return endlabeltype;
LyXTextClass::size_type LyXParagraph::GetLayout() const
{
+#ifndef NEW_INSETS
return FirstPhysicalPar()->layout;
+#else
+ return layout;
+#endif
}
char LyXParagraph::GetDepth() const
{
+#ifndef NEW_INSETS
return FirstPhysicalPar()->depth;
+#else
+ return depth;
+#endif
}
char LyXParagraph::GetAlign() const
{
+#ifndef NEW_INSETS
return FirstPhysicalPar()->align;
+#else
+ return align;
+#endif
}
-string LyXParagraph::GetLabelstring() const
+string const & LyXParagraph::GetLabelstring() const
{
+#ifndef NEW_INSETS
return FirstPhysicalPar()->labelstring;
+#else
+ return labelstring;
+#endif
}
int LyXParagraph::GetFirstCounter(int i) const
{
+#ifndef NEW_INSETS
return FirstPhysicalPar()->counter_[i];
+#else
+ return counter_[i];
+#endif
}
// the next two functions are for the manual labels
string LyXParagraph::GetLabelWidthString() const
{
+#ifndef NEW_INSETS
if (!FirstPhysicalPar()->labelwidthstring.empty())
return FirstPhysicalPar()->labelwidthstring;
+#else
+ if (!labelwidthstring.empty())
+ return labelwidthstring;
+#endif
else
return _("Senseless with this layout!");
}
void LyXParagraph::SetLabelWidthString(string const & s)
{
+#ifndef NEW_INSETS
LyXParagraph * par = FirstPhysicalPar();
par->labelwidthstring = s;
+#else
+ labelwidthstring = s;
+#endif
}
-void LyXParagraph::SetOnlyLayout(LyXTextClass::size_type new_layout)
+void LyXParagraph::SetOnlyLayout(BufferParams const & bparams,
+ LyXTextClass::size_type new_layout)
{
+#ifndef NEW_INSETS
LyXParagraph * par = FirstPhysicalPar();
+#else
+ LyXParagraph * par = this;
+#endif
LyXParagraph * ppar = 0;
LyXParagraph * npar = 0;
par->layout = new_layout;
+#ifndef NEW_TABULAR
/* table stuff -- begin*/
if (table)
par->layout = 0;
- /* table stuff -- end*/
+ /* table stuff -- end*/
+#endif
if (par->pextra_type == PEXTRA_NONE) {
if (par->Previous()) {
+#ifndef NEW_INSETS
ppar = par->Previous()->FirstPhysicalPar();
+#else
+ ppar = par->Previous();
+#endif
while(ppar
&& ppar->Previous()
&& (ppar->depth > par->depth))
+#ifndef NEW_INSETS
ppar = ppar->Previous()->FirstPhysicalPar();
+#else
+ ppar = ppar->Previous();
+#endif
}
if (par->Next()) {
+#ifndef NEW_INSETS
npar = par->Next()->NextAfterFootnote();
+#else
+ npar = par->Next();
+#endif
while(npar
&& npar->Next()
&& (npar->depth > par->depth))
+#ifndef NEW_INSETS
npar = npar->Next()->NextAfterFootnote();
+#else
+ npar = npar->Next();
+#endif
}
if (ppar && (ppar->pextra_type != PEXTRA_NONE)) {
string
p1 = ppar->pextra_width,
p2 = ppar->pextra_widthp;
- ppar->SetPExtraType(ppar->pextra_type,
+ ppar->SetPExtraType(bparams, ppar->pextra_type,
p1.c_str(), p2.c_str());
}
if ((par->pextra_type == PEXTRA_NONE) &&
string
p1 = npar->pextra_width,
p2 = npar->pextra_widthp;
- npar->SetPExtraType(npar->pextra_type,
+ npar->SetPExtraType(bparams, npar->pextra_type,
p1.c_str(), p2.c_str());
}
}
}
-void LyXParagraph::SetLayout(LyXTextClass::size_type new_layout)
+void LyXParagraph::SetLayout(BufferParams const & bparams,
+ LyXTextClass::size_type new_layout)
{
LyXParagraph
+#ifndef NEW_INSETS
* par = FirstPhysicalPar(),
+#else
+ * par = this,
+#endif
* ppar = 0,
* npar = 0;
par->added_space_top = VSpace(VSpace::NONE);
par->added_space_bottom = VSpace(VSpace::NONE);
par->spacing.set(Spacing::Default);
-
+
+#ifndef NEW_TABULAR
/* table stuff -- begin*/
if (table)
par->layout = 0;
/* table stuff -- end*/
+#endif
if (par->pextra_type == PEXTRA_NONE) {
if (par->Previous()) {
+#ifndef NEW_INSETS
ppar = par->Previous()->FirstPhysicalPar();
+#else
+ ppar = par->Previous();
+#endif
while(ppar
&& ppar->Previous()
&& (ppar->depth > par->depth))
+#ifndef NEW_INSETS
ppar = ppar->Previous()->FirstPhysicalPar();
+#else
+ ppar = ppar->Previous();
+#endif
}
if (par->Next()) {
+#ifndef NEW_INSETS
npar = par->Next()->NextAfterFootnote();
+#else
+ npar = par->Next();
+#endif
while(npar
&& npar->Next()
&& (npar->depth > par->depth))
+#ifndef NEW_INSETS
npar = npar->Next()->NextAfterFootnote();
+#else
+ npar = npar->Next();
+#endif
}
if (ppar && (ppar->pextra_type != PEXTRA_NONE)) {
string
p1 = ppar->pextra_width,
p2 = ppar->pextra_widthp;
- ppar->SetPExtraType(ppar->pextra_type,
+ ppar->SetPExtraType(bparams, ppar->pextra_type,
p1.c_str(), p2.c_str());
}
if ((par->pextra_type == PEXTRA_NONE) &&
string
p1 = npar->pextra_width,
p2 = npar->pextra_widthp;
- npar->SetPExtraType(npar->pextra_type,
+ npar->SetPExtraType(bparams, npar->pextra_type,
p1.c_str(), p2.c_str());
}
}
int LyXParagraph::BeginningOfMainBody() const
{
+#ifndef NEW_INSETS
if (FirstPhysicalPar() != this)
return -1;
-
+#endif
// Unroll the first two cycles of the loop
// and remember the previous character to
// remove unnecessary GetChar() calls
}
}
+#ifndef NEW_INSETS
if (i == 0 && i == size() &&
!(footnoteflag == LyXParagraph::NO_FOOTNOTE
&& next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE))
++i; /* the cursor should not jump
* to the main body if there
* is nothing in! */
+#endif
return i;
}
return 0;
do {
+#ifndef NEW_INSETS
newpar = newpar->FirstPhysicalPar()->Previous();
+#else
+ newpar = newpar->Previous();
+#endif
} while (newpar && newpar->GetDepth() > deth
- && newpar->footnoteflag == footnoteflag);
+#ifndef NEW_INSETS
+ && newpar->footnoteflag == footnoteflag
+#endif
+ );
if (!newpar) {
if (Previous() || GetDepth())
"no hook." << endl;
newpar = this;
}
+#ifndef NEW_INSETS
return newpar->FirstPhysicalPar();
+#else
+ return newpar;
+#endif
}
return 0;
do {
+#ifndef NEW_INSETS
newpar = newpar->FirstPhysicalPar()->Previous();
+#else
+ newpar = newpar->Previous();
+#endif
} while (newpar && newpar->GetDepth() > deth
- && newpar->footnoteflag == footnoteflag);
+#ifndef NEW_INSETS
+ && newpar->footnoteflag == footnoteflag
+#endif
+ );
if (!newpar) {
if (Previous() || GetDepth())
"no hook." << endl;
newpar = this;
}
+#ifndef NEW_INSETS
return newpar->FirstPhysicalPar();
+#else
+ return newpar;
+#endif
}
}
-LyXParagraph::inset_iterator LyXParagraph::InsetIterator(LyXParagraph::size_type pos)
+LyXParagraph::inset_iterator
+LyXParagraph::InsetIterator(LyXParagraph::size_type pos)
{
+ InsetTable search_inset(pos, 0);
InsetList::iterator it = lower_bound(insetlist.begin(),
insetlist.end(),
- pos, matchIT());
+ search_inset, matchIT());
return inset_iterator(it);
}
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) {
return (*cit).pos;
}
}
+#ifndef NEW_INSETS
// Think about footnotes.
if (footnoteflag == LyXParagraph::NO_FOOTNOTE
&& next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
if (further != -1)
return text.size() + 1 + further;
}
+#endif
return -1;
}
-LyXParagraph * LyXParagraph::TeXOnePar(ostream & os, TexRow & texrow,
- bool moving_arg,
+LyXParagraph * LyXParagraph::TeXOnePar(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow,
+ bool moving_arg
+#ifndef NEW_INSETS
+ ,
ostream & foot,
TexRow & foot_texrow,
- int & foot_count)
+ int & foot_count
+#endif
+ )
{
lyxerr[Debug::LATEX] << "TeXOnePar... " << this << endl;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
layout);
bool further_blank_line = false;
+#ifndef NEW_INSETS
if (IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXOnePar) is dummy." << endl;
+#endif
if (start_of_appendix) {
os << "\\appendix\n";
further_blank_line = true;
}
if (added_space_top.kind() != VSpace::NONE) {
- os << added_space_top.asLatexCommand(current_view->buffer()->params);
+ os << added_space_top.asLatexCommand(bparams);
further_blank_line = true;
}
if (line_top) {
- os << "\\lyxline{\\" << getFont(0).latexSize() << '}'
+ os << "\\lyxline{\\" << getFont(bparams, 0).latexSize() << '}'
<< "\\vspace{-1\\parskip}";
further_blank_line = true;
}
texrow.newline();
}
- Language const * language = getParLanguage();
- Language const * doc_language = current_view->buffer()->params.language_info;
- if (language != doc_language &&
- (!previous || previous->getParLanguage() != language)) {
+ Language const * language = getParLanguage(bparams);
+ Language const * doc_language = bparams.language_info;
+ Language const * previous_language = previous
+ ? previous->getParLanguage(bparams) : doc_language;
+ if (language != doc_language && language != previous_language) {
os << subst(lyxrc.language_command_begin, "$$lang",
- language->lang)
+ language->lang())
<< endl;
texrow.newline();
}
+
+ if (bparams.inputenc == "auto" &&
+ language->encoding() != previous_language->encoding()) {
+ os << "\\inputencoding{"
+ << language->encoding()->LatexName()
+ << "}" << endl;
+ texrow.newline();
+ }
switch (style.latextype) {
case LATEX_COMMAND:
break;
case LATEX_ITEM_ENVIRONMENT:
if (bibkey) {
- bibkey->Latex(os, false, false);
+ bibkey->Latex(buf, os, false, false);
} else
os << "\\item ";
break;
break;
}
- bool need_par = SimpleTeXOnePar(os, texrow, moving_arg);
+ bool need_par = SimpleTeXOnePar(buf, bparams, os, texrow, moving_arg);
- // Spit out footnotes
LyXParagraph * par = next;
+#ifndef NEW_INSETS
+ // Spit out footnotes
if (lyxrc.rtl_support) {
if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE
&& next->footnoteflag != footnoteflag) {
LyXParagraph * p = 0;
bool is_rtl = (size() > 0)
- ? GetFontSettings(size()-1).isRightToLeft()
- : language->RightToLeft;
+ ? GetFontSettings(bparams,
+ size()-1).isRightToLeft()
+ : language->RightToLeft();
if ( (p = NextAfterFootnote()) != 0 &&
p->size() > 0 &&
- p->GetFontSettings(0).isRightToLeft() != is_rtl)
- is_rtl = getParLanguage()->RightToLeft;
+ p->GetFontSettings(bparams, 0).isRightToLeft() != is_rtl)
+ is_rtl = getParLanguage(bparams)->RightToLeft();
while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE
&& par->footnoteflag != footnoteflag) {
- par = par->TeXFootnote(os, texrow, foot,
+ par = par->TeXFootnote(buf, bparams,
+ os, texrow, foot,
foot_texrow, foot_count,
is_rtl);
- par->SimpleTeXOnePar(os, texrow, moving_arg);
+ par->SimpleTeXOnePar(buf, bparams,
+ os, texrow, moving_arg);
is_rtl = (par->size() > 0)
- ? par->GetFontSettings(par->size()-1).isRightToLeft()
- : language->RightToLeft;
+ ? par->GetFontSettings(bparams,
+ par->size()-1).isRightToLeft()
+ : language->RightToLeft();
if (par->next &&
par->next->footnoteflag != LyXParagraph::NO_FOOTNOTE &&
(p = par->NextAfterFootnote()) != 0 &&
p->size() > 0 &&
- p->GetFontSettings(0).isRightToLeft() != is_rtl)
- is_rtl = language->RightToLeft;
+ p->GetFontSettings(bparams, 0).isRightToLeft() != is_rtl)
+ is_rtl = language->RightToLeft();
par = par->next;
}
}
} else {
while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE
&& par->footnoteflag != footnoteflag) {
- par = par->TeXFootnote(os, texrow,
+ par = par->TeXFootnote(buf, bparams,
+ os, texrow,
foot, foot_texrow, foot_count,
false);
- par->SimpleTeXOnePar(os, texrow, moving_arg);
+ par->SimpleTeXOnePar(buf, bparams, os, texrow, moving_arg);
par = par->next;
}
}
+#endif
// Make sure that \\par is done with the font of the last
// character if this has another size as the default.
// This is necessary because LaTeX (and LyX on the screen)
// calculates the space between the baselines according
// to this font. (Matthias)
- LyXFont font = getFont(Last() - 1);
+ LyXFont font = getFont(bparams, Last() - 1);
if (need_par) {
if (style.resfont.size() != font.size()) {
os << '\\'
<< ' ';
}
os << "\\par}";
- } else if (textclasslist.Style(current_view->buffer()->params.textclass,
- GetLayout()).isCommand()){
+ } else if (textclasslist.Style(bparams.textclass,
+ GetLayout()).isCommand()) {
if (style.resfont.size() != font.size()) {
os << '\\'
<< font.latexSize()
if (language != doc_language &&
(!par
+#ifndef NEW_INSETS
|| (footnoteflag != NO_FOOTNOTE && par->footnoteflag != footnoteflag)
- || par->getParLanguage() != language)) {
+#endif
+ || par->getParLanguage(bparams) != language)) {
os << endl
<< subst(lyxrc.language_command_end, "$$lang",
- doc_language->lang);
+ doc_language->lang());
}
switch (style.latextype) {
break;
default:
// we don't need it for the last paragraph!!!
- if (next && !(footnoteflag != LyXParagraph::NO_FOOTNOTE
+ if (next
+#ifndef NEW_INSETS
+ && !( footnoteflag != LyXParagraph::NO_FOOTNOTE
&& footnotekind != LyXParagraph::FOOTNOTE
- && footnotekind != LyXParagraph::MARGIN
- && (table
+ && footnotekind != LyXParagraph::MARGIN)
+#endif
+#ifndef NEW_TABULAR
+ && !(table
|| (par
- && par->table)))) {
+ && par->table))
+#endif
+ ) {
// don't insert this if we would be adding it
// before or after a table in a float. This
// little trick is needed in order to allow
further_blank_line = false;
if (line_bottom) {
- os << "\\lyxline{\\" << getFont(Last() - 1).latexSize() << '}';
+ os << "\\lyxline{\\" << getFont(bparams, Last() - 1).latexSize() << '}';
further_blank_line = true;
}
if (added_space_bottom.kind() != VSpace::NONE) {
- os << added_space_bottom.asLatexCommand(current_view->buffer()->params);
+ os << added_space_bottom.asLatexCommand(bparams);
further_blank_line = true;
}
}
// we don't need it for the last paragraph!!!
- if (next && !(footnoteflag != LyXParagraph::NO_FOOTNOTE && par &&
- par->footnoteflag == LyXParagraph::NO_FOOTNOTE)) {
+ if (next
+#ifndef NEW_INSETS
+ && !(footnoteflag != LyXParagraph::NO_FOOTNOTE && par &&
+ par->footnoteflag == LyXParagraph::NO_FOOTNOTE)
+#endif
+ ) {
os << '\n';
texrow.newline();
}
// This one spits out the text of the paragraph
-bool LyXParagraph::SimpleTeXOnePar(ostream & os, TexRow & texrow,
+bool LyXParagraph::SimpleTeXOnePar(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow,
bool moving_arg)
{
lyxerr[Debug::LATEX] << "SimpleTeXOnePar... " << this << endl;
+#ifndef NEW_TABULAR
if (table)
- return SimpleTeXOneTablePar(os, texrow);
+ return SimpleTeXOneTablePar(buf, bparams, os, texrow);
+#endif
bool return_value = false;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
LyXFont basefont, last_font;
if (main_body > 0) {
os << '[';
- basefont = getFont(-2); // Get label font
+ basefont = getFont(bparams, -2); // Get label font
} else {
- basefont = getFont(-1); // Get layout font
+ basefont = getFont(bparams, -1); // Get layout font
}
int column = 0;
if (main_body >= 0
&& !text.size()
- && !IsDummy()) {
+#ifndef NEW_INSETS
+ && !IsDummy()
+#endif
+ ) {
if (style.isCommand()) {
os << '{';
++column;
for (size_type i = 0; i < size(); ++i) {
++column;
// First char in paragraph or after label?
- if (i == main_body && !IsDummy()) {
+ if (i == main_body
+#ifndef NEW_INSETS
+ && !IsDummy()
+#endif
+ ) {
if (main_body > 0) {
if (open_font) {
column += running_font.latexWriteEndChanges(os, basefont, basefont);
open_font = false;
}
- basefont = getFont(-1); // Now use the layout font
+ basefont = getFont(bparams, -1); // Now use the layout font
running_font = basefont;
os << ']';
++column;
case LYX_ALIGN_SPECIAL:
break;
case LYX_ALIGN_LEFT:
- if (getParLanguage()->lang != "hebrew") {
+ if (getParLanguage(bparams)->lang() != "hebrew") {
os << "\\raggedright ";
column+= 13;
} else {
}
break;
case LYX_ALIGN_RIGHT:
- if (getParLanguage()->lang != "hebrew") {
+ if (getParLanguage(bparams)->lang() != "hebrew") {
os << "\\raggedleft ";
column+= 12;
} else {
}
}
- int c = GetChar(i);
+ value_type c = GetChar(i);
// Fully instantiated font
- LyXFont font = getFont(i);
+ LyXFont font = getFont(bparams, i);
+#ifndef NEW_INSETS
LyXParagraph * p = 0;
- if (i == 0 && previous &&
+ if (i == 0
+ && previous &&
previous->footnoteflag != LyXParagraph::NO_FOOTNOTE &&
(p = PreviousBeforeFootnote()) != 0)
- last_font = p->getFont(p->size()-1);
+ last_font = p->getFont(bparams, p->size() - 1);
else
+#endif
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(i+1).equalExceptLatex(running_font)
- && !getFont(i+1).equalExceptLatex(font)) {
- font = getFont(i + 1);
+ && !getFont(bparams, i + 1).equalExceptLatex(running_font)
+ && !getFont(bparams, i + 1).equalExceptLatex(font)) {
+ font = getFont(bparams, i + 1);
}
// We end font definition before blanks
if (!font.equalExceptLatex(running_font) && open_font) {
}
// Blanks are printed before start of fontswitch
- if (c == ' '){
+ if (c == ' ') {
// Do not print the separation of the optional argument
if (i != main_body - 1) {
SimpleTeXBlanks(os, texrow, i,
column += running_font.latexWriteEndChanges(os, basefont, basefont);
open_font = false;
}
- basefont = getFont(-1);
+ basefont = getFont(bparams, -1);
running_font = basefont;
if (font.family() ==
LyXFont::TYPEWRITER_FAMILY) {
texrow.start(this, i + 1);
column = 0;
} else {
- SimpleTeXSpecialChars(os, texrow, moving_arg,
+ SimpleTeXSpecialChars(buf, bparams,
+ os, texrow, moving_arg,
font, running_font, basefont,
open_font, style, i, column, c);
}
// If we have an open font definition, we have to close it
if (open_font) {
LyXParagraph * p = 0;
- if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE
- && (p = NextAfterFootnote()) != 0)
+ if (next
+#ifndef NEW_INSETS
+ && next->footnoteflag != LyXParagraph::NO_FOOTNOTE
+ && (p = NextAfterFootnote()) != 0
+#else
+ && (p = next)
+#endif
+ )
running_font.latexWriteEndChanges(os, basefont,
- p->getFont(0));
+ p->getFont(bparams, 0));
else
running_font.latexWriteEndChanges(os, basefont, basefont);
}
}
+#ifndef NEW_TABULAR
// This one spits out the text of a table paragraph
-bool LyXParagraph::SimpleTeXOneTablePar(ostream & os, TexRow & texrow)
+bool LyXParagraph::SimpleTeXOneTablePar(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow)
{
lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar... " << this << endl;
bool return_value = false;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
- GetLayout());
+ textclasslist.Style(bparams.textclass, GetLayout());
int column = 0;
+#ifndef NEW_INSETS
if (!IsDummy()) { // it is dummy if it is in a float!!!
+#endif
if (style.isCommand()) {
os << '{';
++column;
column+= 11;
break;
}
+#ifndef NEW_INSETS
}
+#endif
- LyXFont basefont = getFont(-1); // Get layout font
+ LyXFont basefont = getFont(bparams, -1); // Get layout font
// Which font is currently active?
LyXFont running_font = basefont;
LyXFont last_font;
texrow.start(this, 0);
- bool is_rtl = getParLanguage()->RightToLeft;
+ bool is_rtl = getParLanguage(bparams)->RightToLeft();
bool first_in_cell = true;
for (size_type i = 0; i < size(); ++i) {
- char c = GetChar(i);
+ value_type c = GetChar(i);
if (table->IsContRow(current_cell_number + 1)) {
if (c == LyXParagraph::META_NEWLINE)
++current_cell_number;
}
// Fully instantiated font
- LyXFont font = getFont(i);
+ LyXFont font = getFont(bparams, i);
last_font = running_font;
// Spaces at end of font change are simulated to be
// i.e. we write "\textXX{text} " rather than
// "\textXX{text }". (Asger)
if (open_font && c == ' ' && i <= size() - 2
- && getFont(i + 1) != running_font
- && getFont(i + 1) != font) {
- font = getFont(i + 1);
+ && getFont(bparams, i + 1) != running_font
+ && getFont(bparams, i + 1) != font) {
+ font = getFont(bparams, i + 1);
}
// We end font definition before blanks
open_font = false;
}
// Blanks are printed before start of fontswitch
- if (c == ' '){
+ if (c == ' ') {
SimpleTeXBlanks(os, texrow, i, column, font, style);
}
// Do we need to change font?
basefont);
open_font = false;
}
- basefont = getFont(-1);
+ basefont = getFont(bparams, -1);
running_font = basefont;
++current_cell_number;
if (table->CellHasContRow(current_cell_number) >= 0) {
- TeXContTableRows(os, i + 1,
+ TeXContTableRows(buf, bparams, os, i + 1,
current_cell_number,
column, texrow);
}
}
texrow.start(this, i + 1);
} else {
- SimpleTeXSpecialChars(os, texrow, false,
+ SimpleTeXSpecialChars(buf, bparams,
+ os, texrow, false,
font, running_font, basefont,
open_font, style, i, column, c);
}
lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...done " << this << endl;
return return_value;
}
+#endif
+#ifndef NEW_TABULAR
// This one spits out the text off ContRows in tables
-bool LyXParagraph::TeXContTableRows(ostream & os,
+bool LyXParagraph::TeXContTableRows(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os,
LyXParagraph::size_type i,
int current_cell_number,
int & column, TexRow & texrow)
if (!table)
return false;
- char c;
-
bool return_value = false;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
- LyXFont basefont = getFont(-1); // Get layout font
+ LyXFont basefont = getFont(bparams, -1); // Get layout font
LyXFont last_font;
// Which font is currently active?
LyXFont running_font = basefont;
size_type lastpos = i;
int cell = table->CellHasContRow(current_cell_number);
++current_cell_number;
+ value_type c;
while(cell >= 0) {
// first find the right position
i = lastpos;
- for (; (i < size()) && (current_cell_number<cell); ++i) {
+ for (; (i < size()) && (current_cell_number < cell); ++i) {
c = GetChar(i);
if (c == LyXParagraph::META_NEWLINE)
++current_cell_number;
++column;
// Fully instantiated font
- LyXFont font = getFont(i);
+ LyXFont font = getFont(bparams, i);
last_font = running_font;
// Spaces at end of font change are simulated to
// "\textXX{text} " rather than "\textXX{text }".
// (Asger)
if (open_font && c == ' ' && i <= size() - 2
- && getFont(i + 1) != running_font
- && getFont(i + 1) != font) {
- font = getFont(i + 1);
+ && getFont(bparams, i + 1) != running_font
+ && getFont(bparams, i + 1) != font) {
+ font = getFont(bparams, i + 1);
}
// We end font definition before blanks
column += 9;
}
}
- SimpleTeXSpecialChars(os, texrow, false, font,
+ SimpleTeXSpecialChars(buf, bparams,
+ os, texrow, false, font,
running_font, basefont,
open_font, style, i, column, c);
}
basefont);
open_font = false;
}
- basefont = getFont(-1);
+ basefont = getFont(bparams, -1);
running_font = basefont;
cell = table->CellHasContRow(current_cell_number);
}
lyxerr[Debug::LATEX] << "TeXContTableRows...done " << this << endl;
return return_value;
}
+#endif
bool LyXParagraph::linuxDocConvertChar(char c, string & sgml_string)
}
-void LyXParagraph::SimpleDocBookOneTablePar(ostream & os, string & extra,
+#ifndef NEW_TABULAR
+void LyXParagraph::SimpleDocBookOneTablePar(Buffer const * buffer,
+ ostream & os, string & extra,
int & desc_on, int depth)
{
+ BufferParams const & bparams = buffer->params;
if (!table) return;
lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar... " << this << endl;
int column = 0;
bool emph_flag = false;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
if (style.labeltype != LABEL_MANUAL)
int char_line_count = depth;
os << newlineAndDepth(depth);
+#ifndef NEW_INSETS
if (footnoteflag == LyXParagraph::NO_FOOTNOTE) {
os << "<INFORMALTABLE>"
<< newlineAndDepth(++depth);
}
+#else
+ os << "<INFORMALTABLE>"
+ << newlineAndDepth(++depth);
+#endif
int current_cell_number = -1;
int tmp = table->DocBookEndOfCell(os, current_cell_number, depth);
++column;
// Fully instantiated font
- font2 = getFont(i);
+ font2 = getFont(bparams, i);
// Handle <emphasis> tag.
if (font1.emph() != font2.emph() && i) {
os << "</emphasis>";
emph_flag= false;
}
- font1 = font2 = getFont(-1);
+ font1 = font2 = getFont(bparams, -1);
++current_cell_number;
if (table->CellHasContRow(current_cell_number) >= 0) {
- DocBookContTableRows(os, extra, desc_on, i + 1,
+ DocBookContTableRows(buffer,
+ os, extra, desc_on, i + 1,
current_cell_number,
column);
}
inset = GetInset(i);
#ifdef HAVE_SSTREAM
std::ostringstream ost;
- inset->DocBook(ost);
+ inset->DocBook(buffer, ost);
string tmp_out = ost.str().c_str();
#else
ostrstream ost;
- inset->DocBook(ost);
+ inset->DocBook(buffer, ost);
ost << '\0';
char * ctmp = ost.str();
string tmp_out(ctmp);
os << "</term>";
break;
}
+#ifndef NEW_INSETS
if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
+#endif
os << "</INFORMALTABLE>";
os << '\n';
lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar...done "
<< this << endl;
}
+#endif
-void LyXParagraph::DocBookContTableRows(ostream & os, string & extra,
+#ifndef NEW_TABULAR
+void LyXParagraph::DocBookContTableRows(Buffer const * buffer,
+ ostream & os, string & extra,
int & desc_on,
LyXParagraph::size_type i,
int current_cell_number, int &column)
{
if (!table) return;
+
+ BufferParams const & bparams = buffer->params;
lyxerr[Debug::LATEX] << "DocBookContTableRows... " << this << endl;
int char_line_count = 0;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
size_type main_body;
++column;
// Fully instantiated font
- font2 = getFont(i);
+ font2 = getFont(bparams, i);
// Handle <emphasis> tag.
if (font1.emph() != font2.emph() && i) {
inset = GetInset(i);
#ifdef HAVE_SSTREAM
std::ostringstream ost;
- inset->DocBook(ost);
+ inset->DocBook(buffer, ost);
string tmp_out = ost.str().c_str();
#else
ostrstream ost;
- inset->DocBook(ost);
+ inset->DocBook(buffer, ost);
ost << '\0';
char * ctmp = ost.str();
string tmp_out(ctmp);
os << "</emphasis>";
emph_flag= false;
}
- font1 = font2 = getFont(-1);
+ font1 = font2 = getFont(bparams, -1);
cell = table->CellHasContRow(current_cell_number);
}
lyxerr[Debug::LATEX] << "DocBookContTableRows...done " << this << endl;
}
+#endif
void LyXParagraph::SimpleTeXBlanks(ostream & os, TexRow & texrow,
}
-void LyXParagraph::SimpleTeXSpecialChars(ostream & os, TexRow & texrow,
+void LyXParagraph::SimpleTeXSpecialChars(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow,
bool moving_arg,
LyXFont & font,
LyXFont & running_font,
bool & open_font,
LyXLayout const & style,
LyXParagraph::size_type & i,
- int & column, char const c)
+ int & column,
+ LyXParagraph::value_type const c)
{
// Two major modes: LaTeX or plain
// Handle here those cases common to both modes
close = true;
}
- int tmp = inset->Latex(os, moving_arg,
+ int tmp = inset->Latex(buf, os, moving_arg,
style.free_spacing);
if (close)
basefont);
open_font = false;
}
- basefont = getFont(-1);
+ basefont = getFont(bparams, -1);
running_font = basefont;
break;
case '°': case '±': case '²': case '³':
case '×': case '÷': case '¹': case 'ª':
case 'º': case '¬': case 'µ':
- if (current_view->buffer()->params.inputenc == "latin1") {
+ if (bparams.inputenc == "latin1" ||
+ (bparams.inputenc == "auto" &&
+ font.language()->encoding()->LatexName()
+ == "latin1")) {
os << "\\ensuremath{"
<< c
<< '}';
//... but we should avoid ligatures
if ((c == '>' || c == '<')
&& i <= size() - 2
- && GetChar(i + 1) == c){
- os << "\\textcompwordmark{}";
+ && GetChar(i + 1) == c) {
+ //os << "\\textcompwordmark{}";
+ // Jean-Marc, have a look at
+ // this. IÂ think this works
+ // equally well:
+ os << "\\,{}";
+ // Lgb
column += 19;
}
break;
break;
case '£':
- if (current_view->buffer()->params.inputenc == "default") {
+ if (bparams.inputenc == "default") {
os << "\\pounds{}";
column += 8;
} else {
}
-#if 0
-bool LyXParagraph::RoffContTableRows(ostream & os,
- LyXParagraph::size_type i,
- int actcell)
-{
- if (!table)
- return false;
-
- LyXFont font1(LyXFont::ALL_INHERIT);
- LyXFont font2;
- Inset * inset;
- char c;
-
- string fname2 = TmpFileName(string(), "RAT2");
- int lastpos = i;
- int cell = table->CellHasContRow(actcell);
- ++actcell;
- while(cell >= 0) {
- // first find the right position
- i = lastpos;
- for (; i < size() && actcell < cell; ++i) {
- c = GetChar(i);
- if (c == LyXParagraph::META_NEWLINE)
- ++actcell;
- }
- lastpos = i;
- c = GetChar(i);
- if ((c != ' ') && (c != LyXParagraph::META_NEWLINE))
- os << " ";
- for (; i < size()
- && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
- ++i) {
- font2 = GetFontSettings(i);
- if (font1.latex() != font2.latex()) {
- if (font2.latex() != LyXFont::OFF)
- continue;
- }
- c = GetChar(i);
- switch (c) {
- case LyXParagraph::META_INSET:
- if ((inset = GetInset(i))) {
-#ifdef HAVE_SSTREAM
- stringstream ss(ios::in | ios::out);
- inset->Ascii(ss);
- ss.seekp(0);
- ss.get(c);
- while (!ss) {
- if (c == '\\')
- os << "\\\\";
- else
- os << c;
- ss.get(c);
- }
-#else
- strstream ss;
- inset->Ascii(ss);
- ss.seekp(0);
- ss.get(c);
- while (!ss) {
- if (c == '\\')
- os << "\\\\";
- else
- os << c;
- ss.get(c);
- }
- delete [] ss.str();
-#endif
- }
- break;
- case LyXParagraph::META_NEWLINE:
- break;
- case LyXParagraph::META_HFILL:
- break;
- case '\\':
- os << "\\\\";
- break;
- default:
- if (c != '\0')
- os << c;
- else
- lyxerr.debug() << "RoffAsciiTable: "
- "NULL char in structure."
- << endl;
- break;
- }
- }
- cell = table->CellHasContRow(actcell);
- }
- return true;
-}
-#endif
-
-
-LyXParagraph * LyXParagraph::TeXDeeper(ostream & os, TexRow & texrow,
- ostream & foot,
+LyXParagraph * LyXParagraph::TeXDeeper(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow
+#ifndef NEW_INSETS
+ ,ostream & foot,
TexRow & foot_texrow,
- int & foot_count)
+ int & foot_count
+#endif
+ )
{
lyxerr[Debug::LATEX] << "TeXDeeper... " << this << endl;
LyXParagraph * par = this;
while (par &&
- (par->depth == depth) &&
- (par->footnoteflag == footnoteflag)) {
+ (par->depth == depth)
+#ifndef NEW_INSETS
+ && (par->footnoteflag == footnoteflag)
+#endif
+ ) {
+#ifndef NEW_INSETS
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXDeeper)" << endl;
- if (textclasslist.Style(current_view->buffer()->params.textclass,
+#endif
+ if (textclasslist.Style(bparams.textclass,
par->layout).isEnvironment()
|| par->pextra_type != PEXTRA_NONE) {
- par = par->TeXEnvironment(os, texrow,
- foot, foot_texrow,
- foot_count);
+ par = par->TeXEnvironment(buf, bparams,
+ os, texrow
+#ifndef NEW_INSETS
+ ,foot, foot_texrow,
+ foot_count
+#endif
+ );
} else {
- par = par->TeXOnePar(os, texrow, false,
+ par = par->TeXOnePar(buf, bparams,
+ os, texrow, false
+#ifndef NEW_INSETS
+ ,
foot, foot_texrow,
- foot_count);
+ foot_count
+#endif
+ );
}
}
lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
}
-LyXParagraph * LyXParagraph::TeXEnvironment(ostream & os, TexRow & texrow,
- ostream & foot,
+LyXParagraph * LyXParagraph::TeXEnvironment(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow
+#ifndef NEW_INSETS
+ ,ostream & foot,
TexRow & foot_texrow,
- int & foot_count)
+ int & foot_count
+#endif
+ )
{
bool eindent_open = false;
+#ifndef NEW_INSETS
bool foot_this_level = false;
+#endif
// flags when footnotetext should be appended to file.
static bool minipage_open = false;
static int minipage_open_depth = 0;
- char par_sep = current_view->buffer()->params.paragraph_separation;
+ char par_sep = bparams.paragraph_separation;
lyxerr[Debug::LATEX] << "TeXEnvironment... " << this << endl;
+#ifndef NEW_INSETS
if (IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXEnvironment)" << endl;
+#endif
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
layout);
if (pextra_type == PEXTRA_INDENT) {
} else if (style.labeltype == LABEL_BIBLIO) {
// ale970405
os << "\\begin{" << style.latexname() << "}{"
- << bibitemWidthest(current_view->painter())
+ << bibitemWidest(current_view)
<< "}\n";
} else if (style.latextype == LATEX_ITEM_ENVIRONMENT) {
#ifdef FANCY_FOOTNOTE_CODE
}
LyXParagraph * par = this;
do {
- par = par->TeXOnePar(os, texrow, false,
- foot, foot_texrow, foot_count);
+ par = par->TeXOnePar(buf, bparams,
+ os, texrow, false
+#ifndef NEW_INSETS
+ ,
+ foot, foot_texrow, foot_count
+#endif
+ );
if (minipage_open && par && !style.isEnvironment() &&
(par->pextra_type == PEXTRA_MINIPAGE) &&
minipage_open = false;
}
if (par && par->depth > depth) {
- if (textclasslist.Style(current_view->buffer()->params.textclass,
+ if (textclasslist.Style(bparams.textclass,
par->layout).isParagraph()
+#ifndef NEW_TABULAR
&& !par->table
+#endif
// Thinko!
// How to handle this? (Lgb)
//&& !suffixIs(os, "\n\n")
os << '\n';
texrow.newline();
}
- par = par->TeXDeeper(os, texrow,
- foot, foot_texrow, foot_count);
+ par = par->TeXDeeper(buf, bparams, os, texrow
+#ifndef NEW_INSETS
+ ,foot, foot_texrow, foot_count
+#endif
+ );
}
if (par && par->layout == layout && par->depth == depth &&
(par->pextra_type == PEXTRA_MINIPAGE) && !minipage_open) {
&& par->layout == layout
&& par->depth == depth
&& par->pextra_type == pextra_type
- && par->footnoteflag == footnoteflag);
+#ifndef NEW_INSETS
+ && par->footnoteflag == footnoteflag
+#endif
+ );
if (style.isEnvironment()) {
os << "\\end{" << style.latexname() << '}';
+#ifndef NEW_INSETS
// maybe this should go after the minipage closes?
if (foot_this_level) {
if (foot_count >= 1) {
foot_count = 0;
}
}
+#endif
}
if (minipage_open && (minipage_open_depth == depth) &&
(!par || par->pextra_start_minipage ||
}
-LyXParagraph * LyXParagraph::TeXFootnote(ostream & os, TexRow & texrow,
+#ifndef NEW_INSETS
+LyXParagraph * LyXParagraph::TeXFootnote(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow,
ostream & foot, TexRow & foot_texrow,
int & foot_count,
bool parent_is_rtl)
LyXParagraph * par = this;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
previous->GetLayout());
if (style.needprotect && footnotekind != LyXParagraph::FOOTNOTE){
bool moving_arg = false;
bool need_closing = false;
- bool is_rtl = isRightToLeftPar();
+ bool is_rtl = isRightToLeftPar(bparams);
if (is_rtl != parent_is_rtl) {
if (is_rtl)
need_closing = true;
}
- BufferParams * params = ¤t_view->buffer()->params;
+ //BufferParams * params = ¤t_view->buffer()->params;
bool footer_in_body = true;
switch (footnotekind) {
case LyXParagraph::FOOTNOTE:
<< "\\textwidth}\n";
} else {
os << "\\begin{figure}";
- if (!params->float_placement.empty()) {
- os << '[' << params->float_placement << "]\n";
+ if (!bparams.float_placement.empty()) {
+ os << '[' << bparams.float_placement << "]\n";
} else {
os << '\n';
}
break;
case LyXParagraph::TAB:
os << "\\begin{table}";
- if (!params->float_placement.empty()) {
- os << '[' << params->float_placement << "]\n";
+ if (!bparams.float_placement.empty()) {
+ os << '[' << bparams.float_placement << "]\n";
} else {
os << '\n';
}
break;
case LyXParagraph::WIDE_FIG:
os << "\\begin{figure*}";
- if (!params->float_placement.empty()) {
- os << '[' << params->float_placement << "]\n";
+ if (!bparams.float_placement.empty()) {
+ os << '[' << bparams.float_placement << "]\n";
} else {
os << '\n';
}
break;
case LyXParagraph::WIDE_TAB:
os << "\\begin{table*}";
- if (!params->float_placement.empty()) {
- os << '[' << params->float_placement << "]\n";
+ if (!bparams.float_placement.empty()) {
+ os << '[' << bparams.float_placement << "]\n";
} else {
os << '\n';
}
do {
LyXLayout const & style =
textclasslist
- .Style(current_view->buffer()->params
- .textclass,
- par->layout);
+ .Style(bparams.textclass, par->layout);
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
<< endl;
// environments. Shouldn't be circular because
// we don't support footnotes inside
// floats (yet). ARRae
- par = par->TeXEnvironment(os, texrow,
+ par = par->TeXEnvironment(buf, bparams, os,
+ texrow,
foot, foot_texrow,
foot_count);
} else {
- par = par->TeXOnePar(os, texrow, moving_arg,
+ par = par->TeXOnePar(buf, bparams,
+ os, texrow, moving_arg,
foot, foot_texrow,
foot_count);
}
if (par && !par->IsDummy() && par->depth > depth) {
- par = par->TeXDeeper(os, texrow,
+ par = par->TeXDeeper(buf, bparams, os, texrow,
foot, foot_texrow,
foot_count);
}
do {
LyXLayout const & style =
textclasslist
- .Style(current_view->buffer()->params
- .textclass,
- par->layout);
+ .Style(bparams.textclass, par->layout);
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
<< endl;
// environments. Shouldn't be circular because
// we don't support footnotes inside
// floats (yet). ARRae
- par = par->TeXEnvironment(foot, foot_texrow,
+ par = par->TeXEnvironment(buf, bparams,
+ foot, foot_texrow,
dummy, dummy_texrow,
dummy_count);
} else {
- par = par->TeXOnePar(foot, foot_texrow,
+ par = par->TeXOnePar(buf, bparams,
+ foot, foot_texrow,
moving_arg,
dummy, dummy_texrow,
dummy_count);
}
if (par && !par->IsDummy() && par->depth > depth) {
- par = par->TeXDeeper(foot, foot_texrow,
+ par = par->TeXDeeper(buf, bparams,
+ foot, foot_texrow,
dummy, dummy_texrow,
dummy_count);
}
return (footnoteflag == LyXParagraph::NO_FOOTNOTE && previous
&& previous->footnoteflag != LyXParagraph::NO_FOOTNOTE);
}
+#endif
-
-void LyXParagraph::SetPExtraType(int type, char const * width,
+void LyXParagraph::SetPExtraType(BufferParams const & bparams,
+ int type, char const * width,
char const * widthp)
{
pextra_type = type;
pextra_width = width;
pextra_widthp = widthp;
- if (textclasslist.Style(current_view->buffer()->params.textclass,
+ if (textclasslist.Style(bparams.textclass,
layout).isEnvironment()) {
- LyXParagraph
- * par = this,
- * ppar = par;
+ LyXParagraph * par = this;
+ LyXParagraph * ppar = par;
while (par && (par->layout == layout)
&& (par->depth == depth)) {
ppar = par;
par = par->Previous();
+#ifndef NEW_INSETS
if (par)
par = par->FirstPhysicalPar();
+#endif
while (par && par->depth > depth) {
par = par->Previous();
+#ifndef NEW_INSETS
if (par)
par = par->FirstPhysicalPar();
+#endif
}
}
par = ppar;
par->pextra_type = type;
par->pextra_width = width;
par->pextra_widthp = widthp;
+#ifndef NEW_INSETS
par = par->NextAfterFootnote();
+#else
+ par = par->Next();
+#endif
if (par && (par->depth > depth))
- par->SetPExtraType(type, width, widthp);
+ par->SetPExtraType(bparams,
+ type, width, widthp);
+#ifndef NEW_INSETS
while (par && ((par->depth > depth) || par->IsDummy()))
par = par->NextAfterFootnote();
+#else
+ while (par && ((par->depth > depth)))
+ par = par->Next();
+#endif
}
}
}
-void LyXParagraph::UnsetPExtraType()
+void LyXParagraph::UnsetPExtraType(BufferParams const & bparams)
{
if (pextra_type == PEXTRA_NONE)
return;
pextra_width.erase();
pextra_widthp.erase();
- if (textclasslist.Style(current_view->buffer()->params.textclass,
+ if (textclasslist.Style(bparams.textclass,
layout).isEnvironment()) {
- LyXParagraph
- * par = this,
- * ppar = par;
+ LyXParagraph * par = this;
+ LyXParagraph * ppar = par;
while (par && (par->layout == layout)
&& (par->depth == depth)) {
ppar = par;
par = par->Previous();
+#ifndef NEW_INSETS
if (par)
par = par->FirstPhysicalPar();
+#endif
while (par && par->depth > depth) {
par = par->Previous();
+#ifndef NEW_INSETS
if (par)
par = par->FirstPhysicalPar();
+#endif
}
}
par = ppar;
par->pextra_type = PEXTRA_NONE;
par->pextra_width.erase();
par->pextra_widthp.erase();
+#ifndef NEW_INSETS
par = par->NextAfterFootnote();
+#else
+ par = par->Next();
+#endif
if (par && (par->depth > depth))
- par->UnsetPExtraType();
+ par->UnsetPExtraType(bparams);
+#ifndef NEW_INSETS
while (par && ((par->depth > depth) || par->IsDummy()))
par = par->NextAfterFootnote();
+#else
+ while (par && ((par->depth > depth)))
+ par = par->Next();
+#endif
}
}
}
}
+#ifndef NEW_INSETS
bool LyXParagraph::IsFloat(size_type pos) const
{
return IsFloatChar(GetChar(pos));
}
+#endif
bool LyXParagraph::IsNewline(size_type pos) const
/// Used by the spellchecker
bool LyXParagraph::IsLetter(LyXParagraph::size_type pos) const
{
- unsigned char c = GetChar(pos);
+ value_type c = GetChar(pos);
if (IsLetterChar(c))
return true;
// '\0' is not a letter, allthough every string contains "" (below)
return false;
// We want to pass the ' and escape chars to ispell
string extra = lyxrc.isp_esc_chars + '\'';
- char ch[2];
- ch[0] = c;
- ch[1] = 0;
+ char ch[2] = { c, 0 };
return contains(extra, ch);
}
}
-Language const * LyXParagraph::getParLanguage() const
+Language const *
+LyXParagraph::getParLanguage(BufferParams const & bparams) const
{
+#ifndef NEW_INSETS
if (IsDummy())
- return FirstPhysicalPar()->getParLanguage();
- else if (size() > 0)
+ return FirstPhysicalPar()->getParLanguage(bparams);
+ else
+#endif
+ if (size() > 0)
+#ifndef NEW_TABULAR
if (!table)
+#endif
return GetFirstFontSettings().language();
+#ifndef NEW_TABULAR
else {
for (size_type pos = 0; pos < size(); ++pos)
if (IsNewline(pos))
- return GetFontSettings(pos).language();
+ return GetFontSettings(bparams, pos).language();
return GetFirstFontSettings().language();
}
+#endif
else if (previous)
- return previous->getParLanguage();
- else
- return current_view->buffer()->params.language_info;
+ return previous->getParLanguage(bparams);
+ //else
+ return bparams.language_info;
}
-bool LyXParagraph::isRightToLeftPar() const
+bool LyXParagraph::isRightToLeftPar(BufferParams const & bparams) const
{
- return lyxrc.rtl_support && !table && getParLanguage()->RightToLeft;
+ return lyxrc.rtl_support
+#ifndef NEW_TABULAR
+ && !table
+#endif
+ && getParLanguage(bparams)->RightToLeft();
}
-void LyXParagraph::ChangeLanguage(Language const * from, Language const * to)
+void LyXParagraph::ChangeLanguage(BufferParams const & bparams,
+ Language const * from, Language const * to)
{
for(size_type i = 0; i < size(); ++i) {
- LyXFont font = GetFontSettings(i);
+ LyXFont font = GetFontSettings(bparams, i);
if (font.language() == from) {
font.setLanguage(to);
SetFont(i, font);
}
-bool LyXParagraph::isMultiLingual()
+bool LyXParagraph::isMultiLingual(BufferParams const & bparams)
{
- 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)
+ Language const * doc_language = bparams.language_info;
+ for (FontList::const_iterator cit = fontlist.begin();
+ cit != fontlist.end(); ++cit)
+ if ((*cit).font.language() != doc_language)
return true;
- }
return false;
}
// Convert the paragraph to a string.
// Used for building the table of contents
-string LyXParagraph::String(bool label)
+string LyXParagraph::String(Buffer const * buffer, bool label)
{
+ BufferParams const & bparams = buffer->params;
string s;
+#ifndef NEW_INSETS
if (label && !IsDummy() && !labelstring.empty())
+#else
+ if (label && !labelstring.empty())
+#endif
s += labelstring + ' ';
string::size_type len = s.size();
for (LyXParagraph::size_type i = 0; i < size(); ++i) {
- unsigned char c = GetChar(i);
+ value_type c = GetChar(i);
if (IsPrintable(c))
s += c;
else if (c == META_INSET &&
GetInset(i)->LyxCode() == Inset::MATH_CODE) {
#ifdef HAVE_SSTREAM
std::ostringstream ost;
- GetInset(i)->Ascii(ost);
+ GetInset(i)->Ascii(buffer, ost);
#else
ostrstream ost;
- GetInset(i)->Ascii(ost);
+ GetInset(i)->Ascii(buffer, ost);
ost << '\0';
#endif
s += subst(ost.str(),'\n',' ');
}
}
- if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE &&
- footnoteflag == LyXParagraph::NO_FOOTNOTE)
- s += NextAfterFootnote()->String(false);
+#ifndef NEW_INSETS
+ if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE
+ && footnoteflag == LyXParagraph::NO_FOOTNOTE)
+ s += NextAfterFootnote()->String(buffer, false);
if (!IsDummy()) {
- if (isRightToLeftPar())
+#endif
+ if (isRightToLeftPar(bparams))
reverse(s.begin() + len,s.end());
+#ifndef NEW_INSETS
}
+#endif
return s;
}
-string LyXParagraph::String(LyXParagraph::size_type beg,
+string LyXParagraph::String(Buffer const * buffer,
+ LyXParagraph::size_type beg,
LyXParagraph::size_type end)
{
string s;
+#ifndef NEW_TABULAR
int actcell = 0;
int cell = 1;
if (table)
++cell;
++actcell;
}
+#endif
+#ifndef NEW_INSETS
if (beg == 0 && !IsDummy() && !labelstring.empty())
+#else
+ if (beg == 0 && !labelstring.empty())
+#endif
s += labelstring + ' ';
for (LyXParagraph::size_type i = beg; i < end; ++i) {
- unsigned char c = GetChar(i);
+ value_type c = GetChar(i);
if (IsPrintable(c))
s += c;
else if (c == META_INSET) {
#ifdef HAVE_SSTREAM
std::ostringstream ost;
- GetInset(i)->Ascii(ost);
+ GetInset(i)->Ascii(buffer, ost);
#else
ostrstream ost;
- GetInset(i)->Ascii(ost);
+ GetInset(i)->Ascii(buffer, ost);
ost << '\0';
#endif
s += ost.str();
- } else if (table && IsNewlineChar(c)) {
+ }
+#ifndef NEW_TABULAR
+ else if (table && IsNewlineChar(c)) {
if (cell >= table->NumberOfCellsInRow(actcell)) {
s += '\n';
cell = 1;
}
++actcell;
}
+#endif
}
- //if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
- // s += NextAfterFootnote()->String(false);
-
return s;
}
+
+
+void LyXParagraph::SetInsetOwner(Inset *i)
+{
+ inset_owner = i;
+ for (InsetList::const_iterator cit = insetlist.begin();
+ cit != insetlist.end(); ++cit) {
+ if ((*cit).inset)
+ (*cit).inset->setOwner(i);
+ }
+}
+
+
+void LyXParagraph::deleteInsetsLyXText(BufferView * bv)
+{
+ // then the insets
+ for (InsetList::const_iterator cit = insetlist.begin();
+ cit != insetlist.end(); ++cit) {
+ if ((*cit).inset) {
+ if ((*cit).inset->IsTextInset()) {
+ static_cast<UpdatableInset *>
+ ((*cit).inset)->deleteLyXText(bv);
+ }
+ }
+ }
+}
+
+
+void LyXParagraph::resizeInsetsLyXText(BufferView * bv)
+{
+ // then the insets
+ for (InsetList::const_iterator cit = insetlist.begin();
+ cit != insetlist.end(); ++cit) {
+ if ((*cit).inset) {
+ if ((*cit).inset->IsTextInset()) {
+ static_cast<UpdatableInset *>
+ ((*cit).inset)->resizeLyXText(bv);
+ }
+ }
+ }
+}
projects / lyx.git / blobdiff