#include <config.h>
-#include <fstream>
-#include <iomanip>
-#include <map>
-#include <stack>
-#include <list>
-
-#include <cstdlib>
-#include <cmath>
-#include <unistd.h>
-#include <sys/types.h>
-#include <utime.h>
-
-#include <algorithm>
-
-#ifdef HAVE_LOCALE
-#include <locale>
-#endif
-
#ifdef __GNUG__
#pragma implementation
#endif
#include "bufferview_funcs.h"
#include "lyxfont.h"
#include "version.h"
+#include "LaTeX.h"
+#include "Chktex.h"
+#include "LyXView.h"
+#include "debug.h"
+#include "LaTeXFeatures.h"
+#include "lyxtext.h"
+#include "gettext.h"
+#include "language.h"
+#include "encoding.h"
+#include "exporter.h"
+#include "Lsstream.h"
+#include "converter.h"
+#include "BufferView.h"
+#include "ParagraphParameters.h"
+#include "iterators.h"
+
#include "mathed/formulamacro.h"
#include "mathed/formula.h"
+
#include "insets/inset.h"
#include "insets/inseterror.h"
#include "insets/insetlabel.h"
#endif
#include "insets/insetcaption.h"
#include "insets/insetfloatlist.h"
+
+#include "frontends/Dialogs.h"
+#include "frontends/Alert.h"
+
#include "support/textutils.h"
#include "support/filetools.h"
#include "support/path.h"
#include "support/os.h"
-#include "LaTeX.h"
-#include "Chktex.h"
-#include "LyXView.h"
-#include "debug.h"
-#include "LaTeXFeatures.h"
#include "support/syscall.h"
#include "support/lyxlib.h"
#include "support/FileInfo.h"
#include "support/lyxmanip.h"
-#include "lyxtext.h"
-#include "gettext.h"
-#include "language.h"
-#include "frontends/Dialogs.h"
-#include "frontends/Alert.h"
-#include "encoding.h"
-#include "exporter.h"
-#include "Lsstream.h"
-#include "converter.h"
-#include "BufferView.h"
-#include "ParagraphParameters.h"
-#include "iterators.h"
+
+#include <fstream>
+#include <iomanip>
+#include <map>
+#include <stack>
+#include <list>
+#include <algorithm>
+
+#include <cstdlib>
+#include <cmath>
+#include <unistd.h>
+#include <sys/types.h>
+#include <utime.h>
+
+
+#ifdef HAVE_LOCALE
+#include <locale>
+#endif
+
using std::ostream;
using std::ofstream;
using std::stack;
using std::list;
+using lyx::pos_type;
+using lyx::layout_type;
+using lyx::textclass_type;
+
// all these externs should eventually be removed.
extern BufferList bufferlist;
string const Buffer::getLatexName(bool no_path) const
{
- string name = ChangeExtension(MakeLatexName(filename), ".tex");
+ string const name = ChangeExtension(MakeLatexName(filename), ".tex");
if (no_path)
return OnlyFilename(name);
else
// Should work on a list
void Buffer::updateTitles() const
{
- if (users) users->owner()->updateWindowTitle();
+ if (users)
+ users->owner()->updateWindowTitle();
}
// Should work on a list
void Buffer::resetAutosaveTimers() const
{
- if (users) users->owner()->resetAutosaveTimer();
+ if (users)
+ users->owner()->resetAutosaveTimer();
}
#ifndef NO_COMPABILITY
void Buffer::insertErtContents(Paragraph * par, int & pos,
- LyXFont const & font, bool set_inactive)
+ LyXFont const & f, bool set_inactive)
{
if (!ert_comp.contents.empty()) {
- lyxerr[Debug::INSETS] << "ERT contents:\n"
- << ert_comp.contents << endl;
+ lyxerr[Debug::INSETS] << "ERT contents:\n'"
+ << ert_comp.contents << "'" << endl;
Inset * inset = new InsetERT(ert_comp.contents, true);
+ LyXFont font;
+ font.setLanguage(f.language());
par->insertInset(pos++, inset, font);
ert_comp.contents.erase();
}
// Do the insetert.
insertErtContents(par, pos, font);
#endif
- lex.eatLine();
- string const layoutname = lex.getString();
- pair<bool, LyXTextClass::LayoutList::size_type> pp
- = textclasslist.NumberOfLayout(params.textclass,
- layoutname);
+ lex.eatLine();
+ string const layoutname = lex.getString();
+ pair<bool, layout_type> pp
+ = textclasslist.NumberOfLayout(params.textclass, layoutname);
#ifndef NO_COMPABILITY
if (compare_no_case(layoutname, "latex") == 0) {
+ layoutname + _(" to ")
+ textclasslist.NameOfLayout(params.textclass, par->layout);
InsetError * new_inset = new InsetError(s);
- par->insertInset(0, new_inset);
- par->setFont(0, LyXFont(LyXFont::ALL_INHERIT,
- params.language));
+ par->insertInset(0, new_inset,
+ LyXFont(LyXFont::ALL_INHERIT,
+ params.language));
}
// Test whether the layout is obsolete.
LyXLayout const & layout =
params.readPreamble(lex);
} else if (token == "\\textclass") {
lex.eatLine();
- pair<bool, LyXTextClassList::size_type> pp =
+ pair<bool, textclass_type> pp =
textclasslist.NumberOfClass(lex.getString());
if (pp.first) {
params.textclass = pp.second;
par->getLayout());
// Insets don't make sense in a free-spacing context! ---Kayvan
- if (layout.free_spacing) {
+ if (layout.free_spacing || par->isFreeSpacing()) {
if (lex.isOK()) {
lex.next();
string next_token = lex.getString();
textclasslist.Style(params.textclass,
par->getLayout());
- if (layout.free_spacing) {
+ if (layout.free_spacing || par->isFreeSpacing()) {
par->insertChar(pos, ' ', font);
} else {
Inset * inset = new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
+ " " + lex.text() + "\n";
InsetError * new_inset = new InsetError(s);
- par->insertInset(pos, new_inset);
- par->setFont(pos, LyXFont(LyXFont::ALL_INHERIT,
- params.language));
+ par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT,
+ params.language));
#ifndef NO_COMPABILITY
}
}
// needed to insert the selection
-void Buffer::insertStringAsLines(Paragraph *& par, Paragraph::pos_type & pos,
+void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos,
LyXFont const & fn,string const & str) const
{
LyXLayout const & layout = textclasslist.Style(params.textclass,
}
// do not insert consecutive spaces if !free_spacing
} else if ((*cit == ' ' || *cit == '\t') &&
- space_inserted && !layout.free_spacing)
+ space_inserted && !layout.free_spacing &&
+ !par->isFreeSpacing())
{
continue;
} else if (*cit == '\t') {
- if (!layout.free_spacing) {
+ if (!layout.free_spacing && !par->isFreeSpacing()) {
// tabs are like spaces here
par->insertChar(pos, ' ', font);
++pos;
space_inserted = true;
} else {
- const Paragraph::pos_type nb = 8 - pos % 8;
- for (Paragraph::pos_type a = 0;
- a < nb ; ++a) {
+ const pos_type nb = 8 - pos % 8;
+ for (pos_type a = 0; a < nb ; ++a) {
par->insertChar(pos, ' ', font);
++pos;
}
lyxerr << "Should this ever happen?" << endl;
}
- for (Paragraph::pos_type i = 0; i < par->size(); ++i) {
+ for (pos_type i = 0; i < par->size(); ++i) {
if (!i && !noparbreak) {
if (linelen > 0)
buffer << "\n\n";
}
lyxerr[Debug::INFO] << "Finished making latex file." << endl;
+ lyxerr[Debug::INFO] << "Row count was " << texrow.rows()-1 << "." << endl;
}
{
LyXLayout const & style = textclasslist.Style(params.textclass,
par->getLayout());
- string::size_type char_line_count = 5; // Heuristic choice ;-)
+ string::size_type char_line_count = 5; // Heuristic choice ;-)
// gets paragraph main font
LyXFont font_old;
stack<PAR_TAG> tag_state;
// parsing main loop
- for (Paragraph::pos_type i = 0; i < par->size(); ++i) {
+ for (pos_type i = 0; i < par->size(); ++i) {
PAR_TAG tag_close = NONE;
list < PAR_TAG > tag_open;
}
list < PAR_TAG > temp;
- while(!tag_state.empty() && tag_close ) {
+ while (!tag_state.empty() && tag_close ) {
PAR_TAG k = tag_state.top();
tag_state.pop();
os << "</" << tag_name(k) << ">";
} else {
string sgml_string;
if (par->sgmlConvertChar(c, sgml_string)
- && !style.free_spacing) {
+ && !style.free_spacing && !par->isFreeSpacing())
+ {
// in freespacing mode, spaces are
// non-breaking characters
if (desc_on) {// if char is ' ' then...
{
// insert an error marker in text
InsetError * new_inset = new InsetError(message);
- par->insertInset(pos, new_inset);
- par->setFont(pos, LyXFont(LyXFont::ALL_INHERIT, params.language));
+ par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT,
+ params.language));
}
// treat label as a special case for
// more WYSIWYM handling.
+ // This is a hack while paragraphs can't have
+ // attributes, like id in this case.
if (par->isInset(0)) {
Inset * inset = par->getInset(0);
Inset::Code lyx_code = inset->lyxCode();
// os << string(depth,' ');
// parsing main loop
- for (Paragraph::pos_type i = 0;
- i < par->size(); ++i) {
+ for (pos_type i = 0; i < par->size(); ++i) {
LyXFont font = par->getFont(params, i);
// handle <emphasis> tag
}
}
- char c = par->getChar(i);
- if (c == Paragraph::META_INSET) {
+ if ( par->isInset(i) ) {
Inset * inset = par->getInset(i);
- inset->docbook(this, os);
+ // don't print the inset in position 0 if desc_on == 3 (label)
+ if ( i || desc_on != 3)
+ inset->docbook(this, os);
} else {
+ char c = par->getChar(i);
string sgml_string;
par->sgmlConvertChar(c, sgml_string);
if (style.pass_thru) {
os << c;
- } else if(style.free_spacing || c != ' ') {
+ } else if(style.free_spacing || par->isFreeSpacing() || c != ' ') {
os << sgml_string;
} else if (desc_on ==1) {
++char_line_count;
Paragraph * par = paragraph;
#if 1
- std::pair<bool, LyXTextClassList::size_type> const tmp =
+ std::pair<bool, textclass_type> const tmp =
textclasslist.NumberOfLayout(params.textclass, "Caption");
bool const found = tmp.first;
- LyXTextClassList::size_type const cap = tmp.second;
+ textclass_type const cap = tmp.second;
#else
// This is the prefered way to to this, but boost::tie can break
// some compilers
bool found;
- LyXTextClassList::size_type cap;
+ textclass_type cap;
boost::tie(found, cap) = textclasslist
.NumberOfLayout(params.textclass, "Caption");
#endif
}
-Buffer::inset_iterator::inset_iterator(Paragraph * paragraph,
- Paragraph::pos_type pos)
+Buffer::inset_iterator::inset_iterator(Paragraph * paragraph, pos_type pos)
: par(paragraph)
{
it = par->InsetIterator(pos);
projects / lyx.git / blobdiff