#include "support/textutils.h"
#include "lyxrc.h"
#include "layout.h"
+#include "language.h"
#include "tex-strings.h"
+#include "buffer.h"
#include "bufferparams.h"
#include "support/FileInfo.h"
#include "support/LAssert.h"
#include "support/lyxmanip.h"
#include "BufferView.h"
#include "encoding.h"
+#include "ParameterStruct.h"
+#include "gettext.h"
using std::ostream;
using std::endl;
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;
-extern string bibitemWidest(BufferView *);
+
+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;
-#ifndef NEW_INSETS
- footnoteflag = LyXParagraph::NO_FOOTNOTE;
- footnotekind = LyXParagraph::FOOTNOTE; // should not be needed
-#endif
- align = LYX_ALIGN_BLOCK;
-
-#ifndef NEW_TABULAR
- /* table stuff -- begin*/
- table = 0;
- /* table stuff -- end*/
-#endif
+ next_ = 0;
+ previous_ = 0;
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;
-#endif
-#ifndef NEW_TABULAR
- /* table stuff -- begin*/
- table = 0;
- /* table stuff -- end*/
-#endif
+
inset_owner = 0;
id_ = paragraph_id++;
}
-void LyXParagraph::writeFile(Buffer const * buf, ostream & os,
- BufferParams const & params,
- char footflag, char dth) const
+LyXParagraph::LyXParagraph(LyXParagraph const & lp)
{
- 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;
- if (footflag) {
- os << "\n\\begin_float "
- << string_footnotekinds[footnotekind]
- << " ";
- } else {
- os << "\n\\end_float ";
- }
- }
+ for (int i = 0; i < 10; ++i) setCounter(i , 0);
+ enumdepth = 0;
+ itemdepth = 0;
+ next_ = 0;
+ previous_ = 0;
+ id_ = paragraph_id++;
+ Clear();
+
+ MakeSameLayout(&lp);
- // The beginning or end of a deeper (i.e. nested) area?
- if (dth != depth) {
- if (depth > dth) {
- while (depth > dth) {
- os << "\n\\begin_deeper ";
- ++dth;
- }
- } else {
- while (depth < dth) {
- os << "\n\\end_deeper ";
- --dth;
- }
- }
- }
+ // this is because of the dummy layout of the paragraphs that
+ // follow footnotes
+ layout = lp.layout;
- // First write the layout
- os << "\n\\layout "
- << textclasslist.NameOfLayout(params.textclass, layout)
- << "\n";
-
- // Maybe some vertical spaces.
- if (added_space_top.kind() != VSpace::NONE)
- os << "\\added_space_top "
- << added_space_top.asLyXCommand() << " ";
- if (added_space_bottom.kind() != VSpace::NONE)
- os << "\\added_space_bottom "
- << added_space_bottom.asLyXCommand() << " ";
-
- // Maybe the paragraph has special spacing
- spacing.writeFile(os, true);
-
- // The labelwidth string used in lists.
- if (!labelwidthstring.empty())
- os << "\\labelwidthstring "
- << labelwidthstring << '\n';
-
- // Lines above or below?
- if (line_top)
- os << "\\line_top ";
- if (line_bottom)
- os << "\\line_bottom ";
-
- // Pagebreaks above or below?
- if (pagebreak_top)
- os << "\\pagebreak_top ";
- if (pagebreak_bottom)
- os << "\\pagebreak_bottom ";
-
- // Start of appendix?
- if (start_of_appendix)
- os << "\\start_of_appendix ";
-
- // Noindent?
- if (noindent)
- os << "\\noindent ";
-
- // Alignment?
- if (align != LYX_ALIGN_LAYOUT) {
- int h = 0;
- switch (align) {
- case LYX_ALIGN_LEFT: h = 1; break;
- case LYX_ALIGN_RIGHT: h = 2; break;
- case LYX_ALIGN_CENTER: h = 3; break;
- default: h = 0; break;
+ inset_owner = lp.inset_owner;
+
+ // ale970302
+ if (lp.bibkey)
+ bibkey = static_cast<InsetBibKey *>
+ (lp.bibkey->Clone(*current_view->buffer()));
+ else
+ bibkey = 0;
+
+ // copy everything behind the break-position to the new paragraph
+
+ text = lp.text;
+ fontlist = lp.fontlist;
+ insetlist = lp.insetlist;
+ for (InsetList::iterator it = insetlist.begin();
+ it != insetlist.end(); ++it)
+ it->inset = it->inset->Clone(*current_view->buffer());
+}
+
+
+// the destructor removes the new paragraph from the list
+LyXParagraph::~LyXParagraph()
+{
+ if (previous_)
+ previous_->next_ = next_;
+ if (next_)
+ next_->previous_ = previous_;
+
+ for (InsetList::iterator it = insetlist.begin();
+ it != insetlist.end(); ++it) {
+ delete (*it).inset;
+ }
+
+ // ale970302
+ delete bibkey;
+ //
+ //lyxerr << "LyXParagraph::paragraph_id = "
+ // << LyXParagraph::paragraph_id << endl;
+}
+
+
+void LyXParagraph::writeFile(Buffer const * buf, ostream & os,
+ BufferParams const & bparams,
+ char dth) const
+{
+ // The beginning or end of a deeper (i.e. nested) area?
+ if (dth != params.depth()) {
+ if (params.depth() > dth) {
+ while (params.depth() > dth) {
+ os << "\n\\begin_deeper ";
+ ++dth;
+ }
+ } else {
+ while (params.depth() < dth) {
+ os << "\n\\end_deeper ";
+ --dth;
}
- os << "\\align " << string_align[h] << " ";
}
- if (pextra_type != PEXTRA_NONE) {
- os << "\\pextra_type " << pextra_type;
- if (pextra_type == PEXTRA_MINIPAGE) {
- os << " \\pextra_alignment "
- << pextra_alignment;
- if (pextra_hfill)
- os << " \\pextra_hfill "
- << pextra_hfill;
- if (pextra_start_minipage)
- os << " \\pextra_start_minipage "
- << pextra_start_minipage;
- }
- if (!pextra_width.empty()) {
- os << " \\pextra_width "
- << VSpace(pextra_width).asLyXCommand();
- } else if (!pextra_widthp.empty()) {
- os << " \\pextra_widthp "
- << pextra_widthp;
- }
- os << '\n';
- }
- } else {
- // Dummy layout. This means that a footnote ended.
- os << "\n\\end_float ";
- footflag = LyXParagraph::NO_FOOTNOTE;
}
-#ifndef NEW_TABULAR
- // It might be a table.
- if (table){
- os << "\\LyXTable\n";
- table->Write(os);
+
+ // First write the layout
+ os << "\n\\layout "
+ << textclasslist.NameOfLayout(bparams.textclass, layout)
+ << "\n";
+
+ // Maybe some vertical spaces.
+ if (params.spaceTop().kind() != VSpace::NONE)
+ os << "\\added_space_top "
+ << params.spaceTop().asLyXCommand() << " ";
+ if (params.spaceBottom().kind() != VSpace::NONE)
+ os << "\\added_space_bottom "
+ << params.spaceBottom().asLyXCommand() << " ";
+
+ // Maybe the paragraph has special spacing
+ params.spacing().writeFile(os, true);
+
+ // The labelwidth string used in lists.
+ if (!params.labelWidthString().empty())
+ os << "\\labelwidthstring "
+ << params.labelWidthString() << '\n';
+
+ // Lines above or below?
+ if (params.lineTop())
+ os << "\\line_top ";
+ if (params.lineBottom())
+ os << "\\line_bottom ";
+
+ // Pagebreaks above or below?
+ if (params.pagebreakTop())
+ os << "\\pagebreak_top ";
+ if (params.pagebreakBottom())
+ os << "\\pagebreak_bottom ";
+
+ // Start of appendix?
+ if (params.startOfAppendix())
+ os << "\\start_of_appendix ";
+
+ // Noindent?
+ if (params.noindent())
+ os << "\\noindent ";
+
+ // Alignment?
+ 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;
+ default: h = 0; break;
+ }
+ os << "\\align " << string_align[h] << " ";
}
-#endif
+
// bibitem ale970302
if (bibkey)
bibkey->Write(buf, os);
-
- LyXFont font1(LyXFont::ALL_INHERIT,params.language_info);
-
+
+ LyXFont font1(LyXFont::ALL_INHERIT, bparams.language);
+
int column = 0;
for (size_type i = 0; i < size(); ++i) {
if (!i) {
}
// Write font changes
- LyXFont font2 = GetFontSettings(params, i);
+ LyXFont font2 = GetFontSettings(bparams, i);
if (font2 != font1) {
font2.lyxWriteChanges(font1, os);
column = 0;
font1 = font2;
}
-
- value_type c = GetChar(i);
+
+ value_type const c = GetChar(i);
switch (c) {
case META_INSET:
{
break;
}
}
-
+
// now write the next paragraph
- if (next)
- next->writeFile(buf, os, params, footflag, dth);
+ if (next_)
+ next_->writeFile(buf, os, bparams, dth);
}
void LyXParagraph::validate(LaTeXFeatures & features) const
{
- BufferParams const & params = features.bufferParams();
-
- // this will be useful later
- LyXLayout const & layout =
- textclasslist.Style(params.textclass,
- GetLayout());
-
+ BufferParams const & bparams = features.bufferParams();
+
// 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(0)
+ << (*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(0)
+ << (*cit).font().stateText(0)
<< endl;
}
- 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;
}
}
if ((*cit).inset)
(*cit).inset->Validate(features);
}
-
- if (table && table->IsLongTable())
- features.longtable = true;
- if (pextra_type == PEXTRA_INDENT)
- features.LyXParagraphIndent = true;
- if (pextra_type == PEXTRA_FLOATFLT)
- features.floatflt = true;
- if (layout.needprotect
- && next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
- features.NeedLyXFootnoteCode = true;
- if (params.paragraph_separation == BufferParams::PARSEP_INDENT
- && pextra_type == LyXParagraph::PEXTRA_MINIPAGE)
- features.NeedLyXMinipageIndent = true;
- if (table && table->NeedRotating())
- features.rotating = true;
- if (footnoteflag != NO_FOOTNOTE && footnotekind == ALGORITHM)
- features.algorithm = true;
}
// First few functions needed for cut and paste and paragraph breaking.
-void LyXParagraph::CopyIntoMinibuffer(BufferParams const & bparams,
+void LyXParagraph::CopyIntoMinibuffer(Buffer const & buffer,
LyXParagraph::size_type pos) const
{
+ BufferParams bparams = buffer.params;
+
minibuffer_char = GetChar(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::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;
-
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- delete (*it).inset;
- }
-#ifndef NEW_TABULAR
- /* table stuff -- begin*/
- delete table;
- /* table stuff -- end*/
-#endif
-
- // ale970302
- delete bibkey;
- //
- //lyxerr << "LyXParagraph::paragraph_id = "
- // << LyXParagraph::paragraph_id << endl;
}
void LyXParagraph::Erase(LyXParagraph::size_type pos)
{
- // > because last is the next unused position, and you can
- // use it if you want
- if (pos > size()) {
-#ifndef NEW_INSETS
- if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
- NextAfterFootnote()->Erase(pos - text.size() - 1);
- else
-#endif
- lyxerr.debug() << "ERROR (LyXParagraph::Erase): "
- "position does not exist." << endl;
- return;
- }
- if (pos < size()) { // last is free for insertation, but should be empty
- // if it is an inset, delete the inset entry
- if (text[pos] == LyXParagraph::META_INSET) {
- // find the entry
- 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);
- }
+ lyx::Assert(pos < size());
+ // if it is an inset, delete the inset entry
+ if (text[pos] == LyXParagraph::META_INSET) {
+ // find the entry
+ 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.
- FontTable search_font(pos, LyXFont());
-
- FontList::iterator it =
- lower_bound(fontlist.begin(),
- fontlist.end(),
- search_font, matchFT());
- if (it != fontlist.end() && (*it).pos == pos &&
- (pos == 0 ||
- (it != fontlist.begin() && (*(it-1)).pos == pos - 1))) {
- // If it is a multi-character font
- // entry, we just make it smaller
- // (see update below), otherwise we
- // should delete it.
- unsigned int i = it - fontlist.begin();
- fontlist.erase(fontlist.begin() + i);
- it = fontlist.begin() + i;
- if (i > 0 && i < fontlist.size() &&
- fontlist[i-1].font == fontlist[i].font) {
- fontlist.erase(fontlist.begin() + i-1);
- it = fontlist.begin() + i-1;
- }
+ }
+
+ text.erase(text.begin() + pos);
+
+ // Erase entries in the tables.
+ 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 (; it != fontlist.end(); ++it)
- --(*it).pos;
-
- // Update the inset table.
- InsetTable search_inset(pos, 0);
- for (InsetList::iterator it =
- upper_bound(insetlist.begin(),
- insetlist.end(),
- search_inset, matchIT());
- it != insetlist.end(); ++it)
- --(*it).pos;
- } else {
- lyxerr << "ERROR (LyXParagraph::Erase): "
- "can't erase non-existant char." << endl;
}
+
+ // Update all other entries.
+ FontList::iterator fend = fontlist.end();
+ for (; it != fend; ++it)
+ (*it).pos((*it).pos() - 1);
+
+ // Update the inset table.
+ 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;
}
void LyXParagraph::InsertChar(LyXParagraph::size_type pos,
LyXParagraph::value_type c)
{
- LyXFont f(LyXFont::ALL_INHERIT);
+ LyXFont const f(LyXFont::ALL_INHERIT);
InsertChar(pos, c, f);
}
LyXParagraph::value_type c,
LyXFont const & font)
{
- // > because last is the next unused position, and you can
- // use it if you want
- if (pos > size()) {
-#ifndef NEW_INSETS
- if (next
- && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
- NextAfterFootnote()->InsertChar(pos - text.size() - 1,
- c);
- else
-#endif
- lyxerr.debug() << "ERROR (LyXParagraph::InsertChar): "
- "position does not exist." << endl;
- return;
- }
+ lyx::Assert(pos <= size());
+
text.insert(text.begin() + pos, c);
+
// Update the font table.
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((*it).pos() + 1);
// Update the inset table.
InsetTable search_inset(pos, 0);
void LyXParagraph::InsertInset(LyXParagraph::size_type pos,
Inset * inset)
{
- LyXFont f(LyXFont::ALL_INHERIT);
+ LyXFont const f(LyXFont::ALL_INHERIT);
InsertInset(pos, inset, f);
}
void LyXParagraph::InsertInset(LyXParagraph::size_type pos,
Inset * inset, LyXFont const & font)
{
- Assert(inset);
-
- // > because last is the next unused position, and you can
- // use it if you want
- if (pos > size()) {
-#ifndef NEW_INSETS
- if (next
- && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
- NextAfterFootnote()
- ->InsertInset(pos - text.size() - 1,
- inset, font);
- else
-#endif
- lyxerr << "ERROR (LyXParagraph::InsertInset): "
- "position does not exist: " << pos << endl;
- return;
- }
+ lyx::Assert(inset);
+ lyx::Assert(pos <= size());
InsertChar(pos, META_INSET, font);
- Assert(text[pos] == META_INSET);
+ lyx::Assert(text[pos] == META_INSET);
// Add a new entry in the inset table.
InsetTable search_inset(pos, 0);
bool LyXParagraph::InsertInsetAllowed(Inset * inset)
{
- lyxerr << "LyXParagraph::InsertInsetAllowed" << endl;
+ //lyxerr << "LyXParagraph::InsertInsetAllowed" << endl;
if (inset_owner)
return inset_owner->InsertInsetAllowed(inset);
Inset * LyXParagraph::GetInset(LyXParagraph::size_type pos)
{
- if (pos >= size()) {
-#ifndef NEW_INSETS
- if (next
- && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
- return NextAfterFootnote()
- ->GetInset(pos - text.size() - 1);
- else
-#endif
- lyxerr << "ERROR (LyXParagraph::GetInset): "
- "position does not exist: "
- << pos << endl;
-
- return 0;
- }
+ lyx::Assert(pos < size());
+
// Find the inset.
InsetTable search_inset(pos, 0);
InsetList::iterator it = lower_bound(insetlist.begin(),
Inset const * LyXParagraph::GetInset(LyXParagraph::size_type pos) const
{
- if (pos >= size()) {
-#ifndef NEW_INSETS
- if (next
- && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
- return NextAfterFootnote()
- ->GetInset(pos - text.size() - 1);
- else
-#endif
- lyxerr << "ERROR (LyXParagraph::GetInset): "
- "position does not exist: "
- << pos << endl;
+ lyx::Assert(pos < size());
- return 0;
- }
// Find the inset.
InsetTable search_inset(pos, 0);
InsetList::const_iterator cit = lower_bound(insetlist.begin(),
// Gets uninstantiated font setting at position.
-// Optimized after profiling. (Asger)
-LyXFont LyXParagraph::GetFontSettings(BufferParams const & bparams,
- LyXParagraph::size_type pos) const
+LyXFont const LyXParagraph::GetFontSettings(BufferParams const & bparams,
+ LyXParagraph::size_type pos) const
{
- if (pos < size()) {
- 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;
- }
- // > because last is the next unused position, and you can
- // use it if you want
- else if (pos > size()) {
-#ifndef NEW_INSETS
- if (next
- && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
- return NextAfterFootnote()
- ->GetFontSettings(bparams,
- pos - text.size() - 1);
- else
-#endif
- // 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?
- // We want strict error checking, but it's ok to only
- // have it when debugging. (Asger)
- lyxerr << "ERROR (LyXParagraph::GetFontSettings): "
- "position does not exist. "
- << pos << " (" << static_cast<int>(pos)
- << ")" << endl;
- } else if (pos > 0) {
+ lyx::Assert(pos <= size());
+
+ 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();
+
+ if (pos == size() && size())
return GetFontSettings(bparams, pos - 1);
- } else // pos = size() = 0
- return LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams));
-
- return LyXFont(LyXFont::ALL_INHERIT);
+
+ return LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams));
}
+
// Gets uninstantiated font setting at position 0
-LyXFont LyXParagraph::GetFirstFontSettings() const
+LyXFont const LyXParagraph::GetFirstFontSettings() const
{
if (size() > 0) {
if (!fontlist.empty())
- return fontlist[0].font;
+ return fontlist[0].font();
}
-#ifndef NEW_INSETS
- else if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
- return NextAfterFootnote()->GetFirstFontSettings();
-#endif
return LyXFont(LyXFont::ALL_INHERIT);
}
// 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(BufferParams const & bparams,
+LyXFont const LyXParagraph::getFont(BufferParams const & bparams,
LyXParagraph::size_type pos) const
{
LyXFont tmpfont;
fontlist.end(),
start_search, matchFT());
cit != end_it; ++cit) {
- LyXFont::FONT_SIZE size = (*cit).font.size();
+ LyXFont::FONT_SIZE size = (*cit).font().size();
if (size > maxsize && size <= LyXFont::SIZE_HUGER)
maxsize = size;
}
LyXParagraph::value_type
-LyXParagraph::GetChar(LyXParagraph::size_type pos)
-{
- Assert(pos >= 0);
-
- if (pos < size()) {
- return text[pos];
- }
- // > because last is the next unused position, and you can
- // use it if you want
- else if (pos > size()) {
-#ifndef NEW_INSETS
- if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
- return NextAfterFootnote()
- ->GetChar(pos - text.size() - 1);
- else
-#endif
- {
- lyxerr << "ERROR (LyXParagraph::GetChar): "
- "position does not exist."
- << pos << " (" << static_cast<int>(pos)
- << ")\n";
- // Assert(false); // This triggers sometimes...
- // Why?
- }
-
- return '\0';
- }
-
-#ifndef NEW_INSETS
- 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
- }
-#endif
-}
-
-
-LyXParagraph::value_type
-LyXParagraph::GetChar(LyXParagraph::size_type pos) const
+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()) {
-#ifndef NEW_INSETS
- if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
- return NextAfterFootnote()
- ->GetChar(pos - text.size() - 1);
- else
-#endif
- {
- lyxerr << "ERROR (LyXParagraph::GetChar const): "
- "position does not exist."
- << pos << " (" << static_cast<int>(pos)
- << ")\n";
- Assert(false);
- }
- return '\0';
- }
-#ifndef NEW_INSETS
- 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;
}
-#endif
+ 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);
+ lyx::Assert(lastpos >= 0);
// the current word is defined as starting at the first character
// from the immediate left of lastpospos which meets the definition
while (IsLetter(lastpos)) theword += GetChar(lastpos++);
return theword;
-
-}
-
-
-LyXParagraph::size_type LyXParagraph::Last() const
-{
-#ifndef NEW_INSETS
- if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
- return text.size() + NextAfterFootnote()->Last() + 1;
- // the 1 is the symbol
- // for the footnote
- else
-#endif
- return text.size();
-}
-
-
-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()) {
-#ifndef NEW_INSETS
- if (next
- && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
- return NextAfterFootnote()
- ->ParFromPos(pos - text.size() - 1);
- else
-#endif
- lyxerr << "ERROR (LyXParagraph::ParFromPos): "
- "position does not exist." << endl;
- return this;
- } else
- return this;
-}
-
-
-int LyXParagraph::PositionInParFromPos(LyXParagraph::size_type pos) const
-{
- // > because last is the next unused position, and you can
- // use it if you want
- if (pos > size()) {
-#ifndef NEW_INSETS
- if (next
- && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
- return NextAfterFootnote()
- ->PositionInParFromPos(pos - text.size() - 1);
- else
-#endif
- lyxerr <<
- "ERROR (LyXParagraph::PositionInParFromPos): "
- "position does not exist." << endl;
- return pos;
- }
- else
- return pos;
}
void LyXParagraph::SetFont(LyXParagraph::size_type pos,
LyXFont const & font)
{
- // > because last is the next unused position, and you can
- // use it if you want
- if (pos > size()) {
-#ifndef NEW_INSETS
- if (next &&
- next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
- NextAfterFootnote()->SetFont(pos - text.size() - 1,
- font);
- } else
-#endif
- lyxerr << "ERROR (LyXParagraph::SetFont): "
- "position does not exist." << endl;
-
- return;
- }
+ lyx::Assert(pos <= size());
// First, reduce font against layout/label font
// Update: The SetCharFont() routine in text2.C already
unsigned int i = it - fontlist.begin();
bool notfound = it == fontlist.end();
- if (!notfound && fontlist[i].font == font)
+ if (!notfound && fontlist[i].font() == font)
return;
bool begin = pos == 0 || notfound ||
- (i > 0 && fontlist[i-1].pos == pos - 1);
+ (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;
+ 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) {
+ 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)
+ if (i > 0 && fontlist[i - 1].font() == font)
fontlist.erase(fontlist.begin() + i-1);
- } else if (i > 0 && fontlist[i-1].font == font) {
+ } else if (i > 0 && fontlist[i - 1].font() == font) {
// Merge the singleton block with the previous block
- fontlist[i-1].pos = pos;
+ fontlist[i - 1].pos(pos);
fontlist.erase(fontlist.begin() + i);
} else
- fontlist[i].font = font;
+ fontlist[i].font(font);
} else if (begin) {
- if (i > 0 && fontlist[i-1].font == font)
- fontlist[i-1].pos = pos;
+ 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,
+ 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));
+ FontTable(pos - 1, fontlist[i].font()));
+ fontlist.insert(fontlist.begin() + i + 1,
+ FontTable(pos, font));
}
}
-
-// This function is able to hide closed footnotes.
-LyXParagraph * LyXParagraph::Next()
+
+
+void LyXParagraph::next(LyXParagraph * p)
{
-#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;
+ next_ = p;
}
-LyXParagraph * LyXParagraph::NextAfterFootnote()
+// This function is able to hide closed footnotes.
+LyXParagraph * LyXParagraph::next()
{
-#ifndef NEW_INSETS
- if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
- LyXParagraph * tmp = next;
- while (tmp && tmp->footnoteflag != LyXParagraph::NO_FOOTNOTE)
- 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!
- } else
-#endif
- return next;
+ return next_;
}
-LyXParagraph const * LyXParagraph::NextAfterFootnote() const
+LyXParagraph const * LyXParagraph::next() const
{
-#ifndef NEW_INSETS
- if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
- LyXParagraph * tmp = next;
- while (tmp && tmp->footnoteflag != LyXParagraph::NO_FOOTNOTE)
- 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!
- } else
-#endif
- return next;
+ return next_;
}
-LyXParagraph * LyXParagraph::PreviousBeforeFootnote()
+void LyXParagraph::previous(LyXParagraph * p)
{
-#ifndef NEW_INSETS
- LyXParagraph * tmp;
- if (previous && previous->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
- tmp = previous;
- while (tmp && tmp->footnoteflag != LyXParagraph::NO_FOOTNOTE)
- 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!
- } else
-#endif
- return previous;
-}
-
-
-LyXParagraph * LyXParagraph::LastPhysicalPar()
-{
-#ifndef NEW_INSETS
- if (footnoteflag != LyXParagraph::NO_FOOTNOTE)
- return this;
-
- LyXParagraph * tmp = this;
- while (tmp->next
- && tmp->next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
- tmp = tmp->NextAfterFootnote();
-
- return tmp;
-#else
- return this;
-#endif
-}
-
-LyXParagraph const * LyXParagraph::LastPhysicalPar() const
-{
-#ifndef NEW_INSETS
- if (footnoteflag != LyXParagraph::NO_FOOTNOTE)
- return this;
-
- LyXParagraph const * tmp = this;
- while (tmp->next
- && tmp->next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
- tmp = tmp->NextAfterFootnote();
-
- return tmp;
-#else
- return this;
-#endif
-}
-
-LyXParagraph * LyXParagraph::FirstPhysicalPar()
-{
-#ifndef NEW_INSETS
- if (!IsDummy())
- return this;
- LyXParagraph * tmppar = this;
-
- while (tmppar &&
- (tmppar->IsDummy()
- || tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE))
- tmppar = tmppar->previous;
-
- if (!tmppar) {
- return this;
- } else
- return tmppar;
-#else
- return this;
-#endif
-}
-
-
-LyXParagraph const * LyXParagraph::FirstPhysicalPar() const
-{
-#ifndef NEW_INSETS
- if (!IsDummy())
- return this;
- LyXParagraph const * tmppar = this;
-
- while (tmppar &&
- (tmppar->IsDummy()
- || tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE))
- tmppar = tmppar->previous;
-
- if (!tmppar) {
- return this;
- } else
- return tmppar;
-#else
- return this;
-#endif
+ previous_ = p;
}
// This function is able to hide closed footnotes.
-LyXParagraph * LyXParagraph::Previous()
+LyXParagraph * LyXParagraph::previous()
{
- LyXParagraph * tmp = previous;
- if (!tmp)
- return tmp;
-
-#ifndef NEW_INSETS
- if (tmp->previous
- && tmp->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
- tmp = tmp->previous;
- while (tmp
- && tmp->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
- tmp = tmp->previous;
- if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
- return tmp->next->Previous();
-
- else
- return previous;
- } else
-#endif
- return previous;
+ return previous_;
}
// This function is able to hide closed footnotes.
-LyXParagraph const * LyXParagraph::Previous() const
+LyXParagraph const * LyXParagraph::previous() const
{
- LyXParagraph * tmp = previous;
- if (!tmp)
- return tmp;
-#ifndef NEW_INSETS
- if (tmp->previous
- && tmp->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
- tmp = tmp->previous;
- while (tmp
- && tmp->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
- tmp = tmp->previous;
- if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
- return tmp->next->Previous();
-
- else
- return previous;
- } else
-#endif
- return previous;
+ return previous_;
}
LyXParagraph::size_type pos,
int flag)
{
- size_type i, j, pos_end, pos_first;
// create a new paragraph
- LyXParagraph * par = ParFromPos(pos);
- LyXParagraph * firstpar = FirstPhysicalPar();
-
- LyXParagraph * tmp = new LyXParagraph(par);
-
-#ifndef NEW_INSETS
- tmp->footnoteflag = footnoteflag;
- tmp->footnotekind = footnotekind;
-#endif
+ LyXParagraph * tmp = new LyXParagraph(this);
+
// this is an idea for a more userfriendly layout handling, I will
// see what the users say
-
+
// layout stays the same with latex-environments
if (flag) {
- tmp->SetOnlyLayout(bparams, firstpar->layout);
- tmp->SetLabelWidthString(firstpar->labelwidthstring);
+ tmp->SetOnlyLayout(layout);
+ tmp->SetLabelWidthString(params.labelWidthString());
}
-
- if (Last() > pos || !Last() || flag == 2) {
- tmp->SetOnlyLayout(bparams, firstpar->layout);
- tmp->align = firstpar->align;
- tmp->SetLabelWidthString(firstpar->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->depth = firstpar->depth;
- tmp->noindent = firstpar->noindent;
-
+
+ if (size() > pos || !size() || flag == 2) {
+ tmp->SetOnlyLayout(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());
+
// copy everything behind the break-position
// to the new paragraph
- 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(bparams, i - pos_first);
+ size_type pos_end = text.size() - 1;
+ size_type i = pos;
+ size_type j = pos;
+ for (; i <= pos_end; ++i) {
+ CutIntoMinibuffer(bparams, i);
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());
+ Erase(i);
+
+ fitToSize();
}
-
+
// just an idea of me
if (!pos) {
- tmp->line_top = firstpar->line_top;
- tmp->pagebreak_top = firstpar->pagebreak_top;
- tmp->added_space_top = firstpar->added_space_top;
- tmp->bibkey = firstpar->bibkey;
- firstpar->Clear();
+ 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) {
- firstpar->SetOnlyLayout(bparams, tmp->layout);
- firstpar->SetLabelWidthString(tmp->labelwidthstring);
- firstpar->depth = tmp->depth;
+ SetOnlyLayout(tmp->layout);
+ SetLabelWidthString(tmp->params.labelWidthString());
+ params.depth(tmp->params.depth());
}
}
}
-
+
void LyXParagraph::MakeSameLayout(LyXParagraph const * par)
{
- par = par->FirstPhysicalPar();
-#ifndef NEW_INSETS
- 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;
-}
-
-
-#ifndef NEW_INSETS
-LyXParagraph * LyXParagraph::FirstSelfrowPar()
-{
- LyXParagraph * tmppar = this;
- while (tmppar && (
- (tmppar->IsDummy()
- && tmppar->previous->footnoteflag ==
- LyXParagraph::CLOSED_FOOTNOTE)
- || tmppar->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE))
- tmppar = tmppar->previous;
-
- if (!tmppar)
- return this; // This should never happen!
- else
- return tmppar;
+ // This can be changed after NEW_INSETS is in effect. (Lgb)
+ SetLabelWidthString(par->params.labelWidthString());
}
-#endif
int LyXParagraph::StripLeadingSpaces(LyXTextClassList::size_type tclass)
return 0;
int i = 0;
- if (!IsDummy() && !table){
- while (Last()
- && (IsNewline(0) || IsLineSeparator(0))){
- Erase(0);
- ++i;
- }
+ while (size()
+ && (IsNewline(0) || IsLineSeparator(0))){
+ Erase(0);
+ ++i;
}
- return i;
-}
-
-
-LyXParagraph * LyXParagraph::Clone() const
-{
- // create a new paragraph
- LyXParagraph * result = new LyXParagraph;
-
- result->MakeSameLayout(this);
-
- // this is because of the dummy layout of the paragraphs that
- // follow footnotes
- result->layout = layout;
-
-#ifndef NEW_TABULAR
- /* table stuff -- begin*/
- if (table)
- result->table = table->Clone();
- else
- result->table = 0;
- /* table stuff -- end*/
-#endif
- result->inset_owner = inset_owner;
-
- // ale970302
- result->bibkey = (bibkey) ? new InsetBibKey(bibkey): 0;
-
-
- // copy everything behind the break-position to the new paragraph
- result->text = text;
- result->fontlist = fontlist;
- result->insetlist = insetlist;
- for (InsetList::iterator it = result->insetlist.begin();
- it != result->insetlist.end(); ++it)
- (*it).inset = (*it).inset->Clone();
- return result;
+ return i;
}
bool LyXParagraph::HasSameLayout(LyXParagraph const * par) const
{
- par = par->FirstPhysicalPar();
-
- return (
-#ifndef NEW_INSETS
- par->footnoteflag == footnoteflag &&
- par->footnotekind == footnotekind &&
-#endif
+ return
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 &&
-#ifndef NEW_TABULAR
- par->table == table && // what means: NO TABLE AT ALL
-#endif
-
- par->noindent == noindent &&
- par->depth == depth);
+ params.sameLayout(par->params);
}
LyXParagraph::size_type pos)
{
// create a new paragraph
- LyXParagraph * par = ParFromPos(pos);
-
- LyXParagraph * tmp = new LyXParagraph(par);
-
- tmp->MakeSameLayout(par);
+ LyXParagraph * tmp = new LyXParagraph(this);
+ tmp->MakeSameLayout(this);
- // When can pos < Last()?
+ // When can pos > Last()?
// I guess pos == Last() is possible.
- if (Last() > pos) {
+ if (size() > pos) {
// copy everything behind the break-position to the new
// paragraph
- size_type pos_first = 0;
- while (ParFromPos(pos_first) != par)
- ++pos_first;
- size_type pos_end = pos_first + par->text.size() - 1;
+ size_type pos_end = text.size() - 1;
size_type i, j;
for (i = j = pos; i <= pos_end; ++i) {
- par->CutIntoMinibuffer(bparams, i - pos_first);
+ CutIntoMinibuffer(bparams, i);
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);
+ Erase(i);
- par->text.resize(par->text.size());
+ fitToSize();
}
}
// Be carefull, this does not make any check at all.
+// 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;
+ 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 = Last();
+ size_type pos_insert = size();
// ok, now copy the paragraph
size_type i, j;
}
// delete the next paragraph
- LyXParagraph * ppar = the_next->previous;
- LyXParagraph * npar = the_next->next;
+ LyXParagraph * ppar = the_next->previous_;
+ LyXParagraph * npar = the_next->next_;
delete the_next;
- ppar->next = npar;
-}
-
-
-#ifndef NEW_INSETS
-void LyXParagraph::OpenFootnote(LyXParagraph::size_type pos)
-{
- LyXParagraph * par = ParFromPos(pos);
- par = par->next;
- while (par && par->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
- par->footnoteflag = LyXParagraph::OPEN_FOOTNOTE;
- par = par->next;
- }
+ ppar->next(npar);
}
-void LyXParagraph::CloseFootnote(LyXParagraph::size_type pos)
-{
- LyXParagraph * par = ParFromPos(pos);
- par = par->next;
- while (par && par->footnoteflag == LyXParagraph::OPEN_FOOTNOTE) {
- par->footnoteflag = LyXParagraph::CLOSED_FOOTNOTE;
- par = par->next;
- }
-}
-#endif
-
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 =
+ int const endlabeltype =
textclasslist.Style(bparams.textclass,
layout).endlabeltype;
if (endlabeltype != END_LABEL_NO_LABEL) {
- LyXParagraph const * last = this;
- if( footnoteflag == NO_FOOTNOTE)
- last = LastPhysicalPar();
- else if (next->footnoteflag == NO_FOOTNOTE)
- return endlabeltype;
-
- if (!last || !last->next)
+ if (!next_)
return endlabeltype;
- int next_depth = last->next->GetDepth();
+ int const next_depth = next_->GetDepth();
if (par_depth > next_depth ||
- (par_depth == next_depth && layout != last->next->GetLayout() ))
+ (par_depth == next_depth
+ && layout != next_->GetLayout()))
return endlabeltype;
break;
}
}
-LyXTextClass::size_type LyXParagraph::GetLayout() const
-{
- return FirstPhysicalPar()->layout;
-}
-
-
char LyXParagraph::GetDepth() const
{
- return FirstPhysicalPar()->depth;
+ return params.depth();
}
char LyXParagraph::GetAlign() const
{
- return FirstPhysicalPar()->align;
+ return params.align();
}
-string LyXParagraph::GetLabelstring() const
+string const & LyXParagraph::GetLabelstring() const
{
- return FirstPhysicalPar()->labelstring;
+ return params.labelString();
}
int LyXParagraph::GetFirstCounter(int i) const
{
- return FirstPhysicalPar()->counter_[i];
+ return counter_[i];
}
// 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;
+ if (!params.labelWidthString().empty())
+ return params.labelWidthString();
else
return _("Senseless with this layout!");
}
void LyXParagraph::SetLabelWidthString(string const & s)
{
- LyXParagraph * par = FirstPhysicalPar();
-
- par->labelwidthstring = s;
+ params.labelWidthString(s);
}
-void LyXParagraph::SetOnlyLayout(BufferParams const & bparams,
- LyXTextClass::size_type new_layout)
+void LyXParagraph::SetOnlyLayout(LyXTextClass::size_type new_layout)
{
- LyXParagraph * par = FirstPhysicalPar();
- LyXParagraph * ppar = 0;
- LyXParagraph * npar = 0;
-
- par->layout = new_layout;
-#ifndef NEW_TABULAR
- /* table stuff -- begin*/
- if (table)
- par->layout = 0;
- /* table stuff -- end*/
-#endif
- if (par->pextra_type == PEXTRA_NONE) {
- if (par->Previous()) {
- ppar = par->Previous()->FirstPhysicalPar();
- while(ppar
- && ppar->Previous()
- && (ppar->depth > par->depth))
- ppar = ppar->Previous()->FirstPhysicalPar();
- }
- if (par->Next()) {
- npar = par->Next()->NextAfterFootnote();
- while(npar
- && npar->Next()
- && (npar->depth > par->depth))
- npar = npar->Next()->NextAfterFootnote();
- }
- if (ppar && (ppar->pextra_type != PEXTRA_NONE)) {
- string
- p1 = ppar->pextra_width,
- p2 = ppar->pextra_widthp;
- ppar->SetPExtraType(bparams, ppar->pextra_type,
- p1.c_str(), p2.c_str());
- }
- if ((par->pextra_type == PEXTRA_NONE) &&
- npar && (npar->pextra_type != PEXTRA_NONE)) {
- string
- p1 = npar->pextra_width,
- p2 = npar->pextra_widthp;
- npar->SetPExtraType(bparams, npar->pextra_type,
- p1.c_str(), p2.c_str());
- }
- }
+ layout = new_layout;
}
-void LyXParagraph::SetLayout(BufferParams const & bparams,
- LyXTextClass::size_type new_layout)
+void LyXParagraph::SetLayout(LyXTextClass::size_type new_layout)
{
- LyXParagraph
- * par = FirstPhysicalPar(),
- * 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);
-
-#ifndef NEW_TABULAR
- /* table stuff -- begin*/
- if (table)
- par->layout = 0;
- /* table stuff -- end*/
-#endif
- if (par->pextra_type == PEXTRA_NONE) {
- if (par->Previous()) {
- ppar = par->Previous()->FirstPhysicalPar();
- while(ppar
- && ppar->Previous()
- && (ppar->depth > par->depth))
- ppar = ppar->Previous()->FirstPhysicalPar();
- }
- if (par->Next()) {
- npar = par->Next()->NextAfterFootnote();
- while(npar
- && npar->Next()
- && (npar->depth > par->depth))
- npar = npar->Next()->NextAfterFootnote();
- }
- if (ppar && (ppar->pextra_type != PEXTRA_NONE)) {
- string
- p1 = ppar->pextra_width,
- p2 = ppar->pextra_widthp;
- ppar->SetPExtraType(bparams, ppar->pextra_type,
- p1.c_str(), p2.c_str());
- }
- if ((par->pextra_type == PEXTRA_NONE) &&
- npar && (npar->pextra_type != PEXTRA_NONE)) {
- string
- p1 = npar->pextra_width,
- p2 = npar->pextra_widthp;
- npar->SetPExtraType(bparams, npar->pextra_type,
- p1.c_str(), p2.c_str());
- }
- }
+ layout = new_layout;
+ params.labelWidthString(string());
+ params.align(LYX_ALIGN_LAYOUT);
+ params.spaceTop(VSpace(VSpace::NONE));
+ params.spaceBottom(VSpace(VSpace::NONE));
+ params.spacing(Spacing(Spacing::Default));
}
int LyXParagraph::BeginningOfMainBody() const
{
- if (FirstPhysicalPar() != this)
- return -1;
-
// Unroll the first two cycles of the loop
// and remember the previous character to
// remove unnecessary GetChar() calls
size_type i = 0;
if (i < size()
- && GetChar(i) != LyXParagraph::META_NEWLINE
- ) {
+ && 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 "=="
}
}
- if (i == 0 && i == size() &&
- !(footnoteflag == LyXParagraph::NO_FOOTNOTE
- && next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE))
- ++i; /* the cursor should not jump
- * to the main body if there
- * is nothing in! */
return i;
}
return 0;
do {
- newpar = newpar->FirstPhysicalPar()->Previous();
- } while (newpar && newpar->GetDepth() > deth
- && newpar->footnoteflag == footnoteflag);
+ newpar = newpar->previous();
+ } while (newpar && newpar->GetDepth() > deth);
if (!newpar) {
- if (Previous() || GetDepth())
+ if (previous() || GetDepth())
lyxerr << "ERROR (LyXParagraph::DepthHook): "
"no hook." << endl;
newpar = this;
}
- return newpar->FirstPhysicalPar();
+
+ return newpar;
}
return 0;
do {
- newpar = newpar->FirstPhysicalPar()->Previous();
- } while (newpar && newpar->GetDepth() > deth
- && newpar->footnoteflag == footnoteflag);
+ newpar = newpar->previous();
+ } while (newpar && newpar->GetDepth() > deth);
if (!newpar) {
- if (Previous() || GetDepth())
+ if (previous() || GetDepth())
lyxerr << "ERROR (LyXParagraph::DepthHook): "
"no hook." << endl;
newpar = this;
}
- return newpar->FirstPhysicalPar();
+
+ return newpar;
}
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;
}
}
- // Think about footnotes.
- if (footnoteflag == LyXParagraph::NO_FOOTNOTE
- && next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
- int further =
- NextAfterFootnote()->GetPositionOfInset(inset);
- if (further != -1)
- return text.size() + 1 + further;
- }
+ if (inset == bibkey)
+ return 0;
+
return -1;
}
LyXParagraph * LyXParagraph::TeXOnePar(Buffer const * buf,
BufferParams const & bparams,
ostream & os, TexRow & texrow,
- bool moving_arg,
- ostream & foot,
- TexRow & foot_texrow,
- int & foot_count)
+ bool moving_arg)
{
lyxerr[Debug::LATEX] << "TeXOnePar... " << this << endl;
LyXLayout const & style =
layout);
bool further_blank_line = false;
- if (IsDummy())
- lyxerr << "ERROR (LyXParagraph::TeXOnePar) is dummy." << endl;
- 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(bparams);
+ if (params.spaceTop().kind() != VSpace::NONE) {
+ os << params.spaceTop().asLatexCommand(bparams);
further_blank_line = true;
}
- if (line_top) {
+ if (params.lineTop()) {
os << "\\lyxline{\\" << getFont(bparams, 0).latexSize() << '}'
<< "\\vspace{-1\\parskip}";
further_blank_line = true;
}
Language const * language = getParLanguage(bparams);
- Language const * doc_language = bparams.language_info;
- Language const * previous_language = previous
- ? previous->getParLanguage(bparams) : doc_language;
- if (language != doc_language && language != previous_language) {
+ 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();
}
bool need_par = SimpleTeXOnePar(buf, bparams, os, texrow, moving_arg);
-#ifndef NEW_INSETS
- // Spit out footnotes
- LyXParagraph * par = next;
- if (lyxrc.rtl_support) {
- if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE
- && next->footnoteflag != footnoteflag) {
- LyXParagraph * p = 0;
- 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(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->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(buf, bparams,
- os, texrow,
- foot, foot_texrow, foot_count,
- false);
- 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(bparams, 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.
+ LyXFont font = getFont(bparams, size() - 1);
+
+ 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(bparams.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 &&
- (!par
- || (footnoteflag != NO_FOOTNOTE && par->footnoteflag != footnoteflag)
- || par->getParLanguage(bparams) != language)) {
+ if (language->babel() != doc_language->babel() &&
+ (!next_
+ || next_->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 (next_ && (params.depth() < next_->params.depth())) {
os << '\n';
texrow.newline();
}
case LATEX_ENVIRONMENT:
// if its the last paragraph of the current environment
// skip it otherwise fall through
- if (par
- && (par->layout != layout
- || par->depth != depth
- || par->pextra_type != pextra_type))
+ if (next_
+ && (next_->layout != layout
+ || next_->params.depth() != params.depth()))
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_) {
os << '\n';
texrow.newline();
}
}
further_blank_line = false;
- if (line_bottom) {
- os << "\\lyxline{\\" << getFont(bparams, Last() - 1).latexSize() << '}';
+ if (params.lineBottom()) {
+ os << "\\lyxline{\\" << getFont(bparams,
+ size() - 1).latexSize() << '}';
further_blank_line = true;
}
- if (added_space_bottom.kind() != VSpace::NONE) {
- os << added_space_bottom.asLatexCommand(bparams);
+ 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()
- && (!par || !par->HasSameLayout(this))) {
- os << spacing.writeEnvirEnd() << "\n";
+ if (!params.spacing().isDefault()
+ && (!next_ || !next_->HasSameLayout(this))) {
+ 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_) {
os << '\n';
texrow.newline();
}
- lyxerr[Debug::LATEX] << "TeXOnePar...done " << par << endl;
- return par;
+ lyxerr[Debug::LATEX] << "TeXOnePar...done " << next_ << endl;
+ return next_;
}
{
lyxerr[Debug::LATEX] << "SimpleTeXOnePar... " << this << endl;
-#ifndef NEW_TABULAR
- if (table)
- return SimpleTeXOneTablePar(buf, bparams, os, texrow);
-#endif
-
bool return_value = false;
LyXLayout const & style =
textclasslist.Style(bparams.textclass,
GetLayout());
- LyXFont basefont, last_font;
+ LyXFont basefont;
// Maybe we have to create a optional argument.
size_type main_body;
int column = 0;
if (main_body >= 0
- && !text.size()
- && !IsDummy()) {
+ && !text.size()) {
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) {
if (main_body > 0) {
if (open_font) {
column += running_font.latexWriteEndChanges(os, basefont, basefont);
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(bparams)->lang() != "hebrew") {
+ if (moving_arg)
+ os << "\\protect";
+ if (getParLanguage(bparams)->babel() != "hebrew") {
os << "\\raggedright ";
column+= 13;
} else {
}
break;
case LYX_ALIGN_RIGHT:
- if (getParLanguage(bparams)->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;
// Fully instantiated font
LyXFont font = getFont(bparams, i);
- LyXParagraph * p = 0;
- if (i == 0 && previous &&
- previous->footnoteflag != LyXParagraph::NO_FOOTNOTE &&
- (p = PreviousBeforeFootnote()) != 0)
- last_font = p->getFont(bparams, p->size()-1);
- else
- last_font = running_font;
+
+ LyXFont last_font = running_font;
// Spaces at end of font change are simulated to be
// outside font change, i.e. we write "\textXX{text} "
// If we have an open font definition, we have to close it
if (open_font) {
- LyXParagraph * p = 0;
- if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE
- && (p = NextAfterFootnote()) != 0)
+ if (next_) {
+ running_font
+ .latexWriteEndChanges(os, basefont,
+ next_->getFont(bparams,
+ 0));
+ } else {
running_font.latexWriteEndChanges(os, basefont,
- p->getFont(bparams, 0));
- else
- running_font.latexWriteEndChanges(os, basefont, basefont);
+ basefont);
+ }
}
// Needed if there is an optional argument but no contents.
}
-// This one spits out the text of a table paragraph
-bool LyXParagraph::SimpleTeXOneTablePar(Buffer const * buf,
- BufferParams const & bparams,
- ostream & os, TexRow & texrow)
+bool LyXParagraph::linuxDocConvertChar(char c, string & sgml_string)
{
- lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar... " << this << endl;
-
- bool return_value = false;
-
- LyXLayout const & style =
- textclasslist.Style(bparams.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;
- }
+ bool retval = false;
+ switch (c) {
+ case LyXParagraph::META_HFILL:
+ sgml_string.erase();
+ break;
+ case LyXParagraph::META_NEWLINE:
+ sgml_string = '\n';
+ break;
+ case '&':
+ sgml_string = "&";
+ break;
+ case '<':
+ sgml_string = "<";
+ break;
+ case '>':
+ sgml_string = ">";
+ break;
+ case '$':
+ sgml_string = "$";
+ break;
+ case '#':
+ sgml_string = "#";
+ break;
+ case '%':
+ sgml_string = "%";
+ break;
+ case '[':
+ sgml_string = "[";
+ break;
+ case ']':
+ sgml_string = "]";
+ break;
+ case '{':
+ sgml_string = "{";
+ break;
+ case '}':
+ sgml_string = "}";
+ break;
+ case '~':
+ sgml_string = "˜";
+ break;
+ case '"':
+ sgml_string = """;
+ break;
+ case '\\':
+ sgml_string = "\";
+ break;
+ case ' ':
+ retval = true;
+ sgml_string = ' ';
+ break;
+ case '\0': // Ignore :-)
+ sgml_string.erase();
+ break;
+ default:
+ sgml_string = c;
+ break;
}
-
- LyXFont basefont = getFont(bparams, -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(bparams)->RightToLeft();
- bool first_in_cell = true;
-
- for (size_type i = 0; i < size(); ++i) {
- value_type 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(bparams, 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(bparams, i + 1) != running_font
- && getFont(bparams, i + 1) != font) {
- font = getFont(bparams, 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(bparams, -1);
- running_font = basefont;
- ++current_cell_number;
- if (table->CellHasContRow(current_cell_number) >= 0) {
- TeXContTableRows(buf, bparams, 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(buf, bparams,
- 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(Buffer const * buf,
- BufferParams const & bparams,
- ostream & os,
- LyXParagraph::size_type i,
- int current_cell_number,
- int & column, TexRow & texrow)
-{
- lyxerr[Debug::LATEX] << "TeXContTableRows... " << this << endl;
- if (!table)
- return false;
-
- bool return_value = false;
- LyXLayout const & style =
- textclasslist.Style(bparams.textclass,
- GetLayout());
- LyXFont basefont = getFont(bparams, -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;
- value_type c;
- 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(bparams, 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(bparams, i + 1) != running_font
- && getFont(bparams, i + 1) != font) {
- font = getFont(bparams, 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(buf, bparams,
- 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);
- open_font = false;
- }
- basefont = getFont(bparams, -1);
- running_font = basefont;
- cell = table->CellHasContRow(current_cell_number);
- }
- lyxerr[Debug::LATEX] << "TeXContTableRows...done " << this << endl;
- return return_value;
-}
-
-
-bool LyXParagraph::linuxDocConvertChar(char c, string & sgml_string)
-{
- bool retval = false;
- switch (c) {
- case LyXParagraph::META_HFILL:
- sgml_string.erase();
- break;
- case LyXParagraph::META_NEWLINE:
- sgml_string = '\n';
- break;
- case '&':
- sgml_string = "&";
- break;
- case '<':
- sgml_string = "<";
- break;
- case '>':
- sgml_string = ">";
- break;
- case '$':
- sgml_string = "$";
- break;
- case '#':
- sgml_string = "#";
- break;
- case '%':
- sgml_string = "%";
- break;
- case '[':
- sgml_string = "[";
- break;
- case ']':
- sgml_string = "]";
- break;
- case '{':
- sgml_string = "{";
- break;
- case '}':
- sgml_string = "}";
- break;
- case '~':
- sgml_string = "˜";
- break;
- case '"':
- sgml_string = """;
- break;
- case '\\':
- sgml_string = "\";
- break;
- case ' ':
- retval = true;
- sgml_string = ' ';
- break;
- case '\0': // Ignore :-)
- sgml_string.erase();
- break;
- default:
- sgml_string = c;
- break;
- }
- return retval;
-}
-
-
-void LyXParagraph::SimpleDocBookOneTablePar(Buffer const * buffer,
- ostream & os, string & extra,
- int & desc_on, int depth)
-{
- BufferParams const & bparams = buffer->params;
- if (!table) return;
- lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar... " << this << endl;
- int column = 0;
- LyXFont font1, font2;
- char c;
- Inset * inset;
- size_type main_body;
- bool emph_flag = false;
-
- LyXLayout const & style =
- textclasslist.Style(bparams.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(bparams, 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(bparams, -1);
- ++current_cell_number;
- if (table->CellHasContRow(current_cell_number) >= 0) {
- DocBookContTableRows(buffer,
- 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(buffer, ost);
- string tmp_out = ost.str().c_str();
-#else
- ostrstream ost;
- inset->DocBook(buffer, 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(Buffer const * buffer,
- ostream & os, string & extra,
- int & desc_on,
- LyXParagraph::size_type i,
- int current_cell_number, int &column)
-
-{
- if (!table) return;
-
- BufferParams const & bparams = buffer->params;
-
- lyxerr[Debug::LATEX] << "DocBookContTableRows... " << this << endl;
-
- LyXFont font2;
- char c;
- Inset * inset;
- //string emph = "emphasis";
- bool emph_flag = false;
- int char_line_count = 0;
-
- LyXLayout const & style =
- textclasslist.Style(bparams.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(bparams, 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(buffer, ost);
- string tmp_out = ost.str().c_str();
-#else
- ostrstream ost;
- inset->DocBook(buffer, 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(bparams, -1);
- cell = table->CellHasContRow(current_cell_number);
- }
- lyxerr[Debug::LATEX] << "DocBookContTableRows...done " << this << endl;
-}
+ return retval;
+}
void LyXParagraph::SimpleTeXBlanks(ostream & os, TexRow & texrow,
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)
if (tmp) {
column = 0;
} else {
- column += os.tellp() - len;
+ column += int(os.tellp()) - len;
}
for (; tmp--;) {
texrow.newline();
}
// Otherwise, we use what LaTeX
// provides us.
- switch(c) {
+ switch (c) {
case '<':
os << "\\textless{}";
column += 10;
LyXParagraph * LyXParagraph::TeXDeeper(Buffer const * buf,
BufferParams const & bparams,
- ostream & os, TexRow & texrow,
- ostream & foot,
- TexRow & foot_texrow,
- int & foot_count)
+ ostream & os, TexRow & texrow)
{
lyxerr[Debug::LATEX] << "TeXDeeper... " << this << endl;
LyXParagraph * par = this;
- while (par &&
- (par->depth == depth) &&
- (par->footnoteflag == footnoteflag)) {
- if (par->IsDummy())
- lyxerr << "ERROR (LyXParagraph::TeXDeeper)" << endl;
+ while (par && par->params.depth() == params.depth()) {
if (textclasslist.Style(bparams.textclass,
- par->layout).isEnvironment()
- || par->pextra_type != PEXTRA_NONE) {
+ par->layout).isEnvironment()) {
par = par->TeXEnvironment(buf, bparams,
- os, texrow,
- foot, foot_texrow,
- foot_count);
+ os, texrow);
} else {
par = par->TeXOnePar(buf, bparams,
- os, texrow, false,
- foot, foot_texrow,
- foot_count);
+ os, texrow, false);
}
}
lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
LyXParagraph * LyXParagraph::TeXEnvironment(Buffer const * buf,
BufferParams const & bparams,
- ostream & os, TexRow & texrow,
- ostream & foot,
- TexRow & foot_texrow,
- int & foot_count)
+ ostream & os, TexRow & texrow)
{
- bool eindent_open = false;
- bool foot_this_level = false;
- // flags when footnotetext should be appended to file.
- static bool minipage_open = false;
- static int minipage_open_depth = 0;
- char par_sep = bparams.paragraph_separation;
-
lyxerr[Debug::LATEX] << "TeXEnvironment... " << this << endl;
- if (IsDummy())
- lyxerr << "ERROR (LyXParagraph::TeXEnvironment)" << endl;
LyXLayout const & style =
textclasslist.Style(bparams.textclass,
layout);
-
- if (pextra_type == PEXTRA_INDENT) {
- if (!pextra_width.empty()) {
- os << "\\begin{LyXParagraphIndent}{"
- << pextra_width << "}\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()) {
- case 3:
- os << "1.00";
- break;
- case 2:
- os << "0."
- << pextra_widthp;
- break;
- case 1:
- os << "0.0"
- << pextra_widthp;
- }
- os << "\\columnwidth}\n";
- }
- texrow.newline();
- eindent_open = true;
- }
- if ((pextra_type == PEXTRA_MINIPAGE) && !minipage_open) {
- if (pextra_hfill && Previous() &&
- (Previous()->pextra_type == PEXTRA_MINIPAGE)) {
- os << "\\hfill{}\n";
- texrow.newline();
- }
- if (par_sep == BufferParams::PARSEP_INDENT) {
- os << "{\\setlength\\parindent{0pt}\n";
- texrow.newline();
- }
- os << "\\begin{minipage}";
- switch(pextra_alignment) {
- case MINIPAGE_ALIGN_TOP:
- os << "[t]";
- break;
- case MINIPAGE_ALIGN_MIDDLE:
- os << "[m]";
- break;
- case MINIPAGE_ALIGN_BOTTOM:
- os << "[b]";
- break;
- }
- if (!pextra_width.empty()) {
- os << '{' << pextra_width << "}\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()) {
- case 3:
- os << "1.00";
- break;
- case 2:
- os << "0."
- << pextra_widthp;
- break;
- case 1:
- os << "0.0"
- << pextra_widthp;
- }
- os << "\\columnwidth}\n";
- }
- texrow.newline();
- if (par_sep == BufferParams::PARSEP_INDENT) {
- os << "\\setlength\\parindent{\\LyXMinipageIndent}\n";
- texrow.newline();
- }
- minipage_open = true;
- minipage_open_depth = depth;
- }
-#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
- //pages (JMarc)
-#endif
if (style.isEnvironment()){
if (style.latextype == LATEX_LIST_ENVIRONMENT) {
-#ifdef FANCY_FOOTNOTE_CODE
- if (foot_count < 0) {
- // flag that footnote[mark][text] should be
- // used for any footnotes from now on
- foot_count = 0;
- foot_this_level = true;
- }
-#endif
os << "\\begin{" << style.latexname() << "}{"
- << labelwidthstring << "}\n";
+ << params.labelWidthString() << "}\n";
} else if (style.labeltype == LABEL_BIBLIO) {
// ale970405
os << "\\begin{" << style.latexname() << "}{"
- << bibitemWidest(current_view)
+ << bibitemWidest(buf)
<< "}\n";
} else if (style.latextype == LATEX_ITEM_ENVIRONMENT) {
-#ifdef FANCY_FOOTNOTE_CODE
- if (foot_count < 0) {
- // flag that footnote[mark][text] should be
- // used for any footnotes from now on
- foot_count = 0;
- foot_this_level = true;
- }
-#endif
os << "\\begin{" << style.latexname() << '}'
<< style.latexparam() << '\n';
} else
LyXParagraph * par = this;
do {
par = par->TeXOnePar(buf, bparams,
- os, texrow, false,
- foot, foot_texrow, foot_count);
+ os, texrow, false);
- if (minipage_open && par && !style.isEnvironment() &&
- (par->pextra_type == PEXTRA_MINIPAGE) &&
- par->pextra_start_minipage) {
- os << "\\end{minipage}\n";
- texrow.newline();
- if (par_sep == BufferParams::PARSEP_INDENT) {
- os << "}\n";
- texrow.newline();
- }
- minipage_open = false;
- }
- if (par && par->depth > depth) {
+ 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(buf, bparams, os, texrow,
- foot, foot_texrow, foot_count);
- }
- 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)){
- os << "\\hfill{}\n";
- texrow.newline();
- }
- if (par_sep == BufferParams::PARSEP_INDENT) {
- os << "{\\setlength\\parindent{0pt}\n";
- texrow.newline();
- }
- os << "\\begin{minipage}";
- switch(par->pextra_alignment) {
- case MINIPAGE_ALIGN_TOP:
- os << "[t]";
- break;
- case MINIPAGE_ALIGN_MIDDLE:
- os << "[m]";
- break;
- case MINIPAGE_ALIGN_BOTTOM:
- os << "[b]";
- break;
- }
- if (!par->pextra_width.empty()) {
- os << '{' << par->pextra_width << "}\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()) {
- case 3:
- os << "1.00";
- break;
- case 2:
- os << "0." << par->pextra_widthp;
- break;
- case 1:
- os << "0.0" << par->pextra_widthp;
- }
- os << "\\columnwidth}\n";
- }
- texrow.newline();
- if (par_sep == BufferParams::PARSEP_INDENT) {
- os << "\\setlength\\parindent{\\LyXMinipageIndent}\n";
- texrow.newline();
- }
- minipage_open = true;
- minipage_open_depth = par->depth;
+ par = par->TeXDeeper(buf, bparams, os, texrow);
}
} while (par
&& par->layout == layout
- && par->depth == depth
- && par->pextra_type == pextra_type
- && par->footnoteflag == footnoteflag);
+ && par->params.depth() == params.depth());
if (style.isEnvironment()) {
- os << "\\end{" << style.latexname() << '}';
- // maybe this should go after the minipage closes?
- if (foot_this_level) {
- if (foot_count >= 1) {
- if (foot_count > 1) {
- os << "\\addtocounter{footnote}{-"
- << foot_count - 1
- << '}';
- }
- os << foot;
- texrow += foot_texrow;
- foot.clear();
- foot_texrow.reset();
- foot_count = 0;
- }
- }
- }
- if (minipage_open && (minipage_open_depth == depth) &&
- (!par || par->pextra_start_minipage ||
- par->pextra_type != 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) {
- os << "\\medskip\n\n";
- texrow.newline();
- texrow.newline();
- }
- minipage_open = false;
- }
- if (eindent_open) {
- os << "\\end{LyXParagraphIndent}\n";
- texrow.newline();
- }
- if (!(par && (par->pextra_type == PEXTRA_MINIPAGE)
- && par->pextra_hfill)) {
- os << '\n';
- texrow.newline();
+ os << "\\end{" << style.latexname() << "}\n";
}
+
lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
return par; // ale970302
}
-#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)
-{
- lyxerr[Debug::LATEX] << "TeXFootnote... " << this << endl;
- if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
- lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
- "No footnote!" << endl;
-
- LyXParagraph * par = this;
- LyXLayout const & style =
- textclasslist.Style(bparams.textclass,
- previous->GetLayout());
-
- if (style.needprotect && footnotekind != LyXParagraph::FOOTNOTE){
- lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
- "Float other than footnote in command"
- " with moving argument is illegal" << endl;
- }
-
- if (footnotekind != LyXParagraph::FOOTNOTE
- && footnotekind != LyXParagraph::MARGIN
- && os.tellp()
- // Thinko
- // How to solve this?
- //&& !suffixIs(file, '\n')
- ) {
- // we need to ensure that real floats like tables and figures
- // have their \begin{} on a new line otherwise we can get
- // incorrect results when using the endfloat.sty package
- // especially if two floats follow one another. ARRae 981022
- // NOTE: if the file is length 0 it must have just been
- // written out so we assume it ended with a '\n'
- // Thinkee:
- // As far as I can see there is never any harm in writing
- // a '\n' too much. Please tell me if I am wrong. (Lgb)
- os << '\n';
- texrow.newline();
- }
-
- bool moving_arg = false;
- bool need_closing = false;
- bool is_rtl = isRightToLeftPar(bparams);
-
- if (is_rtl != parent_is_rtl) {
- if (is_rtl)
- os << "\\R{";
- else
- os << "\\L{";
- need_closing = true;
- }
-
- //BufferParams * params = ¤t_view->buffer()->params;
- bool footer_in_body = true;
- switch (footnotekind) {
- case LyXParagraph::FOOTNOTE:
- if (style.intitle) {
- os << "\\thanks{\n";
- footer_in_body = false;
- moving_arg = true;
- } else {
- if (foot_count == -1) {
- // we're at depth 0 so we can use:
- os << "\\footnote{%\n";
- footer_in_body = false;
- } else {
- os << "\\footnotemark{}%\n";
- if (foot_count) {
- // we only need this when there are
- // multiple footnotes
- os << "\\stepcounter{footnote}";
- }
- os << "\\footnotetext{%\n";
- foot_texrow.start(this, 0);
- foot_texrow.newline();
- ++foot_count;
- }
- }
- break;
- case LyXParagraph::MARGIN:
- os << "\\marginpar{\n";
- break;
- case LyXParagraph::FIG:
- if (pextra_type == PEXTRA_FLOATFLT
- && (!pextra_width.empty()
- || !pextra_widthp.empty())) {
- if (!pextra_width.empty())
- os << "\\begin{floatingfigure}{"
- << pextra_width << "}\n";
- else
- os << "\\begin{floatingfigure}{"
- << atoi(pextra_widthp.c_str())/100.0
- << "\\textwidth}\n";
- } else {
- os << "\\begin{figure}";
- if (!bparams.float_placement.empty()) {
- os << '[' << bparams.float_placement << "]\n";
- } else {
- os << '\n';
- }
- }
- break;
- case LyXParagraph::TAB:
- os << "\\begin{table}";
- if (!bparams.float_placement.empty()) {
- os << '[' << bparams.float_placement << "]\n";
- } else {
- os << '\n';
- }
- break;
- case LyXParagraph::WIDE_FIG:
- os << "\\begin{figure*}";
- if (!bparams.float_placement.empty()) {
- os << '[' << bparams.float_placement << "]\n";
- } else {
- os << '\n';
- }
- break;
- case LyXParagraph::WIDE_TAB:
- os << "\\begin{table*}";
- if (!bparams.float_placement.empty()) {
- os << '[' << bparams.float_placement << "]\n";
- } else {
- os << '\n';
- }
- break;
- case LyXParagraph::ALGORITHM:
- os << "\\begin{algorithm}\n";
- break;
- }
- texrow.newline();
-
- if (footnotekind != LyXParagraph::FOOTNOTE
- || !footer_in_body) {
- // Process text for all floats except footnotes in body
- do {
- LyXLayout const & style =
- textclasslist
- .Style(bparams.textclass, par->layout);
- if (par->IsDummy())
- lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
- << endl;
- if (style.isEnvironment()
- || par->pextra_type == 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(buf, bparams, os,
- texrow,
- foot, foot_texrow,
- foot_count);
- } else {
- par = par->TeXOnePar(buf, bparams,
- os, texrow, moving_arg,
- foot, foot_texrow,
- foot_count);
- }
-
- if (par && !par->IsDummy() && par->depth > depth) {
- par = par->TeXDeeper(buf, bparams, os, texrow,
- foot, foot_texrow,
- foot_count);
- }
- } while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE);
- } else {
- // 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(bparams.textclass, par->layout);
- if (par->IsDummy())
- lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
- << endl;
- if (style.isEnvironment()
- || par->pextra_type == 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(buf, bparams,
- foot, foot_texrow,
- dummy, dummy_texrow,
- dummy_count);
- } else {
- 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(buf, bparams,
- foot, foot_texrow,
- dummy, dummy_texrow,
- dummy_count);
- }
- } while (par
- && par->footnoteflag != LyXParagraph::NO_FOOTNOTE);
- if (dummy_count) {
- lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
- "Footnote in a Footnote -- not supported"
- << endl;
- }
-#ifndef HAVE_OSTREAM
- delete [] dummy.str();
-#endif
- }
-
- switch (footnotekind) {
- case LyXParagraph::FOOTNOTE:
- if (footer_in_body) {
- // This helps tell which of the multiple
- // footnotetexts an error was in.
- foot << "}%\n";
- foot_texrow.newline();
- } else {
- os << '}';
- }
- break;
- case LyXParagraph::MARGIN:
- os << '}';
- break;
- case LyXParagraph::FIG:
- if (pextra_type == PEXTRA_FLOATFLT
- && (!pextra_width.empty()
- || !pextra_widthp.empty()))
- os << "\\end{floatingfigure}";
- else
- os << "\\end{figure}";
- break;
- case LyXParagraph::TAB:
- os << "\\end{table}";
- break;
- case LyXParagraph::WIDE_FIG:
- os << "\\end{figure*}";
- break;
- case LyXParagraph::WIDE_TAB:
- os << "\\end{table*}";
- break;
- case LyXParagraph::ALGORITHM:
- os << "\\end{algorithm}";
- break;
- }
-
- if (need_closing)
- os << "}";
-
- if (footnotekind != LyXParagraph::FOOTNOTE
- && footnotekind != LyXParagraph::MARGIN) {
- // we need to ensure that real floats like tables and figures
- // have their \end{} on a line of their own otherwise we can
- // get incorrect results when using the endfloat.sty package.
- os << "\n";
- texrow.newline();
- }
-
- 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);
-}
-#endif
-
-void LyXParagraph::SetPExtraType(BufferParams const & bparams,
- int type, char const * width,
- char const * widthp)
-{
- pextra_type = type;
- pextra_width = width;
- pextra_widthp = widthp;
-
- if (textclasslist.Style(bparams.textclass,
- layout).isEnvironment()) {
- LyXParagraph
- * par = this,
- * ppar = par;
-
- while (par && (par->layout == layout)
- && (par->depth == depth)) {
- ppar = par;
- par = par->Previous();
- if (par)
- par = par->FirstPhysicalPar();
- while (par && par->depth > depth) {
- par = par->Previous();
- if (par)
- par = par->FirstPhysicalPar();
- }
- }
- par = ppar;
- while (par && (par->layout == layout)
- && (par->depth == depth)) {
- par->pextra_type = type;
- par->pextra_width = width;
- par->pextra_widthp = widthp;
- par = par->NextAfterFootnote();
- if (par && (par->depth > depth))
- par->SetPExtraType(bparams,
- type, width, widthp);
- while (par && ((par->depth > depth) || par->IsDummy()))
- par = par->NextAfterFootnote();
- }
- }
-}
-
-
-void LyXParagraph::UnsetPExtraType(BufferParams const & bparams)
-{
- if (pextra_type == PEXTRA_NONE)
- return;
-
- pextra_type = PEXTRA_NONE;
- pextra_width.erase();
- pextra_widthp.erase();
-
- if (textclasslist.Style(bparams.textclass,
- layout).isEnvironment()) {
- LyXParagraph
- * par = this,
- * ppar = par;
-
- while (par && (par->layout == layout)
- && (par->depth == depth)) {
- ppar = par;
- par = par->Previous();
- if (par)
- par = par->FirstPhysicalPar();
- while (par && par->depth > depth) {
- par = par->Previous();
- if (par)
- par = par->FirstPhysicalPar();
- }
- }
- par = ppar;
- while (par && (par->layout == layout)
- && (par->depth == depth)) {
- par->pextra_type = PEXTRA_NONE;
- par->pextra_width.erase();
- par->pextra_widthp.erase();
- par = par->NextAfterFootnote();
- if (par && (par->depth > depth))
- par->UnsetPExtraType(bparams);
- while (par && ((par->depth > depth) || par->IsDummy()))
- par = par->NextAfterFootnote();
- }
- }
-}
-
-
bool LyXParagraph::IsHfill(size_type pos) const
{
return IsHfillChar(GetChar(pos));
}
-bool LyXParagraph::IsFloat(size_type pos) const
-{
- return IsFloatChar(GetChar(pos));
-}
-
-
bool LyXParagraph::IsNewline(size_type pos) const
{
return pos >= 0 && IsNewlineChar(GetChar(pos));
/// Used by the spellchecker
bool LyXParagraph::IsLetter(LyXParagraph::size_type pos) const
{
- value_type 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(BufferParams const & bparams) const
{
- if (IsDummy())
- return FirstPhysicalPar()->getParLanguage(bparams);
- else if (size() > 0)
-#ifndef NEW_TABULAR
- if (!table)
-#endif
- return GetFirstFontSettings().language();
-#ifndef NEW_TABULAR
- else {
- for (size_type pos = 0; pos < size(); ++pos)
- if (IsNewline(pos))
- return GetFontSettings(bparams, pos).language();
- return GetFirstFontSettings().language();
- }
-#endif
- else if (previous)
- return previous->getParLanguage(bparams);
+ if (size() > 0)
+ return GetFirstFontSettings().language();
+ else if (previous_)
+ return previous_->getParLanguage(bparams);
else
- return bparams.language_info;
+ return bparams.language;
}
bool LyXParagraph::isRightToLeftPar(BufferParams const & bparams) const
{
- return lyxrc.rtl_support && !table
+ return lyxrc.rtl_support
&& getParLanguage(bparams)->RightToLeft();
}
void LyXParagraph::ChangeLanguage(BufferParams const & bparams,
Language const * from, Language const * to)
{
- for(size_type i = 0; i < size(); ++i) {
+ for (size_type i = 0; i < size(); ++i) {
LyXFont font = GetFontSettings(bparams, i);
if (font.language() == from) {
font.setLanguage(to);
bool LyXParagraph::isMultiLingual(BufferParams const & bparams)
{
- Language const * doc_language =
- bparams.language_info;
- for(size_type i = 0; i < size(); ++i) {
- LyXFont font = GetFontSettings(bparams, 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 LyXParagraph::String(Buffer const * buffer, bool label)
+string const LyXParagraph::String(Buffer const * buffer, bool label)
{
BufferParams const & bparams = buffer->params;
string s;
- if (label && !IsDummy() && !labelstring.empty())
- s += labelstring + ' ';
- string::size_type len = s.size();
+ if (label && !params.labelString().empty())
+ s += params.labelString() + ' ';
+ string::size_type const len = s.size();
for (LyXParagraph::size_type i = 0; i < size(); ++i) {
value_type c = GetChar(i);
s += c;
else if (c == META_INSET &&
GetInset(i)->LyxCode() == Inset::MATH_CODE) {
-#ifdef HAVE_SSTREAM
std::ostringstream ost;
GetInset(i)->Ascii(buffer, ost);
-#else
- ostrstream ost;
- GetInset(i)->Ascii(buffer, ost);
- ost << '\0';
-#endif
- s += subst(ost.str(),'\n',' ');
+ 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 (isRightToLeftPar(bparams))
+ reverse(s.begin() + len,s.end());
- if (!IsDummy())
-#endif
- {
- if (isRightToLeftPar(bparams))
- reverse(s.begin() + len,s.end());
- }
return s;
}
-string LyXParagraph::String(Buffer const * buffer,
+string const LyXParagraph::String(Buffer const * buffer,
LyXParagraph::size_type beg,
LyXParagraph::size_type end)
{
- string s;
- int actcell = 0;
- int cell = 1;
-#ifndef NEW_TABULAR
- if (table)
- for (LyXParagraph::size_type i = 0; i < beg; ++i)
- if (IsNewline(i)) {
- if (cell >= table->NumberOfCellsInRow(actcell))
- cell = 1;
- else
- ++cell;
- ++actcell;
- }
-#endif
-
- if (beg == 0 && !IsDummy() && !labelstring.empty())
- s += labelstring + ' ';
+ std::ostringstream ost;
+
+ if (beg == 0 && !params.labelString().empty())
+ ost << params.labelString() << ' ';
for (LyXParagraph::size_type i = beg; i < end; ++i) {
- value_type c = GetChar(i);
+ value_type const c = GetUChar(buffer->params, i);
if (IsPrintable(c))
- s += c;
+ ost << c;
else if (c == META_INSET) {
-#ifdef HAVE_SSTREAM
- std::ostringstream ost;
GetInset(i)->Ascii(buffer, ost);
-#else
- ostrstream ost;
- GetInset(i)->Ascii(buffer, ost);
- ost << '\0';
-#endif
- s += ost.str();
- } else if (table && IsNewlineChar(c)) {
- if (cell >= table->NumberOfCellsInRow(actcell)) {
- s += '\n';
- cell = 1;
- } else {
- s += ' ';
- ++cell;
- }
- ++actcell;
}
}
- //if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
- // s += NextAfterFootnote()->String(false);
-
- return s;
+ return ost.str().c_str();
}
-void LyXParagraph::SetInsetOwner(Inset *i)
+void LyXParagraph::SetInsetOwner(Inset * i)
{
inset_owner = i;
for (InsetList::const_iterator cit = insetlist.begin();
}
}
}
+
+
+void LyXParagraph::fitToSize()
+{
+ TextContainer tmp(text.begin(), text.end());
+ text.swap(tmp);
+}
+
+
+void LyXParagraph::setContentsFromPar(LyXParagraph * par)
+{
+ text = par->text;
+}
projects / lyx.git / blobdiff