* 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 <fstream>
+using std::fstream;
+using std::ios;
+
#include "lyxparagraph.h"
#include "support/textutils.h"
#include "lyxrc.h"
#include "tex-strings.h"
#include "bufferparams.h"
#include "support/FileInfo.h"
+#include "support/LAssert.h"
#include "debug.h"
#include "LaTeXFeatures.h"
#include "insets/insetinclude.h"
+#include "insets/insetbib.h"
#include "support/filetools.h"
#include "lyx_gui_misc.h"
#include "texrow.h"
-extern void addNewlineAndDepth(string & file, int const depth); // Jug 990923
-extern unsigned char GetCurrentTextClass(); // this should be fixed/removed
+#ifdef USE_OSTREAM_ONLY
+#include "support/lyxmanip.h"
+#else
+extern void addNewlineAndDepth(string & file, int depth); // Jug 990923
+#endif
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)
// ale970405
-extern string bibitemWidthest();
+extern string bibitemWidthest(Painter &);
-/* this is a minibuffer */
+// this is a minibuffer
static char minibuffer_char;
static LyXFont minibuffer_font;
static Inset * minibuffer_inset;
itemdepth = 0;
next = 0;
previous = 0;
-#ifndef NEW_TABLE
- fonttable = 0;
- insettable = 0;
-#endif
footnoteflag = LyXParagraph::NO_FOOTNOTE;
-
+ footnotekind = LyXParagraph::FOOTNOTE; // should not be needed
+
align = LYX_ALIGN_BLOCK;
/* table stuff -- begin*/
}
-/* this konstruktor inserts the new paragraph in a list */
+// This konstruktor inserts the new paragraph in a list.
LyXParagraph::LyXParagraph(LyXParagraph * par)
{
text.reserve(500);
appendix = false;
enumdepth = 0;
itemdepth = 0;
+ // double linked list begin
next = par->next;
if (next)
next->previous = this;
previous = par;
previous->next = this;
-#ifndef NEW_TABLE
- fonttable = 0;
- insettable = 0;
-#endif
+ // end
footnoteflag = LyXParagraph::NO_FOOTNOTE;
footnotekind = LyXParagraph::FOOTNOTE;
}
-void LyXParagraph::writeFile(FILE * file, BufferParams & params,
- char footflag, char dth)
+void LyXParagraph::writeFile(ostream & os, BufferParams const & params,
+ char footflag, char dth) const
{
LyXFont font1, font2;
- Inset * inset;
int column = 0;
int h = 0;
char c = 0;
|| !previous
|| previous->footnoteflag == LyXParagraph::NO_FOOTNOTE){
- /* The beginning or the end of a footnote environment? */
+ // The beginning or the end of a footnote environment?
if (footflag != footnoteflag) {
footflag = footnoteflag;
if (footflag) {
- fprintf(file, "\n\\begin_float %s ",
- string_footnotekinds[footnotekind]);
- }
- else {
- fprintf(file, "\n\\end_float ");
+ os << "\n\\begin_float "
+ << string_footnotekinds[footnotekind]
+ << " ";
+ } else {
+ os << "\n\\end_float ";
}
}
- /* The beginning or end of a deeper (i.e. nested) area? */
+ // The beginning or end of a deeper (i.e. nested) area?
if (dth != depth) {
if (depth > dth) {
while (depth > dth) {
- fprintf(file, "\n\\begin_deeper ");
- dth++;
+ os << "\n\\begin_deeper ";
+ ++dth;
}
- }
- else {
+ } else {
while (depth < dth) {
- fprintf(file, "\n\\end_deeper ");
- dth--;
+ os << "\n\\end_deeper ";
+ --dth;
}
}
}
- /* First write the layout */
- fprintf(file, "\n\\layout %s\n",
- textclasslist.NameOfLayout(params.textclass, layout)
- .c_str());
+ // First write the layout
+ os << "\n\\layout "
+ << textclasslist.NameOfLayout(params.textclass, layout)
+ << "\n";
- /* maybe some vertical spaces */
+ // Maybe some vertical spaces.
if (added_space_top.kind() != VSpace::NONE)
- fprintf(file, "\\added_space_top %s ",
- added_space_top.asLyXCommand().c_str());
+ os << "\\added_space_top "
+ << added_space_top.asLyXCommand() << " ";
if (added_space_bottom.kind() != VSpace::NONE)
- fprintf(file, "\\added_space_bottom %s ",
- added_space_bottom.asLyXCommand().c_str());
+ os << "\\added_space_bottom "
+ << added_space_bottom.asLyXCommand() << " ";
- /* The labelwidth string used in lists */
+ // The labelwidth string used in lists.
if (!labelwidthstring.empty())
- fprintf(file, "\\labelwidthstring %s\n",
- labelwidthstring.c_str());
+ os << "\\labelwidthstring "
+ << labelwidthstring << '\n';
- /* Lines above or below? */
+ // Lines above or below?
if (line_top)
- fprintf(file, "\\line_top ");
+ os << "\\line_top ";
if (line_bottom)
- fprintf(file, "\\line_bottom ");
+ os << "\\line_bottom ";
- /* Pagebreaks above or below? */
+ // Pagebreaks above or below?
if (pagebreak_top)
- fprintf(file, "\\pagebreak_top ");
+ os << "\\pagebreak_top ";
if (pagebreak_bottom)
- fprintf(file, "\\pagebreak_bottom ");
+ os << "\\pagebreak_bottom ";
- /* Start of appendix? */
+ // Start of appendix?
if (start_of_appendix)
- fprintf(file, "\\start_of_appendix ");
+ os << "\\start_of_appendix ";
- /* Noindent? */
+ // Noindent?
if (noindent)
- fprintf(file, "\\noindent ");
+ os << "\\noindent ";
- /* Alignment? */
+ // Alignment?
if (align != LYX_ALIGN_LAYOUT) {
switch (align) {
case LYX_ALIGN_LEFT: h = 1; break;
case LYX_ALIGN_CENTER: h = 3; break;
default: h = 0; break;
}
- fprintf(file, "\\align %s ", string_align[h]);
+ os << "\\align " << string_align[h] << " ";
}
if (pextra_type != PEXTRA_NONE) {
- fprintf(file, "\\pextra_type %d", pextra_type);
+ os << "\\pextra_type " << pextra_type;
if (pextra_type == PEXTRA_MINIPAGE) {
- fprintf(file, " \\pextra_alignment %d",
- pextra_alignment);
+ os << " \\pextra_alignment "
+ << pextra_alignment;
if (pextra_hfill)
- fprintf(file, " \\pextra_hfill %d",
- pextra_hfill);
+ os << " \\pextra_hfill "
+ << pextra_hfill;
if (pextra_start_minipage)
- fprintf(file,
- " \\pextra_start_minipage %d",
- pextra_start_minipage);
+ os << " \\pextra_start_minipage "
+ << pextra_start_minipage;
}
if (!pextra_width.empty()) {
- fprintf(file, " \\pextra_width %s",
- VSpace(pextra_width)
- .asLyXCommand().c_str());
+ os << " \\pextra_width "
+ << VSpace(pextra_width).asLyXCommand();
} else if (!pextra_widthp.empty()) {
- fprintf(file, " \\pextra_widthp %s",
- pextra_widthp.c_str());
+ os << " \\pextra_widthp "
+ << pextra_widthp;
}
- fprintf(file, "\n");
+ os << '\n';
}
- }
- else {
- /* Dummy layout. This means that a footnote ended */
- fprintf(file, "\n\\end_float ");
+ } else {
+ // Dummy layout. This means that a footnote ended.
+ os << "\n\\end_float ";
footflag = LyXParagraph::NO_FOOTNOTE;
}
- /* It might be a table */
+ // It might be a table.
if (table){
- fprintf(file, "\\LyXTable\n");
- table->Write(file);
+ os << "\\LyXTable\n";
+ table->Write(os);
}
// bibitem ale970302
if (bibkey)
- bibkey->Write(file);
+ bibkey->Write(os);
font1 = LyXFont(LyXFont::ALL_INHERIT);
column = 0;
- for (size_type i = 0; i < size(); i++) {
- if (!i){
- fprintf(file, "\n");
+ for (size_type i = 0; i < size(); ++i) {
+ if (!i) {
+ os << "\n";
column = 0;
}
// Write font changes
font2 = GetFontSettings(i);
if (font2 != font1) {
- font2.lyxWriteChanges(font1, file);
+ font2.lyxWriteChanges(font1, os);
column = 0;
font1 = font2;
}
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(file);
+ inset->Write(os);
} else {
- fprintf(file, "\n\\begin_inset ");
- inset->Write(file);
- fprintf(file, "\n\\end_inset \n");
- fprintf(file, "\n");
+ os << "\n\\begin_inset ";
+ inset->Write(os);
+ os << "\n\\end_inset \n\n";
column = 0;
}
- break;
+ }
+ break;
case META_NEWLINE:
- fprintf(file, "\n\\newline \n");
+ os << "\n\\newline \n";
column = 0;
break;
case META_HFILL:
- fprintf(file, "\n\\hfill \n");
+ os << "\n\\hfill \n";
column = 0;
break;
+#if 0
case META_PROTECTED_SEPARATOR:
- fprintf(file, "\n\\protected_separator \n");
+ os << "\n\\protected_separator \n";
column = 0;
break;
- case '\\':
- fprintf(file, "\n\\backslash \n");
+#endif
+ case '\\':
+ os << "\n\\backslash \n";
column = 0;
break;
case '.':
if (i + 1 < size() && GetChar(i + 1) == ' ') {
- fprintf(file, ".\n");
+ os << ".\n";
column = 0;
} else
- fprintf(file, ".");
+ os << ".";
break;
default:
if ((column > 70 && c == ' ')
- || column > 79){
- fprintf(file, "\n");
+ || column > 79) {
+ os << "\n";
column = 0;
}
// this check is to amend a bug. LyX sometimes
// inserts '\0' this could cause problems.
if (c != '\0')
- fprintf(file, "%c", c);
+ os << c;
else
lyxerr << "ERROR (LyXParagraph::writeFile):"
" NULL char in structure." << endl;
- column++;
+ ++column;
break;
}
}
// now write the next paragraph
if (next)
- next->writeFile(file, params, footflag, dth);
+ next->writeFile(os, params, footflag, dth);
}
-void LyXParagraph::validate(LaTeXFeatures & features)
+void LyXParagraph::validate(LaTeXFeatures & features) const
{
// this will be useful later
- LyXLayout const & layout = textclasslist.Style(GetCurrentTextClass(),
- GetLayout());
+ LyXLayout const & layout =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
// check the params.
if (line_top || line_bottom)
// then the layouts
features.layout[GetLayout()] = true;
-#ifdef NEW_TABLE
+ // then the fonts
for (FontList::const_iterator cit = fontlist.begin();
cit != fontlist.end(); ++cit) {
if ((*cit).font.noun() == LyXFont::ON) {
<< endl;
}
switch ((*cit).font.color()) {
- case LyXFont::NONE:
- case LyXFont::INHERIT_COLOR:
- case LyXFont::IGNORE_COLOR: break;
- default:
- features.color = true;
- lyxerr[Debug::LATEX] << "Color enabled. Font: "
- << (*cit).font.stateText()
- << endl;
- }
- }
-#else
- // then the fonts
- 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:
+ case LColor::none:
+ case LColor::inherit:
+ case LColor::ignore:
break;
default:
features.color = true;
lyxerr[Debug::LATEX] << "Color enabled. Font: "
- << tmpfonttable->font.stateText()
+ << (*cit).font.stateText()
<< endl;
}
- tmpfonttable = tmpfonttable->next;
}
-#endif
-#ifdef NEW_TABLE
+
+ // then the insets
for (InsetList::const_iterator cit = insetlist.begin();
cit != insetlist.end(); ++cit) {
- (*cit).inset->Validate(features);
+ if ((*cit).inset)
+ (*cit).inset->Validate(features);
}
-#else
- // then the insets
- InsetTable * tmpinsettable = insettable;
- while (tmpinsettable) {
- if (tmpinsettable->inset) {
- tmpinsettable->inset->Validate(features);
- }
- tmpinsettable = tmpinsettable->next;
- }
-#endif
+
if (table && table->IsLongTable())
features.longtable = true;
if (pextra_type == PEXTRA_INDENT)
}
-/* first few functions needed for cut and paste and paragraph breaking */
+// First few functions needed for cut and paste and paragraph breaking.
void LyXParagraph::CopyIntoMinibuffer(LyXParagraph::size_type pos) const
{
minibuffer_char = GetChar(pos);
}
}
+
void LyXParagraph::CutIntoMinibuffer(LyXParagraph::size_type pos)
{
minibuffer_char = GetChar(pos);
// This is a little hack since I want exactly
// the inset, not just a clone. Otherwise
// the inset would be deleted when calling Erase(pos)
-#ifdef NEW_TABLE
+ // find the entry
for (InsetList::iterator it = insetlist.begin();
it != insetlist.end(); ++it) {
if ((*it).pos == pos) {
(*it).inset = 0;
break;
}
+
}
-#else
- /* find the entry */
- InsetTable * tmpi = insettable;
- while (tmpi && tmpi->pos != pos) {
- tmpi= tmpi->next;
- }
- if (tmpi) { /* This should always be true */
- tmpi->inset = 0;
- }
-#endif
} else {
minibuffer_inset = 0;
minibuffer_char = ' ';
}
- /* Erase(pos); now the caller is responsible for that*/
+ // Erase(pos); now the caller is responsible for that.
}
InsertInset(pos, minibuffer_inset);
}
-/* end of minibuffer */
+// end of minibuffer
}
-/* the destructor removes the new paragraph from the list */
+// the destructor removes the new paragraph from the list
LyXParagraph::~LyXParagraph()
{
if (previous)
if (next)
next->previous = previous;
-#ifndef NEW_TABLE
- 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;
- }
- }
-
- FontTable * tmpfont;
- while (fonttable) {
- tmpfont = fonttable;
- fonttable = fonttable->next;
- delete tmpfont;
+ for (InsetList::iterator it = insetlist.begin();
+ it != insetlist.end(); ++it) {
+ delete (*it).inset;
}
-#endif
/* table stuff -- begin*/
- if (table)
- delete table;
+ delete table;
/* table stuff -- end*/
// ale970302
- if (bibkey)
- delete bibkey;
+ delete bibkey;
}
void LyXParagraph::Erase(LyXParagraph::size_type pos)
{
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
if (pos > size()) {
if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
NextAfterFootnote()->Erase(pos - text.size() - 1);
return;
}
if (pos < size()) { // last is free for insertation, but should be empty
-#ifdef NEW_TABLE
- /* if it is an inset, delete the inset entry */
+ // if it is an inset, delete the inset entry
if (text[pos] == LyXParagraph::META_INSET) {
- /* find the entry */
- for(InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
+ // find the entry
+ for (InsetList::iterator it = insetlist.begin();
+ it != insetlist.end(); ++it) {
if ((*it).pos == pos) {
delete (*it).inset;
insetlist.erase(it);
}
}
}
-#else
- /* if it is an inset, delete the inset entry */
- if (text[pos] == LyXParagraph::META_INSET) {
- /* find the entry */
- 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;
- }
- }
-#endif
text.erase(text.begin() + pos);
-#ifdef NEW_TABLE
- /* erase entries in the tables */
- for(FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
+ // 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;
}
}
}
-
- /* update all other entries */
- for(FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
+ // 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--;
}
-
- /* update the inset table */
- for(InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
+
+ // Update the inset table.
+ for (InsetList::iterator it = insetlist.begin();
+ it != insetlist.end(); ++it) {
if ((*it).pos > pos)
(*it).pos--;
}
-#else
- /* erase entries in the tables */
- 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 */
-
- tmp = fonttable;
- while (tmp) {
- if (tmp->pos > pos)
- tmp->pos--;
- if (tmp->pos_end >= pos)
- tmp->pos_end--;
- tmp = tmp->next;
- }
-
- /* update the inset table */
- InsetTable * tmpi = insettable;
- while (tmpi) {
- if (tmpi->pos > pos)
- tmpi->pos--;
- tmpi= tmpi->next;
- }
-#endif
} else {
lyxerr << "ERROR (LyXParagraph::Erase): "
"can't erase non-existant char." << endl;
void LyXParagraph::InsertChar(LyXParagraph::size_type pos, char c)
{
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
if (pos > size()) {
if (next
&& next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
return;
}
text.insert(text.begin() + pos, c);
-#ifdef NEW_TABLE
- // update the font table
- for(FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
+ // 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++;
}
- // update the inset table
- for(InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
+
+ // Update the inset table.
+ for (InsetList::iterator it = insetlist.begin();
+ it != insetlist.end(); ++it) {
if ((*it).pos >= pos)
(*it).pos++;
}
-#else
- /* update the font table */
- FontTable * tmp = fonttable;
- while (tmp) {
- if (tmp->pos >= pos)
- tmp->pos++;
- if (tmp->pos_end >= pos)
- tmp->pos_end++;
- tmp = tmp->next;
- }
-
- /* update the inset table */
- InsetTable * tmpi = insettable;
- while (tmpi) {
- if (tmpi->pos >= pos)
- tmpi->pos++;
- tmpi= tmpi->next;
- }
-#endif
}
void LyXParagraph::InsertInset(LyXParagraph::size_type pos,
Inset * inset)
{
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
if (pos > size()) {
if (next
&& next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
return;
}
-#ifdef NEW_TABLE
- if (inset) {
- InsetTable tmp;
- tmp.pos = pos;
- tmp.inset = inset;
- insetlist.push_back(tmp);
- }
-
-#else
if (inset) {
- /* add a new entry in the inset table */
- InsetTable * tmpi = new InsetTable;
- tmpi->pos = pos;
- tmpi->inset = inset;
- tmpi->next = insettable;
- insettable = tmpi;
+ // Add a new entry in the inset table.
+ InsetList::iterator it =
+ insetlist.insert(insetlist.begin(), InsetTable());
+ (*it).inset = inset;
+ (*it).pos = pos;
}
-#endif
}
}
return 0;
}
-#ifdef NEW_TABLE
- /* find the inset */
- for(InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
+ // Find the inset.
+ for (InsetList::iterator it = insetlist.begin();
+ it != insetlist.end(); ++it) {
if ((*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 ' '????
+ 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)
+ // 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 crashes. (Asger)
+ // as well replace it with a space to prevent craches. (Asger)
return 0;
-#else
- /* find the inset */
- 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
}
}
return 0;
}
-#ifdef NEW_TABLE
- /* find the inset */
- for(InsetList::const_iterator cit = insetlist.begin();
- cit != insetlist.end(); ++cit) {
+ // Find the inset.
+ for (InsetList::const_iterator cit = insetlist.begin();
+ cit != insetlist.end(); ++cit) {
if ((*cit).pos == pos) {
return (*cit).inset;
}
}
lyxerr << "ERROR (LyXParagraph::GetInset): "
"Inset does not exist: " << pos << endl;
- text[pos] = ' '; /// WHY!!! does this set the pos to ' '????
+ //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)
+ // 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 crashes. (Asger)
+ // as well replace it with a space to prevent craches. (Asger)
return 0;
-#else
- /* find the inset */
- 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
}
LyXFont LyXParagraph::GetFontSettings(LyXParagraph::size_type pos) const
{
if (pos < size()) {
-#ifdef NEW_TABLE
- for(FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
- if (pos >= (*it).pos && pos <= (*it).pos_end)
- return (*it).font;
- }
-#else
- FontTable * tmp = fonttable;
- while (tmp) {
- if (pos >= tmp->pos && pos <= tmp->pos_end)
- return tmp->font;
- tmp = tmp->next;
+ for (FontList::const_iterator cit = fontlist.begin();
+ cit != fontlist.end(); ++cit) {
+ if (pos >= (*cit).pos && pos <= (*cit).pos_end)
+ return (*cit).font;
}
-#endif
}
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
else if (pos > size()) {
if (next
&& next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
else {
// Why is it an error to ask for the font of a
// position that does not exist? Would it be
- // enough for this to be anable on debug?
+ // enough for this to be enabled on debug?
// We want strict error checking, but it's ok to only
// have it when debugging. (Asger)
lyxerr << "ERROR (LyXParagraph::GetFontSettings): "
"position does not exist. "
<< pos << " (" << static_cast<int>(pos)
- << ")\n";
+ << ")" << endl;
}
} else if (pos) {
return GetFontSettings(pos - 1);
LyXFont LyXParagraph::getFont(LyXParagraph::size_type pos) const
{
LyXFont tmpfont;
- LyXLayout const & layout = textclasslist.Style(GetCurrentTextClass(),
- GetLayout());
+ LyXLayout const & layout =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
LyXParagraph::size_type main_body = 0;
if (layout.labeltype == LABEL_MANUAL)
main_body = BeginningOfMainBody();
tmpfont = layout.font;
else
tmpfont = layout.labelfont;
+ if (getParDirection() == LYX_DIR_RIGHT_TO_LEFT)
+ tmpfont.setDirection(LyXFont::RTL_DIR);
}
// check for environment font information
par = par->DepthHook(par_depth - 1);
if (par) {
tmpfont.realize(textclasslist.
- Style(GetCurrentTextClass(),
+ Style(current_view->buffer()->params.textclass,
par->GetLayout()).font);
par_depth = par->GetDepth();
}
}
- tmpfont.realize(textclasslist.TextClass(GetCurrentTextClass()).defaultfont());
+ tmpfont.realize(textclasslist
+ .TextClass(current_view->buffer()->params.textclass)
+ .defaultfont());
return tmpfont;
}
/// Returns the height of the highest font in range
-LyXFont::FONT_SIZE LyXParagraph::HighestFontInRange(LyXParagraph::size_type startpos, LyXParagraph::size_type endpos) const
+LyXFont::FONT_SIZE
+LyXParagraph::HighestFontInRange(LyXParagraph::size_type startpos,
+ LyXParagraph::size_type endpos) const
{
LyXFont::FONT_SIZE maxsize = LyXFont::SIZE_TINY;
-#ifdef NEW_TABLE
- for(FontList::const_iterator cit = fontlist.begin();
- cit != fontlist.end(); ++cit) {
+ 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;
- }
-#endif
return maxsize;
}
char LyXParagraph::GetChar(LyXParagraph::size_type pos)
{
-#ifdef DEVEL_VERSION
- /* a workaround to 'fix' some bugs in text-class */
- if (pos < 0) {
- // This function is important. It should not work around bugs.
- // Let's find the bugs instead and fix them. (Asger)
- lyxerr << "FATAL ERROR (LyXParagraph::GetChar):"
- " bad position " << pos << endl;
- abort();
- }
-#endif
+ Assert(pos >= 0);
if (pos < size()) {
return text[pos];
}
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
else if (pos > size()) {
if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
return NextAfterFootnote()
"position does not exist."
<< pos << " (" << static_cast<int>(pos)
<< ")\n";
+ // Assert(false); // This triggers sometimes...
+ // Why?
}
return '\0';
} else {
- /* we should have a footnote environment */
+ // We should have a footnote environment.
if (!next || next->footnoteflag == LyXParagraph::NO_FOOTNOTE) {
// Notice that LyX does request the
// last char from time to time. (Asger)
char LyXParagraph::GetChar(LyXParagraph::size_type pos) const
{
-#ifdef DEVEL_VERSION
- /* a workaround to 'fix' some bugs in text-class */
- if (pos < 0) {
- // This function is important. It should not work around bugs.
- // Let's find the bugs instead and fix them. (Asger)
- lyxerr << "FATAL ERROR (LyXParagraph::GetChar):"
- " bad position " << pos << endl;
- abort();
- }
-#endif
+ Assert(pos >= 0);
if (pos < size()) {
return text[pos];
}
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
else if (pos > size()) {
if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
return NextAfterFootnote()
->GetChar(pos - text.size() - 1);
else {
- lyxerr << "ERROR (LyXParagraph::GetChar): "
+ lyxerr << "ERROR (LyXParagraph::GetChar const): "
"position does not exist."
<< pos << " (" << static_cast<int>(pos)
<< ")\n";
+ Assert(false);
}
return '\0';
} else {
- /* we should have a footnote environment */
+ // We should have a footnote environment.
if (!next || next->footnoteflag == LyXParagraph::NO_FOOTNOTE) {
// Notice that LyX does request the
// last char from time to time. (Asger)
}
+// return an string of the current word, and the end of the word in lastpos.
string LyXParagraph::GetWord(LyXParagraph::size_type & lastpos) const
- //Added 98/9/21 by REH
- // return an string of the current word, and the end of the word
- // in lastpos.
-
- // the current word is defined as starting at the first character from
- // the immediate left of lastpospos which meets the definition of IsLetter(),
- // continuing to the last character to the right of this meeting
- // IsLetter.
-
-
- // i just left this in from GetChar()
{
-#ifdef DEVEL_VERSION
- /* a workaround to 'fix' some bugs in text-class */
- if (lastpos < 0) {
- // This function is important. It should not work around bugs.
- // Let's find the bugs instead and fix them. (Asger)
- lyxerr << "FATAL ERROR (LyXParagraph::GetWord):"
- " bad position " << lastpos << endl;
- abort();
- }
-#endif
+ Assert(lastpos>=0);
+
+ // the current word is defined as starting at the first character
+ // from the immediate left of lastpospos which meets the definition
+ // of IsLetter(), continuing to the last character to the right
+ // of this meeting IsLetter.
string theword;
// grab a word
-
-
- //i think the devcode aborts before this, but why not be
- // versatile?
- if (lastpos < 0) lastpos= 0;
-
-
+
// move back until we have a letter
//there's no real reason to have firstpos & lastpos as
int firstpos = lastpos;
while ((firstpos >= 0) && !IsLetter(firstpos))
- firstpos--;
+ --firstpos;
// now find the beginning by looking for a nonletter
while ((firstpos>= 0) && IsLetter(firstpos))
- firstpos--;
+ --firstpos;
// the above is now pointing to the preceeding non-letter
- firstpos++;
- lastpos= firstpos;
+ ++firstpos;
+ lastpos = firstpos;
// so copy characters into theword until we get a nonletter
// note that this can easily exceed lastpos, wich means
while (IsLetter(lastpos)) theword += GetChar(lastpos++);
- return theword;
+ return theword;
}
{
if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
return text.size() + NextAfterFootnote()->Last() + 1;
- /* the 1 is the symbol
- for the footnote */
+ // the 1 is the symbol
+ // for the footnote
else
return text.size();
}
LyXParagraph * LyXParagraph::ParFromPos(LyXParagraph::size_type pos)
{
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
if (pos > size()) {
if (next
&& next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
lyxerr << "ERROR (LyXParagraph::ParFromPos): "
"position does not exist." << endl;
return this;
- }
- else
+ } else
return this;
}
int LyXParagraph::PositionInParFromPos(LyXParagraph::size_type pos) const
{
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
if (pos > size()) {
if (next
&& next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
void LyXParagraph::SetFont(LyXParagraph::size_type pos,
LyXFont const & font)
{
- /* > because last is the next unused position, and you can
- * use it if you want */
+ // > because last is the next unused position, and you can
+ // use it if you want
if (pos > size()) {
- if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
+ if (next &&
+ next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
NextAfterFootnote()->SetFont(pos - text.size() - 1,
font);
} else {
}
LyXFont patternfont(LyXFont::ALL_INHERIT);
-// First, reduce font against layout/label font
-// Update: The SetCharFont() routine in text2.C already reduces font, so
-// we don't need to do that here. (Asger)
-// No need to simplify this because it will disappear in a new kernel. (Asger)
-#ifdef NEW_TABLE
+ // First, reduce font against layout/label font
+ // Update: The SetCharFont() routine in text2.C already
+ // reduces font, so we don't need to do that here. (Asger)
+ // No need to simplify this because it will disappear
+ // in a new kernel. (Asger)
// Next search font table
- for(FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
- if (pos >= (*it).pos && pos <= (*it).pos_end) {
- // found it
- // we found a font entry. maybe we have to
- // split it and create a new one
-
- if ((*it).pos != (*it).pos_end) {
- // more than one character
- if (pos == (*it).pos) {
- // maybe we could enlarge
- // the left fonttable
- for(FontList::iterator fit = fontlist.begin();
- fit != fontlist.end(); ++fit) {
- if (pos - 1 >= (*fit).pos
- && pos - 1 <= (*fit).pos_end
- && (*fit).font == font) {
- // put the position
- // under the font
- (*fit).pos_end++;
- (*it).pos++;
- return;
- }
- }
- // Add a new entry in the
- // fonttable for the position
- FontTable tmp;
- tmp.pos = pos + 1;
- tmp.pos_end = (*it).pos_end;
- tmp.font = (*it).font;
- (*it).pos_end = pos;
- fontlist.push_back(tmp);
- } else if (pos == (*it).pos_end) {
- // Add a new entry in the
- // fonttable for the position
- FontTable tmp;
- tmp.pos = (*it).pos;
- tmp.pos_end = (*it).pos_end - 1;
- tmp.font = (*it).font;
- (*it).pos = (*it).pos_end;
- fontlist.push_back(tmp);
- } else {
- // Add a new entry in the
- // fonttable for the position
- FontTable tmp;
- tmp.pos = (*it).pos;
- tmp.pos_end = pos - 1;
- tmp.font = (*it).font;
- fontlist.push_back(tmp);
-
- tmp.pos = pos + 1;
- tmp.pos_end = (*it).pos_end;
- tmp.font = (*it).font;
- fontlist.push_back(tmp);
-
- (*it).pos = pos;
- (*it).pos_end = pos;
- }
- }
- (*it).font = font;
- return;
- }
- }
-
- // 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
- for(FontList::iterator it = fontlist.begin();
- it != fontlist.end(); ++it) {
- if (pos - 1 >= (*it).pos && pos - 1 <= (*it).pos_end
- && (*it).font == font) {
- (*it).pos_end++;
- return;
+ FontList::iterator tmp = fontlist.begin();
+ for (; tmp != fontlist.end(); ++tmp) {
+ if (pos >= (*tmp).pos && pos <= (*tmp).pos_end) {
+ break;
}
}
- // Add a new entry in the
- // fonttable for the position
- FontTable tmp;
- tmp.pos = pos;
- tmp.pos_end = pos;
- tmp.font = patternfont;
- fontlist.push_back(tmp);
-#else
- // Next search font table
- 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 (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 (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++;
+ 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
- * fonttable for the position */
- tmp = new FontTable;
- tmp->pos = pos;
- tmp->pos_end = pos;
- tmp->font = patternfont;
- 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;
- }
-
- /* 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;
- }
-
- /* 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;
+ // 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;
}
- 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;
+ // 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;
}
- tmp->font = font;
-#endif
}
-/* this function is able to hide closed footnotes */
+// This function is able to hide closed footnotes.
LyXParagraph * LyXParagraph::Next()
{
if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
footnote in a logical
paragraph */
else
- return next; /* this should never happen! */
- }
- else
+ return next; // This should never happen!
+ } else
return next;
}
return tmp; /* there can be more than one footnote
in a logical paragraph */
else
- return next; /* this should never happen! */
- }
- else
+ return next; // This should never happen!
+ } else
return next;
}
return tmp; /* there can be more than one footnote
in a logical paragraph */
else
- return next; /* this should never happen! */
- }
- else
+ return next; // This should never happen!
+ } else
return next;
}
return tmp; /* there can be more than one footnote
in a logical paragraph */
else
- return previous; /* this should never happen! */
- }
- else
+ return previous; // This should never happen!
+ } else
return previous;
}
return this;
LyXParagraph * tmppar = this;
- while (tmppar && (tmppar->IsDummy()
- || tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE))
+ while (tmppar &&
+ (tmppar->IsDummy()
+ || tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE))
tmppar = tmppar->previous;
- if (!tmppar)
- return this; /* this should never happen! */
- else
+ if (!tmppar) {
+ return this;
+ } else
return tmppar;
}
return this;
LyXParagraph const * tmppar = this;
- while (tmppar && (tmppar->IsDummy()
- || tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE))
+ while (tmppar &&
+ (tmppar->IsDummy()
+ || tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE))
tmppar = tmppar->previous;
- if (!tmppar)
- return this; /* this should never happen! */
- else
+ if (!tmppar) {
+ return this;
+ } else
return tmppar;
}
-/* this function is able to hide closed footnotes */
+// This function is able to hide closed footnotes.
LyXParagraph * LyXParagraph::Previous()
{
LyXParagraph * tmp = previous;
else
return previous;
- }
- else
+ } else
return previous;
}
-/* this function is able to hide closed footnotes */
+// This function is able to hide closed footnotes.
LyXParagraph const * LyXParagraph::Previous() const
{
LyXParagraph * tmp = previous;
else
return previous;
- }
- else
+ } else
return previous;
}
int flag)
{
size_type i, pos_end, pos_first;
- /* create a new paragraph */
+ // create a new paragraph
LyXParagraph * par = ParFromPos(pos);
LyXParagraph * firstpar = FirstPhysicalPar();
LyXParagraph * tmp = new LyXParagraph(par);
-
+
tmp->footnoteflag = footnoteflag;
tmp->footnotekind = footnotekind;
- /* this is an idea for a more userfriendly layout handling, I will
- * see what the users say */
+ // this is an idea for a more userfriendly layout handling, I will
+ // see what the users say
- /* layout stays the same with latex-environments */
+ // layout stays the same with latex-environments
if (flag) {
tmp->SetOnlyLayout(firstpar->layout);
tmp->SetLabelWidthString(firstpar->labelwidthstring);
tmp->depth = firstpar->depth;
tmp->noindent = firstpar->noindent;
- /* copy everything behind the break-position
- to the new paragraph
- */
+ // copy everything behind the break-position
+ // to the new paragraph
pos_first = 0;
while (ParFromPos(pos_first) != par)
- pos_first++;
+ ++pos_first;
pos_end = pos_first + par->text.size() - 1;
- tmp->text.reserve(pos_end - pos);
+ // The constructor has already reserved 500 elements
+ //if (pos_end > pos)
+ // tmp->text.reserve(pos_end - pos);
- for (i = pos; i <= pos_end; i++) {
+ for (i = pos; i <= pos_end; ++i) {
par->CutIntoMinibuffer(i - pos_first);
tmp->InsertFromMinibuffer(i - pos);
}
-
- for (i = pos_end; i >= pos; i--)
+ tmp->text.resize(tmp->text.size());
+ for (i = pos_end; i >= pos; --i)
par->Erase(i - pos_first);
par->text.resize(par->text.size());
}
- /* just an idea of me */
+ // just an idea of me
if (!pos) {
tmp->line_top = firstpar->line_top;
tmp->pagebreak_top = firstpar->pagebreak_top;
tmp->added_space_top = firstpar->added_space_top;
tmp->bibkey = firstpar->bibkey;
firstpar->Clear();
- /* layout stays the same with latex-environments */
+ // layout stays the same with latex-environments
if (flag) {
firstpar->SetOnlyLayout(tmp->layout);
firstpar->SetLabelWidthString(tmp->labelwidthstring);
tmppar = tmppar->previous;
if (!tmppar)
- return this; /* this should never happen! */
+ return this; // This should never happen!
else
return tmppar;
}
LyXParagraph * LyXParagraph::Clone() const
{
- /* create a new paragraph */
+ // create a new paragraph
LyXParagraph * result = new LyXParagraph;
result->MakeSameLayout(this);
- /* this is because of the dummy layout of the paragraphs that
- follow footnotes */
+ // this is because of the dummy layout of the paragraphs that
+ // follow footnotes
result->layout = layout;
/* table stuff -- begin*/
result->bibkey = (bibkey) ? new InsetBibKey(bibkey): 0;
- /* copy everything behind the break-position to the new paragraph */
+ // copy everything behind the break-position to the new paragraph
- for (size_type i = 0; i < size(); i++) {
+ for (size_type i = 0; i < size(); ++i) {
CopyIntoMinibuffer(i);
result->InsertFromMinibuffer(i);
}
}
-bool LyXParagraph::HasSameLayout(LyXParagraph const * par)
+bool LyXParagraph::HasSameLayout(LyXParagraph const * par) const
{
par = par->FirstPhysicalPar();
void LyXParagraph::BreakParagraphConservative(LyXParagraph::size_type pos)
{
- size_type i, pos_end, pos_first;
-
- /* create a new paragraph */
+ // create a new paragraph
LyXParagraph * par = ParFromPos(pos);
LyXParagraph * tmp = new LyXParagraph(par);
tmp->MakeSameLayout(par);
-
- if (Last() > pos) {
- /* copy everything behind the break-position to the new
- paragraph */
- pos_first = 0;
+
+ // When can pos < Last()?
+ // I guess pos == Last() is possible.
+ if (Last() > pos) {
+ // copy everything behind the break-position to the new
+ // paragraph
+ size_type pos_first = 0;
while (ParFromPos(pos_first) != par)
- pos_first++;
- pos_end = pos_first + par->text.size() - 1;
- /* make shure 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!!) */
- tmp->text.reserve(pos_end - pos);
-
- for (i = pos; i <= pos_end; i++) {
-
+ ++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);
}
- for (i = pos_end; i >= pos; i--)
+ tmp->text.resize(tmp->text.size());
+ for (size_type i = pos_end; i >= pos; --i)
par->Erase(i - pos_first);
par->text.resize(par->text.size());
}
-/* be carefull, this does not make any check at all */
+// Be carefull, this does not make any check at all.
void LyXParagraph::PasteParagraph()
{
- /* copy the next paragraph to this one */
+ // copy the next paragraph to this one
LyXParagraph * the_next = Next();
LyXParagraph * firstpar = FirstPhysicalPar();
- /* first the DTP-stuff */
+ // first the DTP-stuff
firstpar->line_bottom = the_next->line_bottom;
firstpar->added_space_bottom = the_next->added_space_bottom;
firstpar->pagebreak_bottom = the_next->pagebreak_bottom;
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++) {
+ // ok, now copy the paragraph
+ for (size_type i = 0; i <= pos_end; ++i) {
the_next->CutIntoMinibuffer(i);
InsertFromMinibuffer(pos_insert + i);
}
- /* delete the next paragraph */
+ // delete the next paragraph
delete the_next;
}
}
-LyXTextClass::LayoutList::size_type LyXParagraph::GetLayout() const
+LyXTextClass::size_type LyXParagraph::GetLayout() const
{
return FirstPhysicalPar()->layout;
}
}
-/* the next two functions are for the manual labels */
+// the next two functions are for the manual labels
string LyXParagraph::GetLabelWidthString() const
{
if (!FirstPhysicalPar()->labelwidthstring.empty())
}
-void LyXParagraph::SetOnlyLayout(LyXTextClass::LayoutList::size_type new_layout)
+void LyXParagraph::SetOnlyLayout(LyXTextClass::size_type new_layout)
{
LyXParagraph * par = FirstPhysicalPar();
LyXParagraph * ppar = 0;
}
-void LyXParagraph::SetLayout(LyXTextClass::LayoutList::size_type new_layout)
+void LyXParagraph::SetLayout(LyXTextClass::size_type new_layout)
{
LyXParagraph
* par = FirstPhysicalPar(),
}
-/* if the layout of a paragraph contains a manual label, the beginning of the
-* main body is the beginning of the second word. This is what the par-
-* function returns. If the layout does not contain a label, the main
-* body always starts with position 0. This differentiation is necessary,
-* because there cannot be a newline or a blank <= the beginning of the
-* main body in TeX. */
+// if the layout of a paragraph contains a manual label, the beginning of the
+// main body is the beginning of the second word. This is what the par-
+// function returns. If the layout does not contain a label, the main
+// body always starts with position 0. This differentiation is necessary,
+// because there cannot be a newline or a blank <= the beginning of the
+// main body in TeX.
int LyXParagraph::BeginningOfMainBody() const
{
// 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 "== "
+ // Yes, this ^ is supposed to be "= " not "=="
++i;
while (i < size()
&& previous_char != ' '
if (i == 0 && i == size() &&
!(footnoteflag == LyXParagraph::NO_FOOTNOTE
&& next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE))
- i++; /* the cursor should not jump
+ ++i; /* the cursor should not jump
* to the main body if there
* is nothing in! */
return i;
int LyXParagraph::AutoDeleteInsets()
{
-#ifdef NEW_TABLE
+ vector<size_type> tmpvec;
int i = 0;
for (InsetList::iterator it = insetlist.begin();
it != insetlist.end(); ++it) {
- if ((*it).inset->AutoDelete()) {
+ if ((*it).inset && (*it).inset->AutoDelete()) {
+ tmpvec.push_back((*it).pos);
++i;
- Erase((*it).pos);
}
}
- 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 {}
- else
- lyxerr << "ERROR (LyXParagraph::AutoDeleteInsets): "
- "cannot auto-delete insets" << endl;
+ for (vector<size_type>::const_iterator cit = tmpvec.begin();
+ cit != tmpvec.end(); ++cit) {
+ Erase((*cit));
}
return i;
-#endif
}
Inset * LyXParagraph::ReturnNextInsetPointer(LyXParagraph::size_type & pos)
{
-#ifdef NEW_TABLE
- InsetTable * tmp = 0;
+ InsetList::iterator it2 = insetlist.end();
for (InsetList::iterator it = insetlist.begin();
it != insetlist.end(); ++it) {
- if ((*it).pos >= pos && (!tmp || (*it).pos < tmp->pos)) {
- tmp = &(*it);
+ if ((*it).pos >= pos) {
+ if (it2 == insetlist.end() || (*it).pos < (*it2).pos)
+ it2 = it;
}
}
- if (tmp) {
- pos = tmp->pos;
- return tmp->inset;
+ 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;
- }
- else
- return 0;
-#endif
}
-/* returns -1 if inset not found */
+// returns -1 if inset not found
int LyXParagraph::GetPositionOfInset(Inset * inset) const
{
-#ifdef NEW_TABLE
- for (InsetList::iterator it = insetlist.begin();
- it != insetlist.end(); ++it) {
- if ((*it).inset == inset) {
- return (*it).pos;
+ // Find the entry.
+ for (InsetList::const_iterator cit = insetlist.begin();
+ cit != insetlist.end(); ++cit) {
+ if ((*cit).inset == inset) {
+ return (*cit).pos;
}
}
- // Think about footnotes
- if (footnoteflag == LyXParagraph::NO_FOOTNOTE
+ // Think about footnotes.
+ if (footnoteflag == LyXParagraph::NO_FOOTNOTE
&& next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
- int further = NextAfterFootnote()->GetPositionOfInset(inset);
+ int further =
+ NextAfterFootnote()->GetPositionOfInset(inset);
if (further != -1)
- return size() + 1 + further;
+ return text.size() + 1 + further;
}
return -1;
-#else
- /* find the entry */
- InsetTable * tmpi = insettable;
- while (tmpi && tmpi->inset != inset) {
- tmpi = tmpi->next;
- }
- if (tmpi && tmpi->inset)
- return tmpi->pos;
- else{
- /* think about footnotes */
- if (footnoteflag == LyXParagraph::NO_FOOTNOTE
- && next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
- int further =
- NextAfterFootnote()->GetPositionOfInset(inset);
- if (further != -1)
- return text.size() + 1 + further;
- }
- return -1;
- }
-#endif
}
-void LyXParagraph::readSimpleWholeFile(FILE * myfile)
+void LyXParagraph::readSimpleWholeFile(istream & is)
{
- rewind(myfile);
-
- if (!feof(myfile)) {
- char c = 0;
- do {
- c = fgetc(myfile);
- InsertChar(text.size(), c);
- } while (!feof(myfile));
-
- }
+ 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,
- int & foot_count)
+#ifdef USE_OSTREAM_ONLY
+LyXParagraph * LyXParagraph::TeXOnePar(ostream & os, TexRow & texrow,
+ ostream & foot, TexRow & foot_texrow,
+ int & foot_count)
{
lyxerr[Debug::LATEX] << "TeXOnePar... " << this << endl;
LyXParagraph * par = next;
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(),
- layout);
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ layout);
bool further_blank_line = false;
if (IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXOnePar) is dummy." << endl;
if (start_of_appendix) {
- file += "\\appendix\n";
+ os << "\\appendix\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(current_view->buffer()->params);
further_blank_line = true;
}
if (line_top) {
- file += "\\lyxline{\\" + getFont(0).latexSize() + '}';
- file += "\\vspace{-1\\parskip}";
+ os << "\\lyxline{\\" << getFont(0).latexSize() << '}'
+ << "\\vspace{-1\\parskip}";
further_blank_line = true;
}
if (further_blank_line){
- file += '\n';
+ os << '\n';
+ texrow.newline();
+ }
+
+ LyXDirection direction = getParDirection();
+ LyXDirection global_direction =
+ current_view->buffer()->params.getDocumentDirection();
+ if (direction != global_direction) {
+ if (direction == LYX_DIR_LEFT_TO_RIGHT)
+ os << "\\unsethebrew\n";
+ else
+ os << "\\sethebrew\n";
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(os, 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(os, texrow);
+
+ // Spit out footnotes
+ while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE
+ && par->footnoteflag != footnoteflag) {
+ par = par->TeXFootnote(os, texrow,
+ foot, foot_texrow, foot_count,
+ direction);
+ par->SimpleTeXOnePar(os, texrow);
+ par = par->next;
+ }
+
+ // Make sure that \\par is done with the font of the last
+ // character if this has another size as the default.
+ // This is necessary because LaTeX (and LyX on the screen)
+ // calculates the space between the baselines according
+ // to this font. (Matthias)
+ LyXFont font = getFont(Last() - 1);
+ if (need_par) {
+ if (style.resfont.size() != font.size()) {
+ os << '\\'
+ << font.latexSize()
+ << ' ';
+ }
+ os << "\\par}";
+ } else if (textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout()).isCommand()){
+ if (style.resfont.size() != font.size()) {
+ os << '\\'
+ << font.latexSize()
+ << ' ';
+ }
+ os << '}';
+ } else if (style.resfont.size() != font.size()){
+ os << "{\\" << font.latexSize() << " \\par}";
+ }
+
+ if (direction != global_direction)
+ if (direction == LYX_DIR_LEFT_TO_RIGHT)
+ os << "\\sethebrew";
+ else
+ os << "\\unsethebrew";
+
+ switch (style.latextype) {
+ case LATEX_ITEM_ENVIRONMENT:
+ case LATEX_LIST_ENVIRONMENT:
+ if (par && (depth < par->depth)) {
+ os << '\n';
+ texrow.newline();
+ }
+ break;
+ case LATEX_ENVIRONMENT:
+ // if its the last paragraph of the current environment
+ // skip it otherwise fall through
+ if (par
+ && (par->layout != layout
+ || par->depth != depth
+ || par->pextra_type != pextra_type))
+ break;
+ default:
+ if (!(footnoteflag != LyXParagraph::NO_FOOTNOTE
+ && footnotekind != LyXParagraph::FOOTNOTE
+ && footnotekind != LyXParagraph::MARGIN
+ && (table
+ || (par
+ && par->table)))) {
+ // don't insert this if we would be adding it
+ // before or after a table in a float. This
+ // little trick is needed in order to allow
+ // use of tables in \subfigures or \subtables.
+ os << '\n';
+ texrow.newline();
+ }
+ }
+
+ further_blank_line = false;
+ if (line_bottom) {
+ os << "\\lyxline{\\" << getFont(Last() - 1).latexSize() << '}';
+ further_blank_line = true;
+ }
+
+ if (added_space_bottom.kind() != VSpace::NONE) {
+ os << added_space_bottom.asLatexCommand(current_view->buffer()->params);
+ further_blank_line = true;
+ }
+
+ if (pagebreak_bottom) {
+ os << "\\newpage";
+ further_blank_line = true;
+ }
+
+ if (further_blank_line){
+ os << '\n';
+ texrow.newline();
+ }
+
+ if (!(footnoteflag != LyXParagraph::NO_FOOTNOTE && par &&
+ par->footnoteflag == LyXParagraph::NO_FOOTNOTE)) {
+ os << '\n';
+ texrow.newline();
+ }
+
+ lyxerr[Debug::LATEX] << "TeXOnePar...done " << par << endl;
+ return par;
+}
+#else
+LyXParagraph * LyXParagraph::TeXOnePar(string & file, TexRow & texrow,
+ string & 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,
+ layout);
+
+ bool further_blank_line = false;
+ if (IsDummy())
+ lyxerr << "ERROR (LyXParagraph::TeXOnePar) is dummy." << endl;
+
+ if (start_of_appendix) {
+ file += "\\appendix\n";
+ texrow.newline();
+ }
+
+ if (tex_code_break_column && style.isCommand()){
+ file += '\n';
+ texrow.newline();
+ }
+
+ if (pagebreak_top) {
+ file += "\\newpage";
+ further_blank_line = true;
+ }
+ if (added_space_top.kind() != VSpace::NONE) {
+ file += added_space_top.asLatexCommand(current_view->buffer()->params);
+ further_blank_line = true;
+ }
+
+ if (line_top) {
+ file += "\\lyxline{\\" + getFont(0).latexSize() + '}';
+ file += "\\vspace{-1\\parskip}";
+ further_blank_line = true;
+ }
+
+ if (further_blank_line){
+ file += '\n';
+ texrow.newline();
+ }
+
+ LyXDirection direction = getParDirection();
+ LyXDirection global_direction =
+ current_view->buffer()->params.getDocumentDirection();
+ if (direction != global_direction) {
+ if (direction == LYX_DIR_LEFT_TO_RIGHT)
+ file += "\\unsethebrew\n";
+ else
+ file += "\\sethebrew\n";
+ texrow.newline();
+ }
+
+
+ switch (style.latextype) {
+ case LATEX_COMMAND:
+ file += '\\';
+ file += style.latexname();
+ file += style.latexparam();
+ break;
+ case LATEX_ITEM_ENVIRONMENT:
+ if (bibkey) {
+#ifdef USE_OSTREAM_ONLY
+#ifdef HAVE_SSTREAM
+ ostringstream ost;
+ bibkey->Latex(ost, false);
+ file += ost.str().c_str();
+#else
+ ostrstream ost;
+ bibkey->Latex(ost, false);
+ ost << '\0';
+ char * tmp = ost.str();
+ file += tmp;
+ delete [] tmp;
+#endif
+#else
+ bibkey->Latex(file, false);
+#endif
+ } else
+ file += "\\item ";
+ break;
+ case LATEX_LIST_ENVIRONMENT:
+ file += "\\item ";
+ break;
+ default:
+ break;
+ }
+
+ bool need_par = SimpleTeXOnePar(file, texrow);
// Spit out footnotes
while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE
&& par->footnoteflag != footnoteflag) {
par = par->TeXFootnote(file, texrow,
- foot, foot_texrow, foot_count);
+ foot, foot_texrow, foot_count,
+ direction);
par->SimpleTeXOnePar(file, texrow);
par = par->next;
}
file += ' ';
}
file += "\\par}";
- } else if (textclasslist.Style(GetCurrentTextClass(),
- GetLayout()).isCommand()){
+ } else if (textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout()).isCommand()){
if (style.resfont.size() != font.size()) {
file += '\\';
file += font.latexSize();
} else if (style.resfont.size() != font.size()){
file += "{\\" + font.latexSize() + " \\par}";
}
+
+ if (direction != global_direction)
+ if (direction == LYX_DIR_LEFT_TO_RIGHT)
+ file += "\\sethebrew";
+ else
+ file += "\\unsethebrew";
switch (style.latextype) {
case LATEX_ITEM_ENVIRONMENT:
}
if (added_space_bottom.kind() != VSpace::NONE) {
- file += added_space_bottom.asLatexCommand();
+ file += added_space_bottom.asLatexCommand(current_view->buffer()->params);
further_blank_line = true;
}
lyxerr[Debug::LATEX] << "TeXOnePar...done " << par << endl;
return par;
}
+#endif
// This one spits out the text of the paragraph
-bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
+#ifdef USE_OSTREAM_ONLY
+bool LyXParagraph::SimpleTeXOnePar(ostream & os, TexRow & texrow)
{
lyxerr[Debug::LATEX] << "SimpleTeXOnePar... " << this << endl;
if (table)
- return SimpleTeXOneTablePar(file, texrow);
+ return SimpleTeXOneTablePar(os, texrow);
- char c;
- size_type main_body;
-
bool return_value = false;
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(), GetLayout());
- LyXFont basefont;
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
+ LyXFont basefont, last_font;
- /* maybe we have to create a optional argument */
+ // 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 += '[';
+ os << '[';
basefont = getFont(-2); // Get label font
} else {
basefont = getFont(-1); // Get layout font
&& !text.size()
&& !IsDummy()) {
if (style.isCommand()) {
- file += '{';
- column++;
+ os << '{';
+ ++column;
} else if (align != LYX_ALIGN_LAYOUT) {
- file += '{';
- column++;
+ os << '{';
+ ++column;
return_value = true;
}
}
// Which font is currently active?
- LyXFont running_font = basefont;
+ LyXFont running_font(basefont);
// Do we have an open font change?
bool open_font = false;
texrow.start(this, 0);
for (size_type i = 0; i < size(); ++i) {
- column++;
+ ++column;
// First char in paragraph or after label?
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
running_font = basefont;
- file += ']';
- column++;
+ os << ']';
+ ++column;
}
if (style.isCommand()) {
- file += '{';
- column++;
+ 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_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;
}
}
- c = GetChar(i);
+ int c = GetChar(i);
// Fully instantiated font
LyXFont font = getFont(i);
+ last_font = running_font;
// Spaces at end of font change are simulated to be
// outside font change, i.e. we write "\textXX{text} "
if (open_font && c == ' ' && i <= size() - 2
&& !getFont(i+1).equalExceptLatex(running_font)
&& !getFont(i+1).equalExceptLatex(font)) {
- font = getFont(i+1);
+ font = getFont(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;
}
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);
running_font = basefont;
if (font.family() ==
LyXFont::TYPEWRITER_FAMILY) {
- file += "~";
+ os << "~";
}
- file += "\\\\\n";
+ os << "\\\\\n";
}
texrow.newline();
- texrow.start(this, i+1);
+ texrow.start(this, i + 1);
column = 0;
} else {
- SimpleTeXSpecialChars(file, texrow,
+ SimpleTeXSpecialChars(os, texrow,
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);
}
- /* needed if there is an optional argument but no contents */
+ // Needed if there is an optional argument but no contents.
if (main_body > 0 && main_body == size()) {
- file += "]~";
+ os << "]~";
return_value = false;
}
lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
return return_value;
}
+#else
+bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
+{
+ lyxerr[Debug::LATEX] << "SimpleTeXOnePar... " << this << endl;
+ if (table)
+ return SimpleTeXOneTablePar(file, texrow);
-// This one spits out the text of a table paragraph
-bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
-{
- lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar... " << this << endl;
- char c;
- int tmp;
-
bool return_value = false;
- int current_cell_number = -1;
- LyXLayout const & style =
- textclasslist.Style(GetCurrentTextClass(), GetLayout());
- LyXFont basefont = getFont(-1); // Get layout font
- // Which font is currently active?
- LyXFont running_font = basefont;
- // Do we have an open font change?
- bool open_font = false;
-
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.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
+ } else {
+ basefont = getFont(-1); // Get layout font
+ }
+
int column = 0;
- if (!IsDummy()) { // it is dummy if it is in a float!!!
+
+ if (main_body >= 0
+ && !text.size()
+ && !IsDummy()) {
if (style.isCommand()) {
file += '{';
- column++;
+ ++column;
} else if (align != LYX_ALIGN_LAYOUT) {
file += '{';
- column++;
+ ++column;
return_value = true;
}
- if (noindent) {
- file += "\\noindent ";
- column += 10;
- }
- switch (align) {
- case LYX_ALIGN_NONE:
- case LYX_ALIGN_BLOCK:
- case LYX_ALIGN_LAYOUT:
- case LYX_ALIGN_SPECIAL: break;
- case LYX_ALIGN_LEFT:
- file += "\\raggedright ";
- column+= 13;
- break;
- case LYX_ALIGN_RIGHT:
- file += "\\raggedleft ";
- column+= 12;
- break;
- case LYX_ALIGN_CENTER:
- file += "\\centering ";
- column+= 11;
- break;
- }
}
- current_cell_number = -1;
- tmp = table->TexEndOfCell(file, current_cell_number);
- for (; tmp >0 ; --tmp)
- texrow.newline();
-
+
+ // Which font is currently active?
+ LyXFont running_font = basefont;
+ // Do we have an open font change?
+ bool open_font = false;
+
texrow.start(this, 0);
for (size_type i = 0; i < size(); ++i) {
- c = GetChar(i);
- if (table->IsContRow(current_cell_number+1)) {
- if (c == LyXParagraph::META_NEWLINE)
- current_cell_number++;
- continue;
- }
- column++;
-
- // Fully instantiated font
+ ++column;
+ // First char in paragraph or after label?
+ if (i == main_body && !IsDummy()) {
+ if (main_body > 0) {
+ if (open_font) {
+ column += running_font.latexWriteEndChanges(file, basefont, basefont);
+ open_font = false;
+ }
+ basefont = getFont(-1); // Now use the layout font
+ running_font = basefont;
+ file += ']';
+ ++column;
+ }
+ if (style.isCommand()) {
+ file += '{';
+ ++column;
+ } else if (align != LYX_ALIGN_LAYOUT) {
+ file += "{\\par";
+ column += 4;
+ return_value = true;
+ }
+
+ if (noindent) {
+ file += "\\noindent ";
+ column += 10;
+ }
+ switch (align) {
+ case LYX_ALIGN_NONE:
+ case LYX_ALIGN_BLOCK:
+ case LYX_ALIGN_LAYOUT:
+ case LYX_ALIGN_SPECIAL: break;
+ case LYX_ALIGN_LEFT:
+ file += "\\raggedright ";
+ column+= 13;
+ break;
+ case LYX_ALIGN_RIGHT:
+ file += "\\raggedleft ";
+ column+= 12;
+ break;
+ case LYX_ALIGN_CENTER:
+ file += "\\centering ";
+ column+= 11;
+ break;
+ }
+ }
+
+ int c = GetChar(i);
+
+ // Fully instantiated font
+ LyXFont font = getFont(i);
+ last_font = running_font;
+
+ // Spaces at end of font change are simulated to be
+ // outside font change, i.e. we write "\textXX{text} "
+ // rather than "\textXX{text }". (Asger)
+ if (open_font && c == ' ' && i <= size() - 2
+ && !getFont(i+1).equalExceptLatex(running_font)
+ && !getFont(i+1).equalExceptLatex(font)) {
+ font = getFont(i + 1);
+ }
+ // We end font definition before blanks
+ if (!font.equalExceptLatex(running_font) && open_font) {
+ column += running_font.latexWriteEndChanges(file,
+ basefont,
+ (i == main_body-1) ? basefont : font);
+ running_font = basefont;
+ open_font = false;
+ }
+
+ // Blanks are printed before start of fontswitch
+ if (c == ' '){
+ // Do not print the separation of the optional argument
+ if (i != main_body - 1) {
+ SimpleTeXBlanks(file, 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, last_font);
+ running_font = font;
+ open_font = true;
+ }
+
+ if (c == LyXParagraph::META_NEWLINE) {
+ // newlines are handled differently here than
+ // the default in SimpleTeXSpecialChars().
+ if (!style.newline_allowed
+ || font.latex() == LyXFont::ON) {
+ file += '\n';
+ } else {
+ if (open_font) {
+ column += running_font.latexWriteEndChanges(file, basefont, basefont);
+ open_font = false;
+ }
+ basefont = getFont(-1);
+ running_font = basefont;
+ if (font.family() ==
+ LyXFont::TYPEWRITER_FAMILY) {
+ file += "~";
+ }
+ file += "\\\\\n";
+ }
+ texrow.newline();
+ texrow.start(this, i + 1);
+ column = 0;
+ } else {
+ SimpleTeXSpecialChars(file, texrow,
+ 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, basefont);
+ }
+
+ // Needed if there is an optional argument but no contents.
+ if (main_body > 0 && main_body == size()) {
+ file += "]~";
+ return_value = false;
+ }
+
+ lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
+ return return_value;
+}
+#endif
+
+
+#ifdef USE_OSTREAM_ONLY
+// This one spits out the text of a table paragraph
+bool LyXParagraph::SimpleTeXOneTablePar(ostream & os, TexRow & texrow)
+{
+ lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar... " << this << endl;
+
+ bool return_value = false;
+
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
+
+ int column = 0;
+ if (!IsDummy()) { // it is dummy if it is in a float!!!
+ if (style.isCommand()) {
+ os << '{';
+ ++column;
+ } else if (align != LYX_ALIGN_LAYOUT) {
+ os << '{';
+ ++column;
+ return_value = true;
+ }
+ if (noindent) {
+ os << "\\noindent ";
+ column += 10;
+ }
+ switch (align) {
+ case LYX_ALIGN_NONE:
+ case LYX_ALIGN_BLOCK:
+ case LYX_ALIGN_LAYOUT:
+ case LYX_ALIGN_SPECIAL: break;
+ case LYX_ALIGN_LEFT:
+ os << "\\raggedright ";
+ column+= 13;
+ break;
+ case LYX_ALIGN_RIGHT:
+ os << "\\raggedleft ";
+ column+= 12;
+ break;
+ case LYX_ALIGN_CENTER:
+ os << "\\centering ";
+ column+= 11;
+ break;
+ }
+ }
+
+ LyXFont basefont = getFont(-1); // Get layout font
+ // Which font is currently active?
+ LyXFont running_font = basefont;
+ LyXFont last_font;
+ // Do we have an open font change?
+ bool open_font = false;
+ int current_cell_number = -1;
+ int tmp = table->TexEndOfCell(os, current_cell_number);
+ for (; tmp > 0 ; --tmp)
+ texrow.newline();
+
+ texrow.start(this, 0);
+
+ for (size_type i = 0; i < size(); ++i) {
+ char c = GetChar(i);
+ if (table->IsContRow(current_cell_number + 1)) {
+ if (c == LyXParagraph::META_NEWLINE)
+ ++current_cell_number;
+ continue;
+ }
+ ++column;
+
+ // Fully instantiated font
LyXFont font = getFont(i);
+ last_font = running_font;
- // Spaces at end of font change are simulated to be outside font change.
- // i.e. we write "\textXX{text} " rather than "\textXX{text }". (Asger)
+ // 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(i + 1) != running_font
+ && getFont(i + 1) != font) {
+ font = getFont(i + 1);
}
// We end font definition before blanks
if (font != running_font && open_font) {
- column += running_font.latexWriteEndChanges(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;
}
}
if (c == LyXParagraph::META_NEWLINE) {
// special case for inside a table
- // different from default case in SimpleTeXSpecialChars()
+ // different from default case in
+ // SimpleTeXSpecialChars()
if (open_font) {
- column += running_font.latexWriteEndChanges(file, basefont);
+ column += running_font
+ .latexWriteEndChanges(os, basefont,
+ basefont);
open_font = false;
}
basefont = getFont(-1);
running_font = basefont;
- current_cell_number++;
+ ++current_cell_number;
if (table->CellHasContRow(current_cell_number) >= 0) {
- TeXContTableRows(file, i+1,
+ TeXContTableRows(os, i + 1,
current_cell_number,
column, texrow);
}
// put the EndOfCell because it is put after the
// for(...)
if (table->ShouldBeVeryLastCell(current_cell_number)) {
- current_cell_number--;
- break;
+ --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(os, texrow,
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;
+ tmp = table->TexEndOfCell(os, current_cell_number);
for (; tmp > 0; --tmp)
texrow.newline();
lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...done " << this << endl;
return return_value;
}
-
-
-// This one spits out the text off ContRows in tables
-bool LyXParagraph::TeXContTableRows(string & file,
- LyXParagraph::size_type i,
- int current_cell_number,
- int & column, TexRow & texrow)
+#else
+// This one spits out the text of a table paragraph
+bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
{
- lyxerr[Debug::LATEX] << "TeXContTableRows... " << this << endl;
- if (!table)
- return false;
-
- char c;
+ lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar... " << this << endl;
bool return_value = false;
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(),
- GetLayout());
- LyXFont basefont;
- basefont = getFont(-1); // Get layout font
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
+
+ int column = 0;
+ if (!IsDummy()) { // it is dummy if it is in a float!!!
+ if (style.isCommand()) {
+ file += '{';
+ ++column;
+ } else if (align != LYX_ALIGN_LAYOUT) {
+ file += '{';
+ ++column;
+ return_value = true;
+ }
+ if (noindent) {
+ file += "\\noindent ";
+ column += 10;
+ }
+ switch (align) {
+ case LYX_ALIGN_NONE:
+ case LYX_ALIGN_BLOCK:
+ case LYX_ALIGN_LAYOUT:
+ case LYX_ALIGN_SPECIAL: break;
+ case LYX_ALIGN_LEFT:
+ file += "\\raggedright ";
+ column+= 13;
+ break;
+ case LYX_ALIGN_RIGHT:
+ file += "\\raggedleft ";
+ column+= 12;
+ break;
+ case LYX_ALIGN_CENTER:
+ file += "\\centering ";
+ column+= 11;
+ break;
+ }
+ }
+
+ LyXFont basefont = getFont(-1); // Get layout font
// Which font is currently active?
LyXFont running_font = basefont;
+ LyXFont last_font;
// Do we have an open font change?
bool open_font = false;
+ int current_cell_number = -1;
+ int tmp = table->TexEndOfCell(file, current_cell_number);
+ for (; tmp > 0 ; --tmp)
+ texrow.newline();
+
+ texrow.start(this, 0);
- size_type lastpos = i;
- int cell = table->CellHasContRow(current_cell_number);
- current_cell_number++;
- while(cell >= 0) {
- // first find the right position
- i = lastpos;
- for (; (i < size()) && (current_cell_number<cell); ++i) {
- c = GetChar(i);
+ for (size_type i = 0; i < size(); ++i) {
+ char c = GetChar(i);
+ if (table->IsContRow(current_cell_number + 1)) {
if (c == LyXParagraph::META_NEWLINE)
- current_cell_number++;
- }
- lastpos = i;
- c = GetChar(i);
- if (table->Linebreaks(table->FirstVirtualCell(cell))) {
- file += " \\\\\n";
- texrow.newline();
- column = 0;
- } else if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
- file += ' ';
+ ++current_cell_number;
+ continue;
+ }
+ ++column;
+
+ // Fully instantiated font
+ LyXFont font = getFont(i);
+ last_font = running_font;
+
+ // Spaces at end of font change are simulated to be
+ // outside font change.
+ // i.e. we write "\textXX{text} " rather than
+ // "\textXX{text }". (Asger)
+ if (open_font && c == ' ' && i <= size() - 2
+ && getFont(i+1) != running_font && getFont(i+1) != font) {
+ font = getFont(i+1);
+ }
+
+ // We end font definition before blanks
+ if (font != running_font && open_font) {
+ column += running_font.latexWriteEndChanges(file,
+ basefont, font);
+ running_font = basefont;
+ open_font = false;
+ }
+ // Blanks are printed before start of fontswitch
+ if (c == ' '){
+ SimpleTeXBlanks(file, texrow, i, column, font, style);
+ }
+ // Do we need to change font?
+ if (font != running_font) {
+ column += font.latexWriteStartChanges(file, 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;
+ }
+ }
+ if (c == LyXParagraph::META_NEWLINE) {
+ // special case for inside a table
+ // different from default case in
+ // SimpleTeXSpecialChars()
+ if (open_font) {
+ column += running_font
+ .latexWriteEndChanges(file, basefont, basefont);
+ open_font = false;
+ }
+ basefont = getFont(-1);
+ running_font = basefont;
+ ++current_cell_number;
+ if (table->CellHasContRow(current_cell_number) >= 0) {
+ TeXContTableRows(file, i + 1,
+ current_cell_number,
+ column, texrow);
+ }
+ // if this cell follow only ContRows till end don't
+ // put the EndOfCell because it is put after the
+ // for(...)
+ if (table->ShouldBeVeryLastCell(current_cell_number)) {
+ --current_cell_number;
+ break;
+ }
+ int tmp = table->TexEndOfCell(file,
+ current_cell_number);
+ if (tmp > 0) {
+ column = 0;
+ } else if (tmp < 0) {
+ tmp = -tmp;
+ }
+ for (; tmp--;) {
+ texrow.newline();
+ }
+ texrow.start(this, i + 1);
+ } else {
+ SimpleTeXSpecialChars(file, texrow,
+ 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, basefont);
+ }
+ ++current_cell_number;
+ tmp = table->TexEndOfCell(file, current_cell_number);
+ for (; tmp > 0; --tmp)
+ texrow.newline();
+ lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...done " << this << endl;
+ return return_value;
+}
+#endif
+
+
+#ifdef USE_OSTREAM_ONLY
+// This one spits out the text off ContRows in tables
+bool LyXParagraph::TeXContTableRows(ostream & os,
+ LyXParagraph::size_type i,
+ int current_cell_number,
+ int & column, TexRow & texrow)
+{
+ lyxerr[Debug::LATEX] << "TeXContTableRows... " << this << endl;
+ if (!table)
+ return false;
+
+ char c;
+
+ bool return_value = false;
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
+ LyXFont basefont = getFont(-1); // Get layout font
+ LyXFont last_font;
+ // Which font is currently active?
+ LyXFont running_font = basefont;
+ // Do we have an open font change?
+ bool open_font = false;
+
+ size_type lastpos = i;
+ int cell = table->CellHasContRow(current_cell_number);
+ ++current_cell_number;
+ while(cell >= 0) {
+ // first find the right position
+ i = lastpos;
+ for (; (i < size()) && (current_cell_number<cell); ++i) {
+ c = GetChar(i);
+ if (c == LyXParagraph::META_NEWLINE)
+ ++current_cell_number;
+ }
+ lastpos = i;
+ c = GetChar(i);
+ if (table->Linebreaks(table->FirstVirtualCell(cell))) {
+ os << " \\\\\n";
+ texrow.newline();
+ column = 0;
+ } else if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
+ os << ' ';
+ }
+
+ for (; i < size()
+ && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
+ ++i) {
+ ++column;
+
+ // Fully instantiated font
+ LyXFont font = getFont(i);
+ last_font = running_font;
+
+ // Spaces at end of font change are simulated to
+ // be outside font change. i.e. we write
+ // "\textXX{text} " rather than "\textXX{text }".
+ // (Asger)
+ if (open_font && c == ' ' && i <= size() - 2
+ && getFont(i + 1) != running_font
+ && getFont(i + 1) != font) {
+ font = getFont(i + 1);
+ }
+
+ // We end font definition before blanks
+ if (font != running_font && open_font) {
+ column += running_font.latexWriteEndChanges(os, basefont, font);
+ running_font = basefont;
+ open_font = false;
+ }
+ // Blanks are printed before start of fontswitch
+ if (c == ' '){
+ SimpleTeXBlanks(os, texrow, i,
+ column, font, style);
+ }
+ // Do we need to change font?
+ if (font != running_font) {
+ column +=
+ font.latexWriteStartChanges(os,
+ basefont,
+ last_font);
+ running_font = font;
+ open_font = true;
+ }
+ // Do we need to turn on LaTeX mode?
+ if (font.latex() != running_font.latex()) {
+ if (font.latex() == LyXFont::ON
+ && style.needprotect) {
+ os << "\\protect ";
+ column += 9;
+ }
+ }
+ SimpleTeXSpecialChars(os, texrow, font,
+ running_font, basefont,
+ open_font, style, i, column, c);
+ }
+ // If we have an open font definition, we have to close it
+ if (open_font) {
+ running_font.latexWriteEndChanges(os, basefont,
+ basefont);
+ open_font = false;
+ }
+ basefont = getFont(-1);
+ running_font = basefont;
+ cell = table->CellHasContRow(current_cell_number);
+ }
+ lyxerr[Debug::LATEX] << "TeXContTableRows...done " << this << endl;
+ return return_value;
+}
+#else
+// This one spits out the text off ContRows in tables
+bool LyXParagraph::TeXContTableRows(string & file,
+ LyXParagraph::size_type i,
+ int current_cell_number,
+ int & column, TexRow & texrow)
+{
+ lyxerr[Debug::LATEX] << "TeXContTableRows... " << this << endl;
+ if (!table)
+ return false;
+
+ char c;
+
+ bool return_value = false;
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
+ LyXFont basefont = getFont(-1); // Get layout font
+ LyXFont last_font;
+ // Which font is currently active?
+ LyXFont running_font = basefont;
+ // Do we have an open font change?
+ bool open_font = false;
+
+ size_type lastpos = i;
+ int cell = table->CellHasContRow(current_cell_number);
+ ++current_cell_number;
+ while(cell >= 0) {
+ // first find the right position
+ i = lastpos;
+ for (; (i < size()) && (current_cell_number<cell); ++i) {
+ c = GetChar(i);
+ if (c == LyXParagraph::META_NEWLINE)
+ ++current_cell_number;
+ }
+ lastpos = i;
+ c = GetChar(i);
+ if (table->Linebreaks(table->FirstVirtualCell(cell))) {
+ file += " \\\\\n";
+ texrow.newline();
+ column = 0;
+ } else if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
+ file += ' ';
}
- for (; i < size() && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
+ for (; i < size()
+ && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
++i) {
++column;
// Fully instantiated font
LyXFont font = getFont(i);
+ last_font = running_font;
- // Spaces at end of font change are simulated to be outside font change.
- // i.e. we write "\textXX{text} " rather than "\textXX{text }". (Asger)
+ // 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) {
// We end font definition before blanks
if (font != running_font && open_font) {
- column += running_font.latexWriteEndChanges(file, basefont);
+ column += running_font.latexWriteEndChanges(file, basefont, font);
running_font = basefont;
open_font = false;
}
if (font != running_font) {
column +=
font.latexWriteStartChanges(file,
- basefont);
+ basefont, last_font);
running_font = font;
open_font = true;
}
}
// If we have an open font definition, we have to close it
if (open_font) {
- running_font.latexWriteEndChanges(file, basefont);
+ running_font.latexWriteEndChanges(file, basefont, basefont);
open_font = false;
}
basefont = getFont(-1);
lyxerr[Debug::LATEX] << "TeXContTableRows...done " << this << endl;
return return_value;
}
+#endif
bool LyXParagraph::linuxDocConvertChar(char c, string & sgml_string)
case LyXParagraph::META_HFILL:
sgml_string.clear();
break;
+#if 0
case LyXParagraph::META_PROTECTED_SEPARATOR:
sgml_string = ' ';
break;
+#endif
case LyXParagraph::META_NEWLINE:
sgml_string = '\n';
break;
retval = true;
sgml_string = ' ';
break;
- case '\0': /* Ignore :-) */
+ case '\0': // Ignore :-)
sgml_string.clear();
break;
default:
return retval;
}
-void LyXParagraph::SimpleDocBookOneTablePar(string & file, string & extra,
+
+#ifdef USE_OSTREAM_ONLY
+void LyXParagraph::SimpleDocBookOneTablePar(ostream & os, string & extra,
int & desc_on, int depth)
{
- if (!table)
- return;
+ if (!table) return;
lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar... " << this << endl;
- int column, tmp;
- int current_cell_number = -1;
+ int column = 0;
LyXFont font1, font2;
char c;
- Inset *inset;
+ Inset * inset;
size_type main_body;
- string emph = "emphasis";
- bool emph_flag= false;
- int char_line_count= 0;
+ bool emph_flag = false;
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(), GetLayout());
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
if (style.labeltype != LABEL_MANUAL)
main_body = 0;
else
main_body = BeginningOfMainBody();
- /* gets paragraph main font */
+ // Gets paragraph main font.
if (main_body > 0)
font1 = style.labelfont;
else
font1 = style.font;
- char_line_count = depth;
- addNewlineAndDepth(file, depth);
+ int char_line_count = depth;
+ os << newlineAndDepth(depth);
if (footnoteflag == LyXParagraph::NO_FOOTNOTE) {
- file += "<INFORMALTABLE>";
- addNewlineAndDepth(file, ++depth);
+ os << "<INFORMALTABLE>"
+ << newlineAndDepth(++depth);
}
- current_cell_number = -1;
- tmp = table->DocBookEndOfCell(file, current_cell_number, depth);
+ int current_cell_number = -1;
+ int tmp = table->DocBookEndOfCell(os, current_cell_number, depth);
- /* parsing main loop */
+ // Parsing main loop.
for (size_type i = 0; i < size(); ++i) {
c = GetChar(i);
if (table->IsContRow(current_cell_number+1)) {
if (c == LyXParagraph::META_NEWLINE)
- current_cell_number++;
+ ++current_cell_number;
continue;
}
- column++;
+ ++column;
// Fully instantiated font
font2 = getFont(i);
- /* handle <emphasis> tag */
+ // 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!
+ // 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++;
+ ++current_cell_number;
if (table->CellHasContRow(current_cell_number) >= 0) {
- DocBookContTableRows(file, extra, desc_on, i+1,
+ DocBookContTableRows(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
+ ostringstream ost;
+ inset->DocBook(ost);
+ string tmp_out = ost.str().c_str();
+#else
+ ostrstream ost;
+ inset->DocBook(ost);
+ ost << '\0';
+ char * ctmp = ost.str();
+ string tmp_out(ctmp);
+ delete [] ctmp;
+#endif
//
// This code needs some explanation:
// Two insets are treated specially
- // label if it is the first element in a command paragraph
+ // label if it is the first element in a
+ // command paragraph
// desc_on == 3
- // graphics inside tables or figure floats can't go on
- // title (the equivalente in latex for this case is caption
+ // graphics inside tables or figure floats
+ // can't go on
+ // title (the equivalente in latex for this
+ // case is caption
// and title should come first
// desc_on == 4
//
if(desc_on != 3 || i != 0) {
if(tmp_out[0] == '@') {
if(desc_on == 4)
- extra += frontStrip(tmp_out, '@');
+ 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;
- char_line_count++;
+ os << c;
+ ++char_line_count;
} else {
string sgml_string;
if (linuxDocConvertChar(c, 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;
}
- /* needed if there is an optional argument but no contents */
+ // Needed if there is an optional argument but no contents.
if (main_body > 0 && main_body == size()) {
font1 = style.font;
}
if (emph_flag) {
- file += "</emphasis>";
+ os << "</emphasis>";
}
- current_cell_number++;
- tmp = table->DocBookEndOfCell(file, current_cell_number, depth);
- /* resets description flag correctly */
+ ++current_cell_number;
+ tmp = table->DocBookEndOfCell(os, current_cell_number, depth);
+ // Resets description flag correctly.
switch(desc_on){
case 1:
- /* <term> not closed... */
- file += "</term>";
+ // <term> not closed...
+ 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,
- int & desc_on, LyXParagraph::size_type i,
- int current_cell_number, int &column)
-
+#else
+void LyXParagraph::SimpleDocBookOneTablePar(string & file, string & extra,
+ int & desc_on, int depth)
{
- if (!table)
- return;
-
- lyxerr[Debug::LATEX] << "DocBookContTableRows... " << this << endl;
-
- int cell;
+ if (!table) return;
+ lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar... " << this << endl;
+ int column = 0;
LyXFont font1, font2;
char c;
Inset * inset;
size_type main_body;
- size_type lastpos;
- string emph= "emphasis";
- bool emph_flag= false;
- int char_line_count= 0;
+ bool emph_flag = false;
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(),
- GetLayout());
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
if (style.labeltype != LABEL_MANUAL)
main_body = 0;
else
main_body = BeginningOfMainBody();
- /* gets paragraph main font */
+ // Gets paragraph main font.
if (main_body > 0)
font1 = style.labelfont;
else
font1 = style.font;
- lastpos = i;
- cell = table->CellHasContRow(current_cell_number);
- current_cell_number++;
- while(cell >= 0) {
- // first find the right position
+ int char_line_count = depth;
+ addNewlineAndDepth(file, depth);
+ if (footnoteflag == LyXParagraph::NO_FOOTNOTE) {
+ file += "<INFORMALTABLE>";
+ addNewlineAndDepth(file, ++depth);
+ }
+ int current_cell_number = -1;
+ int tmp = table->DocBookEndOfCell(file, current_cell_number, depth);
+
+ // Parsing main loop.
+ for (size_type i = 0; i < size(); ++i) {
+ c = GetChar(i);
+ if (table->IsContRow(current_cell_number+1)) {
+ if (c == LyXParagraph::META_NEWLINE)
+ ++current_cell_number;
+ continue;
+ }
+ ++column;
+
+ // Fully instantiated font
+ font2 = getFont(i);
+
+ // Handle <emphasis> tag.
+ if (font1.emph() != font2.emph() && i) {
+ if (font2.emph() == LyXFont::ON) {
+ file += "<emphasis>";
+ emph_flag= true;
+ } else if (emph_flag) {
+ file += "</emphasis>";
+ emph_flag= false;
+ }
+ }
+ if (c == LyXParagraph::META_NEWLINE) {
+ // We have only to control for emphasis open here!
+ if (emph_flag) {
+ file += "</emphasis>";
+ emph_flag= false;
+ }
+ font1 = font2 = getFont(-1);
+ ++current_cell_number;
+ if (table->CellHasContRow(current_cell_number) >= 0) {
+ DocBookContTableRows(file, extra, desc_on, i+1,
+ current_cell_number,
+ column);
+ }
+ // if this cell follow only ContRows till end don't
+ // put the EndOfCell because it is put after the
+ // for(...)
+ if (table->ShouldBeVeryLastCell(current_cell_number)) {
+ --current_cell_number;
+ break;
+ }
+ tmp = table->DocBookEndOfCell(file,
+ current_cell_number,
+ depth);
+
+ if (tmp > 0)
+ column = 0;
+ } else if (c == LyXParagraph::META_INSET) {
+ inset = GetInset(i);
+#ifdef USE_OSTREAM_ONLY
+#ifdef HAVE_SSTREAM
+ ostringstream ost;
+ inset->DocBook(ost);
+ string tmp_out = ost.str().c_str();
+#else
+ ostrstream ost;
+ inset->DocBook(ost);
+ ost << '\0';
+ char * ctmp = ost.str();
+ string tmp_out(ctmp);
+ delete [] ctmp;
+#endif
+#else
+ string tmp_out;
+ inset->DocBook(tmp_out);
+#endif
+ //
+ // This code needs some explanation:
+ // Two insets are treated specially
+ // label if it is the first element in a
+ // command paragraph
+ // desc_on == 3
+ // graphics inside tables or figure floats
+ // can't go on
+ // title (the equivalente in latex for this
+ // case is caption
+ // and title should come first
+ // desc_on == 4
+ //
+ if(desc_on != 3 || i != 0) {
+ if(tmp_out[0] == '@') {
+ if(desc_on == 4)
+ extra += frontStrip(tmp_out,
+ '@');
+ else
+ file += frontStrip(tmp_out,
+ '@');
+ } else
+ file += tmp_out;
+ }
+ } else if (font2.latex() == LyXFont::ON) {
+ // "TeX"-Mode on == > SGML-Mode on.
+ if (c != '\0')
+ file += c;
+ ++char_line_count;
+ } else {
+ string sgml_string;
+ if (linuxDocConvertChar(c, sgml_string)
+ && !style.free_spacing) {
+ // in freespacing mode, spaces are
+ // non-breaking characters
+ // char is ' '
+ if (desc_on == 1) {
+ ++char_line_count;
+ file += '\n';
+ file += "</term><listitem><para>";
+ desc_on = 2;
+ } else {
+ file += c;
+ }
+ } else {
+ file += sgml_string;
+ }
+ }
+ font1 = font2;
+ }
+
+ // Needed if there is an optional argument but no contents.
+ if (main_body > 0 && main_body == size()) {
+ font1 = style.font;
+ }
+
+ if (emph_flag) {
+ file += "</emphasis>";
+ }
+
+ ++current_cell_number;
+ tmp = table->DocBookEndOfCell(file, current_cell_number, depth);
+ // Resets description flag correctly.
+ switch(desc_on){
+ case 1:
+ // <term> not closed...
+ file += "</term>";
+ break;
+ }
+ if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
+ file += "</INFORMALTABLE>";
+ file += '\n';
+ lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar...done "
+ << this << endl;
+}
+#endif
+
+
+#ifdef USE_OSTREAM_ONLY
+void LyXParagraph::DocBookContTableRows(ostream & os, string & extra,
+ int & desc_on,
+ LyXParagraph::size_type i,
+ int current_cell_number, int &column)
+
+{
+ if (!table) return;
+
+ lyxerr[Debug::LATEX] << "DocBookContTableRows... " << this << endl;
+
+ LyXFont font2;
+ char c;
+ Inset * inset;
+ //string emph = "emphasis";
+ bool emph_flag = false;
+ int char_line_count = 0;
+
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
+
+ size_type main_body;
+ if (style.labeltype != LABEL_MANUAL)
+ main_body = 0;
+ else
+ main_body = BeginningOfMainBody();
+
+ // Gets paragraph main font.
+ LyXFont font1;
+ if (main_body > 0)
+ font1 = style.labelfont;
+ else
+ font1 = style.font;
+
+ size_type lastpos = i;
+ int cell = table->CellHasContRow(current_cell_number);
+ ++current_cell_number;
+ while(cell >= 0) {
+ // first find the right position
+ i = lastpos;
+ for (; i < size() && current_cell_number < cell; ++i) {
+ c = GetChar(i);
+ if (c == LyXParagraph::META_NEWLINE)
+ ++current_cell_number;
+ }
+ lastpos = i;
+ c = GetChar(i);
+ // I don't know how to handle this so I comment it
+ // for the moment (Jug)
+// if (table->Linebreaks(table->FirstVirtualCell(cell))) {
+// file += " \\\\\n";
+// column = 0;
+// } else
+ if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
+ os << ' ';
+ }
+
+ for (; i < size()
+ && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
+ ++i) {
+ ++column;
+
+ // Fully instantiated font
+ font2 = getFont(i);
+
+ // Handle <emphasis> tag.
+ if (font1.emph() != font2.emph() && i) {
+ if (font2.emph() == LyXFont::ON) {
+ os << "<emphasis>";
+ emph_flag= true;
+ } else if (emph_flag) {
+ os << "</emphasis>";
+ emph_flag= false;
+ }
+ }
+ if (c == LyXParagraph::META_INSET) {
+ inset = GetInset(i);
+#ifdef HAVE_SSTREAM
+ ostringstream ost;
+ inset->DocBook(ost);
+ string tmp_out = ost.str().c_str();
+#else
+ ostrstream ost;
+ inset->DocBook(ost);
+ ost << '\0';
+ char * ctmp = ost.str();
+ string tmp_out(ctmp);
+ delete [] ctmp;
+#endif
+ //
+ // This code needs some explanation:
+ // Two insets are treated specially
+ // label if it is the first element in a
+ // command paragraph
+ // desc_on == 3
+ // graphics inside tables or figure floats
+ // can't go on title (the equivalente in
+ // latex for this case is caption and title
+ // should come first
+ // desc_on == 4
+ //
+ if(desc_on != 3 || i != 0) {
+ if(tmp_out[0] == '@') {
+ if(desc_on == 4)
+ extra += frontStrip(tmp_out, '@');
+ else
+ os << frontStrip(tmp_out, '@');
+ } else
+ os << tmp_out;
+ }
+ } else if (font2.latex() == LyXFont::ON) {
+ // "TeX"-Mode on == > SGML-Mode on.
+ if (c!= '\0')
+ os << c;
+ ++char_line_count;
+ } else {
+ string sgml_string;
+ if (linuxDocConvertChar(c, sgml_string)
+ && !style.free_spacing) {
+ // in freespacing mode, spaces are
+ // non-breaking characters
+ // char is ' '
+ if (desc_on == 1) {
+ ++char_line_count;
+ os << '\n'
+ << "</term><listitem><para>";
+ desc_on = 2;
+ } else {
+ os << c;
+ }
+ } else {
+ os << sgml_string;
+ }
+ }
+ }
+ // we have only to control for emphasis open here!
+ if (emph_flag) {
+ os << "</emphasis>";
+ emph_flag= false;
+ }
+ font1 = font2 = getFont(-1);
+ cell = table->CellHasContRow(current_cell_number);
+ }
+ lyxerr[Debug::LATEX] << "DocBookContTableRows...done " << this << endl;
+}
+#else
+void LyXParagraph::DocBookContTableRows(string & file, string & extra,
+ int & desc_on,
+ LyXParagraph::size_type i,
+ int current_cell_number, int &column)
+
+{
+ if (!table) return;
+
+ lyxerr[Debug::LATEX] << "DocBookContTableRows... " << this << endl;
+
+ LyXFont font2;
+ char c;
+ Inset * inset;
+ //string emph = "emphasis";
+ bool emph_flag= false;
+ int char_line_count= 0;
+
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ GetLayout());
+
+ size_type main_body;
+ if (style.labeltype != LABEL_MANUAL)
+ main_body = 0;
+ else
+ main_body = BeginningOfMainBody();
+
+ // Gets paragraph main font.
+ LyXFont font1;
+ if (main_body > 0)
+ font1 = style.labelfont;
+ else
+ font1 = style.font;
+
+ size_type lastpos = i;
+ int cell = table->CellHasContRow(current_cell_number);
+ ++current_cell_number;
+ while(cell >= 0) {
+ // first find the right position
i = lastpos;
for (; i < size() && current_cell_number < cell; ++i) {
c = GetChar(i);
if (c == LyXParagraph::META_NEWLINE)
- current_cell_number++;
+ ++current_cell_number;
}
lastpos = i;
c = GetChar(i);
// Fully instantiated font
font2 = getFont(i);
- /* handle <emphasis> tag */
+ // Handle <emphasis> tag.
if (font1.emph() != font2.emph() && i) {
if (font2.emph() == LyXFont::ON) {
file += "<emphasis>";
}
if (c == LyXParagraph::META_INSET) {
inset = GetInset(i);
+#ifdef USE_OSTREAM_ONLY
+#ifdef HAVE_SSTREAM
+ ostringstream ost;
+ inset->DocBook(ost);
+ string tmp_out = ost.str().c_str();
+#else
+ ostrstream ost;
+ inset->DocBook(ost);
+ ost << '\0';
+ char * ctmp = ost.str();
+ string tmp_out(ctmp);
+ delete [] ctmp;
+#endif
+#else
string tmp_out;
inset->DocBook(tmp_out);
+#endif
//
// This code needs some explanation:
// Two insets are treated specially
- // label if it is the first element in a command paragraph
+ // label if it is the first element in a
+ // command paragraph
// desc_on == 3
- // graphics inside tables or figure floats can't go on
- // title (the equivalente in latex for this case is caption
- // and title should come first
+ // graphics inside tables or figure floats
+ // can't go on title (the equivalente in
+ // latex for this case is caption and title
+ // should come first
// desc_on == 4
//
if(desc_on != 3 || i != 0) {
// "TeX"-Mode on == > SGML-Mode on.
if (c!= '\0')
file += c;
- char_line_count++;
+ ++char_line_count;
} else {
string sgml_string;
if (linuxDocConvertChar(c, sgml_string)
&& !style.free_spacing) {
- // in freespacing mode, spaces are
- // non-breaking characters
- // char is ' '
+ // in freespacing mode, spaces are
+ // non-breaking characters
+ // char is ' '
if (desc_on == 1) {
- char_line_count++;
+ ++char_line_count;
file += '\n';
file += "</term><listitem><para>";
desc_on = 2;
}
}
}
- // we have only to control for emphasis open here!
- if (emph_flag) {
- file += "</emphasis>";
- emph_flag= false;
- }
- font1 = font2 = getFont(-1);
- cell = table->CellHasContRow(current_cell_number);
- }
- lyxerr[Debug::LATEX] << "DocBookContTableRows...done " << this << endl;
-}
-
-void LyXParagraph::SimpleTeXBlanks(string & file, TexRow & texrow,
- LyXParagraph::size_type const i,
- int & column, LyXFont const & font,
- LyXLayout const & style)
-{
- if (column > tex_code_break_column
- && i
- && GetChar(i - 1) != ' '
- && (i < size() - 1)
- // In LaTeX mode, we don't want to
- // break lines since some commands
- // do not like this
- && ! (font.latex() == LyXFont::ON)
- // same in FreeSpacing mode
- && !style.free_spacing
- // In typewriter mode, we want to avoid
- // ! . ? : at the end of a line
- && !(font.family() == LyXFont::TYPEWRITER_FAMILY
- && (GetChar(i-1) == '.'
- || GetChar(i-1) == '?'
- || GetChar(i-1) == ':'
- || GetChar(i-1) == '!'))) {
- 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";
- } else {
- file += '\n';
- }
- texrow.newline();
- texrow.start(this, i+1);
- column = 0;
- } else if (font.latex() == LyXFont::OFF) {
- if (style.free_spacing) {
- file += '~';
- } else {
- file += ' ';
- }
+ // we have only to control for emphasis open here!
+ if (emph_flag) {
+ file += "</emphasis>";
+ emph_flag= false;
+ }
+ font1 = font2 = getFont(-1);
+ cell = table->CellHasContRow(current_cell_number);
+ }
+ lyxerr[Debug::LATEX] << "DocBookContTableRows...done " << this << endl;
+}
+#endif
+
+
+#ifdef USE_OSTREAM_ONLY
+void LyXParagraph::SimpleTeXBlanks(ostream & os, TexRow & texrow,
+ LyXParagraph::size_type const i,
+ int & column, LyXFont const & font,
+ LyXLayout const & style)
+{
+ if (column > tex_code_break_column
+ && i
+ && GetChar(i - 1) != ' '
+ && (i < size() - 1)
+ // In LaTeX mode, we don't want to
+ // break lines since some commands
+ // do not like this
+ && ! (font.latex() == LyXFont::ON)
+ // same in FreeSpacing mode
+ && !style.free_spacing
+ // In typewriter mode, we want to avoid
+ // ! . ? : at the end of a line
+ && !(font.family() == LyXFont::TYPEWRITER_FAMILY
+ && (GetChar(i-1) == '.'
+ || GetChar(i-1) == '?'
+ || GetChar(i-1) == ':'
+ || GetChar(i-1) == '!'))) {
+ if (tex_code_break_column == 0) {
+ // in batchmode we need LaTeX to still
+ // see it as a space not as an extra '\n'
+ os << " %\n";
+ } else {
+ os << '\n';
+ }
+ texrow.newline();
+ texrow.start(this, i + 1);
+ column = 0;
+ } else if (font.latex() == LyXFont::OFF) {
+ if (style.free_spacing) {
+ os << '~';
+ } else {
+ os << ' ';
+ }
+ }
+}
+#else
+void LyXParagraph::SimpleTeXBlanks(string & file, TexRow & texrow,
+ LyXParagraph::size_type const i,
+ int & column, LyXFont const & font,
+ LyXLayout const & style)
+{
+ if (column > tex_code_break_column
+ && i
+ && GetChar(i - 1) != ' '
+ && (i < size() - 1)
+ // In LaTeX mode, we don't want to
+ // break lines since some commands
+ // do not like this
+ && ! (font.latex() == LyXFont::ON)
+ // same in FreeSpacing mode
+ && !style.free_spacing
+ // In typewriter mode, we want to avoid
+ // ! . ? : at the end of a line
+ && !(font.family() == LyXFont::TYPEWRITER_FAMILY
+ && (GetChar(i-1) == '.'
+ || GetChar(i-1) == '?'
+ || GetChar(i-1) == ':'
+ || GetChar(i-1) == '!'))) {
+ 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";
+ } else {
+ file += '\n';
+ }
+ texrow.newline();
+ texrow.start(this, i+1);
+ column = 0;
+ } else if (font.latex() == LyXFont::OFF) {
+ if (style.free_spacing) {
+ file += '~';
+ } else {
+ file += ' ';
+ }
+ }
+}
+#endif
+
+
+#ifdef USE_OSTREAM_ONLY
+void LyXParagraph::SimpleTeXSpecialChars(ostream & os, TexRow & texrow,
+ LyXFont & font,
+ LyXFont & running_font,
+ LyXFont & basefont,
+ bool & open_font,
+ LyXLayout const & style,
+ LyXParagraph::size_type & i,
+ int & column, char const c)
+{
+ // Two major modes: LaTeX or plain
+ // Handle here those cases common to both modes
+ // and then split to handle the two modes separately.
+ switch (c) {
+ case LyXParagraph::META_INSET: {
+ Inset * inset = GetInset(i);
+ if (inset) {
+ 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.getFontDirection()
+ == LYX_DIR_RIGHT_TO_LEFT) {
+ os << "\\L{";
+ close = true;
+ }
+
+ int tmp = inset->Latex(os, style.isCommand());
+
+ if (close)
+ os << "}";
+
+ if (tmp) {
+ column = 0;
+ } else {
+ column += os.tellp() - len;
+ }
+ for (; tmp--;) {
+ texrow.newline();
+ }
+ }
+ }
+ break;
+
+ case LyXParagraph::META_NEWLINE:
+ if (open_font) {
+ column += running_font.latexWriteEndChanges(os,
+ basefont,
+ basefont);
+ open_font = false;
+ }
+ basefont = getFont(-1);
+ running_font = basefont;
+ break;
+
+ case LyXParagraph::META_HFILL:
+ os << "\\hfill{}";
+ column += 7;
+ break;
+
+ default:
+ // And now for the special cases within each mode
+ // Are we in LaTeX mode?
+ if (font.latex() == LyXFont::ON) {
+ // at present we only have one option
+ // 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
+ // file. This test would not be needed
+ // if it were done in the buffer
+ // itself.
+ if (c != '\0') {
+ os << c;
+ }
+ break;
+ }
+ } else {
+ // Plain mode (i.e. not LaTeX)
+ switch (c) {
+#if 0
+ case LyXParagraph::META_PROTECTED_SEPARATOR:
+ os << '~';
+ break;
+#endif
+ case '\\':
+ os << "\\textbackslash{}";
+ column += 15;
+ break;
+
+ case '°': case '±': case '²': case '³':
+ case '×': case '÷': case '¹': case 'ª':
+ case 'º': case '¬': case 'µ':
+ if (current_view->buffer()->params.inputenc == "latin1") {
+ os << "\\ensuremath{"
+ << c
+ << '}';
+ column += 13;
+ } else {
+ os << c;
+ }
+ break;
+
+ case '|': case '<': case '>':
+ // In T1 encoding, these characters exist
+ if (lyxrc->fontenc == "T1") {
+ os << c;
+ //... but we should avoid ligatures
+ if ((c == '>' || c == '<')
+ && i <= size() - 2
+ && GetChar(i + 1) == c){
+ os << "\\textcompwordmark{}";
+ column += 19;
+ }
+ break;
+ }
+ // Typewriter font also has them
+ if (font.family() == LyXFont::TYPEWRITER_FAMILY) {
+ os << c;
+ break;
+ }
+ // Otherwise, we use what LaTeX
+ // provides us.
+ switch(c) {
+ case '<':
+ os << "\\textless{}";
+ column += 10;
+ break;
+ case '>':
+ os << "\\textgreater{}";
+ column += 13;
+ break;
+ case '|':
+ os << "\\textbar{}";
+ column += 9;
+ break;
+ }
+ break;
+
+ case '-': // "--" in Typewriter mode -> "-{}-"
+ if (i <= size() - 2
+ && GetChar(i + 1) == '-'
+ && font.family() == LyXFont::TYPEWRITER_FAMILY) {
+ os << "-{}";
+ column += 2;
+ } else {
+ os << '-';
+ }
+ break;
+
+ case '\"':
+ os << "\\char`\\\"{}";
+ column += 9;
+ break;
+
+ case '£':
+ if (current_view->buffer()->params.inputenc == "default") {
+ os << "\\pounds{}";
+ column += 8;
+ } else {
+ os << c;
+ }
+ break;
+
+ case '$': case '&':
+ case '%': case '#': case '{':
+ case '}': case '_':
+ os << '\\' << c;
+ column += 1;
+ break;
+
+ case '~':
+ os << "\\textasciitilde{}";
+ column += 16;
+ break;
+
+ case '^':
+ os << "\\textasciicircum{}";
+ column += 17;
+ break;
+
+ case '*': case '[': case ']':
+ // avoid being mistaken for optional arguments
+ os << '{' << c << '}';
+ column += 2;
+ break;
+
+ case ' ':
+ // Blanks are printed before font switching.
+ // Sure? I am not! (try nice-latex)
+ // I am sure it's correct. LyX might be smarter
+ // in the future, but for now, nothing wrong is
+ // written. (Asger)
+ break;
+
+ default:
+ /* idea for labels --- begin*/
+ // Check for "LyX"
+ if (c == 'L'
+ && i <= size() - 3
+ && font.family() != LyXFont::TYPEWRITER_FAMILY
+ && GetChar(i + 1) == 'y'
+ && GetChar(i + 2) == 'X') {
+ os << "\\LyX{}";
+ i += 2;
+ column += 5;
+ }
+ // Check for "TeX"
+ else if (c == 'T'
+ && i <= size() - 3
+ && font.family() != LyXFont::TYPEWRITER_FAMILY
+ && GetChar(i + 1) == 'e'
+ && GetChar(i + 2) == 'X') {
+ os << "\\TeX{}";
+ i += 2;
+ column += 5;
+ }
+ // Check for "LaTeX2e"
+ else if (c == 'L'
+ && i <= size() - 7
+ && font.family() != LyXFont::TYPEWRITER_FAMILY
+ && GetChar(i + 1) == 'a'
+ && GetChar(i + 2) == 'T'
+ && GetChar(i + 3) == 'e'
+ && GetChar(i + 4) == 'X'
+ && GetChar(i + 5) == '2'
+ && GetChar(i + 6) == 'e') {
+ os << "\\LaTeXe{}";
+ i += 6;
+ column += 8;
+ }
+ // Check for "LaTeX"
+ else if (c == 'L'
+ && i <= size() - 5
+ && font.family() != LyXFont::TYPEWRITER_FAMILY
+ && GetChar(i + 1) == 'a'
+ && GetChar(i + 2) == 'T'
+ && GetChar(i + 3) == 'e'
+ && GetChar(i + 4) == 'X') {
+ os << "\\LaTeX{}";
+ i += 4;
+ column += 7;
+ /* idea for labels --- end*/
+ } else if (c != '\0') {
+ os << c;
+ }
+ break;
+ }
+ }
}
}
-
-
+#else
void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
LyXFont & font,
LyXFont & running_font,
case LyXParagraph::META_INSET: {
Inset * inset = GetInset(i);
if (inset) {
+ bool close = false;
int len = file.length();
+ if ((inset->LyxCode() == Inset::GRAPHICS_CODE
+ || inset->LyxCode() == Inset::MATH_CODE
+ || inset->LyxCode() == Inset::URL_CODE)
+ && running_font.getFontDirection()
+ == LYX_DIR_RIGHT_TO_LEFT) {
+ file += "\\L{";
+ close = true;
+ }
+#ifdef USE_OSTREAM_ONLY
+#ifdef HAVE_SSTREAM
+ ostringstream ost;
+ int tmp = inset->Latex(ost, style.isCommand());
+ file += ost.str().c_str();
+#else
+ ostrstream ost;
+ int tmp = inset->Latex(ost, style.isCommand());
+ ost << '\0';
+ char * chtmp = ost.str();
+ file += chtmp;
+ delete [] chtmp;
+#endif
+#else
int tmp = inset->Latex(file, style.isCommand());
+#endif
+ if (close)
+ file += "}";
if (tmp) {
column = 0;
} else {
column += file.length() - len;
}
- for (;tmp--;) {
+ for (; tmp--;) {
texrow.newline();
}
}
case LyXParagraph::META_NEWLINE:
if (open_font) {
column += running_font.latexWriteEndChanges(file,
- basefont);
+ basefont, basefont);
open_font = false;
}
basefont = getFont(-1);
// but I'll leave it as a switch statement
// so its simpler to extend. (ARRae)
switch (c) {
+#if 0
case LyXParagraph::META_PROTECTED_SEPARATOR:
file += ' ';
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:
file += '~';
break;
-
+#endif
case '\\':
file += "\\textbackslash{}";
column += 15;
break;
case ' ':
- /* blanks are printed before font switching */
+ // Blanks are printed before font switching.
// Sure? I am not! (try nice-latex)
// I am sure it's correct. LyX might be smarter
// in the future, but for now, nothing wrong is
default:
/* idea for labels --- begin*/
- /* check for LyX */
+ // Check for "LyX"
if (c == 'L'
&& i <= size() - 3
&& font.family() != LyXFont::TYPEWRITER_FAMILY
i += 2;
column += 5;
}
- /* check for TeX */
+ // Check for "TeX"
else if (c == 'T'
&& i <= size() - 3
&& font.family() != LyXFont::TYPEWRITER_FAMILY
i += 2;
column += 5;
}
- /* check for LaTeX2e */
+ // Check for "LaTeX2e"
else if (c == 'L'
&& i <= size() - 7
&& font.family() != LyXFont::TYPEWRITER_FAMILY
i += 6;
column += 8;
}
- /* check for LaTeX */
+ // Check for "LaTeX"
else if (c == 'L'
&& i <= size() - 5
&& font.family() != LyXFont::TYPEWRITER_FAMILY
}
}
}
+#endif
-bool LyXParagraph::RoffContTableRows(FILE * fp,
+#if 0
+bool LyXParagraph::RoffContTableRows(ostream & os,
LyXParagraph::size_type i,
int actcell)
{
if (!table)
return false;
- LyXFont font1 = LyXFont(LyXFont::ALL_INHERIT);
+ LyXFont font1(LyXFont::ALL_INHERIT);
LyXFont font2;
Inset * inset;
char c;
- FILE * fp2;
string fname2 = TmpFileName(string(), "RAT2");
int lastpos = i;
int cell = table->CellHasContRow(actcell);
- 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++;
+ ++actcell;
}
lastpos = i;
c = GetChar(i);
if ((c != ' ') && (c != LyXParagraph::META_NEWLINE))
- fprintf(fp, " ");
+ os << " ";
for (; i < size()
&& (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
++i) {
switch (c) {
case LyXParagraph::META_INSET:
if ((inset = GetInset(i))) {
- if (!(fp2= fopen(fname2.c_str(), "w+"))) {
+#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(fp2,-1);
- rewind(fp2);
- c = fgetc(fp2);
- while(!feof(fp2)) {
+ inset->Latex(fs, -1);
+ fs.seekp(0);
+ fs.get(c);
+ while (!fs) {
if (c == '\\')
- fprintf(fp, "\\\\");
+ os << "\\\\";
else
- fputc(c, fp);
- c = fgetc(fp2);
+ os << c;
+ fs.get(c);
}
- fclose(fp2);
+ fs.close();
+#endif
}
break;
case LyXParagraph::META_NEWLINE:
break;
case LyXParagraph::META_HFILL:
break;
+#if 0
case LyXParagraph::META_PROTECTED_SEPARATOR:
break;
+#endif
case '\\':
- fprintf(fp, "\\\\");
+ os << "\\\\";
break;
default:
if (c != '\0')
- fprintf(fp, "%c", c);
+ os << c;
else
- lyxerr.debug() << "RoffAsciiTable: NULL char in structure." << endl;
+ lyxerr.debug() << "RoffAsciiTable: "
+ "NULL char in structure."
+ << endl;
break;
}
}
}
return true;
}
+#endif
+
+
+#ifdef USE_OSTREAM_ONLY
+LyXParagraph * LyXParagraph::TeXDeeper(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) {
+ if (par->IsDummy())
+ lyxerr << "ERROR (LyXParagraph::TeXDeeper)" << endl;
+ if (textclasslist.Style(current_view->buffer()->params.textclass,
+ par->layout).isEnvironment()
+ || par->pextra_type != PEXTRA_NONE) {
+ par = par->TeXEnvironment(os, texrow,
+ foot, foot_texrow,
+ foot_count);
+ } else {
+ par = par->TeXOnePar(os, texrow,
+ foot, foot_texrow,
+ foot_count);
+ }
+ }
+ lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
+ return par;
+}
+#else
LyXParagraph * LyXParagraph::TeXDeeper(string & file, TexRow & texrow,
string & foot, TexRow & foot_texrow,
int & foot_count)
while (par && par->depth == depth) {
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXDeeper)" << endl;
- if (textclasslist.Style(GetCurrentTextClass(),
- par->layout).isEnvironment()
+ if (textclasslist.Style(current_view->buffer()->params.textclass,
+ par->layout).isEnvironment()
|| par->pextra_type != PEXTRA_NONE)
{
par = par->TeXEnvironment(file, texrow,
foot_count);
}
}
- lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
-
- return par;
+ lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
+
+ return par;
+}
+#endif
+
+
+#ifdef USE_OSTREAM_ONLY
+LyXParagraph * LyXParagraph::TeXEnvironment(ostream & os, TexRow & texrow,
+ ostream & foot,
+ TexRow & foot_texrow,
+ int & foot_count)
+{
+ bool eindent_open = false;
+ bool foot_this_level = false;
+ // flags when footnotetext should be appended to file.
+ static bool minipage_open = false;
+ static int minipage_open_depth = 0;
+ char par_sep = current_view->buffer()->params.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,
+ layout);
+
+ if (pextra_type == PEXTRA_INDENT) {
+ if (!pextra_width.empty()) {
+ os << "\\begin{LyXParagraphIndent}{"
+ << pextra_width << "}\n";
+ } else {
+ //float ib = atof(pextra_widthp.c_str())/100;
+ // string can't handle floats at present (971109)
+ // so I'll do a conversion by hand knowing that
+ // the limits are 0.0 to 1.0. ARRae.
+ os << "\\begin{LyXParagraphIndent}{";
+ switch (pextra_widthp.length()) {
+ case 3:
+ os << "1.00";
+ break;
+ case 2:
+ os << "0."
+ << pextra_widthp;
+ break;
+ case 1:
+ os << "0.0"
+ << pextra_widthp;
+ }
+ os << "\\columnwidth}\n";
+ }
+ texrow.newline();
+ eindent_open = true;
+ }
+ if ((pextra_type == PEXTRA_MINIPAGE) && !minipage_open) {
+ if (pextra_hfill && Previous() &&
+ (Previous()->pextra_type == PEXTRA_MINIPAGE)) {
+ os << "\\hfill{}\n";
+ texrow.newline();
+ }
+ if (par_sep == BufferParams::PARSEP_INDENT) {
+ os << "{\\setlength\\parindent{0pt}\n";
+ texrow.newline();
+ }
+ os << "\\begin{minipage}";
+ switch(pextra_alignment) {
+ case MINIPAGE_ALIGN_TOP:
+ os << "[t]";
+ break;
+ case MINIPAGE_ALIGN_MIDDLE:
+ os << "[m]";
+ break;
+ case MINIPAGE_ALIGN_BOTTOM:
+ os << "[b]";
+ break;
+ }
+ if (!pextra_width.empty()) {
+ os << '{' << pextra_width << "}\n";
+ } else {
+ //float ib = atof(par->pextra_width.c_str())/100;
+ // string can't handle floats at present
+ // so I'll do a conversion by hand knowing that
+ // the limits are 0.0 to 1.0. ARRae.
+ os << '{';
+ switch (pextra_widthp.length()) {
+ case 3:
+ os << "1.00";
+ break;
+ case 2:
+ os << "0."
+ << pextra_widthp;
+ break;
+ case 1:
+ os << "0.0"
+ << pextra_widthp;
+ }
+ os << "\\columnwidth}\n";
+ }
+ texrow.newline();
+ if (par_sep == BufferParams::PARSEP_INDENT) {
+ os << "\\setlength\\parindent{\\LyXMinipageIndent}\n";
+ texrow.newline();
+ }
+ minipage_open = true;
+ minipage_open_depth = depth;
+ }
+
+#ifdef WITH_WARNINGS
+#warning Define FANCY_FOOTNOTE_CODE to re-enable Allan footnote code
+ //I disabled it because it breaks when lists span on several
+ //pages (JMarc)
+#endif
+ if (style.isEnvironment()){
+ if (style.latextype == LATEX_LIST_ENVIRONMENT) {
+#ifdef FANCY_FOOTNOTE_CODE
+ if (foot_count < 0) {
+ // flag that footnote[mark][text] should be
+ // used for any footnotes from now on
+ foot_count = 0;
+ foot_this_level = true;
+ }
+#endif
+ os << "\\begin{" << style.latexname() << "}{"
+ << labelwidthstring << "}\n";
+ } else if (style.labeltype == LABEL_BIBLIO) {
+ // ale970405
+ os << "\\begin{" << style.latexname() << "}{"
+ << bibitemWidthest(current_view->painter())
+ << "}\n";
+ } else if (style.latextype == LATEX_ITEM_ENVIRONMENT) {
+#ifdef FANCY_FOOTNOTE_CODE
+ if (foot_count < 0) {
+ // flag that footnote[mark][text] should be
+ // used for any footnotes from now on
+ foot_count = 0;
+ foot_this_level = true;
+ }
+#endif
+ os << "\\begin{" << style.latexname() << '}'
+ << style.latexparam() << '\n';
+ } else
+ os << "\\begin{" << style.latexname() << '}'
+ << style.latexparam() << '\n';
+ texrow.newline();
+ }
+ LyXParagraph * par = this;
+ do {
+ par = par->TeXOnePar(os, texrow,
+ foot, foot_texrow, foot_count);
+
+ if (minipage_open && par && !style.isEnvironment() &&
+ (par->pextra_type == PEXTRA_MINIPAGE) &&
+ par->pextra_start_minipage) {
+ os << "\\end{minipage}\n";
+ texrow.newline();
+ if (par_sep == BufferParams::PARSEP_INDENT) {
+ os << "}\n";
+ texrow.newline();
+ }
+ minipage_open = false;
+ }
+ if (par && par->depth > depth) {
+ if (textclasslist.Style(current_view->buffer()->params.textclass,
+ par->layout).isParagraph()
+ && !par->table
+ // 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
+ // 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(os, texrow,
+ foot, foot_texrow, foot_count);
+ }
+ if (par && par->layout == layout && par->depth == depth &&
+ (par->pextra_type == PEXTRA_MINIPAGE) && !minipage_open) {
+ if (par->pextra_hfill && par->Previous() &&
+ (par->Previous()->pextra_type == PEXTRA_MINIPAGE)){
+ os << "\\hfill{}\n";
+ texrow.newline();
+ }
+ if (par_sep == BufferParams::PARSEP_INDENT) {
+ os << "{\\setlength\\parindent{0pt}\n";
+ texrow.newline();
+ }
+ os << "\\begin{minipage}";
+ switch(par->pextra_alignment) {
+ case MINIPAGE_ALIGN_TOP:
+ os << "[t]";
+ break;
+ case MINIPAGE_ALIGN_MIDDLE:
+ os << "[m]";
+ break;
+ case MINIPAGE_ALIGN_BOTTOM:
+ os << "[b]";
+ break;
+ }
+ if (!par->pextra_width.empty()) {
+ os << '{' << par->pextra_width << "}\n";
+ } else {
+ //float ib = atof(par->pextra_widthp.c_str())/100;
+ // string can't handle floats at present
+ // so I'll do a conversion by hand knowing that
+ // the limits are 0.0 to 1.0. ARRae.
+ os << '{';
+ switch (par->pextra_widthp.length()) {
+ case 3:
+ os << "1.00";
+ break;
+ case 2:
+ os << "0." << par->pextra_widthp;
+ break;
+ case 1:
+ os << "0.0" << par->pextra_widthp;
+ }
+ os << "\\columnwidth}\n";
+ }
+ texrow.newline();
+ if (par_sep == BufferParams::PARSEP_INDENT) {
+ os << "\\setlength\\parindent{\\LyXMinipageIndent}\n";
+ texrow.newline();
+ }
+ minipage_open = true;
+ minipage_open_depth = par->depth;
+ }
+ } while (par
+ && par->layout == layout
+ && par->depth == depth
+ && par->pextra_type == pextra_type);
+
+ if (style.isEnvironment()) {
+ os << "\\end{" << style.latexname() << '}';
+ // maybe this should go after the minipage closes?
+ if (foot_this_level) {
+ if (foot_count >= 1) {
+ if (foot_count > 1) {
+ os << "\\addtocounter{footnote}{-"
+ << foot_count - 1
+ << '}';
+ }
+ os << foot;
+ texrow += foot_texrow;
+ foot.clear();
+ foot_texrow.reset();
+ foot_count = 0;
+ }
+ }
+ }
+ if (minipage_open && (minipage_open_depth == depth) &&
+ (!par || par->pextra_start_minipage ||
+ par->pextra_type != PEXTRA_MINIPAGE)) {
+ os << "\\end{minipage}\n";
+ texrow.newline();
+ if (par_sep == BufferParams::PARSEP_INDENT) {
+ os << "}\n";
+ texrow.newline();
+ }
+ if (par && par->pextra_type != PEXTRA_MINIPAGE) {
+ os << "\\medskip\n\n";
+ texrow.newline();
+ texrow.newline();
+ }
+ minipage_open = false;
+ }
+ if (eindent_open) {
+ os << "\\end{LyXParagraphIndent}\n";
+ texrow.newline();
+ }
+ if (!(par && (par->pextra_type == PEXTRA_MINIPAGE)
+ && par->pextra_hfill)) {
+ os << '\n';
+ texrow.newline();
+ }
+ lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
+ return par; // ale970302
}
-
-
+#else
LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
- string & foot, TexRow & foot_texrow,
- int & foot_count)
+ string & foot,
+ TexRow & foot_texrow,
+ int & foot_count)
{
bool eindent_open = false;
bool foot_this_level = false;
- // flags when footnotetext should be appended to file.
+ // 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;
if (IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXEnvironment)" << endl;
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(),
- layout);
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ layout);
if (pextra_type == PEXTRA_INDENT) {
if (!pextra_width.empty()) {
} else if (style.labeltype == LABEL_BIBLIO) {
// ale970405
file += "\\begin{" + style.latexname() + "}{"
- + bibitemWidthest() + "}\n";
+ + bibitemWidthest(current_view->painter())
+ + "}\n";
} else if (style.latextype == LATEX_ITEM_ENVIRONMENT) {
#ifdef FANCY_FOOTNOTE_CODE
if (foot_count < 0) {
if (minipage_open && par && !style.isEnvironment() &&
(par->pextra_type == PEXTRA_MINIPAGE) &&
par->pextra_start_minipage) {
- file += "\\end{minipage}\n";
- texrow.newline();
- if (par_sep == BufferParams::PARSEP_INDENT) {
- file += "}\n";
+ file += "\\end{minipage}\n";
texrow.newline();
- }
- minipage_open = false;
+ if (par_sep == BufferParams::PARSEP_INDENT) {
+ file += "}\n";
+ texrow.newline();
+ }
+ minipage_open = false;
}
if (par && par->depth > depth) {
- if (textclasslist.Style(GetCurrentTextClass(),
- par->layout).isParagraph()
+ if (textclasslist.Style(current_view->buffer()->params.textclass,
+ par->layout).isParagraph()
&& !par->table
&& !suffixIs(file, "\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
+ // 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';
texrow.newline();
}
lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
return par; // ale970302
}
+#endif
+
+
+#ifdef USE_OSTREAM_ONLY
+LyXParagraph * LyXParagraph::TeXFootnote(ostream & os, TexRow & texrow,
+ ostream & foot, TexRow & foot_texrow,
+ int & foot_count,
+ LyXDirection par_direction)
+{
+ lyxerr[Debug::LATEX] << "TeXFootnote... " << this << endl;
+ if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
+ lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
+ "No footnote!" << endl;
+
+ LyXParagraph * par = this;
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ previous->GetLayout());
+
+ if (style.needprotect && footnotekind != LyXParagraph::FOOTNOTE){
+ lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
+ "Float other than footnote in command"
+ " with moving argument is illegal" << endl;
+ }
+
+ if (footnotekind != LyXParagraph::FOOTNOTE
+ && footnotekind != LyXParagraph::MARGIN
+ && os.tellp()
+ // Thinko
+ // How to solve this?
+ //&& !suffixIs(file, '\n')
+ ) {
+ // we need to ensure that real floats like tables and figures
+ // have their \begin{} on a new line otherwise we can get
+ // incorrect results when using the endfloat.sty package
+ // especially if two floats follow one another. ARRae 981022
+ // NOTE: if the file is length 0 it must have just been
+ // written out so we assume it ended with a '\n'
+ // Thinkee:
+ // As far as I can see there is never any harm in writing
+ // a '\n' too much. Please tell me if I am wrong. (Lgb)
+ os << '\n';
+ texrow.newline();
+ }
+
+ 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;
+ } else {
+ if (foot_count == -1) {
+ // we're at depth 0 so we can use:
+ os << "\\footnote{%\n";
+ footer_in_body = false;
+ } else {
+ os << "\\footnotemark{}%\n";
+ if (foot_count) {
+ // we only need this when there are
+ // multiple footnotes
+ os << "\\stepcounter{footnote}";
+ }
+ os << "\\footnotetext{%\n";
+ foot_texrow.start(this, 0);
+ foot_texrow.newline();
+ ++foot_count;
+ }
+ }
+ break;
+ case LyXParagraph::MARGIN:
+ os << "\\marginpar{\n";
+ break;
+ case LyXParagraph::FIG:
+ if (pextra_type == PEXTRA_FLOATFLT
+ && (!pextra_width.empty()
+ || !pextra_widthp.empty())) {
+ if (!pextra_width.empty())
+ os << "\\begin{floatingfigure}{"
+ << pextra_width << "}\n";
+ else
+ os << "\\begin{floatingfigure}{"
+ << atoi(pextra_widthp.c_str())/100.0
+ << "\\textwidth}\n";
+ } else {
+ os << "\\begin{figure}";
+ if (!params->float_placement.empty()) {
+ os << '[' << params->float_placement << "]\n";
+ } else {
+ os << '\n';
+ }
+ }
+ break;
+ case LyXParagraph::TAB:
+ os << "\\begin{table}";
+ if (!params->float_placement.empty()) {
+ os << '[' << params->float_placement << "]\n";
+ } else {
+ os << '\n';
+ }
+ break;
+ case LyXParagraph::WIDE_FIG:
+ os << "\\begin{figure*}";
+ if (!params->float_placement.empty()) {
+ os << '[' << params->float_placement << "]\n";
+ } else {
+ os << '\n';
+ }
+ break;
+ case LyXParagraph::WIDE_TAB:
+ os << "\\begin{table*}";
+ if (!params->float_placement.empty()) {
+ os << '[' << params->float_placement << "]\n";
+ } else {
+ os << '\n';
+ }
+ break;
+ case LyXParagraph::ALGORITHM:
+ os << "\\begin{algorithm}\n";
+ break;
+ }
+ texrow.newline();
+
+
+ LyXDirection direction = getParDirection();
+ if (direction != par_direction) {
+ if (direction == LYX_DIR_LEFT_TO_RIGHT)
+ os << "\\unsethebrew\n";
+ else
+ os << "\\sethebrew\n";
+ texrow.newline();
+ }
+
+ 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);
+ if (par->IsDummy())
+ lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
+ << endl;
+ if (style.isEnvironment()
+ || par->pextra_type == PEXTRA_MINIPAGE) { /* && !minipage_open ?? */
+ // Allows the use of minipages within float
+ // environments. Shouldn't be circular because
+ // we don't support footnotes inside
+ // floats (yet). ARRae
+ par = par->TeXEnvironment(os, texrow,
+ foot, foot_texrow,
+ foot_count);
+ } else {
+ par = par->TeXOnePar(os, texrow,
+ foot, foot_texrow,
+ foot_count);
+ }
+
+ if (par && !par->IsDummy() && par->depth > depth) {
+ par = par->TeXDeeper(os, texrow,
+ foot, foot_texrow,
+ foot_count);
+ }
+ } while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE);
+ } else {
+ // process footnotes > depth 0 or in environments separately
+ // NOTE: Currently don't support footnotes within footnotes
+ // even though that is possible using the \footnotemark
+#ifdef HAVE_SSTREAM
+ 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);
+ if (par->IsDummy())
+ lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
+ << endl;
+ if (style.isEnvironment()
+ || par->pextra_type == PEXTRA_MINIPAGE) { /* && !minipage_open ?? */
+ // Allows the use of minipages within float
+ // environments. Shouldn't be circular because
+ // we don't support footnotes inside
+ // floats (yet). ARRae
+ par = par->TeXEnvironment(foot, foot_texrow,
+ dummy, dummy_texrow,
+ dummy_count);
+ } else {
+ par = par->TeXOnePar(foot, foot_texrow,
+ dummy, dummy_texrow,
+ dummy_count);
+ }
+
+ if (par && !par->IsDummy() && par->depth > depth) {
+ par = par->TeXDeeper(foot, foot_texrow,
+ dummy, dummy_texrow,
+ dummy_count);
+ }
+ } while (par
+ && par->footnoteflag != LyXParagraph::NO_FOOTNOTE);
+ if (dummy_count) {
+ lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
+ "Footnote in a Footnote -- not supported"
+ << endl;
+ }
+#ifndef HAVE_OSTREAM
+ delete [] dummy.str();
+#endif
+ }
+
+ switch (footnotekind) {
+ case LyXParagraph::FOOTNOTE:
+ if (footer_in_body) {
+ // This helps tell which of the multiple
+ // footnotetexts an error was in.
+ foot << "}%\n";
+ foot_texrow.newline();
+ } else {
+ os << '}';
+ }
+ break;
+ case LyXParagraph::MARGIN:
+ os << '}';
+ break;
+ case LyXParagraph::FIG:
+ if (pextra_type == PEXTRA_FLOATFLT
+ && (!pextra_width.empty()
+ || !pextra_widthp.empty()))
+ os << "\\end{floatingfigure}";
+ else
+ os << "\\end{figure}";
+ break;
+ case LyXParagraph::TAB:
+ os << "\\end{table}";
+ break;
+ case LyXParagraph::WIDE_FIG:
+ os << "\\end{figure*}";
+ break;
+ case LyXParagraph::WIDE_TAB:
+ os << "\\end{table*}";
+ break;
+ case LyXParagraph::ALGORITHM:
+ os << "\\end{algorithm}";
+ break;
+ }
+ if (footnotekind != LyXParagraph::FOOTNOTE
+ && footnotekind != LyXParagraph::MARGIN) {
+ // we need to ensure that real floats like tables and figures
+ // have their \end{} on a line of their own otherwise we can
+ // get incorrect results when using the endfloat.sty package.
+ os << "\n";
+ texrow.newline();
+ }
+ lyxerr[Debug::LATEX] << "TeXFootnote...done " << par->next << endl;
+ return par;
+}
+#else
LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
string & foot, TexRow & foot_texrow,
- int & foot_count)
+ int & foot_count,
+ LyXDirection par_direction)
{
lyxerr[Debug::LATEX] << "TeXFootnote... " << this << endl;
if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
"No footnote!" << endl;
LyXParagraph * par = this;
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(),
- previous->GetLayout());
+ LyXLayout const & style =
+ textclasslist.Style(current_view->buffer()->params.textclass,
+ previous->GetLayout());
if (style.needprotect && footnotekind != LyXParagraph::FOOTNOTE){
lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
|| !pextra_widthp.empty())) {
char bufr[80];
if (!pextra_width.empty())
- sprintf(bufr, "\\begin{floatingfigure}{%s}\n",
+ sprintf(bufr,
+ "\\begin{floatingfigure}{%s}\n",
pextra_width.c_str());
else
- sprintf(bufr, "\\begin{floatingfigure}{%f\\textwidth}\n",
+ sprintf(bufr,
+ "\\begin{floatingfigure}{%f\\textwidth}\n",
atoi(pextra_widthp.c_str())/100.0);
file += bufr;
} else {
}
texrow.newline();
+
+ LyXDirection direction = getParDirection();
+ if (direction != par_direction) {
+ if (direction == LYX_DIR_LEFT_TO_RIGHT)
+ file += "\\unsethebrew\n";
+ else
+ file += "\\sethebrew\n";
+ texrow.newline();
+ }
+
if (footnotekind != LyXParagraph::FOOTNOTE
|| !footer_in_body) {
// Process text for all floats except footnotes in body
do {
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(),
- par->layout);
+ LyXLayout const & style =
+ textclasslist
+ .Style(current_view->buffer()->params
+ .textclass,
+ par->layout);
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
<< endl;
if (style.isEnvironment()
|| par->pextra_type == PEXTRA_MINIPAGE) { /* && !minipage_open ?? */
- // Allows the use of minipages within float environments.
- // Shouldn't be circular because we don't support
- // footnotes inside floats (yet). ARRae
+ // Allows the use of minipages within float
+ // environments. Shouldn't be circular because
+ // we don't support footnotes inside
+ // floats (yet). ARRae
par = par->TeXEnvironment(file, texrow,
foot, foot_texrow,
foot_count);
TexRow dummy_texrow;
int dummy_count = 0;
do {
- LyXLayout const & style = textclasslist.Style(GetCurrentTextClass(),
- par->layout);
+ LyXLayout const & style =
+ textclasslist
+ .Style(current_view->buffer()->params
+ .textclass,
+ par->layout);
if (par->IsDummy())
lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
<< endl;
if (style.isEnvironment()
|| par->pextra_type == PEXTRA_MINIPAGE) { /* && !minipage_open ?? */
- // Allows the use of minipages within float environments.
- // Shouldn't be circular because we don't support
- // footnotes inside floats (yet). ARRae
+ // Allows the use of minipages within float
+ // environments. Shouldn't be circular because
+ // we don't support footnotes inside
+ // floats (yet). ARRae
par = par->TeXEnvironment(foot, foot_texrow,
dummy, dummy_texrow,
dummy_count);
dummy, dummy_texrow,
dummy_count);
}
- } while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE);
+ } while (par
+ && par->footnoteflag != LyXParagraph::NO_FOOTNOTE);
if (dummy_count) {
lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
"Footnote in a Footnote -- not supported"
lyxerr[Debug::LATEX] << "TeXFootnote...done " << par->next << endl;
return par;
}
+#endif
void LyXParagraph::SetPExtraType(int type, char const * width,
char const * widthp)
{
- pextra_type = type;
- pextra_width = width;
- pextra_widthp = widthp;
-
- if (textclasslist.Style(GetCurrentTextClass(),
- layout).isEnvironment()) {
- LyXParagraph
- * par = this,
- * ppar = par;
-
- while (par && (par->layout == layout) && (par->depth == depth)) {
- ppar = par;
- par = par->Previous();
- if (par)
- par = par->FirstPhysicalPar();
- while (par && par->depth > depth) {
- par = par->Previous();
- if (par)
- par = par->FirstPhysicalPar();
- }
- }
- par = ppar;
- while (par && (par->layout == layout) && (par->depth == depth)) {
- par->pextra_type = type;
- par->pextra_width = width;
- par->pextra_widthp = widthp;
- par = par->NextAfterFootnote();
- if (par && (par->depth > depth))
- par->SetPExtraType(type, width, widthp);
- while (par && ((par->depth > depth) || par->IsDummy()))
- par = par->NextAfterFootnote();
- }
- }
+ pextra_type = type;
+ pextra_width = width;
+ pextra_widthp = widthp;
+
+ if (textclasslist.Style(current_view->buffer()->params.textclass,
+ layout).isEnvironment()) {
+ LyXParagraph
+ * par = this,
+ * ppar = par;
+
+ while (par && (par->layout == layout)
+ && (par->depth == depth)) {
+ ppar = par;
+ par = par->Previous();
+ if (par)
+ par = par->FirstPhysicalPar();
+ while (par && par->depth > depth) {
+ par = par->Previous();
+ if (par)
+ par = par->FirstPhysicalPar();
+ }
+ }
+ par = ppar;
+ while (par && (par->layout == layout)
+ && (par->depth == depth)) {
+ par->pextra_type = type;
+ par->pextra_width = width;
+ par->pextra_widthp = widthp;
+ par = par->NextAfterFootnote();
+ if (par && (par->depth > depth))
+ par->SetPExtraType(type, width, widthp);
+ while (par && ((par->depth > depth) || par->IsDummy()))
+ par = par->NextAfterFootnote();
+ }
+ }
}
void LyXParagraph::UnsetPExtraType()
{
- if (pextra_type == PEXTRA_NONE)
- return;
+ if (pextra_type == PEXTRA_NONE)
+ return;
- pextra_type = PEXTRA_NONE;
- pextra_width.clear();
- pextra_widthp.clear();
-
- if (textclasslist.Style(GetCurrentTextClass(),
- layout).isEnvironment()) {
- LyXParagraph
- * par = this,
- * ppar = par;
-
- while (par && (par->layout == layout) && (par->depth == depth)) {
- ppar = par;
- par = par->Previous();
- if (par)
- par = par->FirstPhysicalPar();
- while (par && par->depth > depth) {
- par = par->Previous();
- if (par)
- par = par->FirstPhysicalPar();
- }
- }
- par = ppar;
- while (par && (par->layout == layout) && (par->depth == depth)) {
- par->pextra_type = PEXTRA_NONE;
- par->pextra_width.clear();
- par->pextra_widthp.clear();
- par = par->NextAfterFootnote();
- if (par && (par->depth > depth))
- par->UnsetPExtraType();
- while (par && ((par->depth > depth) || par->IsDummy()))
- par = par->NextAfterFootnote();
- }
- }
+ pextra_type = PEXTRA_NONE;
+ pextra_width.clear();
+ pextra_widthp.clear();
+
+ if (textclasslist.Style(current_view->buffer()->params.textclass,
+ layout).isEnvironment()) {
+ LyXParagraph
+ * par = this,
+ * ppar = par;
+
+ while (par && (par->layout == layout)
+ && (par->depth == depth)) {
+ ppar = par;
+ par = par->Previous();
+ if (par)
+ par = par->FirstPhysicalPar();
+ while (par && par->depth > depth) {
+ par = par->Previous();
+ if (par)
+ par = par->FirstPhysicalPar();
+ }
+ }
+ par = ppar;
+ while (par && (par->layout == layout)
+ && (par->depth == depth)) {
+ par->pextra_type = PEXTRA_NONE;
+ par->pextra_width.clear();
+ par->pextra_widthp.clear();
+ par = par->NextAfterFootnote();
+ if (par && (par->depth > depth))
+ par->UnsetPExtraType();
+ while (par && ((par->depth > depth) || par->IsDummy()))
+ par = par->NextAfterFootnote();
+ }
+ }
}
bool LyXParagraph::IsWord(size_type pos ) const
{
- return IsWordChar( GetChar(pos) ) ;
+ return IsWordChar(GetChar(pos)) ;
+}
+
+
+LyXDirection LyXParagraph::getParDirection() const
+{
+ if (!lyxrc->rtl_support || table)
+ return LYX_DIR_LEFT_TO_RIGHT;
+
+ if (size() > 0)
+ return (getFont(0).direction() == LyXFont::RTL_DIR)
+ ? LYX_DIR_RIGHT_TO_LEFT : LYX_DIR_LEFT_TO_RIGHT;
+ else
+ return current_view->buffer()->params.getDocumentDirection();
+}
+
+
+LyXDirection
+LyXParagraph::getLetterDirection(LyXParagraph::size_type pos) const
+{
+ if (!lyxrc->rtl_support)
+ return LYX_DIR_LEFT_TO_RIGHT;
+
+ LyXDirection direction = getFont(pos).getFontDirection();
+ if (IsLineSeparator(pos) && 0 < pos && pos < Last() - 1
+ && !IsLineSeparator(pos + 1)
+ && !(table && IsNewline(pos + 1))
+ && (getFont(pos - 1).getFontDirection() != direction
+ || getFont(pos + 1).getFontDirection() != direction))
+ return getParDirection();
+ else
+ return direction;
}
projects / lyx.git / blobdiff