#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"
+#include "ParameterStruct.h"
using std::ostream;
using std::endl;
using std::ios;
using std::lower_bound;
using std::upper_bound;
+using std::reverse;
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)
-extern BufferView * current_view;
-
-// ale970405
-extern string bibitemWidthest(Painter &);
+extern string bibitemWidest(Buffer const *);
// this is a minibuffer
-static char minibuffer_char;
-static LyXFont minibuffer_font;
-static Inset * minibuffer_inset;
+namespace {
+
+char minibuffer_char;
+LyXFont minibuffer_font;
+Inset * minibuffer_inset;
+
+} // namespace anon
+
+
+extern BufferView * current_view;
// Initialization of the counter for the paragraph id's,
// declared in lyxparagraph.h
unsigned int LyXParagraph::paragraph_id = 0;
+// Initialize static member.
+ShareContainer<LyXFont> LyXParagraph::FontTable::container;
+
LyXParagraph::LyXParagraph()
{
text.reserve(500); // is this number too big?
-
for (int i = 0; i < 10; ++i) setCounter(i , 0);
- appendix = false;
enumdepth = 0;
itemdepth = 0;
- next = 0;
- previous = 0;
+ next_ = 0;
+ previous_ = 0;
+#ifndef NEW_INSETS
footnoteflag = LyXParagraph::NO_FOOTNOTE;
footnotekind = LyXParagraph::FOOTNOTE; // should not be needed
-
- align = LYX_ALIGN_BLOCK;
+#endif
- /* table stuff -- begin*/
- table = 0;
- /* table stuff -- end*/
inset_owner = 0;
id_ = paragraph_id++;
bibkey = 0; // ale970302
LyXParagraph::LyXParagraph(LyXParagraph * par)
{
text.reserve(500);
- par->text.resize(par->text.size());
-
+ par->fitToSize();
+
for (int i = 0; i < 10; ++i) setCounter(i, 0);
- appendix = false;
enumdepth = 0;
itemdepth = 0;
// double linked list begin
- next = par->next;
- if (next)
- next->previous = this;
- previous = par;
- previous->next = this;
+ next_ = par->next_;
+ if (next_)
+ next_->previous_ = this;
+ previous_ = par;
+ previous_->next_ = this;
// end
+#ifndef NEW_INSETS
footnoteflag = LyXParagraph::NO_FOOTNOTE;
footnotekind = LyXParagraph::FOOTNOTE;
-
- /* table stuff -- begin*/
- table = 0;
- /* 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 & bparams,
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) {
// 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) {
- while (depth > dth) {
+ if (dth != params.depth()) {
+ if (params.depth() > dth) {
+ while (params.depth() > dth) {
os << "\n\\begin_deeper ";
++dth;
}
} else {
- while (depth < dth) {
+ while (params.depth() < dth) {
os << "\n\\end_deeper ";
--dth;
}
// First write the layout
os << "\n\\layout "
- << textclasslist.NameOfLayout(params.textclass, layout)
+ << textclasslist.NameOfLayout(bparams.textclass, layout)
<< "\n";
// Maybe some vertical spaces.
- if (added_space_top.kind() != VSpace::NONE)
+ if (params.spaceTop().kind() != VSpace::NONE)
os << "\\added_space_top "
- << added_space_top.asLyXCommand() << " ";
- if (added_space_bottom.kind() != VSpace::NONE)
+ << params.spaceTop().asLyXCommand() << " ";
+ if (params.spaceBottom().kind() != VSpace::NONE)
os << "\\added_space_bottom "
- << added_space_bottom.asLyXCommand() << " ";
+ << params.spaceBottom().asLyXCommand() << " ";
// Maybe the paragraph has special spacing
- spacing.writeFile(os, true);
+ params.spacing().writeFile(os, true);
// The labelwidth string used in lists.
- if (!labelwidthstring.empty())
+ if (!params.labelWidthString().empty())
os << "\\labelwidthstring "
- << labelwidthstring << '\n';
+ << params.labelWidthString() << '\n';
// Lines above or below?
- if (line_top)
+ if (params.lineTop())
os << "\\line_top ";
- if (line_bottom)
+ if (params.lineBottom())
os << "\\line_bottom ";
// Pagebreaks above or below?
- if (pagebreak_top)
+ if (params.pagebreakTop())
os << "\\pagebreak_top ";
- if (pagebreak_bottom)
+ if (params.pagebreakBottom())
os << "\\pagebreak_bottom ";
// Start of appendix?
- if (start_of_appendix)
+ if (params.startOfAppendix())
os << "\\start_of_appendix ";
// Noindent?
- if (noindent)
+ if (params.noindent())
os << "\\noindent ";
// Alignment?
- if (align != LYX_ALIGN_LAYOUT) {
- switch (align) {
+ if (params.align() != LYX_ALIGN_LAYOUT) {
+ int h = 0;
+ switch (params.align()) {
case LYX_ALIGN_LEFT: h = 1; break;
case LYX_ALIGN_RIGHT: h = 2; break;
case LYX_ALIGN_CENTER: h = 3; break;
}
os << "\\align " << string_align[h] << " ";
}
- if (pextra_type != PEXTRA_NONE) {
- os << "\\pextra_type " << pextra_type;
- if (pextra_type == PEXTRA_MINIPAGE) {
+#ifndef NO_PEXTRA
+ if (params.pextraType() != PEXTRA_NONE) {
+ os << "\\pextra_type " << params.pextraType();
+ if (params.pextraType() == PEXTRA_MINIPAGE) {
os << " \\pextra_alignment "
- << pextra_alignment;
- if (pextra_hfill)
+ << params.pextraAlignment();
+ if (params.pextraHfill())
os << " \\pextra_hfill "
- << pextra_hfill;
- if (pextra_start_minipage)
+ << params.pextraHfill();
+ if (params.pextraStartMinipage())
os << " \\pextra_start_minipage "
- << pextra_start_minipage;
+ << params.pextraStartMinipage();
}
- if (!pextra_width.empty()) {
+ if (!params.pextraWidth().empty()) {
os << " \\pextra_width "
- << VSpace(pextra_width).asLyXCommand();
- } else if (!pextra_widthp.empty()) {
+ << VSpace(params.pextraWidth()).asLyXCommand();
+ } else if (!params.pextraWidthp().empty()) {
os << " \\pextra_widthp "
- << pextra_widthp;
+ << params.pextraWidthp();
}
os << '\n';
}
+#endif
+#ifndef NEW_INSETS
} else {
// Dummy layout. This means that a footnote ended.
os << "\n\\end_float ";
footflag = LyXParagraph::NO_FOOTNOTE;
}
-
- // 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, bparams.language);
- 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(bparams, i);
if (font2 != font1) {
font2.lyxWriteChanges(font1, os);
column = 0;
font1 = font2;
}
- c = GetChar(i);
+ value_type const 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);
+ if (next_)
+ next_->writeFile(buf, os, bparams, footflag, dth);
}
void LyXParagraph::validate(LaTeXFeatures & features) const
{
- BufferParams const & params = features.bufferParams();
-
+ BufferParams const & bparams = features.bufferParams();
+
+#ifndef NEW_INSETS
// this will be useful later
LyXLayout const & layout =
- textclasslist.Style(params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
+#endif
// check the params.
- if (line_top || line_bottom)
+ if (params.lineTop() || params.lineBottom())
features.lyxline = true;
- if (!spacing.isDefault())
+ if (!params.spacing().isDefault())
features.setspace = true;
// then the layouts
features.layout[GetLayout()] = true;
// then the fonts
- Language const * doc_language = params.language_info;
+ Language const * doc_language = bparams.language;
for (FontList::const_iterator cit = fontlist.begin();
cit != fontlist.end(); ++cit) {
- if ((*cit).font.noun() == LyXFont::ON) {
+ if ((*cit).font().noun() == LyXFont::ON) {
lyxerr[Debug::LATEX] << "font.noun: "
- << (*cit).font.noun()
+ << (*cit).font().noun()
<< endl;
features.noun = true;
lyxerr[Debug::LATEX] << "Noun enabled. Font: "
- << (*cit).font.stateText()
+ << (*cit).font().stateText(0)
<< endl;
}
- switch ((*cit).font.color()) {
+ switch ((*cit).font().color()) {
case LColor::none:
case LColor::inherit:
case LColor::ignore:
default:
features.color = true;
lyxerr[Debug::LATEX] << "Color enabled. Font: "
- << (*cit).font.stateText()
+ << (*cit).font().stateText(0)
<< endl;
}
-#if 0
- Language const * language = (*cit).font.language();
- if (language != doc_language) {
+
+ Language const * language = (*cit).font().language();
+ if (language->babel() != doc_language->babel()) {
features.UsedLanguages.insert(language);
lyxerr[Debug::LATEX] << "Found language "
- << language->lang << endl;
+ << language->babel() << 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);
}
- if (table && table->IsLongTable())
- features.longtable = true;
- if (pextra_type == PEXTRA_INDENT)
+#ifndef NO_PEXTRA
+ if (params.pextraType() == PEXTRA_INDENT)
features.LyXParagraphIndent = true;
- if (pextra_type == PEXTRA_FLOATFLT)
+ if (params.pextraType() == PEXTRA_FLOATFLT)
features.floatflt = true;
+#endif
+#ifndef NEW_INSETS
if (layout.needprotect
- && next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
+ && next_ && next_->footnoteflag != LyXParagraph::NO_FOOTNOTE)
features.NeedLyXFootnoteCode = true;
- if (params.paragraph_separation == BufferParams::PARSEP_INDENT
- && pextra_type == LyXParagraph::PEXTRA_MINIPAGE)
+#endif
+#ifndef NO_PEXTRA
+ if (bparams.paragraph_separation == BufferParams::PARSEP_INDENT
+ && params.pextraType() == LyXParagraph::PEXTRA_MINIPAGE)
features.NeedLyXMinipageIndent = true;
- 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(Buffer const & buffer,
+ LyXParagraph::size_type pos) const
{
+ BufferParams bparams = buffer.params;
+
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)) {
- minibuffer_inset = GetInset(pos)->Clone();
+ minibuffer_inset = GetInset(pos)->Clone(buffer);
} else {
minibuffer_inset = 0;
minibuffer_char = ' ';
}
-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;
}
void LyXParagraph::Clear()
{
- line_top = false;
- line_bottom = false;
-
- pagebreak_top = false;
- pagebreak_bottom = false;
-
- added_space_top = VSpace(VSpace::NONE);
- added_space_bottom = VSpace(VSpace::NONE);
- spacing.set(Spacing::Default);
+ params.clear();
- align = LYX_ALIGN_LAYOUT;
- depth = 0;
- noindent = false;
-
- pextra_type = PEXTRA_NONE;
- pextra_width.erase();
- pextra_widthp.erase();
- pextra_alignment = MINIPAGE_ALIGN_TOP;
- pextra_hfill = false;
- pextra_start_minipage = false;
-
- labelstring.erase();
- labelwidthstring.erase();
layout = 0;
bibkey = 0;
-
- start_of_appendix = false;
}
// the destructor removes the new paragraph from the list
LyXParagraph::~LyXParagraph()
{
- if (previous)
- previous->next = next;
- if (next)
- next->previous = previous;
+ if (previous_)
+ previous_->next_ = next_;
+ if (next_)
+ next_->previous_ = previous_;
for (InsetList::iterator it = insetlist.begin();
it != insetlist.end(); ++it) {
delete (*it).inset;
}
- /* table stuff -- begin*/
- delete table;
- /* table stuff -- end*/
-
// 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()) {
- if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
+ if (next_ && next_->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
NextAfterFootnote()->Erase(pos - text.size() - 1);
else
lyxerr.debug() << "ERROR (LyXParagraph::Erase): "
"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 const 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((*it).pos() - 1);
// 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 const 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()) {
- if (next
- && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
+ if (next_
+ && next_->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
NextAfterFootnote()->InsertChar(pos - text.size() - 1,
c);
else
"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((*it).pos() + 1);
// 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 const 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)
+ 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)
{
- if (inset_owner) {
- lyxerr << "CODE: << " << inset->LyxCode() << endl;
+ //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)
+ 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)
+ 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 const 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)
+ 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());
+ 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
+LyXFont const 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 const 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)
+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)
+ if (next_ && next_->footnoteflag != LyXParagraph::NO_FOOTNOTE)
return NextAfterFootnote()
->GetChar(pos - text.size() - 1);
- else {
- lyxerr << "ERROR (LyXParagraph::GetChar): "
+ else
+ {
+ lyxerr << "ERROR (LyXParagraph::GetChar const): "
"position does not exist."
<< pos << " (" << static_cast<int>(pos)
<< ")\n";
- // Assert(false); // This triggers sometimes...
- // Why?
+ Assert(false);
}
return '\0';
} else {
// We should have a footnote environment.
- if (!next || next->footnoteflag == LyXParagraph::NO_FOOTNOTE) {
+ 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) {
+ switch (next_->footnotekind) {
case LyXParagraph::FOOTNOTE:
return LyXParagraph::META_FOOTNOTE;
case LyXParagraph::MARGIN:
}
return '\0'; // to shut up gcc
}
+#endif
}
-char LyXParagraph::GetChar(LyXParagraph::size_type pos) const
+LyXParagraph::value_type
+LyXParagraph::GetUChar(BufferParams const & bparams,
+ LyXParagraph::size_type pos) const
{
- Assert(pos >= 0);
+ value_type c = GetChar(pos);
+ if (!lyxrc.rtl_support)
+ return c;
- 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 const): "
- "position does not exist."
- << pos << " (" << static_cast<int>(pos)
- << ")\n";
- Assert(false);
- }
- 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
+ value_type uc = c;
+ switch (c) {
+ case '(':
+ uc = ')';
+ break;
+ case ')':
+ uc = '(';
+ break;
+ case '[':
+ uc = ']';
+ break;
+ case ']':
+ uc = '[';
+ break;
+ case '{':
+ uc = '}';
+ break;
+ case '}':
+ uc = '{';
+ break;
+ case '<':
+ uc = '>';
+ break;
+ case '>':
+ uc = '<';
+ break;
}
+ if (uc != c && GetFontSettings(bparams, pos).isRightToLeft())
+ return uc;
+ else
+ return c;
}
-
// return an string of the current word, and the end of the word in lastpos.
-string LyXParagraph::GetWord(LyXParagraph::size_type & lastpos) const
+string const 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
}
-
+
+#ifndef NEW_INSETS
LyXParagraph::size_type LyXParagraph::Last() const
{
- if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
+ if (next_ && next_->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
return text.size() + NextAfterFootnote()->Last() + 1;
// the 1 is the symbol
// for the footnote
else
return text.size();
}
+#endif
+#ifndef NEW_INSETS
LyXParagraph * LyXParagraph::ParFromPos(LyXParagraph::size_type pos)
{
// > 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)
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
// use it if you want
if (pos > size()) {
- if (next
- && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
+ if (next_
+ && 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()) {
- if (next &&
- next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
+ if (next_ &&
+ 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));
}
}
-
+
+
+void LyXParagraph::next(LyXParagraph * p)
+{
+ next_ = p;
+}
+
+
// This function is able to hide closed footnotes.
-LyXParagraph * LyXParagraph::Next()
+LyXParagraph * LyXParagraph::next()
+{
+#ifndef NEW_INSETS
+ if (next_ && next_->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
+ LyXParagraph * tmp = next_;
+ while (tmp
+ && tmp->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
+ tmp = tmp->next_;
+ if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
+ return tmp->next(); /* there can be more than one
+ footnote in a logical
+ paragraph */
+ else
+ return next_; // This should never happen!
+ } else
+#endif
+ return next_;
+}
+
+
+LyXParagraph const * LyXParagraph::next() const
{
- if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
- LyXParagraph * tmp = next;
+#ifndef NEW_INSETS
+ if (next_ && next_->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
+ LyXParagraph * tmp = next_;
while (tmp
&& tmp->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
- tmp = tmp->next;
+ tmp = tmp->next_;
if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
- return tmp->Next(); /* there can be more than one
+ return tmp->next(); /* there can be more than one
footnote in a logical
paragraph */
else
- return next; // This should never happen!
+ return next_; // This should never happen!
} else
- return next;
+#endif
+ return next_;
}
+#ifndef NEW_INSETS
LyXParagraph * LyXParagraph::NextAfterFootnote()
{
- if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
- LyXParagraph * tmp = next;
+ if (next_ && next_->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
+ LyXParagraph * tmp = next_;
while (tmp && tmp->footnoteflag != LyXParagraph::NO_FOOTNOTE)
- tmp = tmp->next;
+ tmp = tmp->next_;
if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
return tmp; /* there can be more than one footnote
in a logical paragraph */
else
- return next; // This should never happen!
+ return next_; // This should never happen!
} else
- return next;
+ return next_;
}
+#endif
+#ifndef NEW_INSETS
LyXParagraph const * LyXParagraph::NextAfterFootnote() const
{
- if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
- LyXParagraph * tmp = next;
+ if (next_ && next_->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
+ LyXParagraph * tmp = next_;
while (tmp && tmp->footnoteflag != LyXParagraph::NO_FOOTNOTE)
- tmp = tmp->next;
+ tmp = tmp->next_;
if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
return tmp; /* there can be more than one footnote
in a logical paragraph */
else
- return next; // This should never happen!
+ return next_; // This should never happen!
} else
- return next;
+ return next_;
}
+#endif
+#ifndef NEW_INSETS
LyXParagraph * LyXParagraph::PreviousBeforeFootnote()
{
LyXParagraph * tmp;
- if (previous && previous->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
- tmp = previous;
+ if (previous_ && previous_->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
+ tmp = previous_;
while (tmp && tmp->footnoteflag != LyXParagraph::NO_FOOTNOTE)
- tmp = tmp->previous;
+ tmp = tmp->previous_;
if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
return tmp; /* there can be more than one footnote
in a logical paragraph */
else
- return previous; // This should never happen!
+ return previous_; // This should never happen!
} else
- return previous;
+ return previous_;
}
+#endif
+#ifndef NEW_INSETS
LyXParagraph * LyXParagraph::LastPhysicalPar()
{
if (footnoteflag != LyXParagraph::NO_FOOTNOTE)
return this;
LyXParagraph * tmp = this;
- while (tmp->next
- && tmp->next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
+ while (tmp->next_
+ && tmp->next_->footnoteflag != LyXParagraph::NO_FOOTNOTE)
tmp = tmp->NextAfterFootnote();
return tmp;
}
+#endif
+
+#ifndef NEW_INSETS
LyXParagraph const * LyXParagraph::LastPhysicalPar() const
{
if (footnoteflag != LyXParagraph::NO_FOOTNOTE)
return this;
LyXParagraph const * tmp = this;
- while (tmp->next
- && tmp->next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
+ while (tmp->next_
+ && tmp->next_->footnoteflag != LyXParagraph::NO_FOOTNOTE)
tmp = tmp->NextAfterFootnote();
- return tmp;
+ return tmp;
}
+#endif
+
+#ifndef NEW_INSETS
LyXParagraph * LyXParagraph::FirstPhysicalPar()
{
if (!IsDummy())
while (tmppar &&
(tmppar->IsDummy()
|| tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE))
- tmppar = tmppar->previous;
+ tmppar = tmppar->previous_;
if (!tmppar) {
return this;
} else
return tmppar;
}
+#endif
+#ifndef NEW_INSETS
LyXParagraph const * LyXParagraph::FirstPhysicalPar() const
{
if (!IsDummy())
while (tmppar &&
(tmppar->IsDummy()
|| tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE))
- tmppar = tmppar->previous;
+ tmppar = tmppar->previous_;
if (!tmppar) {
return this;
} else
return tmppar;
}
+#endif
+
+
+void LyXParagraph::previous(LyXParagraph * p)
+{
+ previous_ = p;
+}
// This function is able to hide closed footnotes.
-LyXParagraph * LyXParagraph::Previous()
+LyXParagraph * LyXParagraph::previous()
{
- LyXParagraph * tmp = previous;
+#ifndef NEW_INSETS
+ LyXParagraph * tmp = previous_;
if (!tmp)
return tmp;
-
- if (tmp->previous
- && tmp->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
- tmp = tmp->previous;
+
+ if (tmp->previous_
+ && tmp->previous_->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
+ tmp = tmp->previous_;
while (tmp
&& tmp->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
- tmp = tmp->previous;
+ tmp = tmp->previous_;
if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
- return tmp->next->Previous();
+ return tmp->next_->previous();
else
- return previous;
+ return previous_;
} else
- return previous;
+#endif
+ return previous_;
}
// This function is able to hide closed footnotes.
-LyXParagraph const * LyXParagraph::Previous() const
+LyXParagraph const * LyXParagraph::previous() const
{
- LyXParagraph * tmp = previous;
+#ifndef NEW_INSETS
+ LyXParagraph * tmp = previous_;
if (!tmp)
return tmp;
-
- if (tmp->previous
- && tmp->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
- tmp = tmp->previous;
+ if (tmp->previous_
+ && tmp->previous_->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
+ tmp = tmp->previous_;
while (tmp
&& tmp->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
- tmp = tmp->previous;
+ tmp = tmp->previous_;
if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
- return tmp->next->Previous();
+ return tmp->next_->previous();
else
- return previous;
+ return previous_;
} else
- return previous;
+#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->SetLabelWidthString(firstpar->labelwidthstring);
+ tmp->SetOnlyLayout(bparams, firstpar->layout);
+ tmp->SetLabelWidthString(firstpar->params.labelWidthString());
}
-
+#else
+ // layout stays the same with latex-environments
+ if (flag) {
+ tmp->SetOnlyLayout(bparams, layout);
+ tmp->SetLabelWidthString(params.labelWidthString());
+ }
+#endif
+#ifndef NEW_INSETS
if (Last() > pos || !Last() || flag == 2) {
- tmp->SetOnlyLayout(firstpar->layout);
- tmp->align = firstpar->align;
- tmp->SetLabelWidthString(firstpar->labelwidthstring);
+ tmp->SetOnlyLayout(bparams, firstpar->layout);
+ tmp->params.align(firstpar->params.align());
+ tmp->SetLabelWidthString(firstpar->params.labelWidthString());
- tmp->line_bottom = firstpar->line_bottom;
- firstpar->line_bottom = false;
- tmp->pagebreak_bottom = firstpar->pagebreak_bottom;
- firstpar->pagebreak_bottom = false;
- tmp->added_space_bottom = firstpar->added_space_bottom;
- firstpar->added_space_bottom = VSpace(VSpace::NONE);
+ tmp->params.lineBottom(firstpar->params.lineBottom());
+ firstpar->params.lineBottom(false);
+ tmp->params.pagebreakBottom(firstpar->params.pagebreakBottom());
+ firstpar->params.pagebreakBottom(false);
+ tmp->params.spaceBottom(firstpar->params.spaceBottom());
+ firstpar->params.spaceBottom(VSpace(VSpace::NONE));
- tmp->depth = firstpar->depth;
- tmp->noindent = firstpar->noindent;
-
+ tmp->params.depth(firstpar->params.depth());
+ tmp->params.noindent(firstpar->params.noindent());
+#else
+ if (size() > pos || !size() || flag == 2) {
+ tmp->SetOnlyLayout(bparams, layout);
+ tmp->params.align(params.align());
+ tmp->SetLabelWidthString(params.labelWidthString());
+
+ tmp->params.lineBottom(params.lineBottom());
+ params.lineBottom(false);
+ tmp->params.pagebreakBottom(params.pagebreakBottom());
+ params.pagebreakBottom(false);
+ tmp->params.spaceBottom(params.spaceBottom());
+ params.spaceBottom(VSpace(VSpace::NONE));
+
+ tmp->params.depth(params.depth());
+ tmp->params.noindent(params.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;
}
- tmp->text.resize(tmp->text.size());
+
+ tmp->fitToSize();
+
for (i = pos_end; i >= pos; --i)
par->Erase(i - pos_first);
- par->text.resize(par->text.size());
+ par->fitToSize();
+#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;
- tmp->pagebreak_top = firstpar->pagebreak_top;
- tmp->added_space_top = firstpar->added_space_top;
+ tmp->params.lineTop(firstpar->params.lineTop());
+ tmp->params.pagebreakTop(firstpar->params.pagebreakTop());
+ tmp->params.spaceTop(firstpar->params.spaceTop());
tmp->bibkey = firstpar->bibkey;
firstpar->Clear();
// layout stays the same with latex-environments
if (flag) {
- firstpar->SetOnlyLayout(tmp->layout);
- firstpar->SetLabelWidthString(tmp->labelwidthstring);
- firstpar->depth = tmp->depth;
+ firstpar->SetOnlyLayout(bparams, tmp->layout);
+ firstpar->SetLabelWidthString(tmp->params.labelWidthString());
+ firstpar->params.depth(tmp->params.depth());
}
}
+#else
+ // just an idea of me
+ if (!pos) {
+ tmp->params.lineTop(params.lineTop());
+ tmp->params.pagebreakTop(params.pagebreakTop());
+ tmp->params.spaceTop(params.spaceTop());
+ tmp->bibkey = bibkey;
+ Clear();
+ // layout stays the same with latex-environments
+ if (flag) {
+ SetOnlyLayout(bparams, tmp->layout);
+ SetLabelWidthString(tmp->params.labelWidthString());
+ params.depth(tmp->params.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);
-
- line_bottom = par->line_bottom;
- pagebreak_bottom = par->pagebreak_bottom;
- added_space_bottom = par->added_space_bottom;
-
- line_top = par->line_top;
- pagebreak_top = par->pagebreak_top;
- added_space_top = par->added_space_top;
-
- spacing = par->spacing;
+ params.makeSame(par->params);
- pextra_type = par->pextra_type;
- pextra_width = par->pextra_width;
- pextra_widthp = par->pextra_widthp;
- pextra_alignment = par->pextra_alignment;
- pextra_hfill = par->pextra_hfill;
- pextra_start_minipage = par->pextra_start_minipage;
-
- noindent = par->noindent;
- depth = par->depth;
+ // This can be changed after NEW_INSETS is in effect. (Lgb)
+ SetLabelWidthString(par->params.labelWidthString());
}
+#ifndef NEW_INSETS
LyXParagraph * LyXParagraph::FirstSelfrowPar()
{
LyXParagraph * tmppar = this;
while (tmppar && (
(tmppar->IsDummy()
- && tmppar->previous->footnoteflag ==
+ && tmppar->previous_->footnoteflag ==
LyXParagraph::CLOSED_FOOTNOTE)
|| tmppar->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE))
- tmppar = tmppar->previous;
+ tmppar = tmppar->previous_;
if (!tmppar)
return this; // This should never happen!
else
return tmppar;
}
+#endif
+
+
+int LyXParagraph::StripLeadingSpaces(LyXTextClassList::size_type tclass)
+{
+ if (textclasslist.Style(tclass, GetLayout()).free_spacing)
+ return 0;
+
+ int i = 0;
+#ifndef NEW_INSETS
+ if (!IsDummy()) {
+ while (Last()
+#else
+ while (size()
+#endif
+ && (IsNewline(0) || IsLineSeparator(0))){
+ Erase(0);
+ ++i;
+ }
+#ifndef NEW_INSETS
+ }
+#endif
+ return i;
+}
LyXParagraph * LyXParagraph::Clone() const
// this is because of the dummy layout of the paragraphs that
// follow footnotes
result->layout = layout;
-
- /* table stuff -- begin*/
- if (table)
- result->table = table->Clone();
- else
- result->table = 0;
- /* table stuff -- end*/
result->inset_owner = inset_owner;
// ale970302
- result->bibkey = (bibkey) ? new InsetBibKey(bibkey): 0;
-
+ if (bibkey)
+ result->bibkey = static_cast<InsetBibKey *>
+ (bibkey->Clone(*current_view->buffer()));
+ else
+ result->bibkey = 0;
// copy everything behind the break-position to the new paragraph
result->insetlist = insetlist;
for (InsetList::iterator it = result->insetlist.begin();
it != result->insetlist.end(); ++it)
- (*it).inset = (*it).inset->Clone();
+ (*it).inset = (*it).inset->Clone(*current_view->buffer());
return result;
}
bool LyXParagraph::HasSameLayout(LyXParagraph const * par) const
{
+#ifndef NEW_INSETS
par = par->FirstPhysicalPar();
+#endif
- return (
+ return
+#ifndef NEW_INSETS
par->footnoteflag == footnoteflag &&
par->footnotekind == footnotekind &&
-
+#endif
par->layout == layout &&
-
- par->align == align &&
-
- par->line_bottom == line_bottom &&
- par->pagebreak_bottom == pagebreak_bottom &&
- par->added_space_bottom == added_space_bottom &&
-
- par->line_top == line_top &&
- par->pagebreak_top == pagebreak_top &&
- par->added_space_top == added_space_top &&
-
- par->spacing == spacing &&
-
- par->pextra_type == pextra_type &&
- par->pextra_width == pextra_width &&
- par->pextra_widthp == pextra_widthp &&
- 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
-
- par->noindent == noindent &&
- par->depth == depth);
+ params.sameLayout(par->params);
}
-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;
}
- tmp->text.resize(tmp->text.size());
+
+ tmp->fitToSize();
+
for (size_type i = pos_end; i >= pos; --i)
par->Erase(i - pos_first);
- par->text.resize(par->text.size());
+ par->fitToSize();
}
+#else
+ // create a new paragraph
+ LyXParagraph * tmp = new LyXParagraph(this);
+ tmp->MakeSameLayout(this);
+
+ // When can pos > Last()?
+ // I guess pos == Last() is possible.
+ if (size() > 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();
-
- LyXParagraph * firstpar = FirstPhysicalPar();
+ LyXParagraph * the_next = next();
// 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;
+#ifndef NEW_INSETS
+ LyXParagraph * firstpar = FirstPhysicalPar();
+ firstpar->params.lineBottom(the_next->params.lineBottom());
+ firstpar->params.spaceBottom(the_next->params.spaceBottom());
+ firstpar->params.pagebreakBottom(the_next->params.pagebreakBottom());
size_type pos_end = the_next->text.size() - 1;
size_type pos_insert = Last();
+#else
+ params.lineBottom(the_next->params.lineBottom());
+ params.spaceBottom(the_next->params.spaceBottom());
+ params.pagebreakBottom(the_next->params.pagebreakBottom());
+
+ size_type pos_end = the_next->text.size() - 1;
+ size_type pos_insert = size();
+#endif
// 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_;
delete the_next;
+ ppar->next(npar);
}
+#ifndef NEW_INSETS
void LyXParagraph::OpenFootnote(LyXParagraph::size_type pos)
{
LyXParagraph * par = ParFromPos(pos);
- par = par->next;
+ par = par->next_;
while (par && par->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
par->footnoteflag = LyXParagraph::OPEN_FOOTNOTE;
- par = par->next;
+ par = par->next_;
}
}
void LyXParagraph::CloseFootnote(LyXParagraph::size_type pos)
{
LyXParagraph * par = ParFromPos(pos);
- par = par->next;
+ par = par->next_;
while (par && par->footnoteflag == LyXParagraph::OPEN_FOOTNOTE) {
par->footnoteflag = LyXParagraph::CLOSED_FOOTNOTE;
- par = par->next;
+ 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,
+ int const endlabeltype =
+ textclasslist.Style(bparams.textclass,
layout).endlabeltype;
if (endlabeltype != END_LABEL_NO_LABEL) {
LyXParagraph const * last = this;
- if( footnoteflag == NO_FOOTNOTE)
+#ifndef NEW_INSETS
+ if (footnoteflag == NO_FOOTNOTE)
last = LastPhysicalPar();
- else if (next->footnoteflag == NO_FOOTNOTE)
+ else if (next_->footnoteflag == NO_FOOTNOTE)
return endlabeltype;
+#else
+ last = this;
+#endif
- if (!last || !last->next)
+ if (!last || !last->next_)
return endlabeltype;
- int next_depth = last->next->GetDepth();
+ int next_depth = last->next_->GetDepth();
if (par_depth > next_depth ||
- (par_depth == next_depth && layout != last->next->GetLayout() ))
+ (par_depth == next_depth && layout != last->next_->GetLayout() ))
return endlabeltype;
break;
}
LyXTextClass::size_type LyXParagraph::GetLayout() const
{
+#ifndef NEW_INSETS
return FirstPhysicalPar()->layout;
+#else
+ return layout;
+#endif
}
char LyXParagraph::GetDepth() const
{
- return FirstPhysicalPar()->depth;
+#ifndef NEW_INSETS
+ return FirstPhysicalPar()->params.depth();
+#else
+ return params.depth();
+#endif
}
char LyXParagraph::GetAlign() const
{
- return FirstPhysicalPar()->align;
+#ifndef NEW_INSETS
+ return FirstPhysicalPar()->params.align();
+#else
+ return params.align();
+#endif
}
-string LyXParagraph::GetLabelstring() const
+string const & LyXParagraph::GetLabelstring() const
{
- return FirstPhysicalPar()->labelstring;
+#ifndef NEW_INSETS
+ return FirstPhysicalPar()->params.labelString();
+#else
+ return params.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
+string const LyXParagraph::GetLabelWidthString() const
{
- if (!FirstPhysicalPar()->labelwidthstring.empty())
- return FirstPhysicalPar()->labelwidthstring;
+#ifndef NEW_INSETS
+ if (!FirstPhysicalPar()->params.labelWidthString().empty())
+ return FirstPhysicalPar()->params.labelWidthString();
+#else
+ if (!params.labelWidthString().empty())
+ return params.labelWidthString();
+#endif
else
return _("Senseless with this layout!");
}
void LyXParagraph::SetLabelWidthString(string const & s)
{
+#ifndef NEW_INSETS
LyXParagraph * par = FirstPhysicalPar();
- par->labelwidthstring = s;
+ par->params.labelWidthString(s);
+#else
+ params.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;
- /* table stuff -- begin*/
- if (table)
- par->layout = 0;
- /* table stuff -- end*/
- if (par->pextra_type == PEXTRA_NONE) {
- if (par->Previous()) {
- ppar = par->Previous()->FirstPhysicalPar();
+
+#ifndef NO_PEXTRA
+ if (par->params.pextraType() == PEXTRA_NONE) {
+#endif
+ if (par->previous()) {
+#ifndef NEW_INSETS
+ ppar = par->previous()->FirstPhysicalPar();
+#else
+ ppar = par->previous();
+#endif
while(ppar
- && ppar->Previous()
- && (ppar->depth > par->depth))
- ppar = ppar->Previous()->FirstPhysicalPar();
+ && ppar->previous()
+ && (ppar->params.depth() > par->params.depth()))
+#ifndef NEW_INSETS
+ ppar = ppar->previous()->FirstPhysicalPar();
+#else
+ ppar = ppar->previous();
+#endif
}
- if (par->Next()) {
- npar = par->Next()->NextAfterFootnote();
+ if (par->next()) {
+#ifndef NEW_INSETS
+ npar = par->next()->NextAfterFootnote();
+#else
+ npar = par->next();
+#endif
while(npar
- && npar->Next()
- && (npar->depth > par->depth))
- npar = npar->Next()->NextAfterFootnote();
+ && npar->next()
+ && (npar->params.depth() > par->params.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,
- p1.c_str(), p2.c_str());
+#ifndef NO_PEXTRA
+ if (ppar && (ppar->params.pextraType() != PEXTRA_NONE)) {
+ string p1 = ppar->params.pextraWidth();
+ string p2 = ppar->params.pextraWidthp();
+ ppar->SetPExtraType(bparams,
+ ppar->params.pextraType(),
+ p1, p2);
}
- if ((par->pextra_type == PEXTRA_NONE) &&
- npar && (npar->pextra_type != PEXTRA_NONE)) {
- string
- p1 = npar->pextra_width,
- p2 = npar->pextra_widthp;
- npar->SetPExtraType(npar->pextra_type,
- p1.c_str(), p2.c_str());
+ if ((par->params.pextraType() == PEXTRA_NONE) &&
+ npar && (npar->params.pextraType() != PEXTRA_NONE)) {
+ string const p1 = npar->params.pextraWidth();
+ string const p2 = npar->params.pextraWidthp();
+ npar->SetPExtraType(bparams, npar->params.pextraType(),
+ p1, p2);
}
}
+#endif
}
-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->layout = new_layout;
- par->labelwidthstring.erase();
- par->align = LYX_ALIGN_LAYOUT;
- par->added_space_top = VSpace(VSpace::NONE);
- par->added_space_bottom = VSpace(VSpace::NONE);
- par->spacing.set(Spacing::Default);
-
- /* table stuff -- begin*/
- if (table)
- par->layout = 0;
- /* table stuff -- end*/
- if (par->pextra_type == PEXTRA_NONE) {
- if (par->Previous()) {
- ppar = par->Previous()->FirstPhysicalPar();
+ par->params.labelWidthString(string());
+ par->params.align(LYX_ALIGN_LAYOUT);
+ par->params.spaceTop(VSpace(VSpace::NONE));
+ par->params.spaceBottom(VSpace(VSpace::NONE));
+ par->params.spacing(Spacing(Spacing::Default));
+
+#ifndef NO_PEXTRA
+ if (par->params.pextraType() == PEXTRA_NONE) {
+#endif
+ if (par->previous()) {
+#ifndef NEW_INSETS
+ ppar = par->previous()->FirstPhysicalPar();
+#else
+ ppar = par->previous();
+#endif
while(ppar
- && ppar->Previous()
- && (ppar->depth > par->depth))
- ppar = ppar->Previous()->FirstPhysicalPar();
+ && ppar->previous()
+ && (ppar->params.depth() > par->params.depth()))
+#ifndef NEW_INSETS
+ ppar = ppar->previous()->FirstPhysicalPar();
+#else
+ ppar = ppar->previous();
+#endif
}
- if (par->Next()) {
- npar = par->Next()->NextAfterFootnote();
+ if (par->next()) {
+#ifndef NEW_INSETS
+ npar = par->next()->NextAfterFootnote();
+#else
+ npar = par->next();
+#endif
while(npar
- && npar->Next()
- && (npar->depth > par->depth))
- npar = npar->Next()->NextAfterFootnote();
+ && npar->next()
+ && (npar->params.depth() > par->params.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,
- p1.c_str(), p2.c_str());
+#ifndef NO_PEXTRA
+ if (ppar && (ppar->params.pextraType() != PEXTRA_NONE)) {
+ string const p1 = ppar->params.pextraWidth();
+ string const p2 = ppar->params.pextraWidthp();
+ ppar->SetPExtraType(bparams, ppar->params.pextraType(),
+ p1, p2);
}
- if ((par->pextra_type == PEXTRA_NONE) &&
- npar && (npar->pextra_type != PEXTRA_NONE)) {
- string
- p1 = npar->pextra_width,
- p2 = npar->pextra_widthp;
- npar->SetPExtraType(npar->pextra_type,
- p1.c_str(), p2.c_str());
+ if ((par->params.pextraType() == PEXTRA_NONE) &&
+ npar && (npar->params.pextraType() != PEXTRA_NONE)) {
+ string const p1 = npar->params.pextraWidth();
+ string const p2 = npar->params.pextraWidthp();
+ npar->SetPExtraType(bparams, npar->params.pextraType(),
+ p1, p2);
}
}
+#endif
}
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
&& GetChar(i) != LyXParagraph::META_NEWLINE
) {
++i;
- char previous_char = 0, temp = 0;
+ char previous_char = 0;
+ char temp = 0;
if (i < size()
&& (previous_char = GetChar(i)) != LyXParagraph::META_NEWLINE) {
// Yes, this ^ is supposed to be "= " not "=="
}
}
+#ifndef NEW_INSETS
if (i == 0 && i == size() &&
!(footnoteflag == LyXParagraph::NO_FOOTNOTE
- && next && next->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 {
- newpar = newpar->FirstPhysicalPar()->Previous();
+#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())
+ if (previous() || GetDepth())
lyxerr << "ERROR (LyXParagraph::DepthHook): "
"no hook." << endl;
newpar = this;
}
+#ifndef NEW_INSETS
return newpar->FirstPhysicalPar();
+#else
+ return newpar;
+#endif
}
return 0;
do {
- newpar = newpar->FirstPhysicalPar()->Previous();
+#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())
+ if (previous() || GetDepth())
lyxerr << "ERROR (LyXParagraph::DepthHook): "
"no hook." << endl;
newpar = this;
}
+#ifndef NEW_INSETS
return newpar->FirstPhysicalPar();
+#else
+ return newpar;
+#endif
}
}
-Inset * LyXParagraph::ReturnNextInsetPointer(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());
- if (it != insetlist.end()) {
- pos = (*it).pos;
- return (*it).inset;
- }
- return 0;
+ 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;
}
}
+ if (inset == bibkey)
+ return 0;
+
+#ifndef NEW_INSETS
// Think about footnotes.
if (footnoteflag == LyXParagraph::NO_FOOTNOTE
- && next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
- int further =
+ && next_ && next_->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
+ int const further =
NextAfterFootnote()->GetPositionOfInset(inset);
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) {
+ if (params.startOfAppendix()) {
os << "\\appendix\n";
texrow.newline();
}
- if (!spacing.isDefault()
- && (!Previous() || !Previous()->HasSameLayout(this))) {
- os << spacing.writeEnvirBegin() << "\n";
+ if (!params.spacing().isDefault()
+ && (!previous() || !previous()->HasSameLayout(this))) {
+ os << params.spacing().writeEnvirBegin() << "\n";
texrow.newline();
}
texrow.newline();
}
- if (pagebreak_top) {
+ if (params.pagebreakTop()) {
os << "\\newpage";
further_blank_line = true;
}
- if (added_space_top.kind() != VSpace::NONE) {
- os << added_space_top.asLatexCommand(current_view->buffer()->params);
+ if (params.spaceTop().kind() != VSpace::NONE) {
+ os << params.spaceTop().asLatexCommand(bparams);
further_blank_line = true;
}
- if (line_top) {
- os << "\\lyxline{\\" << getFont(0).latexSize() << '}'
+ if (params.lineTop()) {
+ 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) {
+ Language const * language = getParLanguage(bparams);
+ Language const * doc_language = bparams.language;
+ Language const * previous_language = previous_
+ ? previous_->getParLanguage(bparams) : doc_language;
+ if (language->babel() != doc_language->babel() &&
+ language->babel() != previous_language->babel()) {
os << subst(lyxrc.language_command_begin, "$$lang",
- language->lang)
+ language->babel())
<< 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);
+ LyXParagraph * par = next_;
+#ifndef NEW_INSETS
// Spit out footnotes
- LyXParagraph * par = next;
if (lyxrc.rtl_support) {
- if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE
- && next->footnoteflag != footnoteflag) {
+ if (next_ && next_->footnoteflag != LyXParagraph::NO_FOOTNOTE
+ && next_->footnoteflag != footnoteflag) {
LyXParagraph * p = 0;
- bool is_rtl = GetFontSettings(size()-1).isRightToLeft();
- if ( (p = NextAfterFootnote()) != 0 &&
- p->GetFontSettings(0).isRightToLeft() != is_rtl)
- is_rtl = GetFontSettings(0).isRightToLeft();
- while (par &&
- par->footnoteflag != LyXParagraph::NO_FOOTNOTE &&
- par->footnoteflag != footnoteflag) {
- par = par->TeXFootnote(os, texrow, foot,
+ bool is_rtl = (size() > 0)
+ ? GetFontSettings(bparams,
+ size()-1).isRightToLeft()
+ : language->RightToLeft();
+ if ((p = NextAfterFootnote()) != 0 &&
+ p->size() > 0 &&
+ 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(buf, bparams,
+ os, texrow, foot,
foot_texrow, foot_count,
is_rtl);
- par->SimpleTeXOnePar(os, texrow, moving_arg);
- is_rtl = par->GetFontSettings(par->size()-1).isRightToLeft();
- if (par->next &&
- par->next->footnoteflag != LyXParagraph::NO_FOOTNOTE &&
+ par->SimpleTeXOnePar(buf, bparams,
+ os, texrow, moving_arg);
+ is_rtl = (par->size() > 0)
+ ? par->GetFontSettings(bparams,
+ par->size()-1).isRightToLeft()
+ : language->RightToLeft();
+ if (par->next_ &&
+ par->next_->footnoteflag != LyXParagraph::NO_FOOTNOTE &&
(p = par->NextAfterFootnote()) != 0 &&
- p->GetFontSettings(0).isRightToLeft() != is_rtl)
- is_rtl = GetFontSettings(0).isRightToLeft();
- par = par->next;
+ p->size() > 0 &&
+ 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 = par->next;
+ 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);
- if (need_par) {
- if (style.resfont.size() != font.size()) {
- os << '\\'
- << font.latexSize()
- << ' ';
- }
+ //
+ // Is this really needed ? (Dekel)
+ // We do not need to use to change the font for the last paragraph
+ // or for a command.
+#ifndef NEW_INSETS
+ LyXFont font = getFont(bparams, Last() - 1);
+#else
+ LyXFont font = getFont(bparams, size() - 1);
+#endif
+ bool is_command = textclasslist.Style(bparams.textclass,
+ GetLayout()).isCommand();
+ if (style.resfont.size() != font.size() && next_ && !is_command) {
+ if (!need_par)
+ os << "{";
+ os << "\\" << font.latexSize() << " \\par}";
+ } else if (need_par) {
os << "\\par}";
- } else if (textclasslist.Style(current_view->buffer()->params.textclass,
- GetLayout()).isCommand()){
- if (style.resfont.size() != font.size()) {
- os << '\\'
- << font.latexSize()
- << ' ';
- }
- os << '}';
- } else if (style.resfont.size() != font.size()){
- os << "{\\" << font.latexSize() << " \\par}";
- }
+ } else if (is_command)
+ os << "}";
- if (language != doc_language) {
+ if (language->babel() != doc_language->babel() &&
+ (!par
+#ifndef NEW_INSETS
+ || (footnoteflag != NO_FOOTNOTE && par->footnoteflag != footnoteflag)
+#endif
+ || par->getParLanguage(bparams)->babel() != language->babel())) {
os << endl
<< subst(lyxrc.language_command_end, "$$lang",
- doc_language->lang);
+ doc_language->babel());
}
switch (style.latextype) {
case LATEX_ITEM_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
- if (par && (depth < par->depth)) {
+ if (par && (params.depth() < par->params.depth())) {
os << '\n';
texrow.newline();
}
// skip it otherwise fall through
if (par
&& (par->layout != layout
- || par->depth != depth
- || par->pextra_type != pextra_type))
+ || par->params.depth() != params.depth()
+#ifndef NO_PEXTRA
+ || par->params.pextraType() != params.pextraType()
+#endif
+ ))
break;
default:
// we don't need it for the last paragraph!!!
- if (next && !(footnoteflag != LyXParagraph::NO_FOOTNOTE
- && footnotekind != LyXParagraph::FOOTNOTE
- && footnotekind != LyXParagraph::MARGIN
- && (table
- || (par
- && par->table)))) {
- // 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
- // use of tables in \subfigures or \subtables.
+ // or for tables in floats
+ // -- effectively creates a \par where there isn't one which
+ // breaks a \subfigure or \subtable.
+ if (next_) {
+// && footnoteflag == LyXParagraph::NO_FOOTNOTE) {
os << '\n';
texrow.newline();
}
}
further_blank_line = false;
- if (line_bottom) {
- os << "\\lyxline{\\" << getFont(Last() - 1).latexSize() << '}';
+ if (params.lineBottom()) {
+#ifndef NEW_INSETS
+ os << "\\lyxline{\\" << getFont(bparams,
+ Last() - 1).latexSize() << '}';
+#else
+ os << "\\lyxline{\\" << getFont(bparams,
+ size() - 1).latexSize() << '}';
+#endif
further_blank_line = true;
}
- if (added_space_bottom.kind() != VSpace::NONE) {
- os << added_space_bottom.asLatexCommand(current_view->buffer()->params);
+ if (params.spaceBottom().kind() != VSpace::NONE) {
+ os << params.spaceBottom().asLatexCommand(bparams);
further_blank_line = true;
}
- if (pagebreak_bottom) {
+ if (params.pagebreakBottom()) {
os << "\\newpage";
further_blank_line = true;
}
texrow.newline();
}
- if (!spacing.isDefault()
+ if (!params.spacing().isDefault()
&& (!par || !par->HasSameLayout(this))) {
- os << spacing.writeEnvirEnd() << "\n";
+ os << params.spacing().writeEnvirEnd() << "\n";
texrow.newline();
}
// we don't need it for the last paragraph!!!
- if (next && !(footnoteflag != LyXParagraph::NO_FOOTNOTE && par &&
- par->footnoteflag == LyXParagraph::NO_FOOTNOTE)) {
+ 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;
- if (table)
- return SimpleTeXOneTablePar(os, texrow);
-
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;
- } else if (align != LYX_ALIGN_LAYOUT) {
+ } else if (params.align() != LYX_ALIGN_LAYOUT) {
os << '{';
++column;
return_value = true;
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;
if (style.isCommand()) {
os << '{';
++column;
- } else if (align != LYX_ALIGN_LAYOUT) {
- os << "{\\par";
- column += 4;
+ } else if (params.align() != LYX_ALIGN_LAYOUT && next_) {
+ // We do not need \par here (Dekel)
+ // os << "{\\par";
+ os << "{";
+ ++column;
return_value = true;
}
- if (noindent) {
+ if (params.noindent()) {
os << "\\noindent ";
column += 10;
}
- switch (align) {
+ switch (params.align()) {
case LYX_ALIGN_NONE:
case LYX_ALIGN_BLOCK:
case LYX_ALIGN_LAYOUT:
case LYX_ALIGN_SPECIAL:
break;
case LYX_ALIGN_LEFT:
- if (getParLanguage()->lang != "hebrew") {
+ if (moving_arg)
+ os << "\\protect";
+ if (getParLanguage(bparams)->babel() != "hebrew") {
os << "\\raggedright ";
column+= 13;
} else {
}
break;
case LYX_ALIGN_RIGHT:
- if (getParLanguage()->lang != "hebrew") {
+ if (moving_arg)
+ os << "\\protect";
+ if (getParLanguage(bparams)->babel() != "hebrew") {
os << "\\raggedleft ";
column+= 12;
} else {
}
break;
case LYX_ALIGN_CENTER:
+ if (moving_arg)
+ os << "\\protect";
os << "\\centering ";
column+= 11;
break;
}
}
- 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 &&
- previous->footnoteflag != LyXParagraph::NO_FOOTNOTE &&
+ 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)
- running_font.latexWriteEndChanges(os, basefont,
- p->getFont(0));
- else
- running_font.latexWriteEndChanges(os, basefont, basefont);
- }
-
- // Needed if there is an optional argument but no contents.
- if (main_body > 0 && main_body == size()) {
- os << "]~";
- return_value = false;
- }
-
- lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
- return return_value;
-}
-
-
-// This one spits out the text of a table paragraph
-bool LyXParagraph::SimpleTeXOneTablePar(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());
-
- int column = 0;
- if (!IsDummy()) { // it is dummy if it is in a float!!!
- if (style.isCommand()) {
- os << '{';
- ++column;
- } else if (align != LYX_ALIGN_LAYOUT) {
- os << '{';
- ++column;
- return_value = true;
- }
- if (noindent) {
- os << "\\noindent ";
- column += 10;
- }
- switch (align) {
- case LYX_ALIGN_NONE:
- case LYX_ALIGN_BLOCK:
- case LYX_ALIGN_LAYOUT:
- case LYX_ALIGN_SPECIAL: break;
- case LYX_ALIGN_LEFT:
- os << "\\raggedright ";
- column+= 13;
- break;
- case LYX_ALIGN_RIGHT:
- os << "\\raggedleft ";
- column+= 12;
- break;
- case LYX_ALIGN_CENTER:
- os << "\\centering ";
- column+= 11;
- break;
- }
- }
-
- LyXFont basefont = getFont(-1); // Get layout font
- // Which font is currently active?
- LyXFont running_font = basefont;
- LyXFont last_font;
- // Do we have an open font change?
- bool open_font = false;
- int current_cell_number = -1;
- int tmp = table->TexEndOfCell(os, current_cell_number);
- for (; tmp > 0 ; --tmp)
- texrow.newline();
-
- texrow.start(this, 0);
-
- bool is_rtl = getParLanguage()->RightToLeft;
- bool first_in_cell = true;
-
- for (size_type i = 0; i < size(); ++i) {
- char c = GetChar(i);
- if (table->IsContRow(current_cell_number + 1)) {
- if (c == LyXParagraph::META_NEWLINE)
- ++current_cell_number;
- continue;
- }
- ++column;
-
- if (first_in_cell && is_rtl) {
- os << "\\R{";
- column += 3;
- first_in_cell = false;
- }
-
- // Fully instantiated font
- LyXFont font = getFont(i);
- last_font = running_font;
-
- // 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) != running_font
- && getFont(i + 1) != font) {
- font = getFont(i + 1);
- }
-
- // We end font definition before blanks
- if (font != running_font && open_font) {
- column += running_font.latexWriteEndChanges(os,
- basefont,
- font);
- running_font = basefont;
- open_font = false;
- }
- // Blanks are printed before start of fontswitch
- if (c == ' '){
- SimpleTeXBlanks(os, texrow, i, column, font, style);
- }
- // Do we need to change font?
- if (font != running_font) {
- column += font.latexWriteStartChanges(os, basefont,
- last_font);
- running_font = font;
- open_font = true;
- }
- // Do we need to turn on LaTeX mode?
- if (font.latex() != running_font.latex()) {
- if (font.latex() == LyXFont::ON
- && style.needprotect) {
- os << "\\protect ";
- column += 9;
- }
- }
- if (c == LyXParagraph::META_NEWLINE) {
- // special case for inside a table
- // different from default case in
- // SimpleTeXSpecialChars()
- if (open_font) {
- column += running_font
- .latexWriteEndChanges(os, basefont,
- basefont);
- open_font = false;
- }
- basefont = getFont(-1);
- running_font = basefont;
- ++current_cell_number;
- if (table->CellHasContRow(current_cell_number) >= 0) {
- TeXContTableRows(os, i + 1,
- current_cell_number,
- column, texrow);
- }
- if (is_rtl && !first_in_cell) {
- os << "}";
- first_in_cell = true;
- }
-
- // if this cell follow only ContRows till end don't
- // put the EndOfCell because it is put after the
- // for(...)
- if (table->ShouldBeVeryLastCell(current_cell_number)) {
- --current_cell_number;
- break;
- }
- int tmp = table->TexEndOfCell(os,
- current_cell_number);
- if (tmp > 0) {
- column = 0;
- } else if (tmp < 0) {
- tmp = -tmp;
- }
- for (; tmp--;) {
- texrow.newline();
- }
- texrow.start(this, i + 1);
- } else {
- SimpleTeXSpecialChars(os, texrow, false,
- 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) {
- running_font.latexWriteEndChanges(os, basefont, basefont);
- }
- ++current_cell_number;
- if (is_rtl && !first_in_cell)
- os << "}";
- tmp = table->TexEndOfCell(os, current_cell_number);
- for (; tmp > 0; --tmp)
- texrow.newline();
- lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...done " << this << endl;
- return return_value;
-}
-
-
-// This one spits out the text off ContRows in tables
-bool LyXParagraph::TeXContTableRows(ostream & os,
- LyXParagraph::size_type i,
- int current_cell_number,
- int & column, TexRow & texrow)
-{
- lyxerr[Debug::LATEX] << "TeXContTableRows... " << this << endl;
- if (!table)
- return false;
-
- char c;
-
- bool return_value = false;
- LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
- GetLayout());
- LyXFont basefont = getFont(-1); // Get layout font
- LyXFont last_font;
- // Which font is currently active?
- LyXFont running_font = basefont;
- // Do we have an open font change?
- bool open_font = false;
-
- size_type lastpos = i;
- int cell = table->CellHasContRow(current_cell_number);
- ++current_cell_number;
- while(cell >= 0) {
- // first find the right position
- i = lastpos;
- for (; (i < size()) && (current_cell_number<cell); ++i) {
- c = GetChar(i);
- if (c == LyXParagraph::META_NEWLINE)
- ++current_cell_number;
- }
- lastpos = i;
- c = GetChar(i);
- if (table->Linebreaks(table->FirstVirtualCell(cell))) {
- os << " \\\\\n";
- texrow.newline();
- column = 0;
- } else if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
- os << ' ';
- }
-
- for (; i < size()
- && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
- ++i) {
- ++column;
-
- // Fully instantiated font
- LyXFont font = getFont(i);
- 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) != running_font
- && getFont(i + 1) != font) {
- font = getFont(i + 1);
- }
-
- // We end font definition before blanks
- if (font != running_font && open_font) {
- column += running_font.latexWriteEndChanges(os, basefont, font);
- running_font = basefont;
- open_font = false;
- }
- // Blanks are printed before start of fontswitch
- if (c == ' '){
- SimpleTeXBlanks(os, texrow, i,
- column, font, style);
- }
- // Do we need to change font?
- if (font != running_font) {
- column +=
- font.latexWriteStartChanges(os,
- basefont,
- last_font);
- running_font = font;
- open_font = true;
- }
- // Do we need to turn on LaTeX mode?
- if (font.latex() != running_font.latex()) {
- if (font.latex() == LyXFont::ON
- && style.needprotect) {
- os << "\\protect ";
- column += 9;
- }
- }
- SimpleTeXSpecialChars(os, texrow, false, 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) {
+ // If we have an open font definition, we have to close it
+ if (open_font) {
+ LyXParagraph * p = 0;
+ if (next_
+#ifndef NEW_INSETS
+ && next_->footnoteflag != LyXParagraph::NO_FOOTNOTE
+ && (p = NextAfterFootnote()) != 0
+#else
+ && (p = next_)
+#endif
+ )
running_font.latexWriteEndChanges(os, basefont,
- basefont);
- open_font = false;
- }
- basefont = getFont(-1);
- running_font = basefont;
- cell = table->CellHasContRow(current_cell_number);
+ p->getFont(bparams, 0));
+ else
+ running_font.latexWriteEndChanges(os, basefont, basefont);
+ }
+
+ // Needed if there is an optional argument but no contents.
+ if (main_body > 0 && main_body == size()) {
+ os << "]~";
+ return_value = false;
}
- lyxerr[Debug::LATEX] << "TeXContTableRows...done " << this << endl;
+
+ lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
return return_value;
}
}
-void LyXParagraph::SimpleDocBookOneTablePar(ostream & os, string & extra,
- int & desc_on, int depth)
-{
- if (!table) return;
- lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar... " << this << endl;
- int column = 0;
- LyXFont font1, font2;
- char c;
- Inset * inset;
- size_type main_body;
- bool emph_flag = false;
-
- 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.
- if (main_body > 0)
- font1 = style.labelfont;
- else
- font1 = style.font;
-
- int char_line_count = depth;
- os << newlineAndDepth(depth);
- if (footnoteflag == LyXParagraph::NO_FOOTNOTE) {
- os << "<INFORMALTABLE>"
- << newlineAndDepth(++depth);
- }
- int current_cell_number = -1;
- int tmp = table->DocBookEndOfCell(os, current_cell_number, depth);
-
- // Parsing main loop.
- for (size_type i = 0; i < size(); ++i) {
- c = GetChar(i);
- if (table->IsContRow(current_cell_number+1)) {
- if (c == LyXParagraph::META_NEWLINE)
- ++current_cell_number;
- continue;
- }
- ++column;
-
- // Fully instantiated font
- font2 = getFont(i);
-
- // Handle <emphasis> tag.
- if (font1.emph() != font2.emph() && i) {
- if (font2.emph() == LyXFont::ON) {
- os << "<emphasis>";
- emph_flag= true;
- } else if (emph_flag) {
- os << "</emphasis>";
- emph_flag= false;
- }
- }
- if (c == LyXParagraph::META_NEWLINE) {
- // We have only to control for emphasis open here!
- if (emph_flag) {
- os << "</emphasis>";
- emph_flag= false;
- }
- font1 = font2 = getFont(-1);
- ++current_cell_number;
- if (table->CellHasContRow(current_cell_number) >= 0) {
- DocBookContTableRows(os, extra, desc_on, i + 1,
- current_cell_number,
- column);
- }
- // if this cell follow only ContRows till end don't
- // put the EndOfCell because it is put after the
- // for(...)
- if (table->ShouldBeVeryLastCell(current_cell_number)) {
- --current_cell_number;
- break;
- }
- tmp = table->DocBookEndOfCell(os,
- current_cell_number,
- depth);
-
- if (tmp > 0)
- column = 0;
- } else if (c == LyXParagraph::META_INSET) {
- inset = GetInset(i);
-#ifdef HAVE_SSTREAM
- std::ostringstream ost;
- inset->DocBook(ost);
- string tmp_out = ost.str().c_str();
-#else
- ostrstream ost;
- inset->DocBook(ost);
- ost << '\0';
- char * ctmp = ost.str();
- string tmp_out(ctmp);
- delete [] ctmp;
-#endif
- //
- // This code needs some explanation:
- // Two insets are treated specially
- // 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
- // desc_on == 4
- //
- if(desc_on != 3 || i != 0) {
- if(tmp_out[0] == '@') {
- if(desc_on == 4)
- extra += frontStrip(tmp_out,
- '@');
- else
- os << frontStrip(tmp_out,
- '@');
- } else
- os << tmp_out;
- }
- } else if (font2.latex() == LyXFont::ON) {
- // "TeX"-Mode on == > SGML-Mode on.
- if (c != '\0')
- os << c;
- ++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 ' '
- if (desc_on == 1) {
- ++char_line_count;
- os << '\n'
- << "</term><listitem><para>";
- desc_on = 2;
- } else {
- os << c;
- }
- } else {
- os << sgml_string;
- }
- }
- font1 = font2;
- }
-
- // Needed if there is an optional argument but no contents.
- if (main_body > 0 && main_body == size()) {
- font1 = style.font;
- }
-
- if (emph_flag) {
- os << "</emphasis>";
- }
-
- ++current_cell_number;
- tmp = table->DocBookEndOfCell(os, current_cell_number, depth);
- // Resets description flag correctly.
- switch(desc_on){
- case 1:
- // <term> not closed...
- os << "</term>";
- break;
- }
- if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
- os << "</INFORMALTABLE>";
- os << '\n';
- lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar...done "
- << this << endl;
-}
-
-
-void LyXParagraph::DocBookContTableRows(ostream & os, string & extra,
- int & desc_on,
- LyXParagraph::size_type i,
- int current_cell_number, int &column)
-
-{
- if (!table) return;
-
- lyxerr[Debug::LATEX] << "DocBookContTableRows... " << this << endl;
-
- LyXFont font2;
- char c;
- Inset * inset;
- //string emph = "emphasis";
- bool emph_flag = false;
- int char_line_count = 0;
-
- 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.
- LyXFont font1;
- if (main_body > 0)
- font1 = style.labelfont;
- else
- font1 = style.font;
-
- size_type lastpos = i;
- int cell = table->CellHasContRow(current_cell_number);
- ++current_cell_number;
- while(cell >= 0) {
- // first find the right position
- i = lastpos;
- for (; i < size() && current_cell_number < cell; ++i) {
- c = GetChar(i);
- if (c == LyXParagraph::META_NEWLINE)
- ++current_cell_number;
- }
- lastpos = i;
- c = GetChar(i);
- // I don't know how to handle this so I comment it
- // for the moment (Jug)
-// if (table->Linebreaks(table->FirstVirtualCell(cell))) {
-// file += " \\\\\n";
-// column = 0;
-// } else
- if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
- os << ' ';
- }
-
- for (; i < size()
- && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
- ++i) {
- ++column;
-
- // Fully instantiated font
- font2 = getFont(i);
-
- // Handle <emphasis> tag.
- if (font1.emph() != font2.emph() && i) {
- if (font2.emph() == LyXFont::ON) {
- os << "<emphasis>";
- emph_flag= true;
- } else if (emph_flag) {
- os << "</emphasis>";
- emph_flag= false;
- }
- }
- if (c == LyXParagraph::META_INSET) {
- inset = GetInset(i);
-#ifdef HAVE_SSTREAM
- std::ostringstream ost;
- inset->DocBook(ost);
- string tmp_out = ost.str().c_str();
-#else
- ostrstream ost;
- inset->DocBook(ost);
- ost << '\0';
- char * ctmp = ost.str();
- string tmp_out(ctmp);
- delete [] ctmp;
-#endif
- //
- // This code needs some explanation:
- // Two insets are treated specially
- // 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
- // desc_on == 4
- //
- if(desc_on != 3 || i != 0) {
- if(tmp_out[0] == '@') {
- if(desc_on == 4)
- extra += frontStrip(tmp_out, '@');
- else
- os << frontStrip(tmp_out, '@');
- } else
- os << tmp_out;
- }
- } else if (font2.latex() == LyXFont::ON) {
- // "TeX"-Mode on == > SGML-Mode on.
- if (c!= '\0')
- os << c;
- ++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 ' '
- if (desc_on == 1) {
- ++char_line_count;
- os << '\n'
- << "</term><listitem><para>";
- desc_on = 2;
- } else {
- os << c;
- }
- } else {
- os << sgml_string;
- }
- }
- }
- // we have only to control for emphasis open here!
- if (emph_flag) {
- os << "</emphasis>";
- emph_flag= false;
- }
- font1 = font2 = getFont(-1);
- cell = table->CellHasContRow(current_cell_number);
- }
- lyxerr[Debug::LATEX] << "DocBookContTableRows...done " << this << endl;
-}
-
-
void LyXParagraph::SimpleTeXBlanks(ostream & os, TexRow & texrow,
LyXParagraph::size_type const i,
int & column, LyXFont const & font,
}
-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
Inset * inset = GetInset(i);
if (inset) {
bool close = false;
- int len = os.tellp();
+ int const len = os.tellp();
+ //ostream::pos_type const len = os.tellp();
if ((inset->LyxCode() == Inset::GRAPHICS_CODE
|| inset->LyxCode() == Inset::MATH_CODE
|| inset->LyxCode() == Inset::URL_CODE)
close = true;
}
- int tmp = inset->Latex(os, moving_arg,
+ int tmp = inset->Latex(buf, os, moving_arg,
style.free_spacing);
if (close)
if (tmp) {
column = 0;
} else {
- column += os.tellp() - len;
+ column += int(os.tellp()) - len;
}
for (; tmp--;) {
texrow.newline();
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;
}
// Otherwise, we use what LaTeX
// provides us.
- switch(c) {
+ switch (c) {
case '<':
os << "\\textless{}";
column += 10;
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->params.depth() == params.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);
+#ifndef NO_PEXTRA
+ || par->params.pextraType() != PEXTRA_NONE
+#endif
+ ) {
+ 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
+ )
{
+#ifndef NO_PEXTRA
bool eindent_open = false;
+#endif
+#ifndef NEW_INSETS
bool foot_this_level = false;
+#endif
+#ifndef NO_PEXTRA
// 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;
+#endif
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) {
- if (!pextra_width.empty()) {
+
+#ifndef NO_PEXTRA
+ if (params.pextraType() == PEXTRA_INDENT) {
+ if (!params.pextraWidth().empty()) {
os << "\\begin{LyXParagraphIndent}{"
- << pextra_width << "}\n";
+ << params.pextraWidth() << "}\n";
} else {
//float ib = atof(pextra_widthp.c_str())/100;
// string can't handle floats at present (971109)
// so I'll do a conversion by hand knowing that
// the limits are 0.0 to 1.0. ARRae.
os << "\\begin{LyXParagraphIndent}{";
- switch (pextra_widthp.length()) {
+ switch (params.pextraWidthp().length()) {
case 3:
os << "1.00";
break;
case 2:
os << "0."
- << pextra_widthp;
+ << params.pextraWidthp();
break;
case 1:
os << "0.0"
- << pextra_widthp;
+ << params.pextraWidthp();
}
os << "\\columnwidth}\n";
}
texrow.newline();
eindent_open = true;
}
- if ((pextra_type == PEXTRA_MINIPAGE) && !minipage_open) {
- if (pextra_hfill && Previous() &&
- (Previous()->pextra_type == PEXTRA_MINIPAGE)) {
+ if ((params.pextraType() == PEXTRA_MINIPAGE) && !minipage_open) {
+ if (params.pextraHfill() && previous() &&
+ (previous()->params.pextraType() == PEXTRA_MINIPAGE)) {
os << "\\hfill{}\n";
texrow.newline();
}
texrow.newline();
}
os << "\\begin{minipage}";
- switch(pextra_alignment) {
+ switch (params.pextraAlignment()) {
case MINIPAGE_ALIGN_TOP:
os << "[t]";
break;
os << "[b]";
break;
}
- if (!pextra_width.empty()) {
- os << '{' << pextra_width << "}\n";
+ if (!params.pextraWidth().empty()) {
+ os << '{' << params.pextraWidth() << "}\n";
} else {
//float ib = atof(par->pextra_width.c_str())/100;
// string can't handle floats at present
// so I'll do a conversion by hand knowing that
// the limits are 0.0 to 1.0. ARRae.
os << '{';
- switch (pextra_widthp.length()) {
+ switch (params.pextraWidthp().length()) {
case 3:
os << "1.00";
break;
case 2:
os << "0."
- << pextra_widthp;
+ << params.pextraWidthp();
break;
case 1:
os << "0.0"
- << pextra_widthp;
+ << params.pextraWidthp();
}
os << "\\columnwidth}\n";
}
texrow.newline();
}
minipage_open = true;
- minipage_open_depth = depth;
+ minipage_open_depth = params.depth();
}
-
+#endif
#ifdef WITH_WARNINGS
#warning Define FANCY_FOOTNOTE_CODE to re-enable Allan footnote code
//I disabled it because it breaks when lists span on several
}
#endif
os << "\\begin{" << style.latexname() << "}{"
- << labelwidthstring << "}\n";
+ << params.labelWidthString() << "}\n";
} else if (style.labeltype == LABEL_BIBLIO) {
// ale970405
os << "\\begin{" << style.latexname() << "}{"
- << bibitemWidthest(current_view->painter())
+ << bibitemWidest(buf)
<< "}\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
+ );
+#ifndef NO_PEXTRA
if (minipage_open && par && !style.isEnvironment() &&
- (par->pextra_type == PEXTRA_MINIPAGE) &&
- par->pextra_start_minipage) {
+ (par->params.pextraType() == PEXTRA_MINIPAGE) &&
+ par->params.pextraStartMinipage()) {
os << "\\end{minipage}\n";
texrow.newline();
if (par_sep == BufferParams::PARSEP_INDENT) {
}
minipage_open = false;
}
- if (par && par->depth > depth) {
- if (textclasslist.Style(current_view->buffer()->params.textclass,
+#endif
+ if (par && par->params.depth() > params.depth()) {
+ if (textclasslist.Style(bparams.textclass,
par->layout).isParagraph()
- && !par->table
// 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) {
- if (par->pextra_hfill && par->Previous() &&
- (par->Previous()->pextra_type == PEXTRA_MINIPAGE)){
+#ifndef NO_PEXTRA
+ if (par && par->layout == layout && par->params.depth() == params.depth() &&
+ (par->params.pextraType() == PEXTRA_MINIPAGE) && !minipage_open) {
+ if (par->params.pextraHfill() && par->previous() &&
+ (par->previous()->params.pextraType() == PEXTRA_MINIPAGE)){
os << "\\hfill{}\n";
texrow.newline();
}
texrow.newline();
}
os << "\\begin{minipage}";
- switch(par->pextra_alignment) {
+ switch (par->params.pextraAlignment()) {
case MINIPAGE_ALIGN_TOP:
os << "[t]";
break;
os << "[b]";
break;
}
- if (!par->pextra_width.empty()) {
- os << '{' << par->pextra_width << "}\n";
+ if (!par->params.pextraWidth().empty()) {
+ os << '{' << par->params.pextraWidth() << "}\n";
} else {
//float ib = atof(par->pextra_widthp.c_str())/100;
// string can't handle floats at present
// so I'll do a conversion by hand knowing that
// the limits are 0.0 to 1.0. ARRae.
os << '{';
- switch (par->pextra_widthp.length()) {
+ switch (par->params.pextraWidthp().length()) {
case 3:
os << "1.00";
break;
case 2:
- os << "0." << par->pextra_widthp;
+ os << "0." << par->params.pextraWidthp();
break;
case 1:
- os << "0.0" << par->pextra_widthp;
+ os << "0.0" << par->params.pextraWidthp();
}
os << "\\columnwidth}\n";
}
texrow.newline();
}
minipage_open = true;
- minipage_open_depth = par->depth;
+ minipage_open_depth = par->params.depth();
}
+#endif
} while (par
&& par->layout == layout
- && par->depth == depth
- && par->pextra_type == pextra_type
- && par->footnoteflag == footnoteflag);
+ && par->params.depth() == params.depth()
+#ifndef NO_PEXTRA
+ && par->params.pextraType() == params.pextraType()
+#endif
+#ifndef NEW_INSETS
+ && par->footnoteflag == footnoteflag
+#endif
+ );
if (style.isEnvironment()) {
- os << "\\end{" << style.latexname() << '}';
+ os << "\\end{" << style.latexname() << "}\n";
+
+#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 ||
- par->pextra_type != PEXTRA_MINIPAGE)) {
+#ifndef NO_PEXTRA
+ if (minipage_open && (minipage_open_depth == params.depth()) &&
+ (!par || par->params.pextraStartMinipage() ||
+ par->params.pextraType() != PEXTRA_MINIPAGE)) {
os << "\\end{minipage}\n";
texrow.newline();
if (par_sep == BufferParams::PARSEP_INDENT) {
os << "}\n";
texrow.newline();
}
- if (par && par->pextra_type != PEXTRA_MINIPAGE) {
+ if (par && par->params.pextraType() != PEXTRA_MINIPAGE) {
os << "\\medskip\n\n";
texrow.newline();
texrow.newline();
os << "\\end{LyXParagraphIndent}\n";
texrow.newline();
}
- if (!(par && (par->pextra_type == PEXTRA_MINIPAGE)
- && par->pextra_hfill)) {
+ if (!(par && (par->params.pextraType() == PEXTRA_MINIPAGE)
+ && par->params.pextraHfill())) {
os << '\n';
texrow.newline();
}
+#endif
lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
return par; // ale970302
}
-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,
- previous->GetLayout());
+ textclasslist.Style(bparams.textclass,
+ previous_->GetLayout());
if (style.needprotect && footnotekind != LyXParagraph::FOOTNOTE){
lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
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;
bool footer_in_body = true;
switch (footnotekind) {
case LyXParagraph::FOOTNOTE:
os << "\\marginpar{\n";
break;
case LyXParagraph::FIG:
- if (pextra_type == PEXTRA_FLOATFLT
- && (!pextra_width.empty()
- || !pextra_widthp.empty())) {
- if (!pextra_width.empty())
+ if (params.pextraType() == PEXTRA_FLOATFLT
+ && (!params.pextraWidth().empty()
+ || !params.pextraWidthp().empty())) {
+ if (!params.pextraWidth().empty())
os << "\\begin{floatingfigure}{"
- << pextra_width << "}\n";
+ << params.pextraWidth() << "}\n";
else
os << "\\begin{floatingfigure}{"
- << atoi(pextra_widthp.c_str())/100.0
+ << lyx::atoi(params.pextraWidthp()) / 100.0
<< "\\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;
if (style.isEnvironment()
- || par->pextra_type == PEXTRA_MINIPAGE) { /* && !minipage_open ?? */
+ || par->params.pextraType() == PEXTRA_MINIPAGE) { /* && !minipage_open ?? */
// Allows the use of minipages within float
// 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,
+ if (par && !par->IsDummy() && par->params.depth() > params.depth()) {
+ par = par->TeXDeeper(buf, bparams, os, texrow,
foot, foot_texrow,
foot_count);
}
// process footnotes > depth 0 or in environments separately
// NOTE: Currently don't support footnotes within footnotes
// even though that is possible using the \footnotemark
-#ifdef HAVE_SSTREAM
std::ostringstream dummy;
-#else
- ostrstream dummy;
-#endif
TexRow dummy_texrow;
int dummy_count = 0;
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;
if (style.isEnvironment()
- || par->pextra_type == PEXTRA_MINIPAGE) { /* && !minipage_open ?? */
+ || par->params.pextraType() == PEXTRA_MINIPAGE) { /* && !minipage_open ?? */
// Allows the use of minipages within float
// 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,
+ if (par && !par->IsDummy() && par->params.depth() > params.depth()) {
+ par = par->TeXDeeper(buf, bparams,
+ foot, foot_texrow,
dummy, dummy_texrow,
dummy_count);
}
"Footnote in a Footnote -- not supported"
<< endl;
}
-#ifndef HAVE_OSTREAM
- delete [] dummy.str();
-#endif
}
switch (footnotekind) {
os << '}';
break;
case LyXParagraph::FIG:
- if (pextra_type == PEXTRA_FLOATFLT
- && (!pextra_width.empty()
- || !pextra_widthp.empty()))
+ if (params.pextraType() == PEXTRA_FLOATFLT
+ && (!params.pextraWidth().empty()
+ || !params.pextraWidthp().empty()))
os << "\\end{floatingfigure}";
else
os << "\\end{figure}";
texrow.newline();
}
- lyxerr[Debug::LATEX] << "TeXFootnote...done " << par->next << endl;
+ lyxerr[Debug::LATEX] << "TeXFootnote...done " << par->next_ << endl;
return par;
}
bool LyXParagraph::IsDummy() const
{
- return (footnoteflag == LyXParagraph::NO_FOOTNOTE && previous
- && previous->footnoteflag != LyXParagraph::NO_FOOTNOTE);
+ return (footnoteflag == LyXParagraph::NO_FOOTNOTE && previous_
+ && previous_->footnoteflag != LyXParagraph::NO_FOOTNOTE);
}
+#endif
-
-void LyXParagraph::SetPExtraType(int type, char const * width,
- char const * widthp)
+#ifndef NO_PEXTRA
+void LyXParagraph::SetPExtraType(BufferParams const & bparams,
+ int type, string const & width,
+ string const & widthp)
{
- pextra_type = type;
- pextra_width = width;
- pextra_widthp = widthp;
+ params.pextraType(type);
+ params.pextraWidth(width);
+ params.pextraWidthp(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)) {
+ && (par->params.depth() == params.depth())) {
ppar = par;
- par = par->Previous();
+ par = par->previous();
+#ifndef NEW_INSETS
if (par)
par = par->FirstPhysicalPar();
- while (par && par->depth > depth) {
- par = par->Previous();
+#endif
+ while (par && par->params.depth() > params.depth()) {
+ par = par->previous();
+#ifndef NEW_INSETS
if (par)
par = par->FirstPhysicalPar();
+#endif
}
}
par = ppar;
while (par && (par->layout == layout)
- && (par->depth == depth)) {
- par->pextra_type = type;
- par->pextra_width = width;
- par->pextra_widthp = widthp;
+ && (par->params.depth() == params.depth())) {
+ par->params.pextraType(type);
+ par->params.pextraWidth(width);
+ par->params.pextraWidthp(widthp);
+#ifndef NEW_INSETS
par = par->NextAfterFootnote();
- if (par && (par->depth > depth))
- par->SetPExtraType(type, width, widthp);
- while (par && ((par->depth > depth) || par->IsDummy()))
+#else
+ par = par->next();
+#endif
+ if (par && (par->params.depth() > params.depth()))
+ par->SetPExtraType(bparams,
+ type, width, widthp);
+#ifndef NEW_INSETS
+ while (par && ((par->params.depth() > params.depth()) || par->IsDummy()))
par = par->NextAfterFootnote();
+#else
+ while (par && par->params.depth() > params.depth())
+ par = par->next();
+#endif
}
}
}
-void LyXParagraph::UnsetPExtraType()
+void LyXParagraph::UnsetPExtraType(BufferParams const & bparams)
{
- if (pextra_type == PEXTRA_NONE)
+ if (params.pextraType() == PEXTRA_NONE)
return;
- pextra_type = PEXTRA_NONE;
- pextra_width.erase();
- pextra_widthp.erase();
+ params.pextraType(PEXTRA_NONE);
+ params.pextraWidth(string());
+ params.pextraWidthp(string());
- 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)) {
+ && (par->params.depth() == params.depth())) {
ppar = par;
- par = par->Previous();
+ par = par->previous();
+#ifndef NEW_INSETS
if (par)
par = par->FirstPhysicalPar();
- while (par && par->depth > depth) {
- par = par->Previous();
+#endif
+ while (par && par->params.depth() > params.depth()) {
+ par = par->previous();
+#ifndef NEW_INSETS
if (par)
par = par->FirstPhysicalPar();
+#endif
}
}
par = ppar;
while (par && (par->layout == layout)
- && (par->depth == depth)) {
- par->pextra_type = PEXTRA_NONE;
- par->pextra_width.erase();
- par->pextra_widthp.erase();
+ && (par->params.depth() == params.depth())) {
+ par->params.pextraType(PEXTRA_NONE);
+ par->params.pextraWidth(string());
+ par->params.pextraWidthp(string());
+#ifndef NEW_INSETS
par = par->NextAfterFootnote();
- if (par && (par->depth > depth))
- par->UnsetPExtraType();
- while (par && ((par->depth > depth) || par->IsDummy()))
+#else
+ par = par->next();
+#endif
+ if (par && (par->params.depth() > params.depth()))
+ par->UnsetPExtraType(bparams);
+#ifndef NEW_INSETS
+ while (par && ((par->params.depth() > params.depth()) || par->IsDummy()))
par = par->NextAfterFootnote();
+#else
+ while (par && par->params.depth() > params.depth())
+ par = par->next();
+#endif
}
}
}
+#endif
bool LyXParagraph::IsHfill(size_type pos) const
}
+#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 const c = GetChar(pos);
if (IsLetterChar(c))
return true;
// '\0' is not a letter, allthough every string contains "" (below)
- if( c == '\0')
+ if (c == '\0')
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;
+ string const extra = lyxrc.isp_esc_chars + '\'';
+ 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(bparams);
+ else
+#endif
if (size() > 0)
- if (!table)
- return FirstPhysicalPar()->GetFirstFontSettings()
- .language();
- else {
- for (size_type pos = 0; pos < size(); ++pos)
- if (IsNewline(pos))
- return GetFontSettings(pos).language();
- return GetFirstFontSettings().language();
- }
- else if (previous)
- return previous->getParLanguage();
+ return GetFirstFontSettings().language();
+ else if (previous_)
+ return previous_->getParLanguage(bparams);
else
- return current_view->buffer()->params.language_info;
+ return bparams.language;
}
-bool LyXParagraph::isRightToLeftPar() const
+bool LyXParagraph::isRightToLeftPar(BufferParams const & bparams) const
{
- return lyxrc.rtl_support && !table && getParLanguage()->RightToLeft;
+ return lyxrc.rtl_support
+ && 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);
+ for (size_type i = 0; i < size(); ++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;
+ 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 const LyXParagraph::String(Buffer const * buffer, bool label)
+{
+ BufferParams const & bparams = buffer->params;
+ string s;
+#ifndef NEW_INSETS
+ if (label && !IsDummy() && !params.labelString().empty())
+#else
+ if (label && !params.labelString().empty())
+#endif
+ s += params.labelString() + ' ';
+ string::size_type const len = s.size();
+
+ for (LyXParagraph::size_type i = 0; i < size(); ++i) {
+ value_type c = GetChar(i);
+ if (IsPrintable(c))
+ s += c;
+ else if (c == META_INSET &&
+ GetInset(i)->LyxCode() == Inset::MATH_CODE) {
+ std::ostringstream ost;
+ GetInset(i)->Ascii(buffer, ost);
+ s += subst(ost.str().c_str(),'\n',' ');
+ }
+ }
+
+#ifndef NEW_INSETS
+ if (next_ && next_->footnoteflag != LyXParagraph::NO_FOOTNOTE
+ && footnoteflag == LyXParagraph::NO_FOOTNOTE)
+ s += NextAfterFootnote()->String(buffer, false);
+
+ if (!IsDummy()) {
+#endif
+ if (isRightToLeftPar(bparams))
+ reverse(s.begin() + len,s.end());
+#ifndef NEW_INSETS
+ }
+#endif
+ return s;
+}
+
+
+string const LyXParagraph::String(Buffer const * buffer,
+ LyXParagraph::size_type beg,
+ LyXParagraph::size_type end)
+{
+ string s;
+
+#ifndef NEW_INSETS
+ if (beg == 0 && !IsDummy() && !params.labelString().empty())
+#else
+ if (beg == 0 && !params.labelString().empty())
+#endif
+ s += params.labelString() + ' ';
+
+ for (LyXParagraph::size_type i = beg; i < end; ++i) {
+ value_type c = GetUChar(buffer->params, i);
+ if (IsPrintable(c))
+ s += c;
+ else if (c == META_INSET) {
+ std::ostringstream ost;
+ GetInset(i)->Ascii(buffer, ost);
+ s += ost.str().c_str();
+ }
+ }
+
+ 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);
+ }
+ }
+ }
+}
+
+
+void LyXParagraph::fitToSize()
+{
+ TextContainer tmp(text.begin(), text.end());
+ text.swap(tmp);
+}
+
+
+void LyXParagraph::setContentsFromPar(LyXParagraph * par)
+{
+ text = par->text;
+}
projects / lyx.git / blobdiff