#include <algorithm>
#include <fstream>
+#include <csignal>
#include "lyxparagraph.h"
#include "support/textutils.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;
int tex_code_break_column = 72; // needs non-zero initialization. set later.
// this is a bad idea, but how can LyXParagraph find its buffer to get
// parameters? (JMarc)
extern BufferView * current_view;
-
-
-// ale970405
-extern string bibitemWidthest(Painter &);
+extern string bibitemWidest(Painter &);
// this is a minibuffer
static char minibuffer_char;
itemdepth = 0;
next = 0;
previous = 0;
+#ifndef NEW_INSETS
footnoteflag = LyXParagraph::NO_FOOTNOTE;
footnotekind = LyXParagraph::FOOTNOTE; // should not be needed
-
+#endif
align = LYX_ALIGN_BLOCK;
+#ifndef NEW_TABULAR
/* table stuff -- begin*/
table = 0;
- /* table stuff -- end*/
+ /* table stuff -- end*/
+#endif
inset_owner = 0;
id_ = paragraph_id++;
bibkey = 0; // ale970302
previous = par;
previous->next = this;
// end
+#ifndef NEW_INSETS
footnoteflag = LyXParagraph::NO_FOOTNOTE;
footnotekind = LyXParagraph::FOOTNOTE;
-
+#endif
+#ifndef NEW_TABULAR
/* table stuff -- begin*/
table = 0;
- /* table stuff -- end*/
+ /* table stuff -- end*/
+#endif
inset_owner = 0;
id_ = paragraph_id++;
}
-void LyXParagraph::writeFile(ostream & os, BufferParams const & params,
+void LyXParagraph::writeFile(Buffer const * buf, ostream & os,
+ BufferParams const & params,
char footflag, char dth) const
{
LyXFont font1, font2;
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) {
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\\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,params.language_info);
}
// Write font changes
- font2 = GetFontSettings(i);
+ font2 = GetFontSettings(params, i);
if (font2 != font1) {
font2.lyxWriteChanges(font1, os);
column = 0;
// 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;
}
os << "\n\\hfill \n";
column = 0;
break;
-#if 0
- case META_PROTECTED_SEPARATOR:
- os << "\n\\protected_separator \n";
- column = 0;
- break;
-#endif
case '\\':
os << "\n\\backslash \n";
column = 0;
// now write the next paragraph
if (next)
- next->writeFile(os, params, footflag, dth);
+ next->writeFile(buf, os, params, footflag, dth);
}
void LyXParagraph::validate(LaTeXFeatures & features) const
{
+ BufferParams const & params = features.bufferParams();
+
// 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
- Language const * doc_language = current_view->buffer()->params.language_info;
+ 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()) {
default:
features.color = true;
lyxerr[Debug::LATEX] << "Color enabled. Font: "
- << (*cit).font.stateText()
+ << (*cit).font.stateText(0)
<< endl;
}
+
Language const * language = (*cit).font.language();
- if (language != doc_language && language != default_language) {
+ if (language != doc_language) {
features.UsedLanguages.insert(language);
lyxerr[Debug::LATEX] << "Found language "
- << language->lang << endl;
- }
+ << language->lang() << endl;
+ }
}
// then the insets
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)) {
// find the entry
InsetList::iterator it = lower_bound(insetlist.begin(),
insetlist.end(),
- InsetTable(pos,0));
+ pos, matchIT());
if (it != insetlist.end() && (*it).pos == pos)
(*it).inset = 0;
} else {
if ((minibuffer_char == LyXParagraph::META_INSET) &&
!InsertInsetAllowed(minibuffer_inset))
return false;
- InsertChar(pos, minibuffer_char);
- SetFont(pos, minibuffer_font);
if (minibuffer_char == LyXParagraph::META_INSET)
- InsertInset(pos, minibuffer_inset);
+ InsertInset(pos, minibuffer_inset, minibuffer_font);
+ else
+ InsertChar(pos, minibuffer_char, minibuffer_font);
return true;
}
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;
it != insetlist.end(); ++it) {
delete (*it).inset;
}
-
+#ifndef NEW_TABULAR
/* table stuff -- begin*/
delete table;
- /* table stuff -- end*/
+ /* table stuff -- end*/
+#endif
// ale970302
delete bibkey;
+ //
+ //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;
// find the entry
InsetList::iterator it = lower_bound(insetlist.begin(),
insetlist.end(),
- InsetTable(pos,0));
+ pos, matchIT());
if (it != insetlist.end() && (*it).pos == pos) {
delete (*it).inset;
insetlist.erase(it);
}
}
text.erase(text.begin() + pos);
+
// Erase entries in the tables.
- for (FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
- if (pos >= (*it).pos && pos <= (*it).pos_end) {
- if ((*it).pos == (*it).pos_end) {
- // If it is a multi-character font
- // entry, we just make it smaller
- // (see update below), otherwise we
- // should delete it.
- fontlist.erase(it);
- break;
- }
+ 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--;
- }
+ for (; it != fontlist.end(); ++it)
+ --(*it).pos;
// Update the inset table.
for (InsetList::iterator it = upper_bound(insetlist.begin(),
insetlist.end(),
- InsetTable(pos,0));
+ pos, matchIT());
it != insetlist.end(); ++it)
--(*it).pos;
} else {
void LyXParagraph::InsertChar(LyXParagraph::size_type pos, char c)
+{
+ LyXFont f(LyXFont::ALL_INHERIT);
+ InsertChar(pos, c, f);
+}
+
+
+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 = fontlist.begin();
- it != fontlist.end(); ++it) {
- if ((*it).pos >= pos)
- (*it).pos++;
- if ((*it).pos_end >= pos)
- (*it).pos_end++;
- }
+ 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(),
- InsetTable(pos,0));
+ pos, matchIT());
it != insetlist.end(); ++it)
++(*it).pos;
+
+ SetFont(pos, font);
}
void LyXParagraph::InsertInset(LyXParagraph::size_type pos,
Inset * inset)
{
+ LyXFont f(LyXFont::ALL_INHERIT);
+ InsertInset(pos, inset, f);
+}
+
+
+void LyXParagraph::InsertInset(LyXParagraph::size_type pos,
+ Inset * inset, LyXFont const & font)
+{
+ Assert(inset);
+
// > 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
+ ->InsertInset(pos - text.size() - 1,
+ inset, font);
+ else
+#endif
lyxerr << "ERROR (LyXParagraph::InsertInset): "
"position does not exist: " << pos << endl;
return;
}
- if (text[pos] != LyXParagraph::META_INSET) {
+
+ 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 no LyXParagraph::META_INSET" << endl;
- return;
- }
-
- if (inset) {
- // Add a new entry in the inset table.
- InsetList::iterator it = lower_bound(insetlist.begin(),
- insetlist.end(),
- InsetTable(pos,0));
- 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));
- }
+ "there is an inset in position: " << pos << endl;
+ else
+ insetlist.insert(it, InsetTable(pos, inset));
+ if (inset_owner)
+ inset->setOwner(inset_owner);
}
-bool LyXParagraph::InsertInsetAllowed(Inset *inset)
+bool LyXParagraph::InsertInsetAllowed(Inset * inset)
{
- if (inset_owner) {
- printf("CODE:%d\n",inset->LyxCode());
+ 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.
InsetList::iterator it = lower_bound(insetlist.begin(),
insetlist.end(),
- InsetTable(pos,0));
+ pos, matchIT());
if (it != insetlist.end() && (*it).pos == pos)
return (*it).inset;
lyxerr << "ERROR (LyXParagraph::GetInset): "
"Inset does not exist: " << pos << endl;
+ //::raise(SIGSTOP);
+
// text[pos] = ' '; // WHY!!! does this set the pos to ' '????
// Did this commenting out introduce a bug? So far I have not
// see any, please enlighten me. (Lgb)
Inset const * LyXParagraph::GetInset(LyXParagraph::size_type pos) const
{
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.
InsetList::const_iterator cit = lower_bound(insetlist.begin(),
insetlist.end(),
- InsetTable(pos,0));
+ 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)
// 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 SORTED_FONT_LIST
- for (FontList::const_iterator cit = fontlist.begin();
- cit != fontlist.end() && pos <= (*cit).pos_end; ++cit)
- if (pos >= (*cit).pos)
- return (*cit).font;
-#else
- for (FontList::const_iterator cit = fontlist.begin();
- cit != fontlist.end(); ++cit)
- if (pos >= (*cit).pos && pos <= (*cit).pos_end)
- return (*cit).font;
-#endif
+ 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 > 0) {
- return GetFontSettings(pos - 1);
+ return GetFontSettings(bparams, pos - 1);
} else // pos = size() = 0
- return LyXFont(LyXFont::ALL_INHERIT,getParLanguage());
+ return LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams));
return LyXFont(LyXFont::ALL_INHERIT);
}
LyXFont LyXParagraph::GetFirstFontSettings() const
{
if (size() > 0) {
-#ifdef SORTED_FONT_LIST
- if (!fontlist.empty() && fontlist.front().pos == 0)
- return fontlist.front().font;
-#else
- for (FontList::const_iterator cit = fontlist.begin();
- cit != fontlist.end(); ++cit)
- if (0 >= (*cit).pos && 0 <= (*cit).pos_end)
- return (*cit).font;
-#endif
- } else if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
+ if (!fontlist.empty())
+ return fontlist[0].font;
+ }
+
+#ifndef NEW_INSETS
+ else if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
return NextAfterFootnote()->GetFirstFontSettings();
+#endif
return LyXFont(LyXFont::ALL_INHERIT);
}
+
// Gets the fully instantiated font at a given position in a paragraph
// This is basically the same function as LyXText::GetFont() in text2.C.
// The difference is that this one is used for generating the LaTeX file,
// the true picture of the buffer. (Asger)
// If position is -1, we get the layout font of the paragraph.
// If position is -2, we get the font of the manual label of the paragraph.
-LyXFont LyXParagraph::getFont(LyXParagraph::size_type pos) const
+LyXFont LyXParagraph::getFont(BufferParams const & bparams,
+ LyXParagraph::size_type pos) const
{
LyXFont tmpfont;
LyXLayout const & layout =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
LyXParagraph::size_type main_body = 0;
if (layout.labeltype == LABEL_MANUAL)
main_body = BeginningOfMainBody();
- if (pos >= 0){
+ if (pos >= 0) {
LyXFont layoutfont;
if (pos < main_body)
layoutfont = layout.labelfont;
else
layoutfont = layout.font;
- tmpfont = GetFontSettings(pos);
+ tmpfont = GetFontSettings(bparams, pos);
tmpfont.realize(layoutfont);
} else {
// process layoutfont for pos == -1 and labelfont for pos < -1
tmpfont = layout.font;
else
tmpfont = layout.labelfont;
- tmpfont.setLanguage(getParLanguage());
+ tmpfont.setLanguage(getParLanguage(bparams));
}
// check for environment font information
par = par->DepthHook(par_depth - 1);
if (par) {
tmpfont.realize(textclasslist.
- Style(current_view->buffer()->params.textclass,
+ Style(bparams.textclass,
par->GetLayout()).font);
par_depth = par->GetDepth();
}
}
tmpfont.realize(textclasslist
- .TextClass(current_view->buffer()->params.textclass)
+ .TextClass(bparams.textclass)
.defaultfont());
return tmpfont;
}
LyXParagraph::size_type endpos) const
{
LyXFont::FONT_SIZE maxsize = LyXFont::SIZE_TINY;
- for (FontList::const_iterator cit = fontlist.begin();
- cit != fontlist.end(); ++cit) {
- if (startpos <= (*cit).pos_end && endpos >= (*cit).pos) {
- LyXFont::FONT_SIZE size = (*cit).font.size();
- if (size > maxsize && size <= LyXFont::SIZE_HUGER)
- maxsize = size;
- }
+ if (fontlist.empty())
+ return maxsize;
+
+ 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;
}
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)
// 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
}
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
- 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;
+ FontList::iterator it = lower_bound(fontlist.begin(),
+ fontlist.end(),
+ pos, matchFT());
+ unsigned int i = it - fontlist.begin();
+ bool notfound = it == fontlist.end();
+
+ if (!notfound && fontlist[i].font == font)
+ return;
+
+ bool begin = pos == 0 || notfound ||
+ (i > 0 && fontlist[i-1].pos == pos - 1);
+ // Is position pos is a beginning of a font block?
+ bool end = !notfound && fontlist[i].pos == pos;
+ // Is position pos is the end of a font block?
+ if (begin && end) { // A single char block
+ if (i+1 < fontlist.size() &&
+ fontlist[i+1].font == font) {
+ // Merge the singleton block with the next block
+ fontlist.erase(fontlist.begin() + i);
+ if (i > 0 && fontlist[i-1].font == font)
+ fontlist.erase(fontlist.begin() + i-1);
+ } else if (i > 0 && fontlist[i-1].font == font) {
+ // Merge the singleton block with the previous block
+ fontlist[i-1].pos = pos;
+ fontlist.erase(fontlist.begin() + i);
+ } else
+ fontlist[i].font = font;
+ } else if (begin) {
+ if (i > 0 && fontlist[i-1].font == font)
+ fontlist[i-1].pos = pos;
+ else
+ fontlist.insert(fontlist.begin() + i,
+ FontTable(pos, font));
+ } else if (end) {
+ fontlist[i].pos = pos - 1;
+ if (!(i+1 < fontlist.size() &&
+ fontlist[i+1].font == font))
+ fontlist.insert(fontlist.begin() + i+1,
+ FontTable(pos, font));
+ } else { // The general case. The block is splitted into 3 blocks
+ fontlist.insert(fontlist.begin() + i,
+ FontTable(pos - 1, fontlist[i].font));
+ fontlist.insert(fontlist.begin() + i+1, FontTable(pos, font));
}
}
// This function is able to hide closed footnotes.
LyXParagraph * LyXParagraph::Next()
{
+#ifndef NEW_INSETS
if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
LyXParagraph * tmp = next;
while (tmp
else
return next; // This should never happen!
} else
+#endif
return next;
}
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 = previous;
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;
&& tmp->next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
tmp = tmp->NextAfterFootnote();
- return tmp;
+ 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, j, pos_end, pos_first;
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);
++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 = j = pos; i <= pos_end; ++i) {
- par->CutIntoMinibuffer(i - pos_first);
+ par->CutIntoMinibuffer(bparams, i - pos_first);
if (tmp->InsertFromMinibuffer(j - pos))
++j;
}
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
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);
size_type i, j;
for (i = j = pos; i <= pos_end; ++i) {
- par->CutIntoMinibuffer(i - pos_first);
+ par->CutIntoMinibuffer(bparams, i - pos_first);
if (tmp->InsertFromMinibuffer(j - pos))
++j;
}
// 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();
// ok, now copy the paragraph
size_type i, j;
for (i = j = 0; i <= pos_end; ++i) {
- the_next->CutIntoMinibuffer(i);
+ the_next->CutIntoMinibuffer(bparams, i);
if (InsertFromMinibuffer(pos_insert + j))
++j;
}
// delete the next paragraph
+ LyXParagraph * ppar = the_next->previous;
+ LyXParagraph * npar = the_next->next;
delete the_next;
+ ppar->next = npar;
}
+#ifndef NEW_INSETS
void LyXParagraph::OpenFootnote(LyXParagraph::size_type pos)
{
LyXParagraph * par = ParFromPos(pos);
par = par->next;
}
}
+#endif
-int LyXParagraph::GetEndLabel() const
+int LyXParagraph::GetEndLabel(BufferParams const & bparams) const
{
LyXParagraph const * par = this;
int par_depth = GetDepth();
while (par) {
LyXTextClass::LayoutList::size_type layout = par->GetLayout();
int endlabeltype =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
layout).endlabeltype;
if (endlabeltype != END_LABEL_NO_LABEL) {
LyXParagraph const * last = this;
return END_LABEL_NO_LABEL;
}
+
LyXTextClass::size_type LyXParagraph::GetLayout() const
{
return FirstPhysicalPar()->layout;
}
-void LyXParagraph::SetOnlyLayout(LyXTextClass::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::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());
}
}
int LyXParagraph::AutoDeleteInsets()
{
int count = 0;
- unsigned int i = 0;
- while (i < insetlist.size()) {
- if (insetlist[i].inset && insetlist[i].inset->AutoDelete()) {
- Erase(insetlist[i].pos);
- // Erase() calls to insetlist.erase(&insetlist[i])
- // so i shouldn't be increased.
+ 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
- ++i;
+ ++index;
}
return count;
}
-Inset * LyXParagraph::ReturnNextInsetPointer(LyXParagraph::size_type & pos)
+LyXParagraph::inset_iterator LyXParagraph::InsetIterator(LyXParagraph::size_type pos)
{
InsetList::iterator it = lower_bound(insetlist.begin(),
insetlist.end(),
- InsetTable(pos, 0));
- if (it != insetlist.end()) {
- pos = (*it).pos;
- return (*it).inset;
- }
- return 0;
+ pos, matchIT());
+ return inset_iterator(it);
}
int LyXParagraph::GetPositionOfInset(Inset * inset) const
{
// Find the entry.
+ // We could use lower_bound here too, we just need to add
+ // the approp. operator() to matchIT (and change the name
+ // of that struct). Code would then be:
+ // InsetList::const_iterator cit = lower_bound(insetlist.begin(),
+ // insetlist.end(),
+ // inset, matchIT());
+ // if ((*cit).inset == inset) {
+ // return (*cit).pos;
+ // }
for (InsetList::const_iterator cit = insetlist.begin();
cit != insetlist.end(); ++cit) {
if ((*cit).inset == inset) {
}
-LyXParagraph * LyXParagraph::TeXOnePar(ostream & os, TexRow & 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;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
layout);
bool further_blank_line = false;
texrow.newline();
}
+ if (!spacing.isDefault()
+ && (!Previous() || !Previous()->HasSameLayout(this))) {
+ os << spacing.writeEnvirBegin() << "\n";
+ texrow.newline();
+ }
+
if (tex_code_break_column && style.isCommand()){
os << '\n';
texrow.newline();
further_blank_line = true;
}
if (added_space_top.kind() != VSpace::NONE) {
- os << added_space_top.asLatexCommand(current_view->buffer()->params);
+ os << added_space_top.asLatexCommand(bparams);
further_blank_line = true;
}
if (line_top) {
- os << "\\lyxline{\\" << getFont(0).latexSize() << '}'
+ os << "\\lyxline{\\" << getFont(bparams, 0).latexSize() << '}'
<< "\\vspace{-1\\parskip}";
further_blank_line = true;
}
texrow.newline();
}
- Language const * language = getParLanguage();
- Language const * doc_language = current_view->buffer()->params.language_info;
- if (language != doc_language) {
+ 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)
+ language->lang())
<< endl;
texrow.newline();
}
break;
case LATEX_ITEM_ENVIRONMENT:
if (bibkey) {
- bibkey->Latex(os, false, false);
+ bibkey->Latex(buf, os, false, false);
} else
os << "\\item ";
break;
break;
}
- bool need_par = SimpleTeXOnePar(os, texrow);
+ bool need_par = SimpleTeXOnePar(buf, bparams, os, texrow, moving_arg);
+#ifndef NEW_INSETS
// Spit out footnotes
LyXParagraph * par = next;
if (lyxrc.rtl_support) {
if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE
&& next->footnoteflag != footnoteflag) {
LyXParagraph * p = 0;
- bool is_rtl = GetFontSettings(size()-1).isRightToLeft();
+ bool is_rtl = (size() > 0)
+ ? GetFontSettings(bparams,
+ size()-1).isRightToLeft()
+ : language->RightToLeft();
if ( (p = NextAfterFootnote()) != 0 &&
- p->GetFontSettings(0).isRightToLeft() != is_rtl)
- is_rtl = GetFontSettings(0).isRightToLeft();
- while (par &&
- par->footnoteflag != LyXParagraph::NO_FOOTNOTE &&
- par->footnoteflag != footnoteflag) {
- LyXDirection dir = (is_rtl)
- ? LYX_DIR_RIGHT_TO_LEFT
- : LYX_DIR_LEFT_TO_RIGHT;
- par = par->TeXFootnote(os, texrow, foot,
+ 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,
- dir);
- par->SimpleTeXOnePar(os, texrow);
- is_rtl = par->GetFontSettings(par->size()-1).isRightToLeft();
+ 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->GetFontSettings(0).isRightToLeft() != is_rtl)
- is_rtl = GetFontSettings(0).isRightToLeft();
+ p->size() > 0 &&
+ p->GetFontSettings(bparams, 0).isRightToLeft() != is_rtl)
+ is_rtl = language->RightToLeft();
par = par->next;
}
}
} else {
while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE
&& par->footnoteflag != footnoteflag) {
- par = par->TeXFootnote(os, texrow,
+ par = par->TeXFootnote(buf, bparams,
+ os, texrow,
foot, foot_texrow, foot_count,
- LYX_DIR_LEFT_TO_RIGHT);
- par->SimpleTeXOnePar(os, texrow);
+ 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()) {
os << '\\'
<< ' ';
}
os << "\\par}";
- } else if (textclasslist.Style(current_view->buffer()->params.textclass,
- GetLayout()).isCommand()){
+ } else if (textclasslist.Style(bparams.textclass,
+ GetLayout()).isCommand()) {
if (style.resfont.size() != font.size()) {
os << '\\'
<< font.latexSize()
os << "{\\" << font.latexSize() << " \\par}";
}
- if (language != doc_language) {
+ 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);
+ doc_language->lang());
}
switch (style.latextype) {
|| 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
further_blank_line = false;
if (line_bottom) {
- os << "\\lyxline{\\" << getFont(Last() - 1).latexSize() << '}';
+ os << "\\lyxline{\\" << getFont(bparams, Last() - 1).latexSize() << '}';
further_blank_line = true;
}
if (added_space_bottom.kind() != VSpace::NONE) {
- os << added_space_bottom.asLatexCommand(current_view->buffer()->params);
+ os << added_space_bottom.asLatexCommand(bparams);
further_blank_line = true;
}
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)) {
os << '\n';
texrow.newline();
// This one spits out the text of the paragraph
-bool LyXParagraph::SimpleTeXOnePar(ostream & os, TexRow & texrow)
+bool LyXParagraph::SimpleTeXOnePar(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow,
+ bool moving_arg)
{
lyxerr[Debug::LATEX] << "SimpleTeXOnePar... " << this << endl;
+#ifndef NEW_TABULAR
if (table)
- return SimpleTeXOneTablePar(os, texrow);
+ return SimpleTeXOneTablePar(buf, bparams, os, texrow);
+#endif
bool return_value = false;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
LyXFont basefont, last_font;
if (main_body > 0) {
os << '[';
- basefont = getFont(-2); // Get label font
+ basefont = getFont(bparams, -2); // Get label font
} else {
- basefont = getFont(-1); // Get layout font
+ basefont = getFont(bparams, -1); // Get layout font
}
int column = 0;
return_value = true;
}
}
+
+ moving_arg |= style.needprotect;
// Which font is currently active?
LyXFont running_font(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;
os << ']';
++column;
case LYX_ALIGN_SPECIAL:
break;
case LYX_ALIGN_LEFT:
- if (getParLanguage()->lang != "hebrew") {
+ if (getParLanguage(bparams)->lang() != "hebrew") {
os << "\\raggedright ";
column+= 13;
} else {
}
break;
case LYX_ALIGN_RIGHT:
- if (getParLanguage()->lang != "hebrew") {
+ if (getParLanguage(bparams)->lang() != "hebrew") {
os << "\\raggedleft ";
column+= 12;
} else {
int c = GetChar(i);
// 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(p->size()-1);
+ last_font = p->getFont(bparams, p->size()-1);
else
last_font = running_font;
// outside font change, i.e. we write "\textXX{text} "
// rather than "\textXX{text }". (Asger)
if (open_font && c == ' ' && i <= size() - 2
- && !getFont(i+1).equalExceptLatex(running_font)
- && !getFont(i+1).equalExceptLatex(font)) {
- font = getFont(i + 1);
+ && !getFont(bparams, i + 1).equalExceptLatex(running_font)
+ && !getFont(bparams, i + 1).equalExceptLatex(font)) {
+ font = getFont(bparams, i + 1);
}
// We end font definition before blanks
if (!font.equalExceptLatex(running_font) && open_font) {
}
// Blanks are printed before start of fontswitch
- if (c == ' '){
+ if (c == ' ') {
// Do not print the separation of the optional argument
if (i != main_body - 1) {
SimpleTeXBlanks(os, texrow, i,
column += running_font.latexWriteEndChanges(os, basefont, basefont);
open_font = false;
}
- basefont = getFont(-1);
+ basefont = getFont(bparams, -1);
running_font = basefont;
if (font.family() ==
LyXFont::TYPEWRITER_FAMILY) {
os << "~";
}
+ if (moving_arg)
+ os << "\\protect ";
os << "\\\\\n";
}
texrow.newline();
texrow.start(this, i + 1);
column = 0;
} else {
- SimpleTeXSpecialChars(os, texrow,
+ SimpleTeXSpecialChars(buf, bparams,
+ os, texrow, moving_arg,
font, running_font, basefont,
open_font, style, i, column, c);
}
if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE
&& (p = NextAfterFootnote()) != 0)
running_font.latexWriteEndChanges(os, basefont,
- p->getFont(0));
+ p->getFont(bparams, 0));
else
running_font.latexWriteEndChanges(os, basefont, basefont);
}
// This one spits out the text of a table paragraph
-bool LyXParagraph::SimpleTeXOneTablePar(ostream & os, TexRow & texrow)
+bool LyXParagraph::SimpleTeXOneTablePar(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow)
{
lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar... " << this << endl;
bool return_value = false;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
- GetLayout());
+ textclasslist.Style(bparams.textclass, GetLayout());
int column = 0;
if (!IsDummy()) { // it is dummy if it is in a float!!!
}
}
- LyXFont basefont = getFont(-1); // Get layout font
+ LyXFont basefont = getFont(bparams, -1); // Get layout font
// Which font is currently active?
LyXFont running_font = basefont;
LyXFont last_font;
texrow.start(this, 0);
+ bool is_rtl = getParLanguage(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)) {
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
// 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
basefont);
open_font = false;
}
- basefont = getFont(-1);
+ basefont = getFont(bparams, -1);
running_font = basefont;
++current_cell_number;
if (table->CellHasContRow(current_cell_number) >= 0) {
- TeXContTableRows(os, i + 1,
+ TeXContTableRows(buf, bparams, os, i + 1,
current_cell_number,
column, texrow);
}
+ 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(...)
}
texrow.start(this, i + 1);
} else {
- SimpleTeXSpecialChars(os, texrow,
+ SimpleTeXSpecialChars(buf, bparams,
+ os, texrow, false,
font, running_font, basefont,
open_font, style, i, column, c);
}
running_font.latexWriteEndChanges(os, basefont, basefont);
}
++current_cell_number;
+ if (is_rtl && !first_in_cell)
+ os << "}";
tmp = table->TexEndOfCell(os, current_cell_number);
for (; tmp > 0; --tmp)
texrow.newline();
// This one spits out the text off ContRows in tables
-bool LyXParagraph::TeXContTableRows(ostream & os,
+bool LyXParagraph::TeXContTableRows(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os,
LyXParagraph::size_type i,
int current_cell_number,
int & column, TexRow & texrow)
if (!table)
return false;
- char c;
-
bool return_value = false;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
- LyXFont basefont = getFont(-1); // Get layout font
+ LyXFont basefont = getFont(bparams, -1); // Get layout font
LyXFont last_font;
// Which font is currently active?
LyXFont running_font = basefont;
size_type lastpos = i;
int cell = table->CellHasContRow(current_cell_number);
++current_cell_number;
+ char c;
while(cell >= 0) {
// first find the right position
i = lastpos;
++column;
// Fully instantiated font
- LyXFont font = getFont(i);
+ LyXFont font = getFont(bparams, i);
last_font = running_font;
// Spaces at end of font change are simulated to
// "\textXX{text} " rather than "\textXX{text }".
// (Asger)
if (open_font && c == ' ' && i <= size() - 2
- && getFont(i + 1) != running_font
- && getFont(i + 1) != font) {
- font = getFont(i + 1);
+ && getFont(bparams, i + 1) != running_font
+ && getFont(bparams, i + 1) != font) {
+ font = getFont(bparams, i + 1);
}
// We end font definition before blanks
column += 9;
}
}
- SimpleTeXSpecialChars(os, texrow, font,
+ SimpleTeXSpecialChars(buf, bparams,
+ os, texrow, false, font,
running_font, basefont,
open_font, style, i, column, c);
}
basefont);
open_font = false;
}
- basefont = getFont(-1);
+ basefont = getFont(bparams, -1);
running_font = basefont;
cell = table->CellHasContRow(current_cell_number);
}
bool retval = false;
switch (c) {
case LyXParagraph::META_HFILL:
- sgml_string.clear();
+ sgml_string.erase();
break;
-#if 0
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- sgml_string = ' ';
- break;
-#endif
case LyXParagraph::META_NEWLINE:
sgml_string = '\n';
break;
sgml_string = ' ';
break;
case '\0': // Ignore :-)
- sgml_string.clear();
+ sgml_string.erase();
break;
default:
sgml_string = c;
}
-void LyXParagraph::SimpleDocBookOneTablePar(ostream & os, 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 = 0;
bool emph_flag = false;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
if (style.labeltype != LABEL_MANUAL)
++column;
// Fully instantiated font
- font2 = getFont(i);
+ font2 = getFont(bparams, i);
// Handle <emphasis> tag.
if (font1.emph() != font2.emph() && i) {
os << "</emphasis>";
emph_flag= false;
}
- font1 = font2 = getFont(-1);
+ font1 = font2 = getFont(bparams, -1);
++current_cell_number;
if (table->CellHasContRow(current_cell_number) >= 0) {
- DocBookContTableRows(os, extra, desc_on, i + 1,
+ DocBookContTableRows(buffer,
+ os, extra, desc_on, i + 1,
current_cell_number,
column);
}
inset = GetInset(i);
#ifdef HAVE_SSTREAM
std::ostringstream ost;
- inset->DocBook(ost);
+ inset->DocBook(buffer, ost);
string tmp_out = ost.str().c_str();
#else
ostrstream ost;
- inset->DocBook(ost);
+ inset->DocBook(buffer, ost);
ost << '\0';
char * ctmp = ost.str();
string tmp_out(ctmp);
}
-void LyXParagraph::DocBookContTableRows(ostream & os, 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;
int char_line_count = 0;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
GetLayout());
size_type main_body;
++column;
// Fully instantiated font
- font2 = getFont(i);
+ font2 = getFont(bparams, i);
// Handle <emphasis> tag.
if (font1.emph() != font2.emph() && i) {
inset = GetInset(i);
#ifdef HAVE_SSTREAM
std::ostringstream ost;
- inset->DocBook(ost);
+ inset->DocBook(buffer, ost);
string tmp_out = ost.str().c_str();
#else
ostrstream ost;
- inset->DocBook(ost);
+ inset->DocBook(buffer, ost);
ost << '\0';
char * ctmp = ost.str();
string tmp_out(ctmp);
os << "</emphasis>";
emph_flag= false;
}
- font1 = font2 = getFont(-1);
+ font1 = font2 = getFont(bparams, -1);
cell = table->CellHasContRow(current_cell_number);
}
lyxerr[Debug::LATEX] << "DocBookContTableRows...done " << this << endl;
}
-void LyXParagraph::SimpleTeXSpecialChars(ostream & os, TexRow & texrow,
+void LyXParagraph::SimpleTeXSpecialChars(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow,
+ bool moving_arg,
LyXFont & font,
LyXFont & running_font,
LyXFont & basefont,
&& running_font.isRightToLeft()) {
os << "\\L{";
close = true;
- } else if (inset->LyxCode() == Inset::NUMBER_CODE
- && running_font.isRightToLeft()) {
- os << "{\\beginL ";
- close = true;
}
- int tmp = inset->Latex(os, style.isCommand(),
+ int tmp = inset->Latex(buf, os, moving_arg,
style.free_spacing);
if (close)
- if (inset->LyxCode() == Inset::NUMBER_CODE)
- os << "\\endL}";
- else
- os << "}";
+ os << "}";
if (tmp) {
column = 0;
basefont);
open_font = false;
}
- basefont = getFont(-1);
+ basefont = getFont(bparams, -1);
running_font = basefont;
break;
// but I'll leave it as a switch statement
// so its simpler to extend. (ARRae)
switch (c) {
-#if 0
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- os << ' ';
- break;
-#endif
default:
// make sure that we will not print
// error generating chars to the tex
} else {
// Plain mode (i.e. not LaTeX)
switch (c) {
-#if 0
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- os << '~';
- break;
-#endif
case '\\':
os << "\\textbackslash{}";
column += 15;
case '°': case '±': case '²': case '³':
case '×': case '÷': case '¹': case 'ª':
case 'º': case '¬': case 'µ':
- if (current_view->buffer()->params.inputenc == "latin1") {
+ if (bparams.inputenc == "latin1") {
os << "\\ensuremath{"
<< c
<< '}';
break;
case '£':
- if (current_view->buffer()->params.inputenc == "default") {
+ if (bparams.inputenc == "default") {
os << "\\pounds{}";
column += 8;
} else {
}
-#if 0
-bool LyXParagraph::RoffContTableRows(ostream & os,
- LyXParagraph::size_type i,
- int actcell)
-{
- if (!table)
- return false;
-
- LyXFont font1(LyXFont::ALL_INHERIT);
- LyXFont font2;
- Inset * inset;
- char c;
-
- string fname2 = TmpFileName(string(), "RAT2");
- int lastpos = i;
- int cell = table->CellHasContRow(actcell);
- ++actcell;
- while(cell >= 0) {
- // first find the right position
- i = lastpos;
- for (; i < size() && actcell < cell; ++i) {
- c = GetChar(i);
- if (c == LyXParagraph::META_NEWLINE)
- ++actcell;
- }
- lastpos = i;
- c = GetChar(i);
- if ((c != ' ') && (c != LyXParagraph::META_NEWLINE))
- os << " ";
- for (; i < size()
- && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
- ++i) {
- font2 = GetFontSettings(i);
- if (font1.latex() != font2.latex()) {
- if (font2.latex() != LyXFont::OFF)
- continue;
- }
- c = GetChar(i);
- switch (c) {
- case LyXParagraph::META_INSET:
- if ((inset = GetInset(i))) {
-#if 1
-#ifdef HAVE_SSTREAM
- stringstream ss(ios::in | ios::out);
- inset->Latex(ss, -1);
- ss.seekp(0);
- ss.get(c);
- while (!ss) {
- if (c == '\\')
- os << "\\\\";
- else
- os << c;
- ss.get(c);
- }
-#else
- strstream ss;
- inset->Latex(ss, -1);
- ss.seekp(0);
- ss.get(c);
- while (!ss) {
- if (c == '\\')
- os << "\\\\";
- else
- os << c;
- ss.get(c);
- }
- delete [] ss.str();
-#endif
-#else
- 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();
-#endif
- }
- break;
- case LyXParagraph::META_NEWLINE:
- break;
- case LyXParagraph::META_HFILL:
- break;
-#if 0
- case LyXParagraph::META_PROTECTED_SEPARATOR:
- break;
-#endif
- case '\\':
- os << "\\\\";
- break;
- default:
- if (c != '\0')
- os << c;
- else
- lyxerr.debug() << "RoffAsciiTable: "
- "NULL char in structure."
- << endl;
- break;
- }
- }
- cell = table->CellHasContRow(actcell);
- }
- return true;
-}
-#endif
-
-
-LyXParagraph * LyXParagraph::TeXDeeper(ostream & os, TexRow & texrow,
+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(os, texrow,
+ par = par->TeXEnvironment(buf, bparams,
+ os, texrow,
foot, foot_texrow,
foot_count);
} else {
- par = par->TeXOnePar(os, texrow,
+ par = par->TeXOnePar(buf, bparams,
+ os, texrow, false,
foot, foot_texrow,
foot_count);
}
}
-LyXParagraph * LyXParagraph::TeXEnvironment(ostream & os, TexRow & texrow,
+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) {
} else if (style.labeltype == LABEL_BIBLIO) {
// ale970405
os << "\\begin{" << style.latexname() << "}{"
- << bibitemWidthest(current_view->painter())
+ << bibitemWidest(current_view->painter())
<< "}\n";
} else if (style.latextype == LATEX_ITEM_ENVIRONMENT) {
#ifdef FANCY_FOOTNOTE_CODE
}
LyXParagraph * par = this;
do {
- par = par->TeXOnePar(os, texrow,
+ par = par->TeXOnePar(buf, bparams,
+ os, texrow, false,
foot, foot_texrow, foot_count);
if (minipage_open && par && !style.isEnvironment() &&
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
// Thinko!
os << '\n';
texrow.newline();
}
- par = par->TeXDeeper(os, texrow,
+ par = par->TeXDeeper(buf, bparams, os, texrow,
foot, foot_texrow, foot_count);
}
if (par && par->layout == layout && par->depth == depth &&
} while (par
&& par->layout == layout
&& par->depth == depth
- && par->pextra_type == pextra_type);
+ && par->pextra_type == pextra_type
+ && par->footnoteflag == footnoteflag);
if (style.isEnvironment()) {
os << "\\end{" << style.latexname() << '}';
}
-LyXParagraph * LyXParagraph::TeXFootnote(ostream & os, TexRow & texrow,
+#ifndef NEW_INSETS
+LyXParagraph * LyXParagraph::TeXFootnote(Buffer const * buf,
+ BufferParams const & bparams,
+ ostream & os, TexRow & texrow,
ostream & foot, TexRow & foot_texrow,
int & foot_count,
- LyXDirection parent_direction)
+ bool parent_is_rtl)
{
lyxerr[Debug::LATEX] << "TeXFootnote... " << this << endl;
if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
LyXParagraph * par = this;
LyXLayout const & style =
- textclasslist.Style(current_view->buffer()->params.textclass,
+ textclasslist.Style(bparams.textclass,
previous->GetLayout());
if (style.needprotect && footnotekind != LyXParagraph::FOOTNOTE){
texrow.newline();
}
+ bool moving_arg = false;
bool need_closing = false;
- LyXDirection direction = getParDirection();
- if (direction != parent_direction) {
- if (direction == LYX_DIR_LEFT_TO_RIGHT)
- os << "\\L{";
- else
+ 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) {
os << "\\thanks{\n";
footer_in_body = false;
+ moving_arg = true;
} else {
if (foot_count == -1) {
// we're at depth 0 so we can use:
<< "\\textwidth}\n";
} else {
os << "\\begin{figure}";
- if (!params->float_placement.empty()) {
- os << '[' << params->float_placement << "]\n";
+ if (!bparams.float_placement.empty()) {
+ os << '[' << bparams.float_placement << "]\n";
} else {
os << '\n';
}
break;
case LyXParagraph::TAB:
os << "\\begin{table}";
- if (!params->float_placement.empty()) {
- os << '[' << params->float_placement << "]\n";
+ if (!bparams.float_placement.empty()) {
+ os << '[' << bparams.float_placement << "]\n";
} else {
os << '\n';
}
break;
case LyXParagraph::WIDE_FIG:
os << "\\begin{figure*}";
- if (!params->float_placement.empty()) {
- os << '[' << params->float_placement << "]\n";
+ if (!bparams.float_placement.empty()) {
+ os << '[' << bparams.float_placement << "]\n";
} else {
os << '\n';
}
break;
case LyXParagraph::WIDE_TAB:
os << "\\begin{table*}";
- if (!params->float_placement.empty()) {
- os << '[' << params->float_placement << "]\n";
+ if (!bparams.float_placement.empty()) {
+ os << '[' << bparams.float_placement << "]\n";
} else {
os << '\n';
}
do {
LyXLayout const & style =
textclasslist
- .Style(current_view->buffer()->params
- .textclass,
- par->layout);
+ .Style(bparams.textclass, par->layout);
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
<< endl;
// environments. Shouldn't be circular because
// we don't support footnotes inside
// floats (yet). ARRae
- par = par->TeXEnvironment(os, texrow,
+ par = par->TeXEnvironment(buf, bparams, os,
+ texrow,
foot, foot_texrow,
foot_count);
} else {
- par = par->TeXOnePar(os, texrow,
+ par = par->TeXOnePar(buf, bparams,
+ os, texrow, moving_arg,
foot, foot_texrow,
foot_count);
}
if (par && !par->IsDummy() && par->depth > depth) {
- par = par->TeXDeeper(os, texrow,
+ par = par->TeXDeeper(buf, bparams, os, texrow,
foot, foot_texrow,
foot_count);
}
do {
LyXLayout const & style =
textclasslist
- .Style(current_view->buffer()->params
- .textclass,
- par->layout);
+ .Style(bparams.textclass, par->layout);
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
<< endl;
// environments. Shouldn't be circular because
// we don't support footnotes inside
// floats (yet). ARRae
- par = par->TeXEnvironment(foot, foot_texrow,
+ par = par->TeXEnvironment(buf, bparams,
+ foot, foot_texrow,
dummy, dummy_texrow,
dummy_count);
} else {
- par = par->TeXOnePar(foot, foot_texrow,
+ par = par->TeXOnePar(buf, bparams,
+ foot, foot_texrow,
+ moving_arg,
dummy, dummy_texrow,
dummy_count);
}
if (par && !par->IsDummy() && par->depth > depth) {
- par = par->TeXDeeper(foot, foot_texrow,
+ par = par->TeXDeeper(buf, bparams,
+ foot, foot_texrow,
dummy, dummy_texrow,
dummy_count);
}
return (footnoteflag == LyXParagraph::NO_FOOTNOTE && previous
&& previous->footnoteflag != LyXParagraph::NO_FOOTNOTE);
}
+#endif
-
-void LyXParagraph::SetPExtraType(int type, char const * width,
+void LyXParagraph::SetPExtraType(BufferParams const & bparams,
+ int type, char const * width,
char const * widthp)
{
pextra_type = type;
pextra_width = width;
pextra_widthp = widthp;
- if (textclasslist.Style(current_view->buffer()->params.textclass,
+ if (textclasslist.Style(bparams.textclass,
layout).isEnvironment()) {
LyXParagraph
* par = this,
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();
}
return IsWordChar(GetChar(pos)) ;
}
-Language const * LyXParagraph::getParLanguage() const
+
+Language const *
+LyXParagraph::getParLanguage(BufferParams const & bparams) const
{
- if (!table && size() > 0)
- return FirstPhysicalPar()->GetFirstFontSettings().language();
+ 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();
+ return previous->getParLanguage(bparams);
else
- return current_view->buffer()->params.language_info;
+ return bparams.language_info;
}
-Language const * LyXParagraph::getLetterLanguage(size_type pos) const
+
+bool LyXParagraph::isRightToLeftPar(BufferParams const & bparams) const
{
- return GetFontSettings(pos).language();
+ return lyxrc.rtl_support && !table
+ && getParLanguage(bparams)->RightToLeft();
}
-LyXDirection LyXParagraph::getParDirection() const
+
+void LyXParagraph::ChangeLanguage(BufferParams const & bparams,
+ Language const * from, Language const * to)
{
- if (!lyxrc.rtl_support || table)
- return LYX_DIR_LEFT_TO_RIGHT;
- else if (getParLanguage()->RightToLeft)
- return LYX_DIR_RIGHT_TO_LEFT;
- else
- return LYX_DIR_LEFT_TO_RIGHT;
+ for(size_type i = 0; i < size(); ++i) {
+ LyXFont font = GetFontSettings(bparams, i);
+ if (font.language() == from) {
+ font.setLanguage(to);
+ SetFont(i, font);
+ }
+ }
}
-LyXDirection
-LyXParagraph::getLetterDirection(LyXParagraph::size_type pos) const
+
+bool LyXParagraph::isMultiLingual(BufferParams const & bparams)
{
- if (!lyxrc.rtl_support)
- return LYX_DIR_LEFT_TO_RIGHT;
- else if (table && IsNewline(pos))
- return LYX_DIR_LEFT_TO_RIGHT;
-
- bool is_rtl = GetFontSettings(pos).isVisibleRightToLeft();
- if (IsLineSeparator(pos) && 0 < pos && pos < Last() - 1
- && !IsLineSeparator(pos + 1)
- && !(table && IsNewline(pos + 1))
- && ( GetFontSettings(pos - 1).isVisibleRightToLeft() != is_rtl
- || GetFontSettings(pos + 1).isVisibleRightToLeft() != is_rtl))
- return getParDirection();
- else
- return (is_rtl) ? LYX_DIR_RIGHT_TO_LEFT
- : LYX_DIR_LEFT_TO_RIGHT;
+ 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<UpdatableInset *>
+ ((*cit).inset)->deleteLyXText(bv);
+ }
+ }
+ }
}
projects / lyx.git / blobdiff