#include "frontends/Dialogs.h"
#include "frontends/Alert.h"
+#include "graphics/Previews.h"
+
#include "support/textutils.h"
#include "support/filetools.h"
#include "support/path.h"
#include <locale>
#endif
+#ifndef CXX_GLOBAL_CSTD
+using std::pow;
+#endif
using std::ostream;
using std::ofstream;
par = tmppar;
}
paragraph = 0;
+
+ // Remove any previewed LaTeX snippets assocoated with this buffer.
+ grfx::Previews::get().removeLoader(this);
}
if (!par) {
par = new Paragraph;
- par->layout(textclasslist[params.textclass].defaultLayoutName());
+ par->layout(textclasslist[params.textclass].defaultLayout());
} else {
// We are inserting into an existing document
users->text->breakParagraph(users);
first_par = par;
else {
par = new Paragraph(par);
- par->layout(textclasslist[params.textclass].defaultLayoutName());
+ par->layout(textclasslist[params.textclass].defaultLayout());
}
pos = 0;
- par->layout(layoutname);
+ par->layout(textclasslist[params.textclass][layoutname]);
// Test whether the layout is obsolete.
- LyXLayout const & layout =
- textclasslist[params.textclass][par->layout()];
- if (!layout.obsoleted_by().empty())
- par->layout(layout.obsoleted_by());
+ LyXLayout_ptr const & layout = par->layout();
+ if (!layout->obsoleted_by().empty())
+ par->layout(textclasslist[params.textclass][layout->obsoleted_by()]);
par->params().depth(depth);
#ifndef NO_COMPABILITY
} else {
// the code then of NO_COMPATIBILITY
par->layout(layoutname);
// Test whether the layout is obsolete.
- LyXLayout const & layout =
+ LyXLayout_ptr const & layout =
textclasslist[params.textclass][par->layout()];
- if (!layout.obsoleted_by().empty())
- par->layout(layout.obsoleted_by());
+ if (!layout->obsoleted_by().empty())
+ par->layout(layout->obsoleted_by());
par->params().depth(depth);
}
#endif
lex.next();
font.setLyXColor(lex.getString());
} else if (token == "\\SpecialChar") {
- LyXLayout const & layout =
- textclasslist[params.textclass][par->layout()];
+ LyXLayout_ptr const & layout = par->layout();
// Insets don't make sense in a free-spacing context! ---Kayvan
- if (layout.free_spacing || par->isFreeSpacing()) {
+ if (layout->free_spacing || par->isFreeSpacing()) {
if (lex.isOK()) {
lex.next();
string next_token = lex.getString();
// only add the length when value > 0 or
// with option keep
if ((value.length().len().value() != 0) ||
- value.keep() ||
+ value.keep() ||
(value.kind() != VSpace::LENGTH))
par->params().spaceBottom(value);
#ifndef NO_COMPABILITY
// This is a backward compability thingie. (Lgb)
// Remove it later some time...introduced with fileformat
// 2.16. (Lgb)
- LyXLayout const & layout =
- textclasslist[params.textclass][par->layout()];
+ LyXLayout_ptr const & layout = par->layout();
- if (layout.free_spacing || par->isFreeSpacing()) {
+ if (layout->free_spacing || par->isFreeSpacing()) {
par->insertChar(pos, ' ', font);
} else {
Inset * inset = new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos,
LyXFont const & fn,string const & str) const
{
- LyXLayout const & layout =
- textclasslist[params.textclass][par->layout()];
+ LyXLayout_ptr const & layout = par->layout();
+
LyXFont font = fn;
par->checkInsertChar(font);
for(string::const_iterator cit = str.begin();
cit != str.end(); ++cit) {
if (*cit == '\n') {
- if (autobreakrows && (par->size() || layout.keepempty)) {
+ if (autobreakrows && (par->size() || layout->keepempty)) {
par->breakParagraph(params, pos,
- layout.isEnvironment());
+ layout->isEnvironment());
par = par->next();
pos = 0;
space_inserted = true;
}
// 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 && !par->isFreeSpacing()) {
+ if (!layout->free_spacing && !par->isFreeSpacing()) {
// tabs are like spaces here
par->insertChar(pos, ' ', font);
++pos;
} else if (file_format < 220) {
Alert::alert(_("ERROR!"),
_("Old LyX file format found. "
- "User LyX 1.2.x to read this!"));
+ "Use LyX 1.2.x to read this!"));
return false;
}
}
#endif
// First write the layout
- string const & tmp = par->layout();
+ string const & tmp = par->layout()->name();
if (compare_no_case(tmp, "itemize") == 0) {
ltype = 1;
ltype_depth = depth + 1;
void Buffer::makeLaTeXFile(string const & fname,
string const & original_path,
- bool nice, bool only_body)
+ bool nice, bool only_body, bool only_preamble)
{
lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl;
return;
}
+ makeLaTeXFile(ofs, original_path, nice, only_body, only_preamble);
+
+ ofs.close();
+ if (ofs.fail()) {
+ lyxerr << "File was not closed properly." << endl;
+ }
+}
+
+
+void Buffer::makeLaTeXFile(ostream & os,
+ string const & original_path,
+ bool nice, bool only_body, bool only_preamble)
+{
niceFile = nice; // this will be used by Insetincludes.
tex_code_break_column = lyxrc.ascii_linelen;
texrow.start(paragraph, 0);
if (!only_body && nice) {
- ofs << "%% " << lyx_docversion << " created this file. "
+ os << "%% " << lyx_docversion << " created this file. "
"For more info, see http://www.lyx.org/.\n"
"%% Do not edit unless you really know what "
"you are doing.\n";
if (!only_body) {
if (!nice) {
// code for usual, NOT nice-latex-file
- ofs << "\\batchmode\n"; // changed
+ os << "\\batchmode\n"; // changed
// from \nonstopmode
texrow.newline();
}
if (!original_path.empty()) {
string inputpath = os::external_path(original_path);
subst(inputpath, "~", "\\string~");
- ofs << "\\makeatletter\n"
+ os << "\\makeatletter\n"
<< "\\def\\input@path{{"
<< inputpath << "/}}\n"
<< "\\makeatother\n";
texrow.newline();
}
- ofs << "\\documentclass";
+ os << "\\documentclass";
LyXTextClass const & tclass = textclasslist[params.textclass];
string strOptions(options.str().c_str());
if (!strOptions.empty()) {
strOptions = strip(strOptions, ',');
- ofs << '[' << strOptions << ']';
+ os << '[' << strOptions << ']';
}
- ofs << '{' << tclass.latexname() << "}\n";
+ os << '{' << tclass.latexname() << "}\n";
texrow.newline();
// end of \documentclass defs
// The ae package is not needed when using OT1 font encoding.
if (params.fonts != "default" &&
(params.fonts != "ae" || lyxrc.fontenc != "default")) {
- ofs << "\\usepackage{" << params.fonts << "}\n";
+ os << "\\usepackage{" << params.fonts << "}\n";
texrow.newline();
if (params.fonts == "ae") {
- ofs << "\\usepackage{aecompl}\n";
+ os << "\\usepackage{aecompl}\n";
texrow.newline();
}
}
// this one is not per buffer
if (lyxrc.fontenc != "default") {
- ofs << "\\usepackage[" << lyxrc.fontenc
+ os << "\\usepackage[" << lyxrc.fontenc
<< "]{fontenc}\n";
texrow.newline();
}
// in the document
set<string> encodings = features.getEncodingSet(doc_encoding);
- ofs << "\\usepackage[";
+ os << "\\usepackage[";
std::copy(encodings.begin(), encodings.end(),
- std::ostream_iterator<string>(ofs, ","));
- ofs << doc_encoding << "]{inputenc}\n";
+ std::ostream_iterator<string>(os, ","));
+ os << doc_encoding << "]{inputenc}\n";
texrow.newline();
} else if (params.inputenc != "default") {
- ofs << "\\usepackage[" << params.inputenc
+ os << "\\usepackage[" << params.inputenc
<< "]{inputenc}\n";
texrow.newline();
}
if (params.paperpackage != BufferParams::PACKAGE_NONE) {
switch (params.paperpackage) {
case BufferParams::PACKAGE_A4:
- ofs << "\\usepackage{a4}\n";
+ os << "\\usepackage{a4}\n";
texrow.newline();
break;
case BufferParams::PACKAGE_A4WIDE:
- ofs << "\\usepackage{a4wide}\n";
+ os << "\\usepackage{a4wide}\n";
texrow.newline();
break;
case BufferParams::PACKAGE_WIDEMARGINSA4:
- ofs << "\\usepackage[widemargins]{a4}\n";
+ os << "\\usepackage[widemargins]{a4}\n";
texrow.newline();
break;
}
}
if (params.use_geometry) {
- ofs << "\\usepackage{geometry}\n";
+ os << "\\usepackage{geometry}\n";
texrow.newline();
- ofs << "\\geometry{verbose";
+ os << "\\geometry{verbose";
if (params.orientation == BufferParams::ORIENTATION_LANDSCAPE)
- ofs << ",landscape";
+ os << ",landscape";
switch (params.papersize2) {
case BufferParams::VM_PAPER_CUSTOM:
if (!params.paperwidth.empty())
- ofs << ",paperwidth="
+ os << ",paperwidth="
<< params.paperwidth;
if (!params.paperheight.empty())
- ofs << ",paperheight="
+ os << ",paperheight="
<< params.paperheight;
break;
case BufferParams::VM_PAPER_USLETTER:
- ofs << ",letterpaper";
+ os << ",letterpaper";
break;
case BufferParams::VM_PAPER_USLEGAL:
- ofs << ",legalpaper";
+ os << ",legalpaper";
break;
case BufferParams::VM_PAPER_USEXECUTIVE:
- ofs << ",executivepaper";
+ os << ",executivepaper";
break;
case BufferParams::VM_PAPER_A3:
- ofs << ",a3paper";
+ os << ",a3paper";
break;
case BufferParams::VM_PAPER_A4:
- ofs << ",a4paper";
+ os << ",a4paper";
break;
case BufferParams::VM_PAPER_A5:
- ofs << ",a5paper";
+ os << ",a5paper";
break;
case BufferParams::VM_PAPER_B3:
- ofs << ",b3paper";
+ os << ",b3paper";
break;
case BufferParams::VM_PAPER_B4:
- ofs << ",b4paper";
+ os << ",b4paper";
break;
case BufferParams::VM_PAPER_B5:
- ofs << ",b5paper";
+ os << ",b5paper";
break;
default:
// default papersize ie BufferParams::VM_PAPER_DEFAULT
switch (lyxrc.default_papersize) {
case BufferParams::PAPER_DEFAULT: // keep compiler happy
case BufferParams::PAPER_USLETTER:
- ofs << ",letterpaper";
+ os << ",letterpaper";
break;
case BufferParams::PAPER_LEGALPAPER:
- ofs << ",legalpaper";
+ os << ",legalpaper";
break;
case BufferParams::PAPER_EXECUTIVEPAPER:
- ofs << ",executivepaper";
+ os << ",executivepaper";
break;
case BufferParams::PAPER_A3PAPER:
- ofs << ",a3paper";
+ os << ",a3paper";
break;
case BufferParams::PAPER_A4PAPER:
- ofs << ",a4paper";
+ os << ",a4paper";
break;
case BufferParams::PAPER_A5PAPER:
- ofs << ",a5paper";
+ os << ",a5paper";
break;
case BufferParams::PAPER_B5PAPER:
- ofs << ",b5paper";
+ os << ",b5paper";
break;
}
}
if (!params.topmargin.empty())
- ofs << ",tmargin=" << params.topmargin;
+ os << ",tmargin=" << params.topmargin;
if (!params.bottommargin.empty())
- ofs << ",bmargin=" << params.bottommargin;
+ os << ",bmargin=" << params.bottommargin;
if (!params.leftmargin.empty())
- ofs << ",lmargin=" << params.leftmargin;
+ os << ",lmargin=" << params.leftmargin;
if (!params.rightmargin.empty())
- ofs << ",rmargin=" << params.rightmargin;
+ os << ",rmargin=" << params.rightmargin;
if (!params.headheight.empty())
- ofs << ",headheight=" << params.headheight;
+ os << ",headheight=" << params.headheight;
if (!params.headsep.empty())
- ofs << ",headsep=" << params.headsep;
+ os << ",headsep=" << params.headsep;
if (!params.footskip.empty())
- ofs << ",footskip=" << params.footskip;
- ofs << "}\n";
+ os << ",footskip=" << params.footskip;
+ os << "}\n";
texrow.newline();
}
if (tokenPos(tclass.opt_pagestyle(),
'|', params.pagestyle) >= 0) {
if (params.pagestyle == "fancy") {
- ofs << "\\usepackage{fancyhdr}\n";
+ os << "\\usepackage{fancyhdr}\n";
texrow.newline();
}
- ofs << "\\pagestyle{" << params.pagestyle << "}\n";
+ os << "\\pagestyle{" << params.pagestyle << "}\n";
texrow.newline();
}
if (params.secnumdepth != tclass.secnumdepth()) {
- ofs << "\\setcounter{secnumdepth}{"
+ os << "\\setcounter{secnumdepth}{"
<< params.secnumdepth
<< "}\n";
texrow.newline();
}
if (params.tocdepth != tclass.tocdepth()) {
- ofs << "\\setcounter{tocdepth}{"
+ os << "\\setcounter{tocdepth}{"
<< params.tocdepth
<< "}\n";
texrow.newline();
if (params.paragraph_separation) {
switch (params.defskip.kind()) {
case VSpace::SMALLSKIP:
- ofs << "\\setlength\\parskip{\\smallskipamount}\n";
+ os << "\\setlength\\parskip{\\smallskipamount}\n";
break;
case VSpace::MEDSKIP:
- ofs << "\\setlength\\parskip{\\medskipamount}\n";
+ os << "\\setlength\\parskip{\\medskipamount}\n";
break;
case VSpace::BIGSKIP:
- ofs << "\\setlength\\parskip{\\bigskipamount}\n";
+ os << "\\setlength\\parskip{\\bigskipamount}\n";
break;
case VSpace::LENGTH:
- ofs << "\\setlength\\parskip{"
+ os << "\\setlength\\parskip{"
<< params.defskip.length().asLatexString()
<< "}\n";
break;
default: // should never happen // Then delete it.
- ofs << "\\setlength\\parskip{\\medskipamount}\n";
+ os << "\\setlength\\parskip{\\medskipamount}\n";
break;
}
texrow.newline();
- ofs << "\\setlength\\parindent{0pt}\n";
+ os << "\\setlength\\parindent{0pt}\n";
texrow.newline();
}
preamble += "\\makeatother\n";
- ofs << preamble;
+ os << preamble;
+
+ if (only_preamble)
+ return;
// make the body.
- ofs << "\\begin{document}\n";
+ os << "\\begin{document}\n";
texrow.newline();
} // only_body
lyxerr[Debug::INFO] << "preamble finished, now the body." << endl;
if (!lyxrc.language_auto_begin) {
- ofs << subst(lyxrc.language_command_begin, "$$lang",
+ os << subst(lyxrc.language_command_begin, "$$lang",
params.language->babel())
<< endl;
texrow.newline();
}
- latexParagraphs(ofs, paragraph, 0, texrow);
+ latexParagraphs(os, paragraph, 0, texrow);
// add this just in case after all the paragraphs
- ofs << endl;
+ os << endl;
texrow.newline();
if (!lyxrc.language_auto_end) {
- ofs << subst(lyxrc.language_command_end, "$$lang",
+ os << subst(lyxrc.language_command_end, "$$lang",
params.language->babel())
<< endl;
texrow.newline();
}
if (!only_body) {
- ofs << "\\end{document}\n";
+ os << "\\end{document}\n";
texrow.newline();
lyxerr[Debug::LATEX] << "makeLaTeXFile...done" << endl;
// value when we leave otherwise we save incorrect .lyx files.
tex_code_break_column = lyxrc.ascii_linelen;
- ofs.close();
- if (ofs.fail()) {
- lyxerr << "File was not closed properly." << endl;
- }
-
lyxerr[Debug::INFO] << "Finished making latex file." << endl;
lyxerr[Debug::INFO] << "Row count was " << texrow.rows()-1 << "." << endl;
// any special options in the paragraph and also we don't allow
// any environment other then "Standard" to be valid!
if ((in == 0) || !in->forceDefaultParagraphs(in)) {
- LyXLayout const & layout =
- textclasslist[params.textclass][par->layout()];
+ LyXLayout_ptr const & layout = par->layout();
- if (layout.intitle) {
+ if (layout->intitle) {
if (already_title) {
lyxerr <<"Error in latexParagraphs: You"
" should not mix title layouts"
was_title = false;
}
- if (layout.isEnvironment() ||
+ if (layout->isEnvironment() ||
!par->params().leftIndent().zero())
{
par = par->TeXEnvironment(this, params, ofs, texrow);
}
-void Buffer::sgmlOpenTag(ostream & os, Paragraph::depth_type,
+int Buffer::sgmlOpenTag(ostream & os, Paragraph::depth_type depth, bool mixcont,
string const & latexname) const
{
- if (!latexname.empty() && latexname != "!-- --")
- //os << "<!-- " << depth << " -->" << "<" << latexname << ">";
+ if (!latexname.empty() && latexname != "!-- --") {
+ if (!mixcont)
+ os << string(" ",depth);
os << "<" << latexname << ">";
+ }
+
+ if (!mixcont)
+ os << endl;
+
+ return mixcont?0:1;
}
-void Buffer::sgmlCloseTag(ostream & os, Paragraph::depth_type,
+int Buffer::sgmlCloseTag(ostream & os, Paragraph::depth_type depth, bool mixcont,
string const & latexname) const
{
- if (!latexname.empty() && latexname != "!-- --")
- //os << "<!-- " << depth << " -->" << "</" << latexname << ">\n";
+ if (!latexname.empty() && latexname != "!-- --") {
+ if (!mixcont)
+ os << endl << string(" ",depth);
os << "</" << latexname << ">";
+ }
+
+ if (!mixcont)
+ os << endl;
+
+ return mixcont?0:1;
}
ofs << ">\n\n";
if (params.options.empty())
- sgmlOpenTag(ofs, 0, top_element);
+ sgmlOpenTag(ofs, 0, false, top_element);
else {
string top = top_element;
top += " ";
top += params.options;
- sgmlOpenTag(ofs, 0, top);
+ sgmlOpenTag(ofs, 0, false, top);
}
}
vector<string> environment_stack(5);
while (par) {
- LyXLayout const & style = tclass[par->layout()];
-
+ LyXLayout_ptr const & style = par->layout();
// treat <toc> as a special case for compatibility with old code
if (par->isInset(0)) {
Inset * inset = par->getInset(0);
Inset::Code lyx_code = inset->lyxCode();
if (lyx_code == Inset::TOC_CODE) {
string const temp = "toc";
- sgmlOpenTag(ofs, depth, temp);
+ sgmlOpenTag(ofs, depth, false, temp);
par = par->next();
continue;
// environment tag closing
for (; depth > par->params().depth(); --depth) {
- sgmlCloseTag(ofs, depth, environment_stack[depth]);
+ sgmlCloseTag(ofs, depth, false, environment_stack[depth]);
environment_stack[depth].erase();
}
// write opening SGML tags
- switch (style.latextype) {
+ switch (style->latextype) {
case LATEX_PARAGRAPH:
if (depth == par->params().depth()
&& !environment_stack[depth].empty()) {
- sgmlCloseTag(ofs, depth, environment_stack[depth]);
+ sgmlCloseTag(ofs, depth, false, environment_stack[depth]);
environment_stack[depth].erase();
if (depth)
--depth;
else
ofs << "</p>";
}
- sgmlOpenTag(ofs, depth, style.latexname());
+ sgmlOpenTag(ofs, depth, false, style->latexname());
break;
case LATEX_COMMAND:
" LatexType Command.\n"));
if (!environment_stack[depth].empty()) {
- sgmlCloseTag(ofs, depth,
- environment_stack[depth]);
+ sgmlCloseTag(ofs, depth, false, environment_stack[depth]);
ofs << "</p>";
}
environment_stack[depth].erase();
- sgmlOpenTag(ofs, depth, style.latexname());
+ sgmlOpenTag(ofs, depth, false, style->latexname());
break;
case LATEX_ENVIRONMENT:
case LATEX_ITEM_ENVIRONMENT:
+ {
+ string const & latexname = style->latexname();
+
if (depth == par->params().depth()
- && environment_stack[depth] != style.latexname()) {
- sgmlCloseTag(ofs, depth,
+ && environment_stack[depth] != latexname) {
+ sgmlCloseTag(ofs, depth, false,
environment_stack[depth]);
environment_stack[depth].erase();
}
depth = par->params().depth();
environment_stack[depth].erase();
}
- if (environment_stack[depth] != style.latexname()) {
+ if (environment_stack[depth] != latexname) {
if (depth == 0) {
- sgmlOpenTag(ofs, depth, "p");
+ sgmlOpenTag(ofs, depth, false, "p");
}
- sgmlOpenTag(ofs, depth, style.latexname());
+ sgmlOpenTag(ofs, depth, false, latexname);
if (environment_stack.size() == depth + 1)
environment_stack.push_back("!-- --");
- environment_stack[depth] = style.latexname();
+ environment_stack[depth] = latexname;
}
- if (style.latexparam() == "CDATA")
+ if (style->latexparam() == "CDATA")
ofs << "<![CDATA[";
- if (style.latextype == LATEX_ENVIRONMENT) break;
+ if (style->latextype == LATEX_ENVIRONMENT) break;
- if (style.labeltype == LABEL_MANUAL)
+ if (style->labeltype == LABEL_MANUAL)
item_name = "tag";
else
item_name = "item";
- sgmlOpenTag(ofs, depth + 1, item_name);
- break;
+ sgmlOpenTag(ofs, depth + 1, false, item_name);
+ }
+ break;
+
default:
- sgmlOpenTag(ofs, depth, style.latexname());
+ sgmlOpenTag(ofs, depth, false, style->latexname());
break;
}
ofs << "\n";
// write closing SGML tags
- switch (style.latextype) {
+ switch (style->latextype) {
case LATEX_COMMAND:
break;
case LATEX_ENVIRONMENT:
case LATEX_ITEM_ENVIRONMENT:
- if (style.latexparam() == "CDATA")
+ if (style->latexparam() == "CDATA")
ofs << "]]>";
break;
default:
- sgmlCloseTag(ofs, depth, style.latexname());
+ sgmlCloseTag(ofs, depth, false, style->latexname());
break;
}
}
// Close open tags
- for (int i=depth; i >= 0; --i)
- sgmlCloseTag(ofs, depth, environment_stack[i]);
+ for (int i = depth; i >= 0; --i)
+ sgmlCloseTag(ofs, depth, false, environment_stack[i]);
if (!body_only) {
ofs << "\n\n";
- sgmlCloseTag(ofs, 0, top_element);
+ sgmlCloseTag(ofs, 0, false, top_element);
}
ofs.close();
Paragraph * par,
Paragraph::depth_type /*depth*/)
{
- LyXLayout const & style =
- textclasslist[params.textclass][par->layout()];
+ LyXLayout_ptr const & style = par->layout();
+
string::size_type char_line_count = 5; // Heuristic choice ;-)
// gets paragraph main font
LyXFont font_old;
bool desc_on;
- if (style.labeltype == LABEL_MANUAL) {
- font_old = style.labelfont;
+ if (style->labeltype == LABEL_MANUAL) {
+ font_old = style->labelfont;
desc_on = true;
} else {
- font_old = style.font;
+ font_old = style->font;
desc_on = false;
}
continue;
}
- if (style.latexparam() == "CDATA") {
+ if (style->latexparam() == "CDATA") {
// "TeX"-Mode on == > SGML-Mode on.
if (c != '\0')
os << c;
} else {
string sgml_string;
if (par->sgmlConvertChar(c, sgml_string)
- && !style.free_spacing && !par->isFreeSpacing())
+ && !style->free_spacing && !par->isFreeSpacing())
{
// in freespacing mode, spaces are
// non-breaking characters
void Buffer::sgmlError(Paragraph * /*par*/, int /*pos*/,
string const & /*message*/) const
{
+#ifdef WITH_WARNINGS
#warning This is wrong we cannot insert an inset like this!!!
// I guess this was Jose' so I explain you more or less why this
// is wrong. This way you insert something in the paragraph and
// don't tell it to LyXText (row rebreaking and undo handling!!!)
// I deactivate this code, have a look at BufferView::insertErrors
// how you should do this correctly! (Jug 20020315)
+#endif
#if 0
// insert an error marker in text
InsetError * new_inset = new InsetError(message);
top += " ";
top += params.options;
}
- sgmlOpenTag(ofs, 0, top);
+ sgmlOpenTag(ofs, 0, false, top);
ofs << "<!-- DocBook file was created by " << lyx_docversion
<< "\n See http://www.lyx.org/ for more information -->\n";
string c_params;
int desc_on = 0; // description mode
- LyXLayout const & style = tclass[par->layout()];
+ LyXLayout_ptr const & style = par->layout();
// environment tag closing
for (; depth > par->params().depth(); --depth) {
if (environment_inner[depth] != "!-- --") {
item_name = "listitem";
- sgmlCloseTag(ofs, command_depth + depth,
- item_name);
+ sgmlCloseTag(ofs, command_depth + depth, false, item_name);
if (environment_inner[depth] == "varlistentry")
- sgmlCloseTag(ofs, depth+command_depth,
- environment_inner[depth]);
+ sgmlCloseTag(ofs, depth+command_depth, false, environment_inner[depth]);
}
- sgmlCloseTag(ofs, depth + command_depth,
- environment_stack[depth]);
+ sgmlCloseTag(ofs, depth + command_depth, false, environment_stack[depth]);
environment_stack[depth].erase();
environment_inner[depth].erase();
}
if (depth == par->params().depth()
- && environment_stack[depth] != style.latexname()
+ && environment_stack[depth] != style->latexname()
&& !environment_stack[depth].empty()) {
if (environment_inner[depth] != "!-- --") {
item_name= "listitem";
- sgmlCloseTag(ofs, command_depth+depth,
- item_name);
+ sgmlCloseTag(ofs, command_depth+depth, false, item_name);
if (environment_inner[depth] == "varlistentry")
- sgmlCloseTag(ofs,
- depth + command_depth,
- environment_inner[depth]);
+ sgmlCloseTag(ofs, depth + command_depth, false, environment_inner[depth]);
}
- sgmlCloseTag(ofs, depth + command_depth,
- environment_stack[depth]);
+ sgmlCloseTag(ofs, depth + command_depth, false, environment_stack[depth]);
environment_stack[depth].erase();
environment_inner[depth].erase();
}
// Write opening SGML tags.
- switch (style.latextype) {
+ switch (style->latextype) {
case LATEX_PARAGRAPH:
sgmlOpenTag(ofs, depth + command_depth,
- style.latexname());
+ false, style->latexname());
break;
case LATEX_COMMAND:
_("Error : Wrong depth for "
"LatexType Command.\n"));
- command_name = style.latexname();
+ command_name = style->latexname();
- sgmlparam = style.latexparam();
+ sgmlparam = style->latexparam();
c_params = split(sgmlparam, c_depth,'|');
cmd_depth = lyx::atoi(c_depth);
if (cmd_depth < command_base) {
for (Paragraph::depth_type j = command_depth;
j >= command_base; --j) {
- sgmlCloseTag(ofs, j, command_stack[j]);
+ sgmlCloseTag(ofs, j, false, command_stack[j]);
ofs << endl;
}
command_depth = command_base = cmd_depth;
} else if (cmd_depth <= command_depth) {
for (int j = command_depth;
j >= int(cmd_depth); --j) {
- sgmlCloseTag(ofs, j, command_stack[j]);
+ sgmlCloseTag(ofs, j, false, command_stack[j]);
ofs << endl;
}
command_depth = cmd_depth;
}
}
- sgmlOpenTag(ofs, depth + command_depth, command_name);
- if (c_params.empty())
- item_name = "title";
- else
- item_name = c_params;
- sgmlOpenTag(ofs, depth + 1 + command_depth, item_name);
+ sgmlOpenTag(ofs, depth + command_depth, false, command_name);
+
+ item_name = c_params.empty()?"title":c_params;
+ sgmlOpenTag(ofs, depth + 1 + command_depth, false, item_name);
break;
case LATEX_ENVIRONMENT:
environment_stack[depth].erase();
}
- if (environment_stack[depth] != style.latexname()) {
+ if (environment_stack[depth] != style->latexname()) {
if (environment_stack.size() == depth + 1) {
environment_stack.push_back("!-- --");
environment_inner.push_back("!-- --");
}
- environment_stack[depth] = style.latexname();
+ environment_stack[depth] = style->latexname();
environment_inner[depth] = "!-- --";
- sgmlOpenTag(ofs, depth + command_depth,
- environment_stack[depth]);
+ sgmlOpenTag(ofs, depth + command_depth, false, environment_stack[depth]);
} else {
if (environment_inner[depth] != "!-- --") {
item_name= "listitem";
- sgmlCloseTag(ofs,
- command_depth + depth,
- item_name);
+ sgmlCloseTag(ofs, command_depth + depth, false, item_name);
if (environment_inner[depth] == "varlistentry")
- sgmlCloseTag(ofs,
- depth + command_depth,
- environment_inner[depth]);
+ sgmlCloseTag(ofs, depth + command_depth, false, environment_inner[depth]);
}
}
- if (style.latextype == LATEX_ENVIRONMENT) {
- if (!style.latexparam().empty()) {
- if (style.latexparam() == "CDATA")
+ if (style->latextype == LATEX_ENVIRONMENT) {
+ if (!style->latexparam().empty()) {
+ if (style->latexparam() == "CDATA")
ofs << "<![CDATA[";
else
- sgmlOpenTag(ofs, depth + command_depth,
- style.latexparam());
+ sgmlOpenTag(ofs, depth + command_depth, false, style->latexparam());
}
break;
}
- desc_on = (style.labeltype == LABEL_MANUAL);
-
- if (desc_on)
- environment_inner[depth]= "varlistentry";
- else
- environment_inner[depth]= "listitem";
+ desc_on = (style->labeltype == LABEL_MANUAL);
+ environment_inner[depth] = desc_on ? "varlistentry" : "listitem";
sgmlOpenTag(ofs, depth + 1 + command_depth,
- environment_inner[depth]);
+ false, environment_inner[depth]);
- if (desc_on) {
- item_name= "term";
- sgmlOpenTag(ofs, depth + 1 + command_depth,
- item_name);
- } else {
- item_name= "para";
- sgmlOpenTag(ofs, depth + 1 + command_depth,
- item_name);
- }
+ item_name = desc_on ? "term" : "para";
+ sgmlOpenTag(ofs, depth + 1 + command_depth,
+ false, item_name);
break;
default:
sgmlOpenTag(ofs, depth + command_depth,
- style.latexname());
+ false, style->latexname());
break;
}
- simpleDocBookOnePar(ofs, par, desc_on, depth+1+command_depth);
+ simpleDocBookOnePar(ofs, par, desc_on,
+ depth + 1 + command_depth);
par = par->next();
string end_tag;
// write closing SGML tags
- switch (style.latextype) {
+ switch (style->latextype) {
case LATEX_COMMAND:
- if (c_params.empty())
- end_tag = "title";
- else
- end_tag = c_params;
- sgmlCloseTag(ofs, depth + command_depth, end_tag);
+ end_tag = c_params.empty() ? "title" : c_params;
+ sgmlCloseTag(ofs, depth + command_depth,
+ false, end_tag);
break;
case LATEX_ENVIRONMENT:
- if (!style.latexparam().empty()) {
- if (style.latexparam() == "CDATA")
+ if (!style->latexparam().empty()) {
+ if (style->latexparam() == "CDATA")
ofs << "]]>";
else
- sgmlCloseTag(ofs, depth + command_depth,
- style.latexparam());
+ sgmlCloseTag(ofs, depth + command_depth, false, style->latexparam());
}
break;
case LATEX_ITEM_ENVIRONMENT:
if (desc_on == 1) break;
end_tag= "para";
- sgmlCloseTag(ofs, depth + 1 + command_depth, end_tag);
+ sgmlCloseTag(ofs, depth + 1 + command_depth, false, end_tag);
break;
case LATEX_PARAGRAPH:
- sgmlCloseTag(ofs, depth + command_depth, style.latexname());
+ sgmlCloseTag(ofs, depth + command_depth, false, style->latexname());
break;
default:
- sgmlCloseTag(ofs, depth + command_depth, style.latexname());
+ sgmlCloseTag(ofs, depth + command_depth, false, style->latexname());
break;
}
}
if (!environment_stack[depth].empty()) {
if (environment_inner[depth] != "!-- --") {
item_name = "listitem";
- sgmlCloseTag(ofs, command_depth + depth,
- item_name);
+ sgmlCloseTag(ofs, command_depth + depth, false, item_name);
if (environment_inner[depth] == "varlistentry")
- sgmlCloseTag(ofs, depth + command_depth,
- environment_inner[depth]);
+ sgmlCloseTag(ofs, depth + command_depth, false, environment_inner[depth]);
}
- sgmlCloseTag(ofs, depth + command_depth,
- environment_stack[depth]);
+ sgmlCloseTag(ofs, depth + command_depth, false, environment_stack[depth]);
}
}
for (int j = command_depth; j >= 0 ; --j)
if (!command_stack[j].empty()) {
- sgmlCloseTag(ofs, j, command_stack[j]);
+ sgmlCloseTag(ofs, j, false, command_stack[j]);
ofs << endl;
}
ofs << "\n\n";
- sgmlCloseTag(ofs, 0, top_element);
+ sgmlCloseTag(ofs, 0, false, top_element);
ofs.close();
// How to check for successful close
{
bool emph_flag = false;
- LyXLayout const & style =
- textclasslist[params.textclass][par->layout()];
+ LyXLayout_ptr const & style = par->layout();
- LyXFont font_old = style.labeltype == LABEL_MANUAL ? style.labelfont : style.font;
+ LyXFont font_old = (style->labeltype == LABEL_MANUAL ? style->labelfont : style->font);
int char_line_count = depth;
//if (!style.free_spacing)
// handle <emphasis> tag
if (font_old.emph() != font.emph()) {
if (font.emph() == LyXFont::ON) {
- if(style.latexparam() == "CDATA")
+ if (style->latexparam() == "CDATA")
os << "]]>";
os << "<emphasis>";
- if(style.latexparam() == "CDATA")
+ if (style->latexparam() == "CDATA")
os << "<![CDATA[";
emph_flag = true;
} else if (i) {
- if(style.latexparam() == "CDATA")
+ if (style->latexparam() == "CDATA")
os << "]]>";
os << "</emphasis>";
- if(style.latexparam() == "CDATA")
+ if (style->latexparam() == "CDATA")
os << "<![CDATA[";
emph_flag = false;
}
if (par->isInset(i)) {
Inset * inset = par->getInset(i);
// don't print the inset in position 0 if desc_on == 3 (label)
- if ( i || desc_on != 3) {
- if(style.latexparam() == "CDATA")
+ if (i || desc_on != 3) {
+ if (style->latexparam() == "CDATA")
os << "]]>";
- inset->docbook(this, os);
- if(style.latexparam() == "CDATA")
+ inset->docbook(this, os, false);
+ if (style->latexparam() == "CDATA")
os << "<![CDATA[";
}
} else {
string sgml_string;
par->sgmlConvertChar(c, sgml_string);
- if (style.pass_thru) {
+ if (style->pass_thru) {
os << c;
- } else if (style.free_spacing || par->isFreeSpacing() || c != ' ') {
+ } else if (style->free_spacing || par->isFreeSpacing() || c != ' ') {
os << sgml_string;
} else if (desc_on ==1) {
++char_line_count;
}
if (emph_flag) {
- if(style.latexparam() == "CDATA")
+ if (style->latexparam() == "CDATA")
os << "]]>";
os << "</emphasis>";
- if(style.latexparam() == "CDATA")
+ if (style->latexparam() == "CDATA")
os << "<![CDATA[";
}
// <term> not closed...
os << "</term>\n<listitem><para> </para>";
}
- if (style.free_spacing) os << '\n';
+ if (style->free_spacing)
+ os << '\n';
}
// if we removed error insets before we ran chktex or if we inserted
// error insets after we ran chktex, this must be run:
if (removedErrorInsets || res) {
- users->redraw();
+#warning repaint needed here, or do you mean update() ?
+ users->repaint();
users->fitCursor();
}
users->owner()->allowInput();
string const layout("Caption");
while (par) {
- char const labeltype = textclass[par->layout()].labeltype;
+#warning bogus type (Lgb)
+ char const labeltype = par->layout()->labeltype;
if (labeltype >= LABEL_COUNTER_CHAPTER
&& labeltype <= LABEL_COUNTER_CHAPTER + params.tocdepth) {
// the inset...
Paragraph * tmp = il->inset.paragraph();
while (tmp) {
- if (tmp->layout() == layout) {
+ if (tmp->layout()->name() == layout) {
SingleList & item = l[type];
string const str =
tostr(item.size()+1) + ". " + tmp->asString(this, false);
bool Buffer::dispatch(int action, string const & argument, bool * result)
{
bool dispatched = true;
-
+
switch (action) {
case LFUN_EXPORT: {
bool const tmp = Exporter::Export(this, argument, false);
void Buffer::redraw()
{
- users->redraw();
+#warning repaint needed here, or do you mean update() ?
+ users->repaint();
users->fitCursor();
}
projects / lyx.git / blobdiff