#include "insets/insetfloat.h"
#include "insets/insetlist.h"
#include "insets/insettabular.h"
+#include "insets/insettheorem.h"
#include "support/filetools.h"
#include "support/path.h"
#include "LaTeX.h"
if (token[0] != '\\') {
for (string::const_iterator cit = token.begin();
cit != token.end(); ++cit) {
-#ifdef NEW_WAY
par->InsertChar(pos, (*cit), font);
-#else
- par->InsertChar(pos, (*cit));
- par->SetFont(pos, font);
-#endif
++pos;
}
} else if (token == "\\i") {
Inset * inset = new InsetLatexAccent;
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (token == "\\layout") {
if (!return_par)
nylex.setStream(istr);
inset->Read(this, nylex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
#endif
} else if (token == "\\begin_deeper") {
if (tmptok == "Quotes") {
Inset * inset = new InsetQuotes;
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (tmptok == "External") {
Inset * inset = new InsetExternal;
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (tmptok == "FormulaMacro") {
Inset * inset = new InsetFormulaMacro;
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (tmptok == "Formula") {
Inset * inset = new InsetFormula;
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (tmptok == "Figure") {
Inset * inset = new InsetFig(100, 100, this);
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (tmptok == "Info") {
Inset * inset = new InsetInfo;
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (tmptok == "Include") {
Inset * inset = new InsetInclude(string(), this);
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (tmptok == "ERT") {
Inset * inset = new InsetERT;
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (tmptok == "Tabular") {
Inset * inset = new InsetTabular(this);
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (tmptok == "Text") {
Inset * inset = new InsetText;
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (tmptok == "Foot") {
Inset * inset = new InsetFoot;
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (tmptok == "Marginal") {
Inset * inset = new InsetMarginal;
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (tmptok == "Minipage") {
Inset * inset = new InsetMinipage;
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (tmptok == "Float") {
Inset * inset = new InsetFloat;
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
} else if (tmptok == "List") {
Inset * inset = new InsetList;
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
+ ++pos;
+ } else if (tmptok == "Theorem") {
+ Inset * inset = new InsetList;
+ inset->Read(this, lex);
+ par->InsertInset(pos, inset, font);
++pos;
} else if (tmptok == "GRAPHICS") {
Inset * inset = new InsetGraphics;
//inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
} else if (tmptok == "LatexCommand") {
InsetCommand inscmd;
inscmd.Read(this, lex);
}
if (inset) {
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
}
}
lex.next();
next_token = lex.GetString();
if (next_token == "\\-") {
-#ifdef NEW_WAY
par->InsertChar(pos, '-', font);
-#else
- par->InsertChar(pos, '-');
- par->SetFont(pos, font);
-#endif
} else if (next_token == "\\protected_separator"
|| next_token == "~") {
-#ifdef NEW_WAY
par->InsertChar(pos, ' ', font);
-#else
- par->InsertChar(pos, ' ');
- par->SetFont(pos, font);
-#endif
} else {
lex.printError("Token `$$Token' "
"is in free space "
} else {
Inset * inset = new InsetSpecialChar;
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
}
++pos;
} else if (token == "\\newline") {
-#ifdef NEW_WAY
par->InsertChar(pos, LyXParagraph::META_NEWLINE, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_NEWLINE);
- par->SetFont(pos, font);
-#endif
++pos;
} else if (token == "\\LyXTable") {
#ifdef USE_TABULAR_INSETS
Inset * inset = new InsetTabular(this);
inset->Read(this, lex);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
++pos;
#else
par->table = new LyXTable(lex);
#endif
} else if (token == "\\hfill") {
-#ifdef NEW_WAY
par->InsertChar(pos, LyXParagraph::META_HFILL, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_HFILL);
- par->SetFont(pos, font);
-#endif
++pos;
} else if (token == "\\protected_separator") { // obsolete
// This is a backward compability thingie. (Lgb)
par->GetLayout());
if (layout.free_spacing) {
-#ifdef NEW_WAY
par->InsertChar(pos, ' ', font);
-#else
- par->InsertChar(pos, ' ');
- par->SetFont(pos, font);
-#endif
} else {
Inset * inset = new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR);
-#ifdef NEW_WAY
par->InsertInset(pos, inset, font);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->SetFont(pos, font);
- par->InsertInset(pos, inset);
-#endif
}
++pos;
} else if (token == "\\bibitem") { // ale970302
par->bibkey = new InsetBibKey;
par->bibkey->Read(this, lex);
}else if (token == "\\backslash") {
-#ifdef NEW_WAY
par->InsertChar(pos, '\\', font);
-#else
- par->InsertChar(pos, '\\');
- par->SetFont(pos, font);
-#endif
++pos;
}else if (token == "\\the_end") {
the_end_read = true;
"Inserting as text.");
for(string::const_iterator cit = token.begin();
cit != token.end(); ++cit) {
-#ifdef NEW_WAY
par->InsertChar(pos, (*cit), font);
-#else
- par->InsertChar(pos, (*cit));
- par->SetFont(pos, font);
-#endif
++pos;
}
}
string options; // the document class options.
- if (tokenPos(tclass.opt_fontsize(), '|', params.fontsize) >= 0) {
+ if (tokenPos(tclass.opt_fontsize(),
+ '|', params.fontsize) >= 0) {
// only write if existing in list (and not default)
options += params.fontsize;
options += "pt,";
texrow.newline();
}
- if (tokenPos(tclass.opt_pagestyle(), '|', params.pagestyle) >= 0) {
+ if (tokenPos(tclass.opt_pagestyle(),
+ '|', params.pagestyle) >= 0) {
if (params.pagestyle == "fancy") {
ofs << "\\usepackage{fancyhdr}\n";
texrow.newline();
}
// Now insert the LyX specific LaTeX commands...
- string preamble, tmppreamble;
// The optional packages;
- preamble = features.getPackages();
+ string preamble(features.getPackages());
// this might be useful...
- preamble += "\n\\makeatletter\n\n";
+ preamble += "\n\\makeatletter\n";
// Some macros LyX will need
- tmppreamble = features.getMacros();
+ string tmppreamble(features.getMacros());
if (!tmppreamble.empty()) {
preamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
+ params.preamble + '\n';
}
- preamble += "\\makeatother\n\n";
+ preamble += "\\makeatother\n";
// Itemize bullet settings need to be last in case the user
// defines their own bullets that use a package included
ofs << preamble;
// make the body.
- ofs << "\\begin{document}\n\n";
- texrow.newline();
+ ofs << "\\begin{document}\n";
texrow.newline();
} // only_body
lyxerr.debug() << "preamble finished, now the body." << endl;
lyxerr.debug() << "Finished making latex file." << endl;
}
+
//
// LaTeX all paragraphs from par to endpar, if endpar == 0 then to the end
//
-void Buffer::latexParagraphs(ostream & ofs, LyXParagraph *par,
- LyXParagraph *endpar, TexRow & texrow) const
+void Buffer::latexParagraphs(ostream & ofs, LyXParagraph * par,
+ LyXParagraph * endpar, TexRow & texrow) const
{
bool was_title = false;
bool already_title = false;
}
}
+
bool Buffer::isLatex() const
{
return textclasslist.TextClass(params.textclass).outputType() == LATEX;
}
-void Buffer::makeLinuxDocFile(string const & fname, int column)
+void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
{
LyXParagraph * par = paragraph;
+ niceFile = nice; // this will be used by Insetincludes.
+
string top_element = textclasslist.LatexnameOfClass(params.textclass);
string environment_stack[10];
string item_name;
WriteAlert(_("LYX_ERROR:"), _("Cannot write file"), fname);
return;
}
-
- tex_code_break_column = column;
+
+ LyXTextClass const & tclass =
+ textclasslist.TextClass(params.textclass);
+
+ LaTeXFeatures features(params, tclass.numLayouts());
+ validate(features);
+
+ //if(nice)
+ tex_code_break_column = lyxrc.ascii_linelen;
+ //else
+ //tex_code_break_column = 0;
+
texrow.reset();
-
- if (params.preamble.empty()) {
- ofs << "<!doctype linuxdoc system>\n\n";
- }
- else {
- ofs << "<!doctype linuxdoc system \n [ "
- << params.preamble << " \n]>\n\n";
+
+ if (!body_only) {
+ string sgml_includedfiles=features.getIncludedFiles();
+
+ if (params.preamble.empty() && sgml_includedfiles.empty()) {
+ ofs << "<!doctype linuxdoc system>\n\n";
+ } else {
+ ofs << "<!doctype linuxdoc system [ "
+ << params.preamble << sgml_includedfiles << " \n]>\n\n";
+ }
+
+ if(params.options.empty())
+ sgmlOpenTag(ofs, 0, top_element);
+ else {
+ string top = top_element;
+ top += " ";
+ top += params.options;
+ sgmlOpenTag(ofs, 0, top);
+ }
}
ofs << "<!-- " << LYX_DOCVERSION
<< " created this file. For more info see http://www.lyx.org/"
<< " -->\n";
- if(params.options.empty())
- sgmlOpenTag(ofs, 0, top_element);
- else {
- string top = top_element;
- top += " ";
- top += params.options;
- sgmlOpenTag(ofs, 0, top);
- }
-
while (par) {
int desc_on = 0; // description mode
LyXLayout const & style =
- textclasslist.Style(users->buffer()->params.textclass,
+ textclasslist.Style(params.textclass,
par->layout);
// treat <toc> as a special case for compatibility with old code
if(!environment_stack[depth].empty())
sgmlCloseTag(ofs, depth, environment_stack[depth]);
- ofs << "\n\n";
- sgmlCloseTag(ofs, 0, top_element);
+ if (!body_only) {
+ ofs << "\n\n";
+ sgmlCloseTag(ofs, 0, top_element);
+ }
ofs.close();
// How to check for successful close
case 0:
if (font2.family() == LyXFont::TYPEWRITER_FAMILY) {
push_tag(os, "tt", stack_num, stack);
- family_type= 1;
+ family_type = 1;
}
else if (font2.family() == LyXFont::SANS_FAMILY) {
push_tag(os, "sf", stack_num, stack);
- family_type= 2;
+ family_type = 2;
}
break;
case 1:
pop_tag(os, "tt", stack_num, stack);
if (font2.family() == LyXFont::SANS_FAMILY) {
push_tag(os, "sf", stack_num, stack);
- family_type= 2;
- }
- else {
- family_type= 0;
+ family_type = 2;
+ } else {
+ family_type = 0;
}
break;
case 2:
pop_tag(os, "sf", stack_num, stack);
if (font2.family() == LyXFont::TYPEWRITER_FAMILY) {
push_tag(os, "tt", stack_num, stack);
- family_type= 1;
- }
- else {
- family_type= 0;
+ family_type = 1;
+ } else {
+ family_type = 0;
}
}
}
if (font2.series() == LyXFont::BOLD_SERIES) {
push_tag(os, "bf", stack_num, stack);
is_bold = true;
- }
- else if (is_bold) {
+ } else if (is_bold) {
pop_tag(os, "bf", stack_num, stack);
is_bold = false;
}
case 0:
if (font2.shape() == LyXFont::ITALIC_SHAPE) {
push_tag(os, "it", stack_num, stack);
- shape_type= 1;
- }
- else if (font2.shape() == LyXFont::SLANTED_SHAPE) {
+ shape_type = 1;
+ } else if (font2.shape() == LyXFont::SLANTED_SHAPE) {
push_tag(os, "sl", stack_num, stack);
- shape_type= 2;
+ shape_type = 2;
}
break;
case 1:
pop_tag(os, "it", stack_num, stack);
if (font2.shape() == LyXFont::SLANTED_SHAPE) {
push_tag(os, "sl", stack_num, stack);
- shape_type= 2;
- }
- else {
- shape_type= 0;
+ shape_type = 2;
+ } else {
+ shape_type = 0;
}
break;
case 2:
pop_tag(os, "sl", stack_num, stack);
if (font2.shape() == LyXFont::ITALIC_SHAPE) {
push_tag(os, "it", stack_num, stack);
- shape_type= 1;
- }
- else {
- shape_type= 0;
+ shape_type = 1;
+ } else {
+ shape_type = 0;
}
}
}
}
c = par->GetChar(i);
-
+
+ if (c == LyXParagraph::META_INSET) {
+ inset = par->GetInset(i);
+ inset->Linuxdoc(this, os);
+ }
+
if (font2.latex() == LyXFont::ON) {
// "TeX"-Mode on == > SGML-Mode on.
if (c != '\0')
os << c; // see LaTeX-Generation...
++char_line_count;
- } else if (c == LyXParagraph::META_INSET) {
- inset = par->GetInset(i);
- inset->Linuxdoc(this, os);
} else {
string sgml_string;
if (par->linuxDocConvertChar(c, sgml_string)
linux_doc_line_break(os, char_line_count, 6);
os << "</tag>";
desc_on = 2;
- }
- else {
+ } else {
linux_doc_line_break(os, char_line_count, 1);
os << c;
}
- }
- else {
+ } else {
os << sgml_string;
char_line_count += sgml_string.length();
}
{
// insert an error marker in text
InsetError * new_inset = new InsetError(message);
-#ifdef NEW_WAY
par->InsertInset(pos, new_inset);
-#else
- par->InsertChar(pos, LyXParagraph::META_INSET);
- par->InsertInset(pos, new_inset);
-#endif
}
// This constant defines the maximum number of
enum { MAX_NEST_LEVEL = 25};
-void Buffer::makeDocBookFile(string const & fname, int column)
+void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
{
LyXParagraph * par = paragraph;
+ niceFile = nice; // this will be used by Insetincludes.
+
string top_element= textclasslist.LatexnameOfClass(params.textclass);
// Please use a real stack.
string environment_stack[MAX_NEST_LEVEL];
string c_depth, c_params, tmps;
int depth = 0; // paragraph depth
+ LyXTextClass const & tclass =
+ textclasslist.TextClass(params.textclass);
- tex_code_break_column = column;
+ LaTeXFeatures features(params, tclass.numLayouts());
+ validate(features);
+
+ //if(nice)
+ tex_code_break_column = lyxrc.ascii_linelen;
+ //else
+ //tex_code_break_column = 0;
ofstream ofs(fname.c_str());
if (!ofs) {
texrow.reset();
- ofs << "<!doctype " << top_element
- << " public \"-//OASIS//DTD DocBook V3.1//EN\"";
+ if(!only_body) {
+ string sgml_includedfiles=features.getIncludedFiles();
- if (params.preamble.empty())
- ofs << ">\n\n";
- else
- ofs << "\n [ " << params.preamble << " \n]>\n\n";
+ ofs << "<!doctype " << top_element
+ << " public \"-//OASIS//DTD DocBook V3.1//EN\"";
- ofs << "<!-- DocBook file was created by " << LYX_DOCVERSION
- << "\n See http://www.lyx.org/ for more information -->\n";
+ if (params.preamble.empty() && sgml_includedfiles.empty())
+ ofs << ">\n\n";
+ else
+ ofs << "\n [ " << params.preamble
+ << sgml_includedfiles << " \n]>\n\n";
- if(params.options.empty())
- sgmlOpenTag(ofs, 0, top_element);
- else {
- string top = top_element;
- top += " ";
- top += params.options;
- sgmlOpenTag(ofs, 0, top);
+ if(params.options.empty())
+ sgmlOpenTag(ofs, 0, top_element);
+ else {
+ string top = top_element;
+ top += " ";
+ top += params.options;
+ sgmlOpenTag(ofs, 0, top);
+ }
}
+ ofs << "<!-- DocBook file was created by " << LYX_DOCVERSION
+ << "\n See http://www.lyx.org/ for more information -->\n";
+
while (par) {
int desc_on = 0; // description mode
LyXLayout const & style =
- textclasslist.Style(users->buffer()->params.textclass,
+ textclasslist.Style(params.textclass,
par->layout);
// environment tag closing
if(!command_stack[j].empty())
sgmlCloseTag(ofs, j, command_stack[j]);
command_depth= command_base= cmd_depth;
- }
- else if(cmd_depth <= command_depth) {
+ } else if(cmd_depth <= command_depth) {
for(int j = command_depth;
j >= cmd_depth; --j)
if(!command_stack[j].empty())
sgmlCloseTag(ofs, j, command_stack[j]);
command_depth= cmd_depth;
- }
- else
+ } else
command_depth= cmd_depth;
- }
- else {
+ } else {
command_depth = command_base = cmd_depth;
command_flag = true;
}
item_name= "term";
sgmlOpenTag(ofs, depth + 1 + command_depth,
item_name);
- }
- else {
+ } else {
item_name= "para";
sgmlOpenTag(ofs, depth + 1 + command_depth,
item_name);
if(!command_stack[j].empty())
sgmlCloseTag(ofs, j, command_stack[j]);
- ofs << "\n\n";
- sgmlCloseTag(ofs, 0, top_element);
+ if (!only_body) {
+ ofs << "\n\n";
+ sgmlCloseTag(ofs, 0, top_element);
+ }
ofs.close();
// How to check for successful close