X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=4e58256a87bc50d981f51242280fff63556373a5;hb=6a55be9506b112110826cf63bc21786044569f1d;hp=12f4c75b1526ce9c9efa89c2a52f76d4a414d107;hpb=aa848b8ccf2226a9219df9957595a1cea3c49996;p=lyx.git
diff --git a/src/buffer.C b/src/buffer.C
index 12f4c75b15..4e58256a87 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -5,151 +5,209 @@
*
* \author Lars Gullik Bjønnes
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include
#include "buffer.h"
+
+#include "author.h"
#include "buffer_funcs.h"
#include "bufferlist.h"
-#include "LyXAction.h"
-#include "lyxrc.h"
-#include "lyxlex.h"
-#include "tex-strings.h"
-#include "layout.h"
-#include "bufferview_funcs.h"
-#include "lyxfont.h"
-#include "version.h"
-#include "LaTeX.h"
+#include "bufferparams.h"
+#include "counters.h"
+#include "Bullet.h"
#include "Chktex.h"
#include "debug.h"
-#include "LaTeXFeatures.h"
-#include "lyxtext.h"
-#include "gettext.h"
-#include "language.h"
-#include "exporter.h"
+#include "encoding.h"
#include "errorlist.h"
-#include "Lsstream.h"
+#include "exporter.h"
#include "format.h"
+#include "funcrequest.h"
+#include "gettext.h"
+#include "insetiterator.h"
+#include "language.h"
+#include "LaTeX.h"
+#include "LaTeXFeatures.h"
+#include "LyXAction.h"
+#include "lyxlex.h"
+#include "lyxtext.h"
+#include "lyxrc.h"
+#include "lyxvc.h"
+#include "lyx_main.h"
+#include "messages.h"
+#include "output.h"
+#include "output_docbook.h"
+#include "output_latex.h"
+#include "output_linuxdoc.h"
+#include "paragraph.h"
+#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
-#include "iterators.h"
-#include "lyxtextclasslist.h"
+#include "pariterator.h"
#include "sgml.h"
-#include "paragraph_funcs.h"
-#include "messages.h"
-#include "author.h"
-
-#include "frontends/LyXView.h"
-
-#include "mathed/formulamacro.h"
-#include "mathed/formula.h"
+#include "texrow.h"
+#include "undo.h"
+#include "version.h"
#include "insets/insetbibitem.h"
#include "insets/insetbibtex.h"
#include "insets/insetinclude.h"
#include "insets/insettext.h"
-#include "frontends/Dialogs.h"
+#include "mathed/math_macrotemplate.h"
+#include "mathed/math_macrotable.h"
+#include "mathed/math_support.h"
+
#include "frontends/Alert.h"
#include "graphics/Previews.h"
-#include "support/LAssert.h"
-#include "support/textutils.h"
+#include "support/FileInfo.h"
#include "support/filetools.h"
-#include "support/path.h"
+#include "support/gzstream.h"
+#include "support/lyxlib.h"
#include "support/os.h"
+#include "support/path.h"
+#include "support/textutils.h"
#include "support/tostr.h"
-#include "support/lyxlib.h"
-#include "support/FileInfo.h"
-#include "support/lyxmanip.h"
-#include "support/lyxtime.h"
-#include "support/gzstream.h"
#include
-#include
-#include
+#include
+
#include
-#include
";
- }
- sgml::openTag(ofs, depth, false, style->latexname());
- break;
-
- case LATEX_COMMAND:
- if (depth != 0)
- error(ErrorItem(_("Error:"), _("Wrong depth for LatexType Command.\n"), pit->id(), 0, pit->size()));
-
- if (!environment_stack[depth].empty()) {
- sgml::closeTag(ofs, depth, false, environment_stack[depth]);
- ofs << "";
- }
-
- environment_stack[depth].erase();
- sgml::openTag(ofs, depth, false, style->latexname());
- break;
-
- case LATEX_ENVIRONMENT:
- case LATEX_ITEM_ENVIRONMENT:
- case LATEX_BIB_ENVIRONMENT:
- {
- string const & latexname = style->latexname();
-
- if (depth == pit->params().depth()
- && environment_stack[depth] != latexname) {
- sgml::closeTag(ofs, depth, false,
- environment_stack[depth]);
- environment_stack[depth].erase();
- }
- if (depth < pit->params().depth()) {
- depth = pit->params().depth();
- environment_stack[depth].erase();
- }
- if (environment_stack[depth] != latexname) {
- if (depth == 0) {
- sgml::openTag(ofs, depth, false, "p");
- }
- sgml::openTag(ofs, depth, false, latexname);
-
- if (environment_stack.size() == depth + 1)
- environment_stack.push_back("!-- --");
- environment_stack[depth] = latexname;
- }
-
- if (style->latexparam() == "CDATA")
- ofs << "latextype == LATEX_ENVIRONMENT) break;
-
- if (style->labeltype == LABEL_MANUAL)
- item_name = "tag";
- else
- item_name = "item";
-
- sgml::openTag(ofs, depth + 1, false, item_name);
- }
- break;
-
- default:
- sgml::openTag(ofs, depth, false, style->latexname());
- break;
- }
-
- simpleLinuxDocOnePar(ofs, pit, depth);
-
- ofs << "\n";
- // write closing SGML tags
- switch (style->latextype) {
- case LATEX_COMMAND:
- break;
- case LATEX_ENVIRONMENT:
- case LATEX_ITEM_ENVIRONMENT:
- case LATEX_BIB_ENVIRONMENT:
- if (style->latexparam() == "CDATA")
- ofs << "]]>";
- break;
- default:
- sgml::closeTag(ofs, depth, false, style->latexname());
- break;
- }
- }
-
- // Close open tags
- for (int i = depth; i >= 0; --i)
- sgml::closeTag(ofs, depth, false, environment_stack[i]);
+ linuxdocParagraphs(*this, paragraphs(), ofs, runparams);
if (!body_only) {
ofs << "\n\n";
- sgml::closeTag(ofs, 0, false, top_element);
+ sgml::closeTag(ofs, top_element);
}
ofs.close();
- // How to check for successful close
-
- // we want this to be true outside previews (for insetexternal)
- niceFile = true;
-}
-
-
-// checks, if newcol chars should be put into this line
-// writes newline, if necessary.
-namespace {
-
-void sgmlLineBreak(ostream & os, string::size_type & colcount,
- string::size_type newcol)
-{
- colcount += newcol;
- if (colcount > lyxrc.ascii_linelen) {
- os << "\n";
- colcount = newcol; // assume write after this call
- }
-}
-
-enum PAR_TAG {
- NONE=0,
- TT = 1,
- SF = 2,
- BF = 4,
- IT = 8,
- SL = 16,
- EM = 32
-};
-
-
-string tag_name(PAR_TAG const & pt) {
- switch (pt) {
- case NONE: return "!-- --";
- case TT: return "tt";
- case SF: return "sf";
- case BF: return "bf";
- case IT: return "it";
- case SL: return "sl";
- case EM: return "em";
- }
- return "";
-}
-
-
-inline
-void operator|=(PAR_TAG & p1, PAR_TAG const & p2)
-{
- p1 = static_cast(p1 | p2);
+ if (ofs.fail())
+ lyxerr << "File '" << fname << "' was not closed properly." << endl;
}
-inline
-void reset(PAR_TAG & p1, PAR_TAG const & p2)
-{
- p1 = static_cast(p1 & ~p2);
-}
-
-} // anon
-
-
-// Handle internal paragraph parsing -- layout already processed.
-void Buffer::simpleLinuxDocOnePar(ostream & os,
- ParagraphList::iterator par,
- Paragraph::depth_type /*depth*/) const
-{
- 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;
- desc_on = true;
- } else {
- font_old = style->font;
- desc_on = false;
- }
-
- LyXFont::FONT_FAMILY family_type = LyXFont::ROMAN_FAMILY;
- LyXFont::FONT_SERIES series_type = LyXFont::MEDIUM_SERIES;
- LyXFont::FONT_SHAPE shape_type = LyXFont::UP_SHAPE;
- bool is_em = false;
-
- stack tag_state;
- // parsing main loop
- for (pos_type i = 0; i < par->size(); ++i) {
-
- PAR_TAG tag_close = NONE;
- list < PAR_TAG > tag_open;
-
- LyXFont const font = par->getFont(params, i, outerFont(par, paragraphs));
-
- if (font_old.family() != font.family()) {
- switch (family_type) {
- case LyXFont::SANS_FAMILY:
- tag_close |= SF;
- break;
- case LyXFont::TYPEWRITER_FAMILY:
- tag_close |= TT;
- break;
- default:
- break;
- }
-
- family_type = font.family();
-
- switch (family_type) {
- case LyXFont::SANS_FAMILY:
- tag_open.push_back(SF);
- break;
- case LyXFont::TYPEWRITER_FAMILY:
- tag_open.push_back(TT);
- break;
- default:
- break;
- }
- }
-
- if (font_old.series() != font.series()) {
- switch (series_type) {
- case LyXFont::BOLD_SERIES:
- tag_close |= BF;
- break;
- default:
- break;
- }
-
- series_type = font.series();
-
- switch (series_type) {
- case LyXFont::BOLD_SERIES:
- tag_open.push_back(BF);
- break;
- default:
- break;
- }
-
- }
-
- if (font_old.shape() != font.shape()) {
- switch (shape_type) {
- case LyXFont::ITALIC_SHAPE:
- tag_close |= IT;
- break;
- case LyXFont::SLANTED_SHAPE:
- tag_close |= SL;
- break;
- default:
- break;
- }
-
- shape_type = font.shape();
-
- switch (shape_type) {
- case LyXFont::ITALIC_SHAPE:
- tag_open.push_back(IT);
- break;
- case LyXFont::SLANTED_SHAPE:
- tag_open.push_back(SL);
- break;
- default:
- break;
- }
- }
- // handle tag
- if (font_old.emph() != font.emph()) {
- if (font.emph() == LyXFont::ON) {
- tag_open.push_back(EM);
- is_em = true;
- }
- else if (is_em) {
- tag_close |= EM;
- is_em = false;
- }
- }
-
- list < PAR_TAG > temp;
- while (!tag_state.empty() && tag_close) {
- PAR_TAG k = tag_state.top();
- tag_state.pop();
- os << "" << tag_name(k) << '>';
- if (tag_close & k)
- reset(tag_close,k);
- else
- temp.push_back(k);
- }
-
- for(list< PAR_TAG >::const_iterator j = temp.begin();
- j != temp.end(); ++j) {
- tag_state.push(*j);
- os << '<' << tag_name(*j) << '>';
- }
-
- for(list< PAR_TAG >::const_iterator j = tag_open.begin();
- j != tag_open.end(); ++j) {
- tag_state.push(*j);
- os << '<' << tag_name(*j) << '>';
- }
-
- char c = par->getChar(i);
-
- if (c == Paragraph::META_INSET) {
- InsetOld * inset = par->getInset(i);
- inset->linuxdoc(this, os);
- font_old = font;
- continue;
- }
-
- if (style->latexparam() == "CDATA") {
- // "TeX"-Mode on == > SGML-Mode on.
- if (c != '\0')
- os << c;
- ++char_line_count;
- } else {
- bool ws;
- string str;
- boost::tie(ws, str) = sgml::escapeChar(c);
- if (ws && !par->isFreeSpacing()) {
- // in freespacing mode, spaces are
- // non-breaking characters
- if (desc_on) {// if char is ' ' then...
-
- ++char_line_count;
- sgmlLineBreak(os, char_line_count, 6);
- os << "";
- desc_on = false;
- } else {
- sgmlLineBreak(os, char_line_count, 1);
- os << c;
- }
- } else {
- os << str;
- char_line_count += str.length();
- }
- }
- font_old = font;
- }
-
- while (!tag_state.empty()) {
- os << "" << tag_name(tag_state.top()) << '>';
- tag_state.pop();
- }
-
- // resets description flag correctly
- if (desc_on) {
- // not closed...
- sgmlLineBreak(os, char_line_count, 6);
- os << "";
- }
-}
-
-
-void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
+void Buffer::makeDocBookFile(string const & fname,
+ OutputParams const & runparams,
+ bool const only_body)
{
ofstream ofs;
- if (!::openFileWrite(ofs, fname))
+ if (!openFileWrite(ofs, fname))
return;
- niceFile = nice; // this will be used by Insetincludes.
-
- LaTeXFeatures features(params);
+ LaTeXFeatures features(*this, params(), runparams.nice);
validate(features);
- texrow.reset();
+ texrow().reset();
- LyXTextClass const & tclass = params.getLyXTextClass();
- string top_element = tclass.latexname();
+ LyXTextClass const & tclass = params().getLyXTextClass();
+ string const & top_element = tclass.latexname();
if (!only_body) {
- ofs << "encoding()->Name() << "\"?>\n";
+
+ ofs << "\n";
+ preamble += "\n";
+ preamble += "\n";
+ preamble += "\n";
+ }
- string preamble = params.preamble;
- string const name = nice ? ChangeExtension(filename_, ".sgml")
+ string const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml")
: fname;
preamble += features.getIncludedFiles(name);
preamble += features.getLyXSGMLEntities();
@@ -1568,333 +1107,31 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
string top = top_element;
top += " lang=\"";
- top += params.language->code();
+ if (runparams.flavor == OutputParams::XML)
+ top += params().language->code();
+ else
+ top += params().language->code().substr(0,2);
top += '"';
- if (!params.options.empty()) {
+ if (!params().options.empty()) {
top += ' ';
- top += params.options;
+ top += params().options;
}
- sgml::openTag(ofs, 0, false, top);
- ofs << "\n";
- vector environment_stack(10);
- vector environment_inner(10);
- vector command_stack(10);
-
- bool command_flag = false;
- Paragraph::depth_type command_depth = 0;
- Paragraph::depth_type command_base = 0;
- Paragraph::depth_type cmd_depth = 0;
- Paragraph::depth_type depth = 0; // paragraph depth
-
- string item_name;
- string command_name;
-
- ParagraphList::iterator par = paragraphs.begin();
- ParagraphList::iterator pend = paragraphs.end();
-
- for (; par != pend; ++par) {
- string sgmlparam;
- string c_depth;
- string c_params;
- int desc_on = 0; // description mode
-
- LyXLayout_ptr const & style = par->layout();
-
- // environment tag closing
- for (; depth > par->params().depth(); --depth) {
- if (environment_inner[depth] != "!-- --" && !environment_inner[depth].empty()) {
- item_name = "listitem";
- sgml::closeTag(ofs, command_depth + depth, false, item_name);
- if (environment_inner[depth] == "varlistentry")
- sgml::closeTag(ofs, depth+command_depth, false, environment_inner[depth]);
- }
- sgml::closeTag(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].empty()) {
- if (environment_inner[depth] != "!-- --") {
- item_name= "listitem";
- sgml::closeTag(ofs, command_depth+depth, false, item_name);
- if (environment_inner[depth] == "varlistentry")
- sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]);
- }
-
- sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]);
-
- environment_stack[depth].erase();
- environment_inner[depth].erase();
- }
-
- // Write opening SGML tags.
- switch (style->latextype) {
- case LATEX_PARAGRAPH:
- sgml::openTag(ofs, depth + command_depth,
- false, style->latexname());
- break;
-
- case LATEX_COMMAND:
- if (depth != 0)
- error(ErrorItem(_("Error"), _("Wrong depth for LatexType Command."), par->id(), 0, par->size()));
-
- command_name = style->latexname();
-
- sgmlparam = style->latexparam();
- c_params = split(sgmlparam, c_depth,'|');
-
- cmd_depth = atoi(c_depth);
-
- if (command_flag) {
- if (cmd_depth < command_base) {
- for (Paragraph::depth_type j = command_depth;
- j >= command_base; --j) {
- sgml::closeTag(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) {
- sgml::closeTag(ofs, j, false, command_stack[j]);
- ofs << endl;
- }
- command_depth = cmd_depth;
- } else
- command_depth = cmd_depth;
- } else {
- command_depth = command_base = cmd_depth;
- command_flag = true;
- }
- if (command_stack.size() == command_depth + 1)
- command_stack.push_back(string());
- command_stack[command_depth] = command_name;
-
- // 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)) {
- InsetOld * inset = par->getInset(0);
- InsetOld::Code lyx_code = inset->lyxCode();
- if (lyx_code == InsetOld::LABEL_CODE) {
- command_name += " id=\"";
- command_name += (static_cast(inset))->getContents();
- command_name += '"';
- desc_on = 3;
- }
- }
-
- sgml::openTag(ofs, depth + command_depth, false, command_name);
-
- item_name = c_params.empty() ? "title" : c_params;
- sgml::openTag(ofs, depth + 1 + command_depth, false, item_name);
- break;
-
- case LATEX_ENVIRONMENT:
- case LATEX_ITEM_ENVIRONMENT:
- if (depth < par->params().depth()) {
- depth = par->params().depth();
- environment_stack[depth].erase();
- }
-
- 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_inner[depth] = "!-- --";
- sgml::openTag(ofs, depth + command_depth, false, environment_stack[depth]);
- } else {
- if (environment_inner[depth] != "!-- --") {
- item_name= "listitem";
- sgml::closeTag(ofs, command_depth + depth, false, item_name);
- if (environment_inner[depth] == "varlistentry")
- sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]);
- }
- }
-
- if (style->latextype == LATEX_ENVIRONMENT) {
- if (!style->latexparam().empty()) {
- if (style->latexparam() == "CDATA")
- ofs << "latexparam());
- }
- break;
- }
-
- desc_on = (style->labeltype == LABEL_MANUAL);
-
- environment_inner[depth] = desc_on ? "varlistentry" : "listitem";
- sgml::openTag(ofs, depth + 1 + command_depth,
- false, environment_inner[depth]);
-
- item_name = desc_on ? "term" : "para";
- sgml::openTag(ofs, depth + 1 + command_depth,
- false, item_name);
- break;
- default:
- sgml::openTag(ofs, depth + command_depth,
- false, style->latexname());
- break;
- }
-
- simpleDocBookOnePar(ofs, par, desc_on,
- depth + 1 + command_depth);
-
- string end_tag;
- // write closing SGML tags
- switch (style->latextype) {
- case LATEX_COMMAND:
- end_tag = c_params.empty() ? "title" : c_params;
- sgml::closeTag(ofs, depth + command_depth,
- false, end_tag);
- break;
- case LATEX_ENVIRONMENT:
- if (!style->latexparam().empty()) {
- if (style->latexparam() == "CDATA")
- ofs << "]]>";
- else
- sgml::closeTag(ofs, depth + command_depth, false, style->latexparam());
- }
- break;
- case LATEX_ITEM_ENVIRONMENT:
- if (desc_on == 1) break;
- end_tag = "para";
- sgml::closeTag(ofs, depth + 1 + command_depth, false, end_tag);
- break;
- case LATEX_PARAGRAPH:
- sgml::closeTag(ofs, depth + command_depth, false, style->latexname());
- break;
- default:
- sgml::closeTag(ofs, depth + command_depth, false, style->latexname());
- break;
- }
- }
+ params().getLyXTextClass().counters().reset();
- // Close open tags
- for (int d = depth; d >= 0; --d) {
- if (!environment_stack[depth].empty()) {
- if (environment_inner[depth] != "!-- --") {
- item_name = "listitem";
- sgml::closeTag(ofs, command_depth + depth, false, item_name);
- if (environment_inner[depth] == "varlistentry")
- sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]);
- }
-
- sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]);
- }
- }
-
- for (int j = command_depth; j >= 0 ; --j)
- if (!command_stack[j].empty()) {
- sgml::closeTag(ofs, j, false, command_stack[j]);
- ofs << endl;
- }
-
- ofs << "\n\n";
- sgml::closeTag(ofs, 0, false, top_element);
+ sgml::openTag(ofs, top);
+ ofs << '\n';
+ docbookParagraphs(paragraphs(), *this, ofs, runparams);
+ sgml::closeTag(ofs, top_element);
ofs.close();
- // How to check for successful close
-
- // we want this to be true outside previews (for insetexternal)
- niceFile = true;
-}
-
-
-void Buffer::simpleDocBookOnePar(ostream & os,
- ParagraphList::iterator par, int & desc_on,
- Paragraph::depth_type depth) const
-{
- bool emph_flag = false;
-
- LyXLayout_ptr const & style = par->layout();
-
- LyXFont font_old = (style->labeltype == LABEL_MANUAL ? style->labelfont : style->font);
-
- int char_line_count = depth;
- //if (!style.free_spacing)
- // os << string(depth,' ');
-
- // parsing main loop
- for (pos_type i = 0; i < par->size(); ++i) {
- LyXFont font = par->getFont(params, i, outerFont(par, paragraphs));
-
- // handle tag
- if (font_old.emph() != font.emph()) {
- if (font.emph() == LyXFont::ON) {
- if (style->latexparam() == "CDATA")
- os << "]]>";
- os << "";
- if (style->latexparam() == "CDATA")
- os << "latexparam() == "CDATA")
- os << "]]>";
- os << "";
- if (style->latexparam() == "CDATA")
- os << "isInset(i)) {
- InsetOld * 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")
- os << "]]>";
- inset->docbook(this, os, false);
- if (style->latexparam() == "CDATA")
- os << "getChar(i);
- bool ws;
- string str;
- boost::tie(ws, str) = sgml::escapeChar(c);
-
- if (style->pass_thru) {
- os << c;
- } else if (par->isFreeSpacing() || c != ' ') {
- os << str;
- } else if (desc_on == 1) {
- ++char_line_count;
- os << "\n";
- desc_on = 2;
- } else {
- os << ' ';
- }
- }
- font_old = font;
- }
-
- if (emph_flag) {
- if (style->latexparam() == "CDATA")
- os << "]]>";
- os << "";
- if (style->latexparam() == "CDATA")
- os << " not closed...
- os << "\n ";
- }
- if (style->free_spacing)
- os << '\n';
+ if (ofs.fail())
+ lyxerr << "File '" << fname << "' was not closed properly." << endl;
}
@@ -1906,25 +1143,21 @@ int Buffer::runChktex()
// get LaTeX-Filename
string const name = getLatexName();
- string path = filePath();
-
- string const org_path = path;
- if (lyxrc.use_tempdir || !IsDirWriteable(path)) {
- path = tmppath;
- }
+ string const path = temppath();
+ string const org_path = filePath();
Path p(path); // path to LaTeX file
message(_("Running chktex..."));
// Generate the LaTeX file if neccessary
- LatexRunParams runparams;
- runparams.flavor = LatexRunParams::LATEX;
+ OutputParams runparams;
+ runparams.flavor = OutputParams::LATEX;
runparams.nice = false;
makeLaTeXFile(name, org_path, runparams);
TeXErrors terr;
Chktex chktex(lyxrc.chktex_command, name, filePath());
- int res = chktex.run(terr); // run chktex
+ int const res = chktex.run(terr); // run chktex
if (res == -1) {
Alert::error(_("chktex failure"),
@@ -1942,29 +1175,29 @@ int Buffer::runChktex()
void Buffer::validate(LaTeXFeatures & features) const
{
- LyXTextClass const & tclass = params.getLyXTextClass();
+ LyXTextClass const & tclass = params().getLyXTextClass();
- if (params.tracking_changes) {
+ if (params().tracking_changes) {
features.require("dvipost");
features.require("color");
}
// AMS Style is at document level
- if (params.use_amsmath == BufferParams::AMS_ON
+ if (params().use_amsmath == BufferParams::AMS_ON
|| tclass.provides(LyXTextClass::amsmath))
features.require("amsmath");
- for_each(paragraphs.begin(), paragraphs.end(),
+ for_each(paragraphs().begin(), paragraphs().end(),
boost::bind(&Paragraph::validate, _1, boost::ref(features)));
// the bullet shapes are buffer level not paragraph level
// so they are tested here
for (int i = 0; i < 4; ++i) {
- if (params.user_defined_bullets[i] != ITEMIZE_DEFAULTS[i]) {
- int const font = params.user_defined_bullets[i].getFont();
+ if (params().user_defined_bullet(i) != ITEMIZE_DEFAULTS[i]) {
+ int const font = params().user_defined_bullet(i).getFont();
if (font == 0) {
- int const c = params
- .user_defined_bullets[i]
+ int const c = params()
+ .user_defined_bullet(i)
.getCharacter();
if (c == 16
|| c == 17
@@ -1987,49 +1220,52 @@ void Buffer::validate(LaTeXFeatures & features) const
}
-void Buffer::getLabelList(std::vector & list) const
+void Buffer::getLabelList(vector & list) const
{
/// if this is a child document and the parent is already loaded
/// Use the parent's list instead [ale990407]
- if (!params.parentname.empty()
- && bufferlist.exists(params.parentname)) {
- Buffer const * tmp = bufferlist.getBuffer(params.parentname);
- if (tmp) {
- tmp->getLabelList(list);
- return;
- }
+ Buffer const * tmp = getMasterBuffer();
+ if (!tmp) {
+ lyxerr << "getMasterBuffer() failed!" << endl;
+ BOOST_ASSERT(tmp);
}
-
- for (inset_iterator it = inset_const_iterator_begin();
- it != inset_const_iterator_end(); ++it) {
- it->getLabelList(list);
+ if (tmp != this) {
+ tmp->getLabelList(list);
+ return;
}
+
+ for (InsetIterator it = inset_iterator_begin(inset()); it; ++it)
+ it.nextInset()->getLabelList(*this, list);
}
// This is also a buffer property (ale)
-void Buffer::fillWithBibKeys(std::vector > & keys) const
+void Buffer::fillWithBibKeys(vector > & keys)
+ const
{
/// if this is a child document and the parent is already loaded
/// use the parent's list instead [ale990412]
- if (!params.parentname.empty() && bufferlist.exists(params.parentname)) {
- Buffer const * tmp = bufferlist.getBuffer(params.parentname);
- if (tmp) {
- tmp->fillWithBibKeys(keys);
- return;
- }
+ Buffer const * tmp = getMasterBuffer();
+ BOOST_ASSERT(tmp);
+ if (tmp != this) {
+ tmp->fillWithBibKeys(keys);
+ return;
}
- for (inset_iterator it = inset_const_iterator_begin();
- it != inset_const_iterator_end(); ++it) {
- if (it->lyxCode() == InsetOld::BIBTEX_CODE)
- static_cast(*it).fillWithBibKeys(this, keys);
- else if (it->lyxCode() == InsetOld::INCLUDE_CODE)
- static_cast(*it).fillWithBibKeys(keys);
- else if (it->lyxCode() == InsetOld::BIBITEM_CODE) {
- InsetBibitem & bib = static_cast(*it);
- string const key = bib.getContents();
- string const opt = bib.getOptions();
+ for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
+ if (it->lyxCode() == InsetBase::BIBTEX_CODE) {
+ InsetBibtex const & inset =
+ dynamic_cast(*it);
+ inset.fillWithBibKeys(*this, keys);
+ } else if (it->lyxCode() == InsetBase::INCLUDE_CODE) {
+ InsetInclude const & inset =
+ dynamic_cast(*it);
+ inset.fillWithBibKeys(*this, keys);
+ } else if (it->lyxCode() == InsetBase::BIBITEM_CODE) {
+ InsetBibitem const & inset =
+ dynamic_cast(*it);
+ string const key = inset.getContents();
+ string const opt = inset.getOptions();
string const ref; // = pit->asString(this, false);
string const info = opt + "TheBibliographyRef" + ref;
keys.push_back(pair(key, info));
@@ -2040,8 +1276,8 @@ void Buffer::fillWithBibKeys(std::vector > & keys) con
bool Buffer::isDepClean(string const & name) const
{
- DepClean::const_iterator it = dep_clean_.find(name);
- if (it == dep_clean_.end())
+ DepClean::const_iterator const it = pimpl_->dep_clean.find(name);
+ if (it == pimpl_->dep_clean.end())
return true;
return it->second;
}
@@ -2049,28 +1285,23 @@ bool Buffer::isDepClean(string const & name) const
void Buffer::markDepClean(string const & name)
{
- dep_clean_[name] = true;
+ pimpl_->dep_clean[name] = true;
}
bool Buffer::dispatch(string const & command, bool * result)
{
- // Split command string into command and argument
- string cmd;
- string line = ltrim(command);
- string const arg = trim(split(line, cmd, ' '));
-
- return dispatch(lyxaction.LookupFunc(cmd), arg, result);
+ return dispatch(lyxaction.lookupFunc(command), result);
}
-bool Buffer::dispatch(int action, string const & argument, bool * result)
+bool Buffer::dispatch(FuncRequest const & func, bool * result)
{
bool dispatched = true;
- switch (action) {
+ switch (func.action) {
case LFUN_EXPORT: {
- bool const tmp = Exporter::Export(this, argument, false);
+ bool const tmp = Exporter::Export(this, func.argument, false);
if (result)
*result = tmp;
break;
@@ -2085,67 +1316,44 @@ bool Buffer::dispatch(int action, string const & argument, bool * result)
void Buffer::changeLanguage(Language const * from, Language const * to)
{
+ BOOST_ASSERT(from);
+ BOOST_ASSERT(to);
+
lyxerr << "Changing Language!" << endl;
// Take care of l10n/i18n
updateDocLang(to);
- ParIterator end = par_iterator_end();
- for (ParIterator it = par_iterator_begin(); it != end; ++it)
- it->changeLanguage(params, from, to);
+ for_each(par_iterator_begin(),
+ par_iterator_end(),
+ bind(&Paragraph::changeLanguage, _1, params(), from, to));
}
void Buffer::updateDocLang(Language const * nlang)
{
- messages_.reset(new Messages(nlang->code()));
+ BOOST_ASSERT(nlang);
+
+ pimpl_->messages.reset(new Messages(nlang->code()));
}
-bool Buffer::isMultiLingual()
+bool Buffer::isMultiLingual() const
{
- ParIterator end = par_iterator_end();
- for (ParIterator it = par_iterator_begin(); it != end; ++it)
- if (it->isMultiLingual(params))
+ ParConstIterator end = par_iterator_end();
+ for (ParConstIterator it = par_iterator_begin(); it != end; ++it)
+ if (it->isMultiLingual(params()))
return true;
return false;
}
-void Buffer::inset_iterator::setParagraph()
-{
- while (pit != pend) {
- it = pit->insetlist.begin();
- if (it != pit->insetlist.end())
- return;
- ++pit;
- }
-}
-
-
-InsetOld * Buffer::getInsetFromID(int id_arg) const
-{
- for (inset_iterator it = inset_const_iterator_begin();
- it != inset_const_iterator_end(); ++it)
- {
- if (it->id() == id_arg)
- return &(*it);
- InsetOld * in = it->getInsetFromID(id_arg);
- if (in)
- return in;
- }
- return 0;
-}
-
-
-ParIterator Buffer::getParFromID(int id) const
+ParIterator Buffer::getParFromID(int const id) const
{
-#warning FIXME: const correctness! (Andre)
- ParIterator it = const_cast(this)->par_iterator_begin();
- ParIterator end = const_cast(this)->par_iterator_end();
+ ParConstIterator it = par_iterator_begin();
+ ParConstIterator const end = par_iterator_end();
-#warning FIXME, perhaps this func should return a ParIterator? (Lgb)
if (id < 0) {
// John says this is called with id == -1 from undo
lyxerr << "getParFromID(), id: " << id << endl;
@@ -2160,58 +1368,47 @@ ParIterator Buffer::getParFromID(int id) const
}
-bool Buffer::hasParWithID(int id) const
+bool Buffer::hasParWithID(int const id) const
{
- ParConstIterator it = par_iterator_begin();
- ParConstIterator end = par_iterator_end();
-
- if (id < 0) {
- // John says this is called with id == -1 from undo
- lyxerr << "hasParWithID(), id: " << id << endl;
- return 0;
- }
-
- for (; it != end; ++it)
- if (it->id() == id)
- return true;
-
- return false;
+ ParConstIterator const it = getParFromID(id);
+ return it != par_iterator_end();
}
ParIterator Buffer::par_iterator_begin()
{
- return ParIterator(paragraphs.begin(), paragraphs);
+ return ::par_iterator_begin(inset());
}
ParIterator Buffer::par_iterator_end()
{
- return ParIterator(paragraphs.end(), paragraphs);
+ return ::par_iterator_end(inset());
}
+
ParConstIterator Buffer::par_iterator_begin() const
{
- return ParConstIterator(const_cast(paragraphs).begin(), paragraphs);
+ return ::par_const_iterator_begin(inset());
}
ParConstIterator Buffer::par_iterator_end() const
{
- return ParConstIterator(const_cast(paragraphs).end(), paragraphs);
+ return ::par_const_iterator_end(inset());
}
Language const * Buffer::getLanguage() const
{
- return params.language;
+ return params().language;
}
string const Buffer::B_(string const & l10n) const
{
- if (messages_.get()) {
- return messages_->get(l10n);
+ if (pimpl_->messages.get()) {
+ return pimpl_->messages->get(l10n);
}
return _(l10n);
@@ -2220,56 +1417,57 @@ string const Buffer::B_(string const & l10n) const
bool Buffer::isClean() const
{
- return lyx_clean;
+ return pimpl_->lyx_clean;
}
bool Buffer::isBakClean() const
{
- return bak_clean;
+ return pimpl_->bak_clean;
}
void Buffer::markClean() const
{
- if (!lyx_clean) {
- lyx_clean = true;
+ if (!pimpl_->lyx_clean) {
+ pimpl_->lyx_clean = true;
updateTitles();
}
// if the .lyx file has been saved, we don't need an
// autosave
- bak_clean = true;
+ pimpl_->bak_clean = true;
}
void Buffer::markBakClean()
{
- bak_clean = true;
+ pimpl_->bak_clean = true;
}
void Buffer::setUnnamed(bool flag)
{
- unnamed = flag;
+ pimpl_->unnamed = flag;
}
-bool Buffer::isUnnamed()
+bool Buffer::isUnnamed() const
{
- return unnamed;
+ return pimpl_->unnamed;
}
+#warning this function should be moved to buffer_pimpl.C
void Buffer::markDirty()
{
- if (lyx_clean) {
- lyx_clean = false;
+ if (pimpl_->lyx_clean) {
+ pimpl_->lyx_clean = false;
updateTitles();
}
- bak_clean = false;
+ pimpl_->bak_clean = false;
- DepClean::iterator it = dep_clean_.begin();
- DepClean::const_iterator const end = dep_clean_.end();
+ DepClean::iterator it = pimpl_->dep_clean.begin();
+ DepClean::const_iterator const end = pimpl_->dep_clean.end();
for (; it != end; ++it) {
it->second = false;
@@ -2279,121 +1477,79 @@ void Buffer::markDirty()
string const & Buffer::fileName() const
{
- return filename_;
+ return pimpl_->filename;
}
string const & Buffer::filePath() const
{
- return filepath_;
+ return pimpl_->filepath;
}
bool Buffer::isReadonly() const
{
- return read_only;
+ return pimpl_->read_only;
}
void Buffer::setParentName(string const & name)
{
- params.parentname = name;
-}
-
-
-Buffer::inset_iterator::inset_iterator()
- : pit(), pend()
-{}
-
-
-Buffer::inset_iterator::inset_iterator(base_type p, base_type e)
- : pit(p), pend(e)
-{
- setParagraph();
-}
-
-
-Buffer::inset_iterator Buffer::inset_iterator_begin()
-{
- return inset_iterator(paragraphs.begin(), paragraphs.end());
+ params().parentname = name;
}
-Buffer::inset_iterator Buffer::inset_iterator_end()
+Buffer const * Buffer::getMasterBuffer() const
{
- return inset_iterator(paragraphs.end(), paragraphs.end());
-}
-
-
-Buffer::inset_iterator Buffer::inset_const_iterator_begin() const
-{
- return inset_iterator(const_cast(paragraphs).begin(),
- const_cast(paragraphs).end());
-}
-
-
-Buffer::inset_iterator Buffer::inset_const_iterator_end() const
-{
- return inset_iterator(const_cast(paragraphs).end(),
- const_cast(paragraphs).end());
-}
-
-
-Buffer::inset_iterator & Buffer::inset_iterator::operator++()
-{
- if (pit != pend) {
- ++it;
- if (it == pit->insetlist.end()) {
- ++pit;
- setParagraph();
- }
+ if (!params().parentname.empty()
+ && bufferlist.exists(params().parentname)) {
+ Buffer const * buf = bufferlist.getBuffer(params().parentname);
+ if (buf)
+ return buf->getMasterBuffer();
}
- return *this;
-}
-
-Buffer::inset_iterator Buffer::inset_iterator::operator++(int)
-{
- inset_iterator tmp = *this;
- ++*this;
- return tmp;
+ return this;
}
-Buffer::inset_iterator::reference Buffer::inset_iterator::operator*()
+MacroData const & Buffer::getMacro(std::string const & name) const
{
- return *it->inset;
+ return pimpl_->macros.get(name);
}
-Buffer::inset_iterator::pointer Buffer::inset_iterator::operator->()
+bool Buffer::hasMacro(string const & name) const
{
- return it->inset;
+ return pimpl_->macros.has(name);
}
-ParagraphList::iterator Buffer::inset_iterator::getPar() const
+void Buffer::insertMacro(string const & name, MacroData const & data)
{
- return pit;
+ MacroTable::globalMacros().insert(name, data);
+ pimpl_->macros.insert(name, data);
}
-lyx::pos_type Buffer::inset_iterator::getPos() const
+void Buffer::buildMacros()
{
- return it->pos;
-}
-
-
-bool operator==(Buffer::inset_iterator const & iter1,
- Buffer::inset_iterator const & iter2)
-{
- return iter1.pit == iter2.pit
- && (iter1.pit == iter1.pend || iter1.it == iter2.it);
-}
+ // Start with global table.
+ pimpl_->macros = MacroTable::globalMacros();
-
-bool operator!=(Buffer::inset_iterator const & iter1,
- Buffer::inset_iterator const & iter2)
-{
- return !(iter1 == iter2);
+ // Now add our own.
+ ParagraphList & pars = text().paragraphs();
+ for (size_t i = 0, n = pars.size(); i != n; ++i) {
+ //lyxerr << "searching main par " << i
+ // << " for macro definitions" << std::endl;
+ InsetList::iterator it = pars[i].insetlist.begin();
+ InsetList::iterator end = pars[i].insetlist.end();
+ for ( ; it != end; ++it) {
+ //lyxerr << "found inset code " << it->inset->lyxCode() << std::endl;
+ if (it->inset->lyxCode() == InsetBase::MATHMACRO_CODE) {
+ MathMacroTemplate & mac
+ = static_cast(*it->inset);
+ insertMacro(mac.name(), mac.asMacroData());
+ }
+ }
+ }
}