* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-1999 The LyX Team.
+ * Copyright 1995-2000 The LyX Team.
*
* ====================================================== */
#pragma implementation "lyxparagraph.h"
#endif
+#include <algorithm>
#include <fstream>
-using std::fstream;
-using std::ios;
+#include <csignal>
#include "lyxparagraph.h"
#include "support/textutils.h"
#include "debug.h"
#include "LaTeXFeatures.h"
#include "insets/insetinclude.h"
+#include "insets/insetbib.h"
+#include "insets/insettext.h"
#include "support/filetools.h"
#include "lyx_gui_misc.h"
#include "texrow.h"
+#include "support/lyxmanip.h"
+#include "BufferView.h"
+using std::ostream;
+using std::endl;
+using std::fstream;
+using std::ios;
+using std::lower_bound;
+using std::upper_bound;
+using std::reverse;
-extern void addNewlineAndDepth(string & file, int const depth); // Jug 990923
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 LyXRC * lyxrc;
-
-
-// ale970405
-extern string bibitemWidthest();
+extern string bibitemWidest(Painter &);
// this is a minibuffer
static char minibuffer_char;
itemdepth = 0;
next = 0;
previous = 0;
-#ifndef NEW_FONTTABLE // OK
- fonttable = 0;
-#endif
-#ifndef NEW_INSETTABLE
- insettable = 0;
-#endif
+#ifndef NEW_INSETS
footnoteflag = LyXParagraph::NO_FOOTNOTE;
-
+ footnotekind = LyXParagraph::FOOTNOTE; // should not be needed
+#endif
align = LYX_ALIGN_BLOCK;
+#ifndef NEW_TABULAR
/* table stuff -- begin*/
table = 0;
- /* table stuff -- end*/
+ /* table stuff -- end*/
+#endif
+ inset_owner = 0;
id_ = paragraph_id++;
bibkey = 0; // ale970302
Clear();
previous = par;
previous->next = this;
// end
-#ifndef NEW_FONTTABLE // OK
- fonttable = 0;
-#endif
-#ifndef NEW_INSETTABLE
- insettable = 0;
-#endif
+#ifndef NEW_INSETS
footnoteflag = LyXParagraph::NO_FOOTNOTE;
footnotekind = LyXParagraph::FOOTNOTE;
-
+#endif
+#ifndef NEW_TABULAR
/* table stuff -- begin*/
table = 0;
- /* table stuff -- end*/
+ /* table stuff -- end*/
+#endif
+ inset_owner = 0;
id_ = paragraph_id++;
bibkey = 0; // ale970302
}
-void LyXParagraph::writeFile(ostream & os, BufferParams & params,
- char footflag, char dth)
+void LyXParagraph::writeFile(Buffer const * buf, ostream & os,
+ BufferParams const & params,
+ char footflag, char dth) const
{
LyXFont font1, font2;
- Inset * inset;
int column = 0;
int h = 0;
char c = 0;
if (footnoteflag != LyXParagraph::NO_FOOTNOTE
|| !previous
- || previous->footnoteflag == LyXParagraph::NO_FOOTNOTE){
+ || previous->footnoteflag == LyXParagraph::NO_FOOTNOTE) {
// The beginning or the end of a footnote environment?
if (footflag != footnoteflag) {
os << "\n\\begin_float "
<< string_footnotekinds[footnotekind]
<< " ";
- }
- else {
+ } else {
os << "\n\\end_float ";
}
}
if (depth > dth) {
while (depth > dth) {
os << "\n\\begin_deeper ";
- dth++;
+ ++dth;
}
- }
- else {
+ } else {
while (depth < dth) {
os << "\n\\end_deeper ";
- dth--;
+ --dth;
}
}
}
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 "
}
os << '\n';
}
- }
- else {
+ } 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);
}
-
+#endif
// bibitem ale970302
if (bibkey)
- bibkey->Write(os);
+ bibkey->Write(buf, os);
- font1 = LyXFont(LyXFont::ALL_INHERIT);
+ font1 = LyXFont(LyXFont::ALL_INHERIT,params.language_info);
column = 0;
- for (size_type i = 0; i < size(); i++) {
- if (!i){
+ for (size_type i = 0; i < size(); ++i) {
+ if (!i) {
os << "\n";
column = 0;
}
// Write font changes
- font2 = GetFontSettings(i);
+ font2 = GetFontSettings(params, i);
if (font2 != font1) {
font2.lyxWriteChanges(font1, os);
column = 0;
c = GetChar(i);
switch (c) {
case META_INSET:
- inset = GetInset(i);
+ {
+ Inset const * inset = GetInset(i);
if (inset)
if (inset->DirectWrite()) {
// international char, let it write
// code directly so it's shorter in
// the file
- inset->Write(os);
+ inset->Write(buf, os);
} else {
os << "\n\\begin_inset ";
- inset->Write(os);
+ inset->Write(buf, os);
os << "\n\\end_inset \n\n";
column = 0;
}
- break;
+ }
+ break;
case META_NEWLINE:
os << "\n\\newline \n";
column = 0;
os << "\n\\hfill \n";
column = 0;
break;
- case META_PROTECTED_SEPARATOR:
- os << "\n\\protected_separator \n";
- column = 0;
- break;
case '\\':
os << "\n\\backslash \n";
column = 0;
break;
default:
if ((column > 70 && c == ' ')
- || column > 79){
+ || column > 79) {
os << "\n";
column = 0;
}
else
lyxerr << "ERROR (LyXParagraph::writeFile):"
" NULL char in structure." << endl;
- column++;
+ ++column;
break;
}
}
// now write the next paragraph
if (next)
- next->writeFile(os, params, footflag, dth);
+ next->writeFile(buf, os, params, footflag, dth);
}
-void LyXParagraph::validate(LaTeXFeatures & features)
+void LyXParagraph::validate(LaTeXFeatures & features) const
{
+ BufferParams const & params = features.bufferParams();
+
// this will be useful later
LyXLayout const & layout =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(params.textclass,
GetLayout());
// check the params.
if (line_top || line_bottom)
features.lyxline = true;
+ if (!spacing.isDefault())
+ features.setspace = true;
// then the layouts
features.layout[GetLayout()] = true;
// then the fonts
-#ifdef NEW_FONTTABLE // OK, but does not affect structure anyway
+ Language const * doc_language = params.language_info;
+
for (FontList::const_iterator cit = fontlist.begin();
cit != fontlist.end(); ++cit) {
if ((*cit).font.noun() == LyXFont::ON) {
<< endl;
features.noun = true;
lyxerr[Debug::LATEX] << "Noun enabled. Font: "
- << (*cit).font.stateText()
+ << (*cit).font.stateText(0)
<< endl;
}
switch ((*cit).font.color()) {
- case LyXFont::NONE:
- case LyXFont::INHERIT_COLOR:
- case LyXFont::IGNORE_COLOR:
+ case LColor::none:
+ case LColor::inherit:
+ case LColor::ignore:
break;
default:
features.color = true;
lyxerr[Debug::LATEX] << "Color enabled. Font: "
- << (*cit).font.stateText()
+ << (*cit).font.stateText(0)
<< endl;
}
- }
-#else
- FontTable * tmpfonttable = fonttable;
- while (tmpfonttable) {
- if (tmpfonttable->font.noun() == LyXFont::ON) {
- lyxerr[Debug::LATEX] << "font.noun: "
- << tmpfonttable->font.noun()
- << endl;
- features.noun = true;
- lyxerr[Debug::LATEX] << "Noun enabled. Font: "
- << tmpfonttable->font.stateText()
- << endl;
- }
- switch (tmpfonttable->font.color()) {
- case LyXFont::NONE:
- case LyXFont::INHERIT_COLOR:
- case LyXFont::IGNORE_COLOR:
- break;
- default:
- features.color = true;
- lyxerr[Debug::LATEX] << "Color enabled. Font: "
- << tmpfonttable->font.stateText()
- << endl;
+
+ Language const * language = (*cit).font.language();
+ if (language != doc_language) {
+ features.UsedLanguages.insert(language);
+ lyxerr[Debug::LATEX] << "Found language "
+ << language->lang() << endl;
}
- tmpfonttable = tmpfonttable->next;
}
-#endif
+
// then the insets
-#ifdef NEW_INSETTABLE
for (InsetList::const_iterator cit = insetlist.begin();
cit != insetlist.end(); ++cit) {
if ((*cit).inset)
(*cit).inset->Validate(features);
}
-#else
- InsetTable * tmpinsettable = insettable;
- while (tmpinsettable) {
- if (tmpinsettable->inset) {
- tmpinsettable->inset->Validate(features);
- }
- tmpinsettable = tmpinsettable->next;
- }
-#endif
if (table && table->IsLongTable())
features.longtable = true;
if (layout.needprotect
&& next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
features.NeedLyXFootnoteCode = true;
- if ((current_view->buffer()->params.paragraph_separation == BufferParams::PARSEP_INDENT) &&
- (pextra_type == LyXParagraph::PEXTRA_MINIPAGE))
+ if (params.paragraph_separation == BufferParams::PARSEP_INDENT
+ && pextra_type == LyXParagraph::PEXTRA_MINIPAGE)
features.NeedLyXMinipageIndent = true;
if (table && table->NeedRotating())
features.rotating = true;
// First few functions needed for cut and paste and paragraph breaking.
-void LyXParagraph::CopyIntoMinibuffer(LyXParagraph::size_type pos) const
+void LyXParagraph::CopyIntoMinibuffer(BufferParams const & bparams,
+ LyXParagraph::size_type pos) const
{
minibuffer_char = GetChar(pos);
- minibuffer_font = GetFontSettings(pos);
+ minibuffer_font = GetFontSettings(bparams, pos);
minibuffer_inset = 0;
if (minibuffer_char == LyXParagraph::META_INSET) {
if (GetInset(pos)) {
}
-void LyXParagraph::CutIntoMinibuffer(LyXParagraph::size_type pos)
+void LyXParagraph::CutIntoMinibuffer(BufferParams const & bparams,
+ LyXParagraph::size_type pos)
{
minibuffer_char = GetChar(pos);
- minibuffer_font = GetFontSettings(pos);
+ minibuffer_font = GetFontSettings(bparams, pos);
minibuffer_inset = 0;
if (minibuffer_char == LyXParagraph::META_INSET) {
if (GetInset(pos)) {
// the inset, not just a clone. Otherwise
// the inset would be deleted when calling Erase(pos)
// find the entry
-#ifdef NEW_INSETTABLE
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).pos == pos) {
- (*it).inset = 0;
- break;
- }
-
- }
-#else
- InsetTable * tmpi = insettable;
- while (tmpi && tmpi->pos != pos) {
- tmpi= tmpi->next;
- }
- if (tmpi) { // This should always be true.
- tmpi->inset = 0;
- }
-#endif
+ InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ if (it != insetlist.end() && (*it).pos == pos)
+ (*it).inset = 0;
} else {
minibuffer_inset = 0;
minibuffer_char = ' ';
}
-void LyXParagraph::InsertFromMinibuffer(LyXParagraph::size_type pos)
+bool LyXParagraph::InsertFromMinibuffer(LyXParagraph::size_type pos)
{
+ if ((minibuffer_char == LyXParagraph::META_INSET) &&
+ !InsertInsetAllowed(minibuffer_inset))
+ return false;
+#ifdef NEW_WAY
+ if (minibuffer_char == LyXParagraph::META_INSET)
+ InsertInset(pos, minibuffer_inset, minibuffer_font);
+ else
+ InsertChar(pos, minibuffer_char, minibuffer_font);
+#else
InsertChar(pos, minibuffer_char);
SetFont(pos, minibuffer_font);
if (minibuffer_char == LyXParagraph::META_INSET)
InsertInset(pos, minibuffer_inset);
+#endif
+ return true;
}
// end of minibuffer
added_space_top = VSpace(VSpace::NONE);
added_space_bottom = VSpace(VSpace::NONE);
-
+ spacing.set(Spacing::Default);
+
align = LYX_ALIGN_LAYOUT;
depth = 0;
noindent = false;
pextra_type = PEXTRA_NONE;
- pextra_width.clear();
- pextra_widthp.clear();
+ pextra_width.erase();
+ pextra_widthp.erase();
pextra_alignment = MINIPAGE_ALIGN_TOP;
pextra_hfill = false;
pextra_start_minipage = false;
- labelstring.clear();
- labelwidthstring.clear();
+ labelstring.erase();
+ labelwidthstring.erase();
layout = 0;
bibkey = 0;
if (next)
next->previous = previous;
-#ifdef NEW_INSETTABLE
for (InsetList::iterator it = insetlist.begin();
it != insetlist.end(); ++it) {
delete (*it).inset;
}
-#else
- InsetTable * tmpinset;
- while (insettable) {
- tmpinset = insettable;
- insettable = insettable->next;
- if (tmpinset->inset)
- delete tmpinset->inset;
- delete tmpinset;
- if (insettable && insettable->next == insettable) {
- // somehow this recursion appears occasionally
- // but I can't find where. This bandaid
- // helps but isn't the best fix. (ARRae)
- if (insettable->inset) {
- delete insettable->inset;
- }
- delete insettable;
- break;
- }
- }
-#endif
-#ifndef NEW_FONTTABLE // OK
- FontTable * tmpfont;
- while (fonttable) {
- tmpfont = fonttable;
- fonttable = fonttable->next;
- delete tmpfont;
- }
-#endif
-
+#ifndef NEW_TABULAR
/* table stuff -- begin*/
- if (table)
- delete table;
- /* table stuff -- end*/
+ delete table;
+ /* table stuff -- end*/
+#endif
// ale970302
- if (bibkey)
- delete bibkey;
+ delete bibkey;
+ //
+ //lyxerr << "LyXParagraph::paragraph_id = "
+ // << LyXParagraph::paragraph_id << endl;
}
// > 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 it is an inset, delete the inset entry
if (text[pos] == LyXParagraph::META_INSET) {
// find the entry
-#ifdef NEW_INSETTABLE
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).pos == pos) {
- delete (*it).inset;
- insetlist.erase(it);
- break;
- }
- }
-#else
- InsetTable *tmpi = insettable;
- InsetTable *tmpi2 = tmpi;
- while (tmpi && tmpi->pos != pos) {
- tmpi2 = tmpi;
- tmpi = tmpi->next;
- }
- if (tmpi) { // this should always be true
- if (tmpi->inset) // delete the inset if it exists
- delete tmpi->inset;
- if (tmpi == insettable)
- insettable = tmpi->next;
- else
- tmpi2->next = tmpi->next;
- delete tmpi;
+ InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ if (it != insetlist.end() && (*it).pos == pos) {
+ delete (*it).inset;
+ insetlist.erase(it);
}
-#endif
}
text.erase(text.begin() + pos);
+
// Erase entries in the tables.
-#ifdef NEW_FONTTABLE // Seems OK
- for (FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
- if (pos >= (*it).pos && pos <= (*it).pos_end) {
- if ((*it).pos == (*it).pos_end) {
- // If it is a multi-character font
- // entry, we just make it smaller
- // (see update below), otherwise we
- // should delete it.
- fontlist.erase(it);
- break;
- }
+ FontList::iterator it = lower_bound(fontlist.begin(),
+ fontlist.end(),
+ pos, matchFT());
+ if (it != fontlist.end() && (*it).pos == pos &&
+ (pos == 0 ||
+ (it != fontlist.begin() && (*(it-1)).pos == pos - 1))) {
+ // If it is a multi-character font
+ // entry, we just make it smaller
+ // (see update below), otherwise we
+ // should delete it.
+ unsigned int i = it - fontlist.begin();
+ fontlist.erase(fontlist.begin() + i);
+ it = fontlist.begin() + i;
+ if (i > 0 && i < fontlist.size() &&
+ fontlist[i-1].font == fontlist[i].font) {
+ fontlist.erase(fontlist.begin() + i-1);
+ it = fontlist.begin() + i-1;
}
}
- // Update all other entries.
- for (FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
- if ((*it).pos > pos)
- (*it).pos--;
- if ((*it).pos_end >= pos)
- (*it).pos_end--;
- }
-#else
- int found = 0;
- FontTable * tmp = fonttable;
- FontTable * prev = 0;
- while (tmp && !found) {
- if (pos >= tmp->pos && pos <= tmp->pos_end)
- found = 1;
- else {
- prev = tmp;
- tmp = tmp->next;
- }
- }
-
- if (found && tmp->pos == tmp->pos_end) {
- // if it is a multi-character font entry, we just make
- // it smaller (see update below), otherwise we should
- // delete it
- if (prev)
- prev->next = tmp->next;
- else
- fonttable = tmp->next;
-
- delete tmp;
- }
// Update all other entries.
+ for (; it != fontlist.end(); ++it)
+ --(*it).pos;
- tmp = fonttable;
- while (tmp) {
- if (tmp->pos > pos)
- tmp->pos--;
- if (tmp->pos_end >= pos)
- tmp->pos_end--;
- tmp = tmp->next;
- }
-#endif
// Update the inset table.
-#ifdef NEW_INSETTABLE
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).pos > pos)
- (*it).pos--;
- }
-#else
- InsetTable * tmpi = insettable;
- while (tmpi) {
- if (tmpi->pos > pos)
- tmpi->pos--;
- tmpi= tmpi->next;
- }
-#endif
+ for (InsetList::iterator it = upper_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ it != insetlist.end(); ++it)
+ --(*it).pos;
} else {
lyxerr << "ERROR (LyXParagraph::Erase): "
"can't erase non-existant char." << endl;
void LyXParagraph::InsertChar(LyXParagraph::size_type pos, char c)
{
+#ifndef NEW_WAY
// > 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;
}
text.insert(text.begin() + pos, c);
// Update the font table.
-#ifdef NEW_FONTTABLE // Seems OK
- for (FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
- if ((*it).pos >= pos)
- (*it).pos++;
- if ((*it).pos_end >= pos)
- (*it).pos_end++;
- }
-#else
- FontTable * tmp = fonttable;
- while (tmp) {
- if (tmp->pos >= pos)
- tmp->pos++;
- if (tmp->pos_end >= pos)
- tmp->pos_end++;
- tmp = tmp->next;
- }
-#endif
+ for (FontList::iterator it = lower_bound(fontlist.begin(),
+ fontlist.end(),
+ pos, matchFT());
+ it != fontlist.end(); ++it)
+ ++(*it).pos;
// Update the inset table.
-#ifdef NEW_INSETTABLE
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).pos >= pos)
- (*it).pos++;
- }
+ for (InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ it != insetlist.end(); ++it)
+ ++(*it).pos;
#else
- InsetTable * tmpi = insettable;
- while (tmpi) {
- if (tmpi->pos >= pos)
- tmpi->pos++;
- tmpi= tmpi->next;
- }
+ LyXFont f(LyXFont::ALL_INHERIT);
+ InsertChar(pos, c, f);
+#endif
+}
+
+
+#ifdef NEW_WAY
+void LyXParagraph::InsertChar(LyXParagraph::size_type pos,
+ char 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;
+ }
+ text.insert(text.begin() + pos, c);
+ // Update the font table.
+ for (FontList::iterator it = lower_bound(fontlist.begin(),
+ fontlist.end(),
+ pos, matchFT());
+ it != fontlist.end(); ++it)
+ ++(*it).pos;
+
+ // Update the inset table.
+ for (InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ it != insetlist.end(); ++it)
+ ++(*it).pos;
+
+ SetFont(pos, font);
}
+#endif
void LyXParagraph::InsertInset(LyXParagraph::size_type pos,
Inset * inset)
{
+#ifdef NEW_WAY
+ LyXFont f(LyXFont::ALL_INHERIT);
+ InsertInset(pos, inset, f);
+#else
// > 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);
- else
+ else
+#endif
lyxerr << "ERROR (LyXParagraph::InsertInset): "
"position does not exist: " << pos << endl;
return;
if (inset) {
// Add a new entry in the inset table.
-#ifdef NEW_INSETTABLE
- InsetTable tmpi;
- InsetList::iterator it =
- insetlist.insert(insetlist.begin(), tmpi);
- (*it).inset = inset;
- (*it).pos = pos;
-#else
- InsetTable * tmpi = new InsetTable;
- tmpi->pos = pos;
- tmpi->inset = inset;
- tmpi->next = insettable;
- insettable = tmpi;
+ InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ if (it != insetlist.end() && (*it).pos == pos)
+ lyxerr << "ERROR (LyXParagraph::InsertInset): "
+ "there is an inset in position: " << pos << endl;
+ else
+ insetlist.insert(it, InsetTable(pos,inset));
+ if (inset_owner)
+ inset->setOwner(inset_owner);
+ }
#endif
+}
+
+
+#ifdef NEW_WAY
+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;
}
+
+ InsertChar(pos, META_INSET, font);
+ Assert(text[pos] == META_INSET);
+
+ // Add a new entry in the inset table.
+ InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ if (it != insetlist.end() && (*it).pos == pos)
+ lyxerr << "ERROR (LyXParagraph::InsertInset): "
+ "there is an inset in position: " << pos << endl;
+ else
+ insetlist.insert(it, InsetTable(pos, inset));
+ if (inset_owner)
+ inset->setOwner(inset_owner);
+}
+#endif
+
+
+bool LyXParagraph::InsertInsetAllowed(Inset * inset)
+{
+ if (inset_owner)
+ return inset_owner->InsertInsetAllowed(inset);
+ return true;
}
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 {
+ else
+#endif
lyxerr << "ERROR (LyXParagraph::GetInset): "
"position does not exist: "
<< pos << endl;
- }
+
return 0;
}
// Find the inset.
-#ifdef NEW_INSETTABLE
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).pos == pos) {
- return (*it).inset;
- }
- }
+ InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ if (it != insetlist.end() && (*it).pos == pos)
+ return (*it).inset;
+
lyxerr << "ERROR (LyXParagraph::GetInset): "
"Inset does not exist: " << pos << endl;
- text[pos] = ' '; // WHY!!! does this set the pos to ' '????
+ //::raise(SIGSTOP);
+
+ // text[pos] = ' '; // WHY!!! does this set the pos to ' '????
// Did this commenting out introduce a bug? So far I have not
// see any, please enlighten me. (Lgb)
// My guess is that since the inset does not exist, we might
// as well replace it with a space to prevent craches. (Asger)
return 0;
-#else
- InsetTable * tmpi = insettable;
-
- while (tmpi && tmpi->pos != pos)
- tmpi = tmpi->next;
-
- if (tmpi)
- return tmpi->inset;
- else {
- lyxerr << "ERROR (LyXParagraph::GetInset): "
- "Inset does not exist: " << pos << endl;
- text[pos] = ' '; /// WHY!!! does this set the pos to ' '????
- // Did this commenting out introduce a bug? So far I have not
- // seen any, please enlighten me. (Lgb)
- // My guess is that since the inset does not exist, we might
- // as well replace it with a space to prevent crashes. (Asger)
- return 0;
- }
-#endif
}
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 {
+ else
+#endif
lyxerr << "ERROR (LyXParagraph::GetInset): "
"position does not exist: "
<< pos << endl;
- }
+
return 0;
}
// Find the inset.
-#ifdef NEW_INSETTABLE
- for (InsetList::const_iterator cit = insetlist.begin();
- cit != insetlist.end(); ++cit) {
- if ((*cit).pos == pos) {
- return (*cit).inset;
- }
- }
+ InsetList::const_iterator cit = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ if (cit != insetlist.end() && (*cit).pos == pos)
+ return (*cit).inset;
+
lyxerr << "ERROR (LyXParagraph::GetInset): "
"Inset does not exist: " << pos << endl;
+ //::raise(SIGSTOP);
//text[pos] = ' '; // WHY!!! does this set the pos to ' '????
// Did this commenting out introduce a bug? So far I have not
// see any, please enlighten me. (Lgb)
// My guess is that since the inset does not exist, we might
// as well replace it with a space to prevent craches. (Asger)
return 0;
-#else
- InsetTable * tmpi = insettable;
-
- while (tmpi && tmpi->pos != pos)
- tmpi = tmpi->next;
-
- if (tmpi)
- return tmpi->inset;
- else {
- lyxerr << "ERROR (LyXParagraph::GetInset): "
- "Inset does not exist: " << pos << endl;
- // in the const version we need to comment it out anyway...
- //text[pos] = ' '; /// WHY!!! does this set the pos to ' '????
- // Did this commenting out introduce a bug? So far I have not
- // seen any, please enlighten me. (Lgb)
- // My guess is that since the inset does not exist, we might
- // as well replace it with a space to prevent crashes. (Asger)
- return 0;
- }
-#endif
}
// Gets uninstantiated font setting at position.
// Optimized after profiling. (Asger)
-LyXFont LyXParagraph::GetFontSettings(LyXParagraph::size_type pos) const
+LyXFont LyXParagraph::GetFontSettings(BufferParams const & bparams,
+ LyXParagraph::size_type pos) const
{
if (pos < size()) {
-#ifdef NEW_FONTTABLE // Seems OK
- for (FontList::const_iterator cit = fontlist.begin();
- cit != fontlist.end(); ++cit) {
- if (pos >= (*cit).pos && pos <= (*cit).pos_end)
- return (*cit).font;
- }
-#else
- FontTable * tmp = fonttable;
- while (tmp) {
- if (pos >= tmp->pos && pos <= tmp->pos_end)
- return tmp->font;
- tmp = tmp->next;
- }
-#endif
+ FontList::const_iterator cit = lower_bound(fontlist.begin(),
+ fontlist.end(),
+ pos, 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(pos - text.size() - 1);
- else {
+ ->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?
"position does not exist. "
<< pos << " (" << static_cast<int>(pos)
<< ")" << endl;
- }
- } else if (pos) {
- return GetFontSettings(pos - 1);
+ } else if (pos > 0) {
+ return GetFontSettings(bparams, pos - 1);
+ } else // pos = size() = 0
+ return LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams));
+
+ return LyXFont(LyXFont::ALL_INHERIT);
+}
+
+// Gets uninstantiated font setting at position 0
+LyXFont LyXParagraph::GetFirstFontSettings() const
+{
+ if (size() > 0) {
+ if (!fontlist.empty())
+ return fontlist[0].font;
}
+
+#ifndef NEW_INSETS
+ else if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
+ return NextAfterFootnote()->GetFirstFontSettings();
+#endif
return LyXFont(LyXFont::ALL_INHERIT);
}
// the true picture of the buffer. (Asger)
// If position is -1, we get the layout font of the paragraph.
// If position is -2, we get the font of the manual label of the paragraph.
-LyXFont LyXParagraph::getFont(LyXParagraph::size_type pos) const
+LyXFont LyXParagraph::getFont(BufferParams const & bparams,
+ LyXParagraph::size_type pos) const
{
LyXFont tmpfont;
LyXLayout const & layout =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
LyXParagraph::size_type main_body = 0;
if (layout.labeltype == LABEL_MANUAL)
main_body = BeginningOfMainBody();
- if (pos >= 0){
+ if (pos >= 0) {
LyXFont layoutfont;
if (pos < main_body)
layoutfont = layout.labelfont;
else
layoutfont = layout.font;
- tmpfont = GetFontSettings(pos);
+ tmpfont = GetFontSettings(bparams, pos);
tmpfont.realize(layoutfont);
} else {
// process layoutfont for pos == -1 and labelfont for pos < -1
tmpfont = layout.font;
else
tmpfont = layout.labelfont;
+ tmpfont.setLanguage(getParLanguage(bparams));
}
// check for environment font information
par = par->DepthHook(par_depth - 1);
if (par) {
tmpfont.realize(textclasslist.
- Style(current_view->buffer()->params.textclass,
+ Style(bparams.textclass,
par->GetLayout()).font);
par_depth = par->GetDepth();
}
}
tmpfont.realize(textclasslist
- .TextClass(current_view->buffer()->params.textclass)
+ .TextClass(bparams.textclass)
.defaultfont());
return tmpfont;
}
LyXParagraph::size_type endpos) const
{
LyXFont::FONT_SIZE maxsize = LyXFont::SIZE_TINY;
-#ifdef NEW_FONTTABLE // Seems OK
- for (FontList::const_iterator cit = fontlist.begin();
- cit != fontlist.end(); ++cit) {
- if (startpos <= (*cit).pos_end && endpos >= (*cit).pos) {
- LyXFont::FONT_SIZE size = (*cit).font.size();
- if (size > maxsize && size <= LyXFont::SIZE_HUGER)
- maxsize = size;
- }
- }
-#else
- FontTable * tmp = fonttable;
- while (tmp) {
- if (startpos <= tmp->pos_end && endpos >= tmp->pos) {
- LyXFont::FONT_SIZE size = tmp->font.size();
- if (size > maxsize && size<= LyXFont::SIZE_HUGER)
- maxsize = size;
- }
- tmp = tmp->next;
+ if (fontlist.empty())
+ return maxsize;
+
+ FontList::const_iterator end_it = lower_bound(fontlist.begin(),
+ fontlist.end(),
+ endpos, matchFT());
+ if (end_it != fontlist.end())
+ ++end_it;
+
+ for (FontList::const_iterator cit = lower_bound(fontlist.begin(),
+ fontlist.end(),
+ startpos, matchFT());
+ cit != end_it; ++cit) {
+ LyXFont::FONT_SIZE size = (*cit).font.size();
+ if (size > maxsize && size <= LyXFont::SIZE_HUGER)
+ maxsize = size;
}
-#endif
return maxsize;
}
// > 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 {
+ else
+#endif
+ {
lyxerr << "ERROR (LyXParagraph::GetChar): "
"position does not exist."
<< pos << " (" << static_cast<int>(pos)
<< ")\n";
- Assert(false);
+ // Assert(false); // This triggers sometimes...
+ // Why?
}
+
return '\0';
- } else {
+ }
+
+#ifndef NEW_INSETS
+ else {
// We should have a footnote environment.
if (!next || next->footnoteflag == LyXParagraph::NO_FOOTNOTE) {
// Notice that LyX does request the
}
return '\0'; // to shut up gcc
}
+#endif
}
// > 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 {
+ else
+#endif
+ {
lyxerr << "ERROR (LyXParagraph::GetChar const): "
"position does not exist."
<< pos << " (" << static_cast<int>(pos)
Assert(false);
}
return '\0';
- } else {
+ }
+#ifndef NEW_INSETS
+ else {
// We should have a footnote environment.
if (!next || next->footnoteflag == LyXParagraph::NO_FOOTNOTE) {
// Notice that LyX does request the
}
return '\0'; // to shut up gcc
}
+#endif
}
int firstpos = lastpos;
while ((firstpos >= 0) && !IsLetter(firstpos))
- firstpos--;
+ --firstpos;
// now find the beginning by looking for a nonletter
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();
}
// > 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
+ else
+#endif
lyxerr << "ERROR (LyXParagraph::ParFromPos): "
"position does not exist." << endl;
return this;
// > 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
+ else
+#endif
lyxerr <<
"ERROR (LyXParagraph::PositionInParFromPos): "
"position does not exist." << endl;
// > 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 {
+ } else
+#endif
lyxerr << "ERROR (LyXParagraph::SetFont): "
"position does not exist." << endl;
- }
+
return;
}
- LyXFont patternfont(LyXFont::ALL_INHERIT);
// First, reduce font against layout/label font
// Update: The SetCharFont() routine in text2.C already
// No need to simplify this because it will disappear
// in a new kernel. (Asger)
// Next search font table
-#ifdef NEW_FONTTABLE
- FontList::iterator tmp = fontlist.begin();
- for (; tmp != fontlist.end(); ++tmp) {
- if (pos >= (*tmp).pos && pos <= (*tmp).pos_end) {
- break;
- }
- }
- if (tmp == fontlist.end()) { // !found
- // if we did not find a font entry, but if the font at hand
- // is the same as default, we just forget it
- if (font == patternfont) return;
-
- // ok, we did not find a font entry. But maybe there is exactly
- // the needed font ientry one position left
- FontList::iterator tmp2 = fontlist.begin();
- for (; tmp2 != fontlist.end(); ++tmp2) {
- if (pos - 1 >= (*tmp2).pos
- && pos - 1 <= (*tmp2).pos_end)
- break;
- }
- if (tmp2 != fontlist.end()) {
- // ok there is one, maybe it is exactly
- // the needed font
- if ((*tmp2).font == font) {
- // put the position under the font
- (*tmp2).pos_end++;
- return;
- }
- }
- // Add a new entry in the
- // fontlist for the position
- FontTable ft;
- ft.pos = pos;
- ft.pos_end = pos;
- ft.font = font; // or patternfont
- // It seems that using font instead of patternfont here
- // fixes all the problems. This also surfaces a "bug" in
- // the old code.
- fontlist.insert(fontlist.begin(), ft);
- } else if ((*tmp).pos != (*tmp).pos_end) { // we found a font entry. maybe we have to split it and create a new one.
-
-// more than one character
- if (pos == (*tmp).pos) {
- // maybe we should enlarge the left fonttable
- FontList::iterator tmp2 = fontlist.begin();
- for (; tmp2 != fontlist.end(); ++tmp2) {
- if (pos - 1 >= (*tmp2).pos
- && pos - 1 <= (*tmp2).pos_end)
- break;
- }
- // Is there is one, and is it exactly
- // the needed font?
- if (tmp2 != fontlist.end() &&
- (*tmp2).font == font) {
- // Put the position under the font
- (*tmp2).pos_end++;
- (*tmp).pos++;
- return;
- }
-
- // Add a new entry in the
- // fontlist for the position
- FontTable ft;
- ft.pos = pos + 1;
- ft.pos_end = (*tmp).pos_end;
- ft.font = (*tmp).font;
- (*tmp).pos_end = pos;
- (*tmp).font = font;
- fontlist.insert(fontlist.begin(), ft);
- } else if (pos == (*tmp).pos_end) {
- // Add a new entry in the
- // fontlist for the position
- FontTable ft;
- ft.pos = (*tmp).pos;
- ft.pos_end = (*tmp).pos_end - 1;
- ft.font = (*tmp).font;
- (*tmp).pos = (*tmp).pos_end;
- (*tmp).font = font;
- fontlist.insert(fontlist.begin(), ft);
- } else {
- // Add a new entry in the
- // fontlist for the position
- FontTable ft;
- ft.pos = (*tmp).pos;
- ft.pos_end = pos - 1;
- ft.font = (*tmp).font;
-
- FontTable ft2;
- ft2.pos = pos + 1;
- ft2.pos_end = (*tmp).pos_end;
- ft2.font = (*tmp).font;
-
- (*tmp).pos = pos;
- (*tmp).pos_end = pos;
- (*tmp).font = font;
-
- fontlist.insert(fontlist.begin(), ft);
- fontlist.insert(fontlist.begin(), ft2);
- }
- } else {
- (*tmp).font = font;
- }
-
-#else
- FontTable * tmp2;
- bool found = false;
- FontTable * tmp = fonttable;
- while (tmp && !found) {
- if (pos >= tmp->pos && pos <= tmp->pos_end)
- found = true;
- else
- tmp = tmp->next;
- }
-
- if (!found) {
- // if we did not find a font entry, but if the font at hand
- // is the same as default, we just forget it
- if (font == patternfont)
- return;
-
- // ok, we did not find a font entry. But maybe there is exactly
- // the needed font entry one position left
- found = false;
- tmp2 = fonttable;
- while (tmp2 && !found) {
- if (pos - 1 >= tmp2->pos && pos - 1 <= tmp2->pos_end)
- found = true;
- else
- tmp2 = tmp2->next;
- }
- if (found) {
- // ok there is one. maybe it is exactly
- // the needed font
- if (tmp2->font == font) {
- // put the position under the font
- tmp2->pos_end++;
- return;
- }
- }
- // Add a new entry in the
- // fonttable for the position
- tmp = new FontTable;
- tmp->pos = pos;
- tmp->pos_end = pos;
- tmp->font = patternfont; // It seems that is actually totally
- // wrong to use patternfont here, the correct should be font
- // lockily at the end of this function we have
- // tmp->font = font, so this one setting it to patternfont
- // is negated.
- tmp->next = fonttable;
- fonttable = tmp;
- } else {
- // we found a font entry. maybe we have
- // to split it and create a new one
-
- if (tmp->pos != tmp->pos_end) { // more than one character
- if (pos == tmp->pos) {
- // maybe we could enlarge the left fonttable
- found = false;
- tmp2 = fonttable;
- while (tmp2 && !found) {
- if (pos - 1 >= tmp2->pos && pos - 1 <= tmp2->pos_end)
- found = true;
- else
- tmp2 = tmp2->next;
- }
+ FontList::iterator it = lower_bound(fontlist.begin(),
+ fontlist.end(),
+ pos, matchFT());
+ unsigned int i = it - fontlist.begin();
+ bool notfound = it == fontlist.end();
- // Is there is one, and is it exactly
- // the needed font?
- if (found && tmp2->font == font) {
- // Put the position under the font
- tmp2->pos_end++;
- tmp->pos++;
- return;
- }
+ if (!notfound && fontlist[i].font == font)
+ return;
- // Add a new entry in the
- // fonttable for the position
- tmp2 = new FontTable;
- tmp2->pos = pos + 1;
- tmp2->pos_end = tmp->pos_end;
- tmp2->font = tmp->font;
- tmp->pos_end = pos;
- tmp2->next = fonttable;
- fonttable = tmp2;
- }
- else if (pos == tmp->pos_end) {
- // Add a new entry in the
- // fonttable for the position
- tmp2 = new FontTable;
- tmp2->pos = tmp->pos;
- tmp2->pos_end = tmp->pos_end - 1;
- tmp2->font = tmp->font;
- tmp->pos = tmp->pos_end;
- tmp2->next = fonttable;
- fonttable = tmp2;
- }
- else {
- // Add a new entry in the
- // fonttable for the position
- tmp2 = new FontTable;
- tmp2->pos = tmp->pos;
- tmp2->pos_end = pos - 1;
- tmp2->font = tmp->font;
- tmp2->next = fonttable;
- fonttable = tmp2;
-
- tmp2 = new FontTable;
- tmp2->pos = pos + 1;
- tmp2->pos_end = tmp->pos_end;
- tmp2->font = tmp->font;
- tmp2->next = fonttable;
- fonttable = tmp2;
-
- tmp->pos = pos;
- tmp->pos_end = pos;
- }
- }
+ bool begin = pos == 0 || notfound ||
+ (i > 0 && fontlist[i-1].pos == pos - 1);
+ // Is position pos is a beginning of a font block?
+ bool end = !notfound && fontlist[i].pos == pos;
+ // Is position pos is the end of a font block?
+ if (begin && end) { // A single char block
+ if (i+1 < fontlist.size() &&
+ fontlist[i+1].font == font) {
+ // Merge the singleton block with the next block
+ fontlist.erase(fontlist.begin() + i);
+ if (i > 0 && fontlist[i-1].font == font)
+ fontlist.erase(fontlist.begin() + i-1);
+ } else if (i > 0 && fontlist[i-1].font == font) {
+ // Merge the singleton block with the previous block
+ fontlist[i-1].pos = pos;
+ fontlist.erase(fontlist.begin() + i);
+ } else
+ fontlist[i].font = font;
+ } else if (begin) {
+ if (i > 0 && fontlist[i-1].font == font)
+ fontlist[i-1].pos = pos;
+ else
+ fontlist.insert(fontlist.begin() + i,
+ FontTable(pos, font));
+ } else if (end) {
+ fontlist[i].pos = pos - 1;
+ if (!(i+1 < fontlist.size() &&
+ fontlist[i+1].font == font))
+ fontlist.insert(fontlist.begin() + i+1,
+ FontTable(pos, font));
+ } else { // The general case. The block is splitted into 3 blocks
+ fontlist.insert(fontlist.begin() + i,
+ FontTable(pos - 1, fontlist[i].font));
+ fontlist.insert(fontlist.begin() + i+1, FontTable(pos, font));
}
- tmp->font = font;
-#endif
}
// This function is able to hide closed footnotes.
LyXParagraph * LyXParagraph::Next()
{
+#ifndef NEW_INSETS
if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
LyXParagraph * tmp = next;
while (tmp
else
return next; // This should never happen!
} else
+#endif
return next;
}
LyXParagraph * LyXParagraph::NextAfterFootnote()
{
+#ifndef NEW_INSETS
if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
LyXParagraph * tmp = next;
while (tmp && tmp->footnoteflag != LyXParagraph::NO_FOOTNOTE)
else
return next; // This should never happen!
} else
+#endif
return next;
}
LyXParagraph const * LyXParagraph::NextAfterFootnote() const
{
+#ifndef NEW_INSETS
if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
LyXParagraph * tmp = next;
while (tmp && tmp->footnoteflag != LyXParagraph::NO_FOOTNOTE)
else
return next; // This should never happen!
} else
+#endif
return next;
}
LyXParagraph * LyXParagraph::PreviousBeforeFootnote()
{
+#ifndef NEW_INSETS
LyXParagraph * tmp;
if (previous && previous->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
- tmp = next;
+ tmp = previous;
while (tmp && tmp->footnoteflag != LyXParagraph::NO_FOOTNOTE)
tmp = tmp->previous;
if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE)
else
return previous; // This should never happen!
} else
+#endif
return previous;
}
LyXParagraph * LyXParagraph::LastPhysicalPar()
{
+#ifndef NEW_INSETS
if (footnoteflag != LyXParagraph::NO_FOOTNOTE)
return this;
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;
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;
return this;
} else
return tmppar;
+#else
+ return this;
+#endif
}
LyXParagraph * tmp = previous;
if (!tmp)
return tmp;
-
+
+#ifndef NEW_INSETS
if (tmp->previous
&& tmp->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
tmp = tmp->previous;
else
return previous;
} else
+#endif
return previous;
}
LyXParagraph * tmp = previous;
if (!tmp)
return tmp;
-
+#ifndef NEW_INSETS
if (tmp->previous
&& tmp->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
tmp = tmp->previous;
else
return previous;
} else
+#endif
return previous;
}
-void LyXParagraph::BreakParagraph(LyXParagraph::size_type pos,
+void LyXParagraph::BreakParagraph(BufferParams const & bparams,
+ LyXParagraph::size_type pos,
int flag)
{
- size_type i, pos_end, pos_first;
+ 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
// 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(firstpar->layout);
+ tmp->SetOnlyLayout(bparams, firstpar->layout);
tmp->SetLabelWidthString(firstpar->labelwidthstring);
}
if (Last() > pos || !Last() || flag == 2) {
- tmp->SetOnlyLayout(firstpar->layout);
+ tmp->SetOnlyLayout(bparams, firstpar->layout);
tmp->align = firstpar->align;
tmp->SetLabelWidthString(firstpar->labelwidthstring);
// to the new paragraph
pos_first = 0;
while (ParFromPos(pos_first) != par)
- pos_first++;
+ ++pos_first;
pos_end = pos_first + par->text.size() - 1;
- // The constructor has already reserved 500 elements
- //if (pos_end > pos)
- // tmp->text.reserve(pos_end - pos);
- for (i = pos; i <= pos_end; i++) {
- par->CutIntoMinibuffer(i - pos_first);
- tmp->InsertFromMinibuffer(i - pos);
+ for (i = j = pos; i <= pos_end; ++i) {
+ par->CutIntoMinibuffer(bparams, i - pos_first);
+ if (tmp->InsertFromMinibuffer(j - pos))
+ ++j;
}
tmp->text.resize(tmp->text.size());
- for (i = pos_end; i >= pos; i--)
+ for (i = pos_end; i >= pos; --i)
par->Erase(i - pos_first);
par->text.resize(par->text.size());
firstpar->Clear();
// layout stays the same with latex-environments
if (flag) {
- firstpar->SetOnlyLayout(tmp->layout);
+ firstpar->SetOnlyLayout(bparams, tmp->layout);
firstpar->SetLabelWidthString(tmp->labelwidthstring);
firstpar->depth = tmp->depth;
}
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);
pagebreak_top = par->pagebreak_top;
added_space_top = par->added_space_top;
+ spacing = par->spacing;
+
pextra_type = par->pextra_type;
pextra_width = par->pextra_width;
pextra_widthp = par->pextra_widthp;
}
+#ifndef NEW_INSETS
LyXParagraph * LyXParagraph::FirstSelfrowPar()
{
LyXParagraph * tmppar = this;
else
return tmppar;
}
+#endif
+
+
+int LyXParagraph::StripLeadingSpaces(LyXTextClassList::size_type tclass)
+{
+ if (textclasslist.Style(tclass, GetLayout()).free_spacing)
+ return 0;
+
+ int i = 0;
+ if (!IsDummy() && !table){
+ while (Last()
+ && (IsNewline(0) || IsLineSeparator(0))){
+ Erase(0);
+ ++i;
+ }
+ }
+ return i;
+}
LyXParagraph * LyXParagraph::Clone() const
// 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
-
- for (size_type i = 0; i < size(); i++) {
- CopyIntoMinibuffer(i);
- result->InsertFromMinibuffer(i);
- }
- result->text.resize(result->text.size());
+
+ result->text = text;
+ result->fontlist = fontlist;
+ result->insetlist = insetlist;
+ for (InsetList::iterator it = result->insetlist.begin();
+ it != result->insetlist.end(); ++it)
+ (*it).inset = (*it).inset->Clone();
return result;
}
-bool LyXParagraph::HasSameLayout(LyXParagraph const * par)
+bool LyXParagraph::HasSameLayout(LyXParagraph const * par) const
{
par = par->FirstPhysicalPar();
return (
+#ifndef NEW_INSETS
par->footnoteflag == footnoteflag &&
par->footnotekind == footnotekind &&
-
+#endif
par->layout == layout &&
par->align == align &&
par->pagebreak_top == pagebreak_top &&
par->added_space_top == added_space_top &&
+ par->spacing == spacing &&
+
par->pextra_type == pextra_type &&
par->pextra_width == pextra_width &&
par->pextra_widthp == pextra_widthp &&
par->pextra_alignment == pextra_alignment &&
par->pextra_hfill == pextra_hfill &&
par->pextra_start_minipage == pextra_start_minipage &&
-
- par->table == table && // what means: NO TABLE AT ALL
+#ifndef NEW_TABULAR
+ par->table == table && // what means: NO TABLE AT ALL
+#endif
par->noindent == noindent &&
par->depth == depth);
}
-void LyXParagraph::BreakParagraphConservative(LyXParagraph::size_type pos)
+void LyXParagraph::BreakParagraphConservative(BufferParams const & bparams,
+ LyXParagraph::size_type pos)
{
// create a new paragraph
LyXParagraph * par = ParFromPos(pos);
while (ParFromPos(pos_first) != par)
++pos_first;
size_type pos_end = pos_first + par->text.size() - 1;
- // make sure there is enough memory for the now larger
- // paragraph. This is not neccessary, because
- // InsertFromMinibuffer will enlarge the memory (it uses
- // InsertChar of course). But doing it by hand
- // is MUCH faster! (only one time, not thousend times!!)
- // Not needed since the constructor aleady have
- // reserved 500 elements in text.
- //if (pos_end > pos)
- // tmp->text.reserve(pos_end - pos);
-
- for (size_type i = pos; i <= pos_end; ++i) {
- par->CutIntoMinibuffer(i - pos_first);
- tmp->InsertFromMinibuffer(i - pos);
+
+ size_type i, j;
+ for (i = j = pos; i <= pos_end; ++i) {
+ par->CutIntoMinibuffer(bparams, i - pos_first);
+ if (tmp->InsertFromMinibuffer(j - pos))
+ ++j;
}
tmp->text.resize(tmp->text.size());
for (size_type i = pos_end; i >= pos; --i)
// Be carefull, this does not make any check at all.
-void LyXParagraph::PasteParagraph()
+void LyXParagraph::PasteParagraph(BufferParams const & bparams)
{
// copy the next paragraph to this one
LyXParagraph * the_next = Next();
size_type pos_end = the_next->text.size() - 1;
size_type pos_insert = Last();
- size_type i;
// ok, now copy the paragraph
- for (i = 0; i <= pos_end; i++) {
- the_next->CutIntoMinibuffer(i);
- InsertFromMinibuffer(pos_insert + i);
+ size_type i, j;
+ for (i = j = 0; i <= pos_end; ++i) {
+ the_next->CutIntoMinibuffer(bparams, i);
+ if (InsertFromMinibuffer(pos_insert + j))
+ ++j;
}
// delete the next paragraph
+ LyXParagraph * ppar = the_next->previous;
+ LyXParagraph * npar = the_next->next;
delete the_next;
+ ppar->next = npar;
}
+#ifndef NEW_INSETS
void LyXParagraph::OpenFootnote(LyXParagraph::size_type pos)
{
LyXParagraph * par = ParFromPos(pos);
par = par->next;
}
}
+#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 =
+ 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)
+ return endlabeltype;
+
+ int next_depth = last->next->GetDepth();
+ if (par_depth > next_depth ||
+ (par_depth == next_depth && layout != last->next->GetLayout() ))
+ return endlabeltype;
+ break;
+ }
+ if (par_depth == 0)
+ break;
+ par = par->DepthHook(par_depth - 1);
+ if (par)
+ par_depth = par->GetDepth();
+ }
+ return END_LABEL_NO_LABEL;
+}
-LyXTextClass::LayoutList::size_type LyXParagraph::GetLayout() const
+LyXTextClass::size_type LyXParagraph::GetLayout() const
{
return FirstPhysicalPar()->layout;
}
}
-string LyXParagraph::GetLabestring() const
+string LyXParagraph::GetLabelstring() const
{
return FirstPhysicalPar()->labelstring;
}
}
-void LyXParagraph::SetOnlyLayout(LyXTextClass::LayoutList::size_type new_layout)
+void LyXParagraph::SetOnlyLayout(BufferParams const & bparams,
+ 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*/
+ /* table stuff -- end*/
+#endif
if (par->pextra_type == PEXTRA_NONE) {
if (par->Previous()) {
ppar = par->Previous()->FirstPhysicalPar();
string
p1 = ppar->pextra_width,
p2 = ppar->pextra_widthp;
- ppar->SetPExtraType(ppar->pextra_type,
+ ppar->SetPExtraType(bparams, ppar->pextra_type,
p1.c_str(), p2.c_str());
}
if ((par->pextra_type == PEXTRA_NONE) &&
string
p1 = npar->pextra_width,
p2 = npar->pextra_widthp;
- npar->SetPExtraType(npar->pextra_type,
+ npar->SetPExtraType(bparams, npar->pextra_type,
p1.c_str(), p2.c_str());
}
}
}
-void LyXParagraph::SetLayout(LyXTextClass::LayoutList::size_type new_layout)
+void LyXParagraph::SetLayout(BufferParams const & bparams,
+ LyXTextClass::size_type new_layout)
{
LyXParagraph
* par = FirstPhysicalPar(),
* npar = 0;
par->layout = new_layout;
- par->labelwidthstring.clear();
+ par->labelwidthstring.erase();
par->align = LYX_ALIGN_LAYOUT;
par->added_space_top = VSpace(VSpace::NONE);
par->added_space_bottom = VSpace(VSpace::NONE);
+ par->spacing.set(Spacing::Default);
+
+#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();
string
p1 = ppar->pextra_width,
p2 = ppar->pextra_widthp;
- ppar->SetPExtraType(ppar->pextra_type,
+ ppar->SetPExtraType(bparams, ppar->pextra_type,
p1.c_str(), p2.c_str());
}
if ((par->pextra_type == PEXTRA_NONE) &&
string
p1 = npar->pextra_width,
p2 = npar->pextra_widthp;
- npar->SetPExtraType(npar->pextra_type,
+ npar->SetPExtraType(bparams, npar->pextra_type,
p1.c_str(), p2.c_str());
}
}
// 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, temp;
+ char previous_char = 0, temp = 0;
if (i < size()
&& (previous_char = GetChar(i)) != LyXParagraph::META_NEWLINE) {
// Yes, this ^ is supposed to be "= " not "=="
int LyXParagraph::AutoDeleteInsets()
{
-#ifdef NEW_INSETTABLE
- vector<size_type> tmpvec;
- int i = 0;
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).inset && (*it).inset->AutoDelete()) {
- tmpvec.push_back((*it).pos);
- ++i;
- }
- }
- for (vector<size_type>::const_iterator cit = tmpvec.begin();
- cit != tmpvec.end(); ++cit) {
- Erase((*cit));
- }
- return i;
-#else
- InsetTable * tmpi = insettable;
- InsetTable * tmpi2 = tmpi;
- int i = 0;
- while (tmpi) {
- tmpi2 = tmpi;
- tmpi = tmpi->next;
- if (tmpi2->inset) {
- if (tmpi2->inset->AutoDelete()) {
- i++;
- Erase(tmpi2->pos);
- }
- } else {
- lyxerr << "ERROR (LyXParagraph::AutoDeleteInsets): "
- "cannot auto-delete insets" << endl;
- }
- }
- return i;
-#endif
-}
-
-
-Inset * LyXParagraph::ReturnNextInsetPointer(LyXParagraph::size_type & pos)
-{
-#ifdef NEW_INSETTABLE
- InsetList::iterator it2 = insetlist.end();
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).pos >= pos) {
- if (it2 != insetlist.end() || (*it).pos < (*it2).pos)
- it2 = it;
- }
- }
- if (it2 != insetlist.end()) {
- pos = (*it2).pos;
- return (*it2).inset;
- }
- return 0;
-#else
- InsetTable * tmpi = insettable;
- InsetTable * tmpi2 = 0;
- while (tmpi){
- if (tmpi->pos >= pos) {
- if (!tmpi2 || tmpi->pos < tmpi2->pos)
- tmpi2 = tmpi;
- }
- tmpi= tmpi->next;
- }
- if (tmpi2){
- pos = tmpi2->pos;
- return tmpi2->inset;
+ int count = 0;
+ InsetList::size_type index = 0;
+ while (index < insetlist.size()) {
+ if (insetlist[index].inset && insetlist[index].inset->AutoDelete()) {
+ Erase(insetlist[index].pos);
+ // Erase() calls to insetlist.erase(&insetlist[index])
+ // so index shouldn't be increased.
+ ++count;
+ } else
+ ++index;
}
- else
- return 0;
-#endif
+ return count;
+}
+
+
+LyXParagraph::inset_iterator LyXParagraph::InsetIterator(LyXParagraph::size_type pos)
+{
+ InsetList::iterator it = lower_bound(insetlist.begin(),
+ insetlist.end(),
+ pos, matchIT());
+ return inset_iterator(it);
}
int LyXParagraph::GetPositionOfInset(Inset * inset) const
{
// Find the entry.
-#ifdef NEW_INSETTABLE
+ // 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;
}
}
-#else
- InsetTable * tmpi = insettable;
- while (tmpi && tmpi->inset != inset) {
- tmpi = tmpi->next;
- }
- if (tmpi && tmpi->inset)
- return tmpi->pos;
-#endif
// Think about footnotes.
if (footnoteflag == LyXParagraph::NO_FOOTNOTE
&& next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
}
-void LyXParagraph::readSimpleWholeFile(istream & is)
-{
- is.seekg(0);
- char c = 0;
- while(!is.eof()) {
- is.get(c);
- InsertChar(text.size(), c);
- };
-}
-
-
-LyXParagraph * LyXParagraph::TeXOnePar(string & file, TexRow & texrow,
- string & foot, TexRow & foot_texrow,
+LyXParagraph * LyXParagraph::TeXOnePar(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow,
+ bool moving_arg,
+ ostream & foot,
+ TexRow & foot_texrow,
int & foot_count)
{
lyxerr[Debug::LATEX] << "TeXOnePar... " << this << endl;
- LyXParagraph * par = next;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
layout);
bool further_blank_line = false;
lyxerr << "ERROR (LyXParagraph::TeXOnePar) is dummy." << endl;
if (start_of_appendix) {
- file += "\\appendix\n";
+ os << "\\appendix\n";
texrow.newline();
}
+ if (!spacing.isDefault()
+ && (!Previous() || !Previous()->HasSameLayout(this))) {
+ os << spacing.writeEnvirBegin() << "\n";
+ texrow.newline();
+ }
+
if (tex_code_break_column && style.isCommand()){
- file += '\n';
+ os << '\n';
texrow.newline();
}
if (pagebreak_top) {
- file += "\\newpage";
+ os << "\\newpage";
further_blank_line = true;
}
if (added_space_top.kind() != VSpace::NONE) {
- file += added_space_top.asLatexCommand();
+ os << added_space_top.asLatexCommand(bparams);
further_blank_line = true;
}
if (line_top) {
- file += "\\lyxline{\\" + getFont(0).latexSize() + '}';
- file += "\\vspace{-1\\parskip}";
+ os << "\\lyxline{\\" << getFont(bparams, 0).latexSize() << '}'
+ << "\\vspace{-1\\parskip}";
further_blank_line = true;
}
if (further_blank_line){
- file += '\n';
+ os << '\n';
texrow.newline();
}
+ Language const * language = getParLanguage(bparams);
+ Language const * doc_language = bparams.language_info;
+ if (language != doc_language &&
+ (!previous || previous->getParLanguage(bparams) != language)) {
+ os << subst(lyxrc.language_command_begin, "$$lang",
+ language->lang())
+ << endl;
+ texrow.newline();
+ }
+
switch (style.latextype) {
case LATEX_COMMAND:
- file += '\\';
- file += style.latexname();
- file += style.latexparam();
+ os << '\\'
+ << style.latexname()
+ << style.latexparam();
break;
case LATEX_ITEM_ENVIRONMENT:
- if (bibkey)
- bibkey->Latex(file, false);
- else
- file += "\\item ";
+ if (bibkey) {
+ bibkey->Latex(buf, os, false, false);
+ } else
+ os << "\\item ";
break;
case LATEX_LIST_ENVIRONMENT:
- file += "\\item ";
+ os << "\\item ";
break;
default:
break;
}
- bool need_par = SimpleTeXOnePar(file, texrow);
+ bool need_par = SimpleTeXOnePar(buf, bparams, os, texrow, moving_arg);
+#ifndef NEW_INSETS
// Spit out footnotes
- while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE
- && par->footnoteflag != footnoteflag) {
- par = par->TeXFootnote(file, texrow,
- foot, foot_texrow, foot_count);
- par->SimpleTeXOnePar(file, texrow);
- par = par->next;
+ LyXParagraph * par = next;
+ if (lyxrc.rtl_support) {
+ if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE
+ && next->footnoteflag != footnoteflag) {
+ LyXParagraph * p = 0;
+ bool is_rtl = (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(Last()-1);
+ LyXFont font = getFont(bparams, Last() - 1);
if (need_par) {
if (style.resfont.size() != font.size()) {
- file += '\\';
- file += font.latexSize();
- file += ' ';
+ os << '\\'
+ << font.latexSize()
+ << ' ';
}
- file += "\\par}";
- } else if (textclasslist.Style(current_view->buffer()->params.textclass,
- GetLayout()).isCommand()){
+ os << "\\par}";
+ } else if (textclasslist.Style(bparams.textclass,
+ GetLayout()).isCommand()) {
if (style.resfont.size() != font.size()) {
- file += '\\';
- file += font.latexSize();
- file += ' ';
+ os << '\\'
+ << font.latexSize()
+ << ' ';
}
- file += '}';
+ os << '}';
} else if (style.resfont.size() != font.size()){
- file += "{\\" + font.latexSize() + " \\par}";
+ os << "{\\" << font.latexSize() << " \\par}";
+ }
+
+ if (language != doc_language &&
+ (!par
+ || (footnoteflag != NO_FOOTNOTE && par->footnoteflag != footnoteflag)
+ || par->getParLanguage(bparams) != language)) {
+ os << endl
+ << subst(lyxrc.language_command_end, "$$lang",
+ doc_language->lang());
}
switch (style.latextype) {
case LATEX_ITEM_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
if (par && (depth < par->depth)) {
- file += '\n';
+ os << '\n';
texrow.newline();
}
break;
|| par->pextra_type != pextra_type))
break;
default:
- if (!(footnoteflag != LyXParagraph::NO_FOOTNOTE
+ // we don't need it for the last paragraph!!!
+ if (next && !(footnoteflag != LyXParagraph::NO_FOOTNOTE
&& footnotekind != LyXParagraph::FOOTNOTE
&& footnotekind != LyXParagraph::MARGIN
&& (table
// before or after a table in a float. This
// little trick is needed in order to allow
// use of tables in \subfigures or \subtables.
- file += '\n';
+ os << '\n';
texrow.newline();
}
}
further_blank_line = false;
if (line_bottom) {
- file += "\\lyxline{\\" + getFont(Last()-1).latexSize() + '}';
+ os << "\\lyxline{\\" << getFont(bparams, Last() - 1).latexSize() << '}';
further_blank_line = true;
}
if (added_space_bottom.kind() != VSpace::NONE) {
- file += added_space_bottom.asLatexCommand();
+ os << added_space_bottom.asLatexCommand(bparams);
further_blank_line = true;
}
if (pagebreak_bottom) {
- file += "\\newpage";
+ os << "\\newpage";
further_blank_line = true;
}
if (further_blank_line){
- file += '\n';
+ os << '\n';
texrow.newline();
}
- if (!(footnoteflag != LyXParagraph::NO_FOOTNOTE && par &&
+ if (!spacing.isDefault()
+ && (!par || !par->HasSameLayout(this))) {
+ os << spacing.writeEnvirEnd() << "\n";
+ texrow.newline();
+ }
+
+ // we don't need it for the last paragraph!!!
+ if (next && !(footnoteflag != LyXParagraph::NO_FOOTNOTE && par &&
par->footnoteflag == LyXParagraph::NO_FOOTNOTE)) {
- file += '\n';
+ os << '\n';
texrow.newline();
}
// This one spits out the text of the paragraph
-bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
+bool LyXParagraph::SimpleTeXOnePar(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow,
+ bool moving_arg)
{
lyxerr[Debug::LATEX] << "SimpleTeXOnePar... " << this << endl;
+#ifndef NEW_TABULAR
if (table)
- return SimpleTeXOneTablePar(file, texrow);
+ return SimpleTeXOneTablePar(buf, bparams, os, texrow);
+#endif
- char c;
- size_type main_body;
-
bool return_value = false;
- LyXLayout const & style = textclasslist.Style(current_view->buffer()->params.textclass, GetLayout());
- LyXFont basefont;
+ LyXLayout const & style =
+ textclasslist.Style(bparams.textclass,
+ GetLayout());
+ LyXFont basefont, last_font;
// Maybe we have to create a optional argument.
+ size_type main_body;
if (style.labeltype != LABEL_MANUAL)
main_body = 0;
else
main_body = BeginningOfMainBody();
if (main_body > 0) {
- file += '[';
- basefont = getFont(-2); // Get label font
+ os << '[';
+ basefont = getFont(bparams, -2); // Get label font
} else {
- basefont = getFont(-1); // Get layout font
+ basefont = getFont(bparams, -1); // Get layout font
}
int column = 0;
&& !text.size()
&& !IsDummy()) {
if (style.isCommand()) {
- file += '{';
- column++;
+ os << '{';
+ ++column;
} else if (align != LYX_ALIGN_LAYOUT) {
- file += '{';
- column++;
+ os << '{';
+ ++column;
return_value = true;
}
}
+
+ moving_arg |= style.needprotect;
// Which font is currently active?
- LyXFont running_font = basefont;
+ LyXFont running_font(basefont);
// Do we have an open font change?
bool open_font = false;
if (i == main_body && !IsDummy()) {
if (main_body > 0) {
if (open_font) {
- column += running_font.latexWriteEndChanges(file, basefont);
+ column += running_font.latexWriteEndChanges(os, basefont, basefont);
open_font = false;
}
- basefont = getFont(-1); // Now use the layout font
+ basefont = getFont(bparams, -1); // Now use the layout font
running_font = basefont;
- file += ']';
+ os << ']';
++column;
}
if (style.isCommand()) {
- file += '{';
+ os << '{';
++column;
} else if (align != LYX_ALIGN_LAYOUT) {
- file += "{\\par";
+ os << "{\\par";
column += 4;
return_value = true;
}
if (noindent) {
- file += "\\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_SPECIAL:
+ break;
case LYX_ALIGN_LEFT:
- file += "\\raggedright ";
- column+= 13;
+ if (getParLanguage(bparams)->lang() != "hebrew") {
+ os << "\\raggedright ";
+ column+= 13;
+ } else {
+ os << "\\raggedleft ";
+ column+= 12;
+ }
break;
case LYX_ALIGN_RIGHT:
- file += "\\raggedleft ";
- column+= 12;
+ if (getParLanguage(bparams)->lang() != "hebrew") {
+ os << "\\raggedleft ";
+ column+= 12;
+ } else {
+ os << "\\raggedright ";
+ column+= 13;
+ }
break;
case LYX_ALIGN_CENTER:
- file += "\\centering ";
+ os << "\\centering ";
column+= 11;
break;
}
}
- c = GetChar(i);
+ int c = GetChar(i);
// Fully instantiated font
- LyXFont font = getFont(i);
+ 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;
// Spaces at end of font change are simulated to be
// outside font change, i.e. we write "\textXX{text} "
// rather than "\textXX{text }". (Asger)
if (open_font && c == ' ' && i <= size() - 2
- && !getFont(i+1).equalExceptLatex(running_font)
- && !getFont(i+1).equalExceptLatex(font)) {
- font = getFont(i + 1);
+ && !getFont(bparams, i + 1).equalExceptLatex(running_font)
+ && !getFont(bparams, i + 1).equalExceptLatex(font)) {
+ font = getFont(bparams, i + 1);
}
// We end font definition before blanks
if (!font.equalExceptLatex(running_font) && open_font) {
- column += running_font.latexWriteEndChanges(file,
- basefont);
+ column += running_font.latexWriteEndChanges(os,
+ basefont,
+ (i == main_body-1) ? basefont : font);
running_font = basefont;
open_font = false;
}
// Blanks are printed before start of fontswitch
- if (c == ' '){
+ if (c == ' ') {
// Do not print the separation of the optional argument
if (i != main_body - 1) {
- SimpleTeXBlanks(file, texrow, i,
+ SimpleTeXBlanks(os, texrow, i,
column, font, style);
}
}
// Do we need to change font?
if (!font.equalExceptLatex(running_font)
&& i != main_body-1) {
- column += font.latexWriteStartChanges(file, basefont);
+ column += font.latexWriteStartChanges(os, basefont,
+ last_font);
running_font = font;
open_font = true;
}
// the default in SimpleTeXSpecialChars().
if (!style.newline_allowed
|| font.latex() == LyXFont::ON) {
- file += '\n';
+ os << '\n';
} else {
if (open_font) {
- column += running_font.latexWriteEndChanges(file, basefont);
+ column += running_font.latexWriteEndChanges(os, basefont, basefont);
open_font = false;
}
- basefont = getFont(-1);
+ basefont = getFont(bparams, -1);
running_font = basefont;
if (font.family() ==
LyXFont::TYPEWRITER_FAMILY) {
- file += "~";
+ os << "~";
}
- file += "\\\\\n";
+ if (moving_arg)
+ os << "\\protect ";
+ os << "\\\\\n";
}
texrow.newline();
texrow.start(this, i + 1);
column = 0;
} else {
- SimpleTeXSpecialChars(file, texrow,
+ SimpleTeXSpecialChars(buf, bparams,
+ os, texrow, moving_arg,
font, running_font, basefont,
open_font, style, i, column, c);
}
// If we have an open font definition, we have to close it
if (open_font) {
- running_font.latexWriteEndChanges(file, basefont);
+ LyXParagraph * p = 0;
+ if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE
+ && (p = NextAfterFootnote()) != 0)
+ running_font.latexWriteEndChanges(os, basefont,
+ p->getFont(bparams, 0));
+ else
+ running_font.latexWriteEndChanges(os, basefont, basefont);
}
// Needed if there is an optional argument but no contents.
if (main_body > 0 && main_body == size()) {
- file += "]~";
+ os << "]~";
return_value = false;
}
// This one spits out the text of a table paragraph
-bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
+bool LyXParagraph::SimpleTeXOneTablePar(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow)
{
lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar... " << this << endl;
bool return_value = false;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
- GetLayout());
+ textclasslist.Style(bparams.textclass, GetLayout());
int column = 0;
if (!IsDummy()) { // it is dummy if it is in a float!!!
if (style.isCommand()) {
- file += '{';
+ os << '{';
++column;
} else if (align != LYX_ALIGN_LAYOUT) {
- file += '{';
+ os << '{';
++column;
return_value = true;
}
if (noindent) {
- file += "\\noindent ";
+ os << "\\noindent ";
column += 10;
}
switch (align) {
case LYX_ALIGN_LAYOUT:
case LYX_ALIGN_SPECIAL: break;
case LYX_ALIGN_LEFT:
- file += "\\raggedright ";
+ os << "\\raggedright ";
column+= 13;
break;
case LYX_ALIGN_RIGHT:
- file += "\\raggedleft ";
+ os << "\\raggedleft ";
column+= 12;
break;
case LYX_ALIGN_CENTER:
- file += "\\centering ";
+ os << "\\centering ";
column+= 11;
break;
}
}
- LyXFont basefont = getFont(-1); // Get layout font
+ LyXFont basefont = getFont(bparams, -1); // Get layout font
// Which font is currently active?
LyXFont running_font = basefont;
+ LyXFont last_font;
// Do we have an open font change?
bool open_font = false;
int current_cell_number = -1;
- int tmp = table->TexEndOfCell(file, current_cell_number);
+ 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) {
char c = GetChar(i);
- if (table->IsContRow(current_cell_number+1)) {
+ if (table->IsContRow(current_cell_number + 1)) {
if (c == LyXParagraph::META_NEWLINE)
- current_cell_number++;
+ ++current_cell_number;
continue;
}
++column;
-
+
+ if (first_in_cell && is_rtl) {
+ os << "\\R{";
+ column += 3;
+ first_in_cell = false;
+ }
+
// Fully instantiated font
- LyXFont font = getFont(i);
+ 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(i+1) != running_font && getFont(i+1) != font) {
- font = getFont(i+1);
+ && getFont(bparams, i + 1) != running_font
+ && getFont(bparams, i + 1) != font) {
+ font = getFont(bparams, i + 1);
}
// We end font definition before blanks
if (font != running_font && open_font) {
- column += running_font.latexWriteEndChanges(file,
- basefont);
+ column += running_font.latexWriteEndChanges(os,
+ basefont,
+ font);
running_font = basefont;
open_font = false;
}
// Blanks are printed before start of fontswitch
if (c == ' '){
- SimpleTeXBlanks(file, texrow, i, column, font, style);
+ SimpleTeXBlanks(os, texrow, i, column, font, style);
}
// Do we need to change font?
if (font != running_font) {
- column += font.latexWriteStartChanges(file, basefont);
+ column += font.latexWriteStartChanges(os, basefont,
+ last_font);
running_font = font;
open_font = true;
}
if (font.latex() != running_font.latex()) {
if (font.latex() == LyXFont::ON
&& style.needprotect) {
- file += "\\protect ";
+ os << "\\protect ";
column += 9;
}
}
// SimpleTeXSpecialChars()
if (open_font) {
column += running_font
- .latexWriteEndChanges(file, basefont);
+ .latexWriteEndChanges(os, basefont,
+ basefont);
open_font = false;
}
- basefont = getFont(-1);
+ basefont = getFont(bparams, -1);
running_font = basefont;
- current_cell_number++;
+ ++current_cell_number;
if (table->CellHasContRow(current_cell_number) >= 0) {
- TeXContTableRows(file, i+1,
+ 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--;
+ --current_cell_number;
break;
}
- int tmp = table->TexEndOfCell(file,
+ int tmp = table->TexEndOfCell(os,
current_cell_number);
- if (tmp>0) {
+ if (tmp > 0) {
column = 0;
} else if (tmp < 0) {
tmp = -tmp;
}
- for (;tmp--;) {
+ for (; tmp--;) {
texrow.newline();
}
- texrow.start(this, i+1);
+ texrow.start(this, i + 1);
} else {
- SimpleTeXSpecialChars(file, texrow,
+ 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(file, basefont);
+ running_font.latexWriteEndChanges(os, basefont, basefont);
}
- current_cell_number++;
- tmp = table->TexEndOfCell(file, current_cell_number);
+ ++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;
// This one spits out the text off ContRows in tables
-bool LyXParagraph::TeXContTableRows(string & file,
+bool LyXParagraph::TeXContTableRows(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os,
LyXParagraph::size_type i,
int current_cell_number,
int & column, TexRow & texrow)
if (!table)
return false;
- char c;
-
bool return_value = false;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
- LyXFont basefont = getFont(-1); // Get layout font
+ LyXFont basefont = getFont(bparams, -1); // Get layout font
+ LyXFont last_font;
// Which font is currently active?
LyXFont running_font = basefont;
// Do we have an open font change?
size_type lastpos = i;
int cell = table->CellHasContRow(current_cell_number);
++current_cell_number;
+ char 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++;
+ ++current_cell_number;
}
lastpos = i;
c = GetChar(i);
if (table->Linebreaks(table->FirstVirtualCell(cell))) {
- file += " \\\\\n";
+ os << " \\\\\n";
texrow.newline();
column = 0;
} else if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
- file += ' ';
+ os << ' ';
}
for (; i < size()
++column;
// Fully instantiated font
- LyXFont font = getFont(i);
+ LyXFont font = getFont(bparams, i);
+ last_font = running_font;
// Spaces at end of font change are simulated to
// be outside font change. i.e. we write
// "\textXX{text} " rather than "\textXX{text }".
// (Asger)
if (open_font && c == ' ' && i <= size() - 2
- && getFont(i + 1) != running_font
- && getFont(i + 1) != font) {
- font = getFont(i + 1);
+ && 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(file, basefont);
+ column += running_font.latexWriteEndChanges(os, basefont, font);
running_font = basefont;
open_font = false;
}
// Blanks are printed before start of fontswitch
if (c == ' '){
- SimpleTeXBlanks(file, texrow, i,
+ SimpleTeXBlanks(os, texrow, i,
column, font, style);
}
// Do we need to change font?
if (font != running_font) {
column +=
- font.latexWriteStartChanges(file,
- basefont);
+ 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)
- {
- file += "\\protect ";
- column += 9;
- }
+ && style.needprotect) {
+ os << "\\protect ";
+ column += 9;
+ }
}
- SimpleTeXSpecialChars(file, texrow, font,
+ 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(file, basefont);
+ running_font.latexWriteEndChanges(os, basefont,
+ basefont);
open_font = false;
}
- basefont = getFont(-1);
+ basefont = getFont(bparams, -1);
running_font = basefont;
cell = table->CellHasContRow(current_cell_number);
}
bool retval = false;
switch (c) {
case LyXParagraph::META_HFILL:
- sgml_string.clear();
- break;
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- sgml_string = ' ';
+ sgml_string.erase();
break;
case LyXParagraph::META_NEWLINE:
sgml_string = '\n';
sgml_string = ' ';
break;
case '\0': // Ignore :-)
- sgml_string.clear();
+ sgml_string.erase();
break;
default:
sgml_string = c;
}
-void LyXParagraph::SimpleDocBookOneTablePar(string & file, string & extra,
+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;
+ int column = 0;
LyXFont font1, font2;
char c;
Inset * inset;
size_type main_body;
- string emph = "emphasis";
bool emph_flag = false;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
if (style.labeltype != LABEL_MANUAL)
font1 = style.font;
int char_line_count = depth;
- addNewlineAndDepth(file, depth);
+ os << newlineAndDepth(depth);
if (footnoteflag == LyXParagraph::NO_FOOTNOTE) {
- file += "<INFORMALTABLE>";
- addNewlineAndDepth(file, ++depth);
+ os << "<INFORMALTABLE>"
+ << newlineAndDepth(++depth);
}
int current_cell_number = -1;
- int tmp = table->DocBookEndOfCell(file, current_cell_number, depth);
+ int tmp = table->DocBookEndOfCell(os, current_cell_number, depth);
// Parsing main loop.
for (size_type i = 0; i < size(); ++i) {
++column;
// Fully instantiated font
- font2 = getFont(i);
+ font2 = getFont(bparams, i);
// Handle <emphasis> tag.
if (font1.emph() != font2.emph() && i) {
if (font2.emph() == LyXFont::ON) {
- file += "<emphasis>";
+ os << "<emphasis>";
emph_flag= true;
} else if (emph_flag) {
- file += "</emphasis>";
+ os << "</emphasis>";
emph_flag= false;
}
}
if (c == LyXParagraph::META_NEWLINE) {
// We have only to control for emphasis open here!
if (emph_flag) {
- file += "</emphasis>";
+ os << "</emphasis>";
emph_flag= false;
}
- font1 = font2 = getFont(-1);
- current_cell_number++;
+ font1 = font2 = getFont(bparams, -1);
+ ++current_cell_number;
if (table->CellHasContRow(current_cell_number) >= 0) {
- DocBookContTableRows(file, extra, desc_on, i+1,
+ DocBookContTableRows(buffer,
+ os, extra, desc_on, i + 1,
current_cell_number,
column);
}
// put the EndOfCell because it is put after the
// for(...)
if (table->ShouldBeVeryLastCell(current_cell_number)) {
- current_cell_number--;
+ --current_cell_number;
break;
}
- tmp= table->DocBookEndOfCell(file, current_cell_number,
- depth);
+ tmp = table->DocBookEndOfCell(os,
+ current_cell_number,
+ depth);
if (tmp > 0)
column = 0;
} else if (c == LyXParagraph::META_INSET) {
inset = GetInset(i);
- string tmp_out;
- inset->DocBook(tmp_out);
+#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
extra += frontStrip(tmp_out,
'@');
else
- file += frontStrip(tmp_out,
- '@');
+ os << frontStrip(tmp_out,
+ '@');
} else
- file += tmp_out;
+ os << tmp_out;
}
} else if (font2.latex() == LyXFont::ON) {
// "TeX"-Mode on == > SGML-Mode on.
if (c != '\0')
- file += c;
+ os << c;
++char_line_count;
} else {
string sgml_string;
// non-breaking characters
// char is ' '
if (desc_on == 1) {
- char_line_count++;
- file += '\n';
- file += "</term><listitem><para>";
+ ++char_line_count;
+ os << '\n'
+ << "</term><listitem><para>";
desc_on = 2;
} else {
- file += c;
+ os << c;
}
} else {
- file += sgml_string;
+ os << sgml_string;
}
}
font1 = font2;
}
if (emph_flag) {
- file += "</emphasis>";
+ os << "</emphasis>";
}
++current_cell_number;
- tmp = table->DocBookEndOfCell(file, current_cell_number, depth);
+ tmp = table->DocBookEndOfCell(os, current_cell_number, depth);
// Resets description flag correctly.
switch(desc_on){
case 1:
// <term> not closed...
- file += "</term>";
+ os << "</term>";
break;
}
if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
- file += "</INFORMALTABLE>";
- file += '\n';
+ os << "</INFORMALTABLE>";
+ os << '\n';
lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar...done "
<< this << endl;
}
-void LyXParagraph::DocBookContTableRows(string & file, string & extra,
+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;
+ //string emph = "emphasis";
+ bool emph_flag = false;
+ int char_line_count = 0;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
size_type main_body;
for (; i < size() && current_cell_number < cell; ++i) {
c = GetChar(i);
if (c == LyXParagraph::META_NEWLINE)
- current_cell_number++;
+ ++current_cell_number;
}
lastpos = i;
c = GetChar(i);
// column = 0;
// } else
if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
- file += ' ';
+ os << ' ';
}
for (; i < size()
++column;
// Fully instantiated font
- font2 = getFont(i);
+ font2 = getFont(bparams, i);
// Handle <emphasis> tag.
if (font1.emph() != font2.emph() && i) {
if (font2.emph() == LyXFont::ON) {
- file += "<emphasis>";
+ os << "<emphasis>";
emph_flag= true;
} else if (emph_flag) {
- file += "</emphasis>";
+ os << "</emphasis>";
emph_flag= false;
}
}
if (c == LyXParagraph::META_INSET) {
inset = GetInset(i);
- string tmp_out;
- inset->DocBook(tmp_out);
+#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
if(desc_on == 4)
extra += frontStrip(tmp_out, '@');
else
- file += frontStrip(tmp_out, '@');
+ os << frontStrip(tmp_out, '@');
} else
- file += tmp_out;
+ os << tmp_out;
}
} else if (font2.latex() == LyXFont::ON) {
// "TeX"-Mode on == > SGML-Mode on.
if (c!= '\0')
- file += c;
+ os << c;
++char_line_count;
} else {
string sgml_string;
// non-breaking characters
// char is ' '
if (desc_on == 1) {
- char_line_count++;
- file += '\n';
- file += "</term><listitem><para>";
+ ++char_line_count;
+ os << '\n'
+ << "</term><listitem><para>";
desc_on = 2;
} else {
- file += c;
+ os << c;
}
} else {
- file += sgml_string;
+ os << sgml_string;
}
}
}
// we have only to control for emphasis open here!
if (emph_flag) {
- file += "</emphasis>";
+ os << "</emphasis>";
emph_flag= false;
}
- font1 = font2 = getFont(-1);
+ font1 = font2 = getFont(bparams, -1);
cell = table->CellHasContRow(current_cell_number);
}
lyxerr[Debug::LATEX] << "DocBookContTableRows...done " << this << endl;
}
-void LyXParagraph::SimpleTeXBlanks(string & file, TexRow & texrow,
+void LyXParagraph::SimpleTeXBlanks(ostream & os, TexRow & texrow,
LyXParagraph::size_type const i,
int & column, LyXFont const & font,
LyXLayout const & style)
if (tex_code_break_column == 0) {
// in batchmode we need LaTeX to still
// see it as a space not as an extra '\n'
- file += " %\n";
+ os << " %\n";
} else {
- file += '\n';
+ os << '\n';
}
texrow.newline();
- texrow.start(this, i+1);
+ texrow.start(this, i + 1);
column = 0;
} else if (font.latex() == LyXFont::OFF) {
if (style.free_spacing) {
- file += '~';
+ os << '~';
} else {
- file += ' ';
+ os << ' ';
}
}
}
-void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
+void LyXParagraph::SimpleTeXSpecialChars(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow,
+ bool moving_arg,
LyXFont & font,
LyXFont & running_font,
LyXFont & basefont,
case LyXParagraph::META_INSET: {
Inset * inset = GetInset(i);
if (inset) {
- int len = file.length();
- int tmp = inset->Latex(file, style.isCommand());
-
+ bool close = false;
+ int len = os.tellp();
+ if ((inset->LyxCode() == Inset::GRAPHICS_CODE
+ || inset->LyxCode() == Inset::MATH_CODE
+ || inset->LyxCode() == Inset::URL_CODE)
+ && running_font.isRightToLeft()) {
+ os << "\\L{";
+ close = true;
+ }
+
+ int tmp = inset->Latex(buf, os, moving_arg,
+ style.free_spacing);
+
+ if (close)
+ os << "}";
+
if (tmp) {
column = 0;
} else {
- column += file.length() - len;
+ column += os.tellp() - len;
}
- for (;tmp--;) {
+ for (; tmp--;) {
texrow.newline();
}
}
case LyXParagraph::META_NEWLINE:
if (open_font) {
- column += running_font.latexWriteEndChanges(file,
+ column += running_font.latexWriteEndChanges(os,
+ basefont,
basefont);
open_font = false;
}
- basefont = getFont(-1);
+ basefont = getFont(bparams, -1);
running_font = basefont;
break;
case LyXParagraph::META_HFILL:
- file += "\\hfill{}";
+ os << "\\hfill{}";
column += 7;
break;
// but I'll leave it as a switch statement
// so its simpler to extend. (ARRae)
switch (c) {
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- file += ' ';
- break;
-
default:
// make sure that we will not print
// error generating chars to the tex
// if it were done in the buffer
// itself.
if (c != '\0') {
- file += c;
+ os << c;
}
break;
}
} else {
// Plain mode (i.e. not LaTeX)
switch (c) {
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- file += '~';
- break;
-
case '\\':
- file += "\\textbackslash{}";
+ os << "\\textbackslash{}";
column += 15;
break;
case '°': case '±': case '²': case '³':
case '×': case '÷': case '¹': case 'ª':
case 'º': case '¬': case 'µ':
- if (current_view->buffer()->params.inputenc == "latin1") {
- file += "\\ensuremath{";
- file += c;
- file += '}';
+ if (bparams.inputenc == "latin1") {
+ os << "\\ensuremath{"
+ << c
+ << '}';
column += 13;
} else {
- file += c;
+ os << c;
}
break;
case '|': case '<': case '>':
// In T1 encoding, these characters exist
- if (lyxrc->fontenc == "T1") {
- file += c;
+ if (lyxrc.fontenc == "T1") {
+ os << c;
//... but we should avoid ligatures
if ((c == '>' || c == '<')
&& i <= size() - 2
- && GetChar(i+1) == c){
- file += "\\textcompwordmark{}";
+ && GetChar(i + 1) == c){
+ os << "\\textcompwordmark{}";
column += 19;
}
break;
}
// Typewriter font also has them
if (font.family() == LyXFont::TYPEWRITER_FAMILY) {
- file += c;
+ os << c;
break;
}
// Otherwise, we use what LaTeX
// provides us.
switch(c) {
case '<':
- file += "\\textless{}";
+ os << "\\textless{}";
column += 10;
break;
case '>':
- file += "\\textgreater{}";
+ os << "\\textgreater{}";
column += 13;
break;
case '|':
- file += "\\textbar{}";
+ os << "\\textbar{}";
column += 9;
break;
}
if (i <= size() - 2
&& GetChar(i + 1) == '-'
&& font.family() == LyXFont::TYPEWRITER_FAMILY) {
- file += "-{}";
+ os << "-{}";
column += 2;
} else {
- file += '-';
+ os << '-';
}
break;
case '\"':
- file += "\\char`\\\"{}";
+ os << "\\char`\\\"{}";
column += 9;
break;
case '£':
- if (current_view->buffer()->params.inputenc == "default") {
- file += "\\pounds{}";
+ if (bparams.inputenc == "default") {
+ os << "\\pounds{}";
column += 8;
} else {
- file += c;
+ os << c;
}
break;
case '$': case '&':
case '%': case '#': case '{':
case '}': case '_':
- file += '\\';
- file += c;
+ os << '\\' << c;
column += 1;
break;
case '~':
- file += "\\textasciitilde{}";
+ os << "\\textasciitilde{}";
column += 16;
break;
case '^':
- file += "\\textasciicircum{}";
+ os << "\\textasciicircum{}";
column += 17;
break;
case '*': case '[': case ']':
// avoid being mistaken for optional arguments
- file += '{';
- file += c;
- file += '}';
+ os << '{' << c << '}';
column += 2;
break;
&& font.family() != LyXFont::TYPEWRITER_FAMILY
&& GetChar(i + 1) == 'y'
&& GetChar(i + 2) == 'X') {
- file += "\\LyX{}";
+ os << "\\LyX{}";
i += 2;
column += 5;
}
&& font.family() != LyXFont::TYPEWRITER_FAMILY
&& GetChar(i + 1) == 'e'
&& GetChar(i + 2) == 'X') {
- file += "\\TeX{}";
+ os << "\\TeX{}";
i += 2;
column += 5;
}
&& GetChar(i + 4) == 'X'
&& GetChar(i + 5) == '2'
&& GetChar(i + 6) == 'e') {
- file += "\\LaTeXe{}";
+ os << "\\LaTeXe{}";
i += 6;
column += 8;
}
&& GetChar(i + 2) == 'T'
&& GetChar(i + 3) == 'e'
&& GetChar(i + 4) == 'X') {
- file += "\\LaTeX{}";
+ os << "\\LaTeX{}";
i += 4;
column += 7;
/* idea for labels --- end*/
} else if (c != '\0') {
- file += c;
- }
- break;
- }
- }
- }
-}
-
-
-bool LyXParagraph::RoffContTableRows(ostream & os,
- LyXParagraph::size_type i,
- int actcell)
-{
- if (!table)
- return false;
-
- LyXFont font1 = LyXFont(LyXFont::ALL_INHERIT);
- LyXFont font2;
- Inset * inset;
- char c;
-
- string fname2 = TmpFileName(string(), "RAT2");
- int lastpos = i;
- int cell = table->CellHasContRow(actcell);
- ++actcell;
- while(cell >= 0) {
- // first find the right position
- i = lastpos;
- for (; i < size() && actcell < cell; ++i) {
- c = GetChar(i);
- if (c == LyXParagraph::META_NEWLINE)
- ++actcell;
- }
- lastpos = i;
- c = GetChar(i);
- if ((c != ' ') && (c != LyXParagraph::META_NEWLINE))
- os << " ";
- for (; i < size()
- && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
- ++i) {
- font2 = GetFontSettings(i);
- if (font1.latex() != font2.latex()) {
- if (font2.latex() != LyXFont::OFF)
- continue;
- }
- c = GetChar(i);
- switch (c) {
- case LyXParagraph::META_INSET:
- if ((inset = GetInset(i))) {
- fstream fs(fname2.c_str(),
- ios::in|ios::out);
- if (!fs) {
- WriteAlert(_("LYX_ERROR:"),
- _("Cannot open temporary file:"),
- fname2);
- return false;
- }
- inset->Latex(fs, -1);
- fs.seekp(0);
- fs.get(c);
- while (!fs) {
- if (c == '\\')
- os << "\\\\";
- else
- os << c;
- fs.get(c);
- }
- fs.close();
- }
- break;
- case LyXParagraph::META_NEWLINE:
- break;
- case LyXParagraph::META_HFILL:
- break;
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- break;
- case '\\':
- os << "\\\\";
- break;
- default:
- if (c != '\0')
os << c;
- else
- lyxerr.debug() << "RoffAsciiTable: "
- "NULL char in structure."
- << endl;
+ }
break;
}
}
- cell = table->CellHasContRow(actcell);
}
- return true;
}
-LyXParagraph * LyXParagraph::TeXDeeper(string & file, TexRow & texrow,
- string & foot, TexRow & foot_texrow,
+LyXParagraph * LyXParagraph::TeXDeeper(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow,
+ ostream & foot,
+ TexRow & foot_texrow,
int & foot_count)
{
lyxerr[Debug::LATEX] << "TeXDeeper... " << this << endl;
LyXParagraph * par = this;
- while (par && par->depth == depth) {
+ while (par &&
+ (par->depth == depth) &&
+ (par->footnoteflag == footnoteflag)) {
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXDeeper)" << endl;
- if (textclasslist.Style(current_view->buffer()->params.textclass,
+ if (textclasslist.Style(bparams.textclass,
par->layout).isEnvironment()
- || par->pextra_type != PEXTRA_NONE)
- {
- par = par->TeXEnvironment(file, texrow,
- foot, foot_texrow,
- foot_count);
- } else {
- par = par->TeXOnePar(file, texrow,
- foot, foot_texrow,
- foot_count);
- }
+ || par->pextra_type != PEXTRA_NONE) {
+ par = par->TeXEnvironment(buf, bparams,
+ os, texrow,
+ foot, foot_texrow,
+ foot_count);
+ } else {
+ par = par->TeXOnePar(buf, bparams,
+ os, texrow, false,
+ foot, foot_texrow,
+ foot_count);
+ }
}
lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
}
-LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
- string & foot,
+LyXParagraph * LyXParagraph::TeXEnvironment(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow,
+ ostream & foot,
TexRow & foot_texrow,
int & foot_count)
{
// flags when footnotetext should be appended to file.
static bool minipage_open = false;
static int minipage_open_depth = 0;
- char par_sep = current_view->buffer()->params.paragraph_separation;
+ char par_sep = bparams.paragraph_separation;
lyxerr[Debug::LATEX] << "TeXEnvironment... " << this << endl;
if (IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXEnvironment)" << endl;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
layout);
if (pextra_type == PEXTRA_INDENT) {
if (!pextra_width.empty()) {
- file += "\\begin{LyXParagraphIndent}{"
- + pextra_width + "}\n";
+ 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.
- file += "\\begin{LyXParagraphIndent}{";
+ os << "\\begin{LyXParagraphIndent}{";
switch (pextra_widthp.length()) {
case 3:
- file += "1.00";
+ os << "1.00";
break;
case 2:
- file += "0.";
- file += pextra_widthp;
+ os << "0."
+ << pextra_widthp;
break;
case 1:
- file += "0.0";
- file += pextra_widthp;
+ os << "0.0"
+ << pextra_widthp;
}
- file += "\\columnwidth}\n";
+ os << "\\columnwidth}\n";
}
texrow.newline();
eindent_open = true;
if ((pextra_type == PEXTRA_MINIPAGE) && !minipage_open) {
if (pextra_hfill && Previous() &&
(Previous()->pextra_type == PEXTRA_MINIPAGE)) {
- file += "\\hfill{}\n";
+ os << "\\hfill{}\n";
texrow.newline();
}
if (par_sep == BufferParams::PARSEP_INDENT) {
- file += "{\\setlength\\parindent{0pt}\n";
+ os << "{\\setlength\\parindent{0pt}\n";
texrow.newline();
}
- file += "\\begin{minipage}";
+ os << "\\begin{minipage}";
switch(pextra_alignment) {
case MINIPAGE_ALIGN_TOP:
- file += "[t]";
+ os << "[t]";
break;
case MINIPAGE_ALIGN_MIDDLE:
- file += "[m]";
+ os << "[m]";
break;
case MINIPAGE_ALIGN_BOTTOM:
- file += "[b]";
+ os << "[b]";
break;
}
if (!pextra_width.empty()) {
- file += '{';
- file += pextra_width + "}\n";
+ 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.
- file += '{';
+ os << '{';
switch (pextra_widthp.length()) {
case 3:
- file += "1.00";
+ os << "1.00";
break;
case 2:
- file += "0.";
- file += pextra_widthp;
+ os << "0."
+ << pextra_widthp;
break;
case 1:
- file += "0.0";
- file += pextra_widthp;
+ os << "0.0"
+ << pextra_widthp;
}
- file += "\\columnwidth}\n";
+ os << "\\columnwidth}\n";
}
texrow.newline();
if (par_sep == BufferParams::PARSEP_INDENT) {
- file += "\\setlength\\parindent{\\LyXMinipageIndent}\n";
+ os << "\\setlength\\parindent{\\LyXMinipageIndent}\n";
texrow.newline();
}
minipage_open = true;
foot_this_level = true;
}
#endif
- file += "\\begin{" + style.latexname() + "}{"
- + labelwidthstring + "}\n";
+ os << "\\begin{" << style.latexname() << "}{"
+ << labelwidthstring << "}\n";
} else if (style.labeltype == LABEL_BIBLIO) {
// ale970405
- file += "\\begin{" + style.latexname() + "}{"
- + bibitemWidthest() + "}\n";
+ os << "\\begin{" << style.latexname() << "}{"
+ << bibitemWidest(current_view->painter())
+ << "}\n";
} else if (style.latextype == LATEX_ITEM_ENVIRONMENT) {
#ifdef FANCY_FOOTNOTE_CODE
if (foot_count < 0) {
foot_this_level = true;
}
#endif
- file += "\\begin{" + style.latexname() + '}'
- + style.latexparam() + '\n';
+ os << "\\begin{" << style.latexname() << '}'
+ << style.latexparam() << '\n';
} else
- file += "\\begin{" + style.latexname() + '}'
- + style.latexparam() + '\n';
+ os << "\\begin{" << style.latexname() << '}'
+ << style.latexparam() << '\n';
texrow.newline();
}
LyXParagraph * par = this;
do {
- par = par->TeXOnePar(file, texrow,
+ par = par->TeXOnePar(buf, bparams,
+ os, texrow, false,
foot, foot_texrow, foot_count);
if (minipage_open && par && !style.isEnvironment() &&
(par->pextra_type == PEXTRA_MINIPAGE) &&
par->pextra_start_minipage) {
- file += "\\end{minipage}\n";
+ os << "\\end{minipage}\n";
texrow.newline();
if (par_sep == BufferParams::PARSEP_INDENT) {
- file += "}\n";
+ os << "}\n";
texrow.newline();
}
minipage_open = false;
}
if (par && par->depth > depth) {
- if (textclasslist.Style(current_view->buffer()->params.textclass,
+ if (textclasslist.Style(bparams.textclass,
par->layout).isParagraph()
&& !par->table
- && !suffixIs(file, "\n\n")) {
+ // Thinko!
+ // How to handle this? (Lgb)
+ //&& !suffixIs(os, "\n\n")
+ ) {
// There should be at least one '\n' already
// but we need there to be two for Standard
// paragraphs that are depth-increment'ed to be
// output correctly. However, tables can
// also be paragraphs so don't adjust them.
// ARRae
- file += '\n';
+ // Thinkee:
+ // Will it ever harm to have one '\n' too
+ // many? i.e. that we sometimes will have
+ // three in a row. (Lgb)
+ os << '\n';
texrow.newline();
}
- par = par->TeXDeeper(file, texrow,
+ 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)){
- file += "\\hfill{}\n";
+ os << "\\hfill{}\n";
texrow.newline();
}
if (par_sep == BufferParams::PARSEP_INDENT) {
- file += "{\\setlength\\parindent{0pt}\n";
+ os << "{\\setlength\\parindent{0pt}\n";
texrow.newline();
}
- file += "\\begin{minipage}";
+ os << "\\begin{minipage}";
switch(par->pextra_alignment) {
case MINIPAGE_ALIGN_TOP:
- file += "[t]";
+ os << "[t]";
break;
case MINIPAGE_ALIGN_MIDDLE:
- file += "[m]";
+ os << "[m]";
break;
case MINIPAGE_ALIGN_BOTTOM:
- file += "[b]";
+ os << "[b]";
break;
}
if (!par->pextra_width.empty()) {
- file += '{';
- file += par->pextra_width;
- file += "}\n";
+ 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.
- file += '{';
+ os << '{';
switch (par->pextra_widthp.length()) {
case 3:
- file += "1.00";
+ os << "1.00";
break;
case 2:
- file += "0.";
- file += par->pextra_widthp;
+ os << "0." << par->pextra_widthp;
break;
case 1:
- file += "0.0";
- file += par->pextra_widthp;
+ os << "0.0" << par->pextra_widthp;
}
- file += "\\columnwidth}\n";
+ os << "\\columnwidth}\n";
}
texrow.newline();
if (par_sep == BufferParams::PARSEP_INDENT) {
- file += "\\setlength\\parindent{\\LyXMinipageIndent}\n";
+ os << "\\setlength\\parindent{\\LyXMinipageIndent}\n";
texrow.newline();
}
minipage_open = true;
} while (par
&& par->layout == layout
&& par->depth == depth
- && par->pextra_type == pextra_type);
+ && par->pextra_type == pextra_type
+ && par->footnoteflag == footnoteflag);
if (style.isEnvironment()) {
- file += "\\end{" + style.latexname() + '}';
+ os << "\\end{" << style.latexname() << '}';
// maybe this should go after the minipage closes?
if (foot_this_level) {
if (foot_count >= 1) {
if (foot_count > 1) {
- file += "\\addtocounter{footnote}{-";
- file += tostr(foot_count - 1);
- file += '}';
+ os << "\\addtocounter{footnote}{-"
+ << foot_count - 1
+ << '}';
}
- file += foot;
+ os << foot;
texrow += foot_texrow;
foot.clear();
foot_texrow.reset();
if (minipage_open && (minipage_open_depth == depth) &&
(!par || par->pextra_start_minipage ||
par->pextra_type != PEXTRA_MINIPAGE)) {
- file += "\\end{minipage}\n";
+ os << "\\end{minipage}\n";
texrow.newline();
if (par_sep == BufferParams::PARSEP_INDENT) {
- file += "}\n";
+ os << "}\n";
texrow.newline();
}
if (par && par->pextra_type != PEXTRA_MINIPAGE) {
- file += "\\medskip\n\n";
+ os << "\\medskip\n\n";
texrow.newline();
texrow.newline();
}
minipage_open = false;
}
if (eindent_open) {
- file += "\\end{LyXParagraphIndent}\n";
+ os << "\\end{LyXParagraphIndent}\n";
texrow.newline();
}
if (!(par && (par->pextra_type == PEXTRA_MINIPAGE)
&& par->pextra_hfill)) {
- file += '\n';
+ os << '\n';
texrow.newline();
}
lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
}
-LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
- string & foot, TexRow & foot_texrow,
- int & foot_count)
+#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)
"No footnote!" << endl;
LyXParagraph * par = this;
- LyXLayout const & style = textclasslist.Style(current_view->buffer()->params.textclass,
- previous->GetLayout());
+ LyXLayout const & style =
+ textclasslist.Style(bparams.textclass,
+ previous->GetLayout());
if (style.needprotect && footnotekind != LyXParagraph::FOOTNOTE){
lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
if (footnotekind != LyXParagraph::FOOTNOTE
&& footnotekind != LyXParagraph::MARGIN
- && file.length()
- && !suffixIs(file, '\n')) {
+ && 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'
- file += '\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;
+ //BufferParams * params = ¤t_view->buffer()->params;
bool footer_in_body = true;
switch (footnotekind) {
case LyXParagraph::FOOTNOTE:
if (style.intitle) {
- file += "\\thanks{\n";
+ os << "\\thanks{\n";
footer_in_body = false;
+ moving_arg = true;
} else {
if (foot_count == -1) {
// we're at depth 0 so we can use:
- file += "\\footnote{%\n";
+ os << "\\footnote{%\n";
footer_in_body = false;
} else {
- file += "\\footnotemark{}%\n";
+ os << "\\footnotemark{}%\n";
if (foot_count) {
// we only need this when there are
// multiple footnotes
- foot += "\\stepcounter{footnote}";
+ os << "\\stepcounter{footnote}";
}
- foot += "\\footnotetext{%\n";
+ os << "\\footnotetext{%\n";
foot_texrow.start(this, 0);
foot_texrow.newline();
++foot_count;
}
break;
case LyXParagraph::MARGIN:
- file += "\\marginpar{\n";
+ os << "\\marginpar{\n";
break;
case LyXParagraph::FIG:
if (pextra_type == PEXTRA_FLOATFLT
&& (!pextra_width.empty()
|| !pextra_widthp.empty())) {
- char bufr[80];
if (!pextra_width.empty())
- sprintf(bufr, "\\begin{floatingfigure}{%s}\n",
- pextra_width.c_str());
+ os << "\\begin{floatingfigure}{"
+ << pextra_width << "}\n";
else
- sprintf(bufr,
- "\\begin{floatingfigure}{%f\\textwidth}\n",
- atoi(pextra_widthp.c_str())/100.0);
- file += bufr;
+ os << "\\begin{floatingfigure}{"
+ << atoi(pextra_widthp.c_str())/100.0
+ << "\\textwidth}\n";
} else {
- file += "\\begin{figure}";
- if (!params->float_placement.empty()) {
- file += '[';
- file += params->float_placement;
- file += "]\n";
+ os << "\\begin{figure}";
+ if (!bparams.float_placement.empty()) {
+ os << '[' << bparams.float_placement << "]\n";
} else {
- file += '\n';
+ os << '\n';
}
}
break;
case LyXParagraph::TAB:
- file += "\\begin{table}";
- if (!params->float_placement.empty()) {
- file += '[';
- file += params->float_placement;
- file += "]\n";
+ os << "\\begin{table}";
+ if (!bparams.float_placement.empty()) {
+ os << '[' << bparams.float_placement << "]\n";
} else {
- file += '\n';
+ os << '\n';
}
break;
case LyXParagraph::WIDE_FIG:
- file += "\\begin{figure*}";
- if (!params->float_placement.empty()) {
- file += '[';
- file += params->float_placement;
- file += "]\n";
+ os << "\\begin{figure*}";
+ if (!bparams.float_placement.empty()) {
+ os << '[' << bparams.float_placement << "]\n";
} else {
- file += '\n';
+ os << '\n';
}
break;
case LyXParagraph::WIDE_TAB:
- file += "\\begin{table*}";
- if (!params->float_placement.empty()) {
- file += '[';
- file += params->float_placement;
- file += "]\n";
+ os << "\\begin{table*}";
+ if (!bparams.float_placement.empty()) {
+ os << '[' << bparams.float_placement << "]\n";
} else {
- file += '\n';
+ os << '\n';
}
break;
case LyXParagraph::ALGORITHM:
- file += "\\begin{algorithm}\n";
+ os << "\\begin{algorithm}\n";
break;
}
texrow.newline();
- if (footnotekind != LyXParagraph::FOOTNOTE
+ if (footnotekind != LyXParagraph::FOOTNOTE
|| !footer_in_body) {
// Process text for all floats except footnotes in body
do {
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
- par->layout);
+ textclasslist
+ .Style(bparams.textclass, par->layout);
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
<< endl;
// environments. Shouldn't be circular because
// we don't support footnotes inside
// floats (yet). ARRae
- par = par->TeXEnvironment(file, texrow,
+ par = par->TeXEnvironment(buf, bparams, os,
+ texrow,
foot, foot_texrow,
foot_count);
} else {
- par = par->TeXOnePar(file, texrow,
+ par = par->TeXOnePar(buf, bparams,
+ os, texrow, moving_arg,
foot, foot_texrow,
foot_count);
}
if (par && !par->IsDummy() && par->depth > depth) {
- par = par->TeXDeeper(file, texrow,
+ par = par->TeXDeeper(buf, bparams, os, texrow,
foot, foot_texrow,
foot_count);
}
// process footnotes > depth 0 or in environments separately
// NOTE: Currently don't support footnotes within footnotes
// even though that is possible using the \footnotemark
- string dummy;
+#ifdef HAVE_SSTREAM
+ std::ostringstream dummy;
+#else
+ ostrstream dummy;
+#endif
TexRow dummy_texrow;
int dummy_count = 0;
do {
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
- par->layout);
+ textclasslist
+ .Style(bparams.textclass, par->layout);
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
<< endl;
// environments. Shouldn't be circular because
// we don't support footnotes inside
// floats (yet). ARRae
- par = par->TeXEnvironment(foot, foot_texrow,
+ par = par->TeXEnvironment(buf, bparams,
+ foot, foot_texrow,
dummy, dummy_texrow,
dummy_count);
} else {
- par = par->TeXOnePar(foot, foot_texrow,
+ par = par->TeXOnePar(buf, bparams,
+ foot, foot_texrow,
+ moving_arg,
dummy, dummy_texrow,
dummy_count);
}
if (par && !par->IsDummy() && par->depth > depth) {
- par = par->TeXDeeper(foot, foot_texrow,
+ par = par->TeXDeeper(buf, bparams,
+ foot, foot_texrow,
dummy, dummy_texrow,
dummy_count);
}
"Footnote in a Footnote -- not supported"
<< endl;
}
+#ifndef HAVE_OSTREAM
+ delete [] dummy.str();
+#endif
}
switch (footnotekind) {
if (footer_in_body) {
// This helps tell which of the multiple
// footnotetexts an error was in.
- foot += "}%\n";
+ foot << "}%\n";
foot_texrow.newline();
} else {
- file += '}';
+ os << '}';
}
break;
case LyXParagraph::MARGIN:
- file += '}';
+ os << '}';
break;
case LyXParagraph::FIG:
if (pextra_type == PEXTRA_FLOATFLT
&& (!pextra_width.empty()
|| !pextra_widthp.empty()))
- file += "\\end{floatingfigure}";
+ os << "\\end{floatingfigure}";
else
- file += "\\end{figure}";
+ os << "\\end{figure}";
break;
case LyXParagraph::TAB:
- file += "\\end{table}";
+ os << "\\end{table}";
break;
case LyXParagraph::WIDE_FIG:
- file += "\\end{figure*}";
+ os << "\\end{figure*}";
break;
case LyXParagraph::WIDE_TAB:
- file += "\\end{table*}";
+ os << "\\end{table*}";
break;
case LyXParagraph::ALGORITHM:
- file += "\\end{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.
- file += "\n";
+ os << "\n";
texrow.newline();
}
}
-void LyXParagraph::SetPExtraType(int type, char const * width,
+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(current_view->buffer()->params.textclass,
+ if (textclasslist.Style(bparams.textclass,
layout).isEnvironment()) {
LyXParagraph
* par = this,
par->pextra_widthp = widthp;
par = par->NextAfterFootnote();
if (par && (par->depth > depth))
- par->SetPExtraType(type, width, widthp);
+ par->SetPExtraType(bparams,
+ type, width, widthp);
while (par && ((par->depth > depth) || par->IsDummy()))
par = par->NextAfterFootnote();
}
}
-void LyXParagraph::UnsetPExtraType()
+void LyXParagraph::UnsetPExtraType(BufferParams const & bparams)
{
if (pextra_type == PEXTRA_NONE)
return;
pextra_type = PEXTRA_NONE;
- pextra_width.clear();
- pextra_widthp.clear();
+ pextra_width.erase();
+ pextra_widthp.erase();
- if (textclasslist.Style(current_view->buffer()->params.textclass,
+ if (textclasslist.Style(bparams.textclass,
layout).isEnvironment()) {
LyXParagraph
* par = this,
while (par && (par->layout == layout)
&& (par->depth == depth)) {
par->pextra_type = PEXTRA_NONE;
- par->pextra_width.clear();
- par->pextra_widthp.clear();
+ par->pextra_width.erase();
+ par->pextra_widthp.erase();
par = par->NextAfterFootnote();
if (par && (par->depth > depth))
- par->UnsetPExtraType();
+ par->UnsetPExtraType(bparams);
while (par && ((par->depth > depth) || par->IsDummy()))
par = par->NextAfterFootnote();
}
bool LyXParagraph::IsNewline(size_type pos) const
{
- bool tmp = false;
- if (pos >= 0)
- tmp = IsNewlineChar(GetChar(pos));
- return tmp;
+ return pos >= 0 && IsNewlineChar(GetChar(pos));
}
if( c == '\0')
return false;
// We want to pass the ' and escape chars to ispell
- string extra = lyxrc->isp_esc_chars + '\'';
+ string extra = lyxrc.isp_esc_chars + '\'';
char ch[2];
ch[0] = c;
ch[1] = 0;
{
return IsWordChar(GetChar(pos)) ;
}
+
+
+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);
+ else
+ return bparams.language_info;
+}
+
+
+bool LyXParagraph::isRightToLeftPar(BufferParams const & bparams) const
+{
+ return lyxrc.rtl_support && !table
+ && getParLanguage(bparams)->RightToLeft();
+}
+
+
+void LyXParagraph::ChangeLanguage(BufferParams const & bparams,
+ Language const * from, Language const * to)
+{
+ for(size_type i = 0; i < size(); ++i) {
+ LyXFont font = GetFontSettings(bparams, i);
+ if (font.language() == from) {
+ font.setLanguage(to);
+ SetFont(i, font);
+ }
+ }
+}
+
+
+bool LyXParagraph::isMultiLingual(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)
+ 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)
+{
+ BufferParams const & bparams = buffer->params;
+ string s;
+ if (label && !IsDummy() && !labelstring.empty())
+ s += labelstring + ' ';
+ string::size_type len = s.size();
+
+ for (LyXParagraph::size_type i = 0; i < size(); ++i) {
+ unsigned char c = GetChar(i);
+ if (IsPrintable(c))
+ s += c;
+ else if (c == META_INSET &&
+ GetInset(i)->LyxCode() == Inset::MATH_CODE) {
+#ifdef HAVE_SSTREAM
+ std::ostringstream ost;
+ GetInset(i)->Ascii(buffer, ost);
+#else
+ ostrstream ost;
+ GetInset(i)->Ascii(buffer, ost);
+ ost << '\0';
+#endif
+ s += subst(ost.str(),'\n',' ');
+ }
+ }
+
+#ifndef NEW_INSETS
+ if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE
+ && footnoteflag == LyXParagraph::NO_FOOTNOTE)
+ s += NextAfterFootnote()->String(buffer, false);
+
+ if (!IsDummy())
+#endif
+ {
+ if (isRightToLeftPar(bparams))
+ reverse(s.begin() + len,s.end());
+ }
+ return s;
+}
+
+
+string 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 + ' ';
+
+ for (LyXParagraph::size_type i = beg; i < end; ++i) {
+ unsigned char c = GetChar(i);
+ if (IsPrintable(c))
+ s += 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;
+}
+
+
+void LyXParagraph::SetInsetOwner(Inset *i)
+{
+ inset_owner = i;
+ for (InsetList::const_iterator cit = insetlist.begin();
+ cit != insetlist.end(); ++cit) {
+ if ((*cit).inset)
+ (*cit).inset->setOwner(i);
+ }
+}
+
+
+void LyXParagraph::deleteInsetsLyXText(BufferView * bv)
+{
+ // then the insets
+ for (InsetList::const_iterator cit = insetlist.begin();
+ cit != insetlist.end(); ++cit) {
+ if ((*cit).inset) {
+ if ((*cit).inset->IsTextInset()) {
+ static_cast<InsetText *>((*cit).inset)->
+ deleteLyXText(bv);
+ }
+ }
+ }
+}