*
* \author André Pönitz
* \author Jean-Marc Lasgouttes
+ * \author Uwe Stöhr
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "tex2lyx.h"
+
#include "Context.h"
#include "FloatList.h"
-#include "lengthcommon.h"
-#include "support/lstrings.h"
+#include "Layout.h"
+#include "Length.h"
+
#include "support/convert.h"
+#include "support/FileName.h"
#include "support/filetools.h"
-
-#include <boost/filesystem/operations.hpp>
-#include <boost/tuple/tuple.hpp>
+#include "support/lstrings.h"
#include <iostream>
#include <map>
#include <sstream>
#include <vector>
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::addExtension;
-using support::changeExtension;
-using support::FileName;
-using support::makeAbsPath;
-using support::makeRelPath;
-using support::rtrim;
-using support::suffixIs;
-using support::contains;
-using support::subst;
-
-using std::cerr;
-using std::endl;
-
-using std::map;
-using std::ostream;
-using std::ostringstream;
-using std::istringstream;
-using std::string;
-using std::vector;
-
-namespace fs = boost::filesystem;
-
void parse_text_in_inset(Parser & p, ostream & os, unsigned flags, bool outer,
Context const & context)
}
-char const * const known_latex_commands[] = { "ref", "cite", "label", "index",
-"printindex", "pageref", "url", "vref", "vpageref", "prettyref", "eqref", 0 };
+char const * const known_latex_commands[] = { "ref", "cite", "nocite", "label",
+ "index", "printindex", "pageref", "url", "vref", "vpageref", "prettyref",
+ "eqref", 0 };
/*!
* natbib commands.
"citefield", "citetitle", "cite*", 0 };
/// LaTeX names for quotes
-char const * const known_quotes[] = { "glqq", "grqq", "quotedblbase",
-"textquotedblleft", "quotesinglbase", "guilsinglleft", "guilsinglright", 0};
+char const * const known_quotes[] = { "dq", "guillemotleft", "flqq", "og",
+"guillemotright", "frqq", "fg", "glq", "glqq", "textquoteleft", "grq", "grqq",
+"quotedblbase", "textquotedblleft", "quotesinglbase", "textquoteright", "flq",
+"guilsinglleft", "frq", "guilsinglright", 0};
/// the same as known_quotes with .lyx names
-char const * const known_coded_quotes[] = { "gld", "grd", "gld",
-"grd", "gls", "fls", "frs", 0};
+char const * const known_coded_quotes[] = { "prd", "ard", "ard", "ard",
+"ald", "ald", "ald", "gls", "gld", "els", "els", "grd",
+"gld", "grd", "gls", "ers", "fls",
+"fls", "frs", "frs", 0};
/// LaTeX names for font sizes
char const * const known_sizes[] = { "tiny", "scriptsize", "footnotesize",
"small", "normalsize", "large", "Large", "LARGE", "huge", "Huge", 0};
/// the same as known_sizes with .lyx names
-char const * const known_coded_sizes[] = { "tiny", "scriptsize", "footnotesize",
+char const * const known_coded_sizes[] = { "default", "tiny", "scriptsize", "footnotesize",
"small", "normal", "large", "larger", "largest", "huge", "giant", 0};
/// LaTeX 2.09 names for font families
if (contains(len, '\\'))
unit = trim(string(len, i));
else
- unit = support::ascii_lowercase(trim(string(len, i)));
+ unit = ascii_lowercase(trim(string(len, i)));
return true;
}
// expects utf8)
for (char const * const * what = extensions; *what; ++what) {
string const trial = addExtension(name, *what);
- if (fs::exists(makeAbsPath(trial, path).toFilesystemEncoding()))
+ if (makeAbsPath(trial, path).exists())
return trial;
}
return string();
}
-class isLayout : public std::unary_function<LyXLayout_ptr, bool> {
+class isLayout : public unary_function<LayoutPtr, bool> {
public:
isLayout(string const name) : name_(name) {}
- bool operator()(LyXLayout_ptr const & ptr) const {
+ bool operator()(LayoutPtr const & ptr) const {
return ptr->latexname() == name_;
}
private:
};
-LyXLayout_ptr findLayout(LyXTextClass const & textclass,
+LayoutPtr findLayout(TextClass const & textclass,
string const & name)
{
- LyXTextClass::const_iterator beg = textclass.begin();
- LyXTextClass::const_iterator end = textclass.end();
+ TextClass::const_iterator beg = textclass.begin();
+ TextClass::const_iterator end = textclass.end();
- LyXTextClass::const_iterator
- it = std::find_if(beg, end, isLayout(name));
+ TextClass::const_iterator
+ it = find_if(beg, end, isLayout(name));
- return (it == end) ? LyXLayout_ptr() : *it;
+ return (it == end) ? LayoutPtr() : *it;
}
void output_command_layout(ostream & os, Parser & p, bool outer,
Context & parent_context,
- LyXLayout_ptr newlayout)
+ LayoutPtr newlayout)
{
parent_context.check_end_layout(os);
Context context(true, parent_context.textclass, newlayout,
{
string position;
string inner_pos;
- string height_value = "0";
- string height_unit = "pt";
- string height_special = "none";
+ // We need to set the height to the LaTeX default of 1\\totalheight
+ // for the case when no height argument is given
+ string height_value = "1";
+ string height_unit = "in";
+ string height_special = "totalheight";
string latex_height;
if (p.next_token().asInput() == "[") {
position = p.getArg('[', ']');
void parse_environment(Parser & p, ostream & os, bool outer,
Context & parent_context)
{
- LyXLayout_ptr newlayout;
+ LayoutPtr newlayout;
string const name = p.getArg('{', '}');
const bool is_starred = suffixIs(name, '*');
string const unstarred_name = rtrim(name, "*");
p.skip_spaces();
}
+ else if (name == "framed") {
+ eat_whitespace(p, os, parent_context, false);
+ parent_context.check_layout(os);
+ begin_inset(os, "Note Framed\n");
+ os << "status open\n";
+ parse_text_in_inset(p, os, FLAG_END, outer, parent_context);
+ end_inset(os);
+ p.skip_spaces();
+ }
+
+ else if (name == "shaded") {
+ eat_whitespace(p, os, parent_context, false);
+ parent_context.check_layout(os);
+ begin_inset(os, "Note Shaded\n");
+ os << "status open\n";
+ parse_text_in_inset(p, os, FLAG_END, outer, parent_context);
+ end_inset(os);
+ p.skip_spaces();
+ }
+
else if (!parent_context.new_layout_allowed)
parse_unknown_environment(p, name, os, FLAG_END, outer,
parent_context);
/// get the arguments of a natbib or jurabib citation command
-std::pair<string, string> getCiteArguments(Parser & p, bool natbibOrder)
+void get_cite_arguments(Parser & p, bool natbibOrder,
+ string & before, string & after)
{
// We need to distinguish "" and "[]", so we can't use p.getOpt().
// text before the citation
- string before;
+ before.clear();
// text after the citation
- string after = p.getFullOpt();
+ after = p.getFullOpt();
if (!after.empty()) {
before = p.getFullOpt();
if (natbibOrder && !before.empty())
- std::swap(before, after);
+ swap(before, after);
}
- return std::make_pair(before, after);
}
-/// Convert filenames with TeX macros and/or quotes to something LyX can understand
+/// Convert filenames with TeX macros and/or quotes to something LyX
+/// can understand
string const normalize_filename(string const & name)
{
Parser p(trim(name, "\""));
/// convention (relative to .lyx file) if it is relative
void fix_relative_filename(string & name)
{
- if (lyx::support::absolutePath(name))
+ FileName fname(name);
+ if (fname.isAbsolute())
return;
+
// FIXME UNICODE encoding of name may be wrong (makeAbsPath expects
// utf8)
name = to_utf8(makeRelPath(from_utf8(makeAbsPath(name, getMasterFilePath()).absFilename()),
- from_utf8(getParentFilePath())));
+ from_utf8(getParentFilePath())));
}
}
if (!scrap || !context.new_layout_allowed ||
- !context.textclass.hasLayout("Scrap")) {
+ !context.textclass.hasLayout(from_ascii("Scrap"))) {
cerr << "Warning: Could not interpret '" << name
<< "'. Ignoring it." << endl;
return;
// noweb code chunks are implemented with a layout style in LyX they
// always must be in an own paragraph.
context.new_paragraph(os);
- Context newcontext(true, context.textclass, context.textclass["Scrap"]);
+ Context newcontext(true, context.textclass,
+ context.textclass[from_ascii("Scrap")]);
newcontext.check_layout(os);
os << name;
while (p.good()) {
void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
Context & context)
{
- LyXLayout_ptr newlayout;
+ LayoutPtr newlayout;
+ // store the current selectlanguage to be used after \foreignlanguage
+ string selectlang;
// Store the latest bibliographystyle (needed for bibtex inset)
string bibliographystyle;
bool const use_natbib = used_packages.find("natbib") != used_packages.end();
// extended to other quotes, but is not so easy (a
// left english quote is the same as a right german
// quote...)
- else if (t.asInput() == "`"
- && p.next_token().asInput() == "`") {
+ else if (t.asInput() == "`" && p.next_token().asInput() == "`") {
context.check_layout(os);
begin_inset(os, "Quotes ");
os << "eld";
p.get_token();
skip_braces(p);
}
- else if (t.asInput() == "'"
- && p.next_token().asInput() == "'") {
+ else if (t.asInput() == "'" && p.next_token().asInput() == "'") {
context.check_layout(os);
begin_inset(os, "Quotes ");
os << "erd";
skip_braces(p);
}
+ else if (t.asInput() == ">" && p.next_token().asInput() == ">") {
+ context.check_layout(os);
+ begin_inset(os, "Quotes ");
+ os << "ald";
+ end_inset(os);
+ p.get_token();
+ skip_braces(p);
+ }
+
+ else if (t.asInput() == "<" && p.next_token().asInput() == "<") {
+ context.check_layout(os);
+ begin_inset(os, "Quotes ");
+ os << "ard";
+ end_inset(os);
+ p.get_token();
+ skip_braces(p);
+ }
+
else if (t.asInput() == "<"
&& p.next_token().asInput() == "<" && noweb_mode) {
p.get_token();
check_space(p, os, context);
else if (t.character() == '[' && noweb_mode &&
- p.next_token().character() == '[') {
+ p.next_token().character() == '[') {
// These can contain underscores
p.putback();
string const s = p.getFullOpt() + ']';
// special handling of font attribute changes
Token const prev = p.prev_token();
Token const next = p.next_token();
- Font const oldFont = context.font;
+ TeXFont const oldFont = context.font;
if (next.character() == '[' ||
next.character() == ']' ||
next.character() == '*') {
context.check_layout(os);
eat_whitespace(p, os, context, false);
string name = p.get_token().cs();
- while (p.next_token().cat() != catBegin)
- name += p.get_token().asString();
- handle_ert(os, "\\def\\" + name + '{' + p.verbatim_item() + '}', context);
+ eat_whitespace(p, os, context, false);
+
+ // parameter text
+ bool simple = true;
+ string paramtext;
+ int arity = 0;
+ while (p.next_token().cat() != catBegin) {
+ if (p.next_token().cat() == catParameter) {
+ // # found
+ p.get_token();
+ paramtext += "#";
+
+ // followed by number?
+ if (p.next_token().cat() == catOther) {
+ char c = p.getChar();
+ paramtext += c;
+ // number = current arity + 1?
+ if (c == arity + '0' + 1)
+ ++arity;
+ else
+ simple = false;
+ } else
+ paramtext += p.get_token().asString();
+ } else {
+ paramtext += p.get_token().asString();
+ simple = false;
+ }
+ }
+
+ // only output simple (i.e. compatible) macro as FormulaMacros
+ string ert = "\\def\\" + name + ' ' + paramtext + '{' + p.verbatim_item() + '}';
+ if (simple) {
+ context.check_layout(os);
+ begin_inset(os, "FormulaMacro");
+ os << "\n" << ert;
+ end_inset(os);
+ } else
+ handle_ert(os, ert, context);
}
else if (t.cs() == "noindent") {
p.skip_spaces();
}
+ // Special handling for \caption
+ // FIXME: remove this when InsetCaption is supported.
+ else if (context.new_layout_allowed &&
+ t.cs() == captionlayout->latexname()) {
+ output_command_layout(os, p, outer, context,
+ captionlayout);
+ p.skip_spaces();
+ }
+
else if (t.cs() == "includegraphics") {
bool const clip = p.next_token().asInput() == "*";
if (clip)
// therefore path is only used for testing
// FIXME UNICODE encoding of name and path may be
// wrong (makeAbsPath expects utf8)
- if (!fs::exists(makeAbsPath(name, path).toFilesystemEncoding())) {
+ if (!makeAbsPath(name, path).exists()) {
// The file extension is probably missing.
// Now try to find it out.
string const dvips_name =
// FIXME UNICODE encoding of name and path may be
// wrong (makeAbsPath expects utf8)
- if (fs::exists(makeAbsPath(name, path).toFilesystemEncoding()))
+ if (makeAbsPath(name, path).exists())
fix_relative_filename(name);
else
cerr << "Warning: Could not find graphics file '"
numberOfbbOptions++;
if (numberOfbbOptions == 4)
os << "\tBoundingBox "
- << opts["bbllx"] << opts["bblly"]
- << opts["bburx"] << opts["bbury"] << '\n';
+ << opts["bbllx"] << " " << opts["bblly"] << " "
+ << opts["bburx"] << " " << opts["bbury"] << '\n';
else if (numberOfbbOptions > 0)
cerr << "Warning: Ignoring incomplete includegraphics boundingbox arguments.\n";
numberOfbbOptions = 0;
numberOfbbOptions++;
if (numberOfbbOptions == 2)
os << "\tBoundingBox 0bp 0bp "
- << opts["natwidth"] << opts["natheight"] << '\n';
+ << opts["natwidth"] << " " << opts["natheight"] << '\n';
else if (numberOfbbOptions > 0)
cerr << "Warning: Ignoring incomplete includegraphics boundingbox arguments.\n";
ostringstream special;
p.skip_spaces();
context.check_layout(os);
string const s = p.verbatim_item();
- if (s == "±" || s == "³" || s == "²" || s == "µ")
+ if (s == "\xb1" || s == "\xb3" || s == "\xb2" || s == "\xb5")
os << s;
else
handle_ert(os, "\\ensuremath{" + s + "}",
else if (t.cs() == "textnormal" || t.cs() == "normalfont") {
context.check_layout(os);
- Font oldFont = context.font;
+ TeXFont oldFont = context.font;
context.font.init();
context.font.size = oldFont.size;
os << "\n\\family " << context.font.family << "\n";
string before;
// text after the citation
string after;
+ get_cite_arguments(p, true, before, after);
- boost::tie(before, after) = getCiteArguments(p, true);
if (command == "\\cite") {
// \cite without optional argument means
// \citet, \cite with at least one optional
string const command = '\\' + t.cs();
char argumentOrder = '\0';
vector<string> const & options = used_packages["jurabib"];
- if (std::find(options.begin(), options.end(),
+ if (find(options.begin(), options.end(),
"natbiborder") != options.end())
argumentOrder = 'n';
- else if (std::find(options.begin(), options.end(),
+ else if (find(options.begin(), options.end(),
"jurabiborder") != options.end())
argumentOrder = 'j';
string before;
// text after the citation
string after;
+ get_cite_arguments(p, argumentOrder != 'j', before, after);
- boost::tie(before, after) =
- getCiteArguments(p, argumentOrder != 'j');
string const citation = p.verbatim_item();
if (!before.empty() && argumentOrder == '\0') {
cerr << "Warning: Assuming argument order "
context.new_layout_allowed) {
char const * const * where = is_known(t.cs(), known_sizes);
context.check_layout(os);
- Font const oldFont = context.font;
+ TeXFont const oldFont = context.font;
context.font.size = known_coded_sizes[where - known_sizes];
output_font_change(os, oldFont, context.font);
eat_whitespace(p, os, context, false);
char const * const * where =
is_known(t.cs(), known_font_families);
context.check_layout(os);
- Font const oldFont = context.font;
+ TeXFont const oldFont = context.font;
context.font.family =
known_coded_font_families[where - known_font_families];
output_font_change(os, oldFont, context.font);
char const * const * where =
is_known(t.cs(), known_font_series);
context.check_layout(os);
- Font const oldFont = context.font;
+ TeXFont const oldFont = context.font;
context.font.series =
known_coded_font_series[where - known_font_series];
output_font_change(os, oldFont, context.font);
char const * const * where =
is_known(t.cs(), known_font_shapes);
context.check_layout(os);
- Font const oldFont = context.font;
+ TeXFont const oldFont = context.font;
context.font.shape =
known_coded_font_shapes[where - known_font_shapes];
output_font_change(os, oldFont, context.font);
char const * const * where =
is_known(t.cs(), known_old_font_families);
context.check_layout(os);
- Font const oldFont = context.font;
+ TeXFont const oldFont = context.font;
context.font.init();
context.font.size = oldFont.size;
context.font.family =
char const * const * where =
is_known(t.cs(), known_old_font_series);
context.check_layout(os);
- Font const oldFont = context.font;
+ TeXFont const oldFont = context.font;
context.font.init();
context.font.size = oldFont.size;
context.font.series =
char const * const * where =
is_known(t.cs(), known_old_font_shapes);
context.check_layout(os);
- Font const oldFont = context.font;
+ TeXFont const oldFont = context.font;
context.font.init();
context.font.size = oldFont.size;
context.font.shape =
eat_whitespace(p, os, context, false);
}
+ else if (t.cs() == "selectlanguage") {
+ context.check_layout(os);
+ // save the language for the case that a \foreignlanguage is used
+ selectlang = subst(p.verbatim_item(), "\n", " ");
+ os << "\\lang " << selectlang << "\n";
+
+ }
+
+ else if (t.cs() == "foreignlanguage") {
+ context.check_layout(os);
+ os << "\n\\lang " << subst(p.verbatim_item(), "\n", " ") << "\n";
+ os << subst(p.verbatim_item(), "\n", " ");
+ // set back to last selectlanguage
+ os << "\n\\lang " << selectlang << "\n";
+ }
+
+ else if (t.cs() == "inputencoding")
+ // write nothing because this is done by LyX using the "\lang"
+ // information given by selectlanguage and foreignlanguage
+ subst(p.verbatim_item(), "\n", " ");
+
else if (t.cs() == "LyX" || t.cs() == "TeX"
|| t.cs() == "LaTeX") {
context.check_layout(os);
else if (t.cs() == "\"") {
context.check_layout(os);
string const name = p.verbatim_item();
- if (name == "a") os << 'ä';
- else if (name == "o") os << 'ö';
- else if (name == "u") os << 'ü';
- else if (name == "A") os << 'Ä';
- else if (name == "O") os << 'Ö';
- else if (name == "U") os << 'Ü';
+ if (name == "a") os << '\xe4';
+ else if (name == "o") os << '\xf6';
+ else if (name == "u") os << '\xfc';
+ else if (name == "A") os << '\xc4';
+ else if (name == "O") os << '\xd6';
+ else if (name == "U") os << '\xdc';
else handle_ert(os, "\"{" + name + "}", context);
}
// subset of LaTeX, so don't parse anything here,
// but use the raw argument.
// Otherwise we would convert \~{\i} wrongly.
- // This will of course not translate \~{\ss} to \~{ß},
+ // This will of course not translate \~{\ss} to \~{ß},
// but that does at least compile and does only look
// strange on screen.
context.check_layout(os);
else if (t.cs() == "ss") {
context.check_layout(os);
- os << "ß";
+ os << "\xdf";
skip_braces(p); // eat {}
}
else if (t.cs() == "i" || t.cs() == "j" || t.cs() == "l" ||
- t.cs() == "L") {
+ t.cs() == "L") {
context.check_layout(os);
os << "\\i \\" << t.cs() << "{}\n";
skip_braces(p); // eat {}
}
}
+ else if (t.cs() == "newline" ||
+ t.cs() == "linebreak") {
+ context.check_layout(os);
+ os << "\n\\" << t.cs() << "\n";
+ skip_braces(p); // eat {}
+ }
+
+ else if (t.cs() == "href") {
+ context.check_layout(os);
+ begin_inset(os, "CommandInset ");
+ os << t.cs() << "\n";
+ os << "LatexCommand " << t.cs() << "\n";
+ bool erase = false;
+ size_t pos;
+ // the first argument is "type:target", "type:" is optional
+ // the second argument the name
+ string href_target = subst(p.verbatim_item(), "\n", " ");
+ string href_name = subst(p.verbatim_item(), "\n", " ");
+ string href_type;
+ // serach for the ":" to divide type from target
+ if ((pos = href_target.find(":", 0)) != string::npos){
+ href_type = href_target;
+ href_type.erase(pos + 1, href_type.length());
+ href_target.erase(0, pos + 1);
+ erase = true;
+ }
+ os << "name " << '"' << href_name << '"' << "\n";
+ os << "target " << '"' << href_target << '"' << "\n";
+ if(erase)
+ os << "type " << '"' << href_type << '"' << "\n";
+ end_inset(os);
+ }
+
else if (t.cs() == "input" || t.cs() == "include"
|| t.cs() == "verbatiminput") {
string name = '\\' + t.cs();
// therefore path is only used for testing
// FIXME UNICODE encoding of filename and path may be
// wrong (makeAbsPath expects utf8)
- if (t.cs() == "include" &&
- !fs::exists(makeAbsPath(filename, path).toFilesystemEncoding())) {
+ if ((t.cs() == "include" || t.cs() == "input") &&
+ !makeAbsPath(filename, path).exists()) {
// The file extension is probably missing.
// Now try to find it out.
string const tex_name =
}
// FIXME UNICODE encoding of filename and path may be
// wrong (makeAbsPath expects utf8)
- if (fs::exists(makeAbsPath(filename, path).toFilesystemEncoding())) {
+ if (makeAbsPath(filename, path).exists()) {
string const abstexname =
makeAbsPath(filename, path).absFilename();
string const abslyxname =
}
else if (t.cs() == "newpage" ||
- t.cs() == "clearpage" ||
- t.cs() == "cleardoublepage") {
+ t.cs() == "pagebreak" ||
+ t.cs() == "clearpage" ||
+ t.cs() == "cleardoublepage") {
context.check_layout(os);
- // FIXME: what about \\pagebreak?
os << "\n\\" << t.cs() << "\n";
skip_braces(p); // eat {}
}
else if (t.cs() == "newcommand" ||
t.cs() == "providecommand" ||
- t.cs() == "renewcommand") {
+ t.cs() == "renewcommand" ||
+ t.cs() == "newlyxcommand") {
// these could be handled by parse_command(), but
// we need to call add_known_command() here.
string name = t.asInput();
}
string const command = p.verbatim_item();
string const opt1 = p.getOpt();
- string const opt2 = p.getFullOpt();
- add_known_command(command, opt1, !opt2.empty());
- string const ert = name + '{' + command + '}' +
- opt1 + opt2 +
- '{' + p.verbatim_item() + '}';
- handle_ert(os, ert, context);
+ string optionals;
+ unsigned optionalsNum = 0;
+ while (true) {
+ string const opt = p.getFullOpt();
+ if (opt.empty())
+ break;
+ optionalsNum++;
+ optionals += opt;
+ }
+ add_known_command(command, opt1, optionalsNum);
+ string const ert = name + '{' + command + '}' + opt1
+ + optionals + '{' + p.verbatim_item() + '}';
+
+ context.check_layout(os);
+ begin_inset(os, "FormulaMacro");
+ os << "\n" << ert;
+ end_inset(os);
}
else if (t.cs() == "vspace") {
}
if (!known_vspace) {
switch (unitFromString(unit)) {
- case LyXLength::SP:
- case LyXLength::PT:
- case LyXLength::BP:
- case LyXLength::DD:
- case LyXLength::MM:
- case LyXLength::PC:
- case LyXLength::CC:
- case LyXLength::CM:
- case LyXLength::IN:
- case LyXLength::EX:
- case LyXLength::EM:
- case LyXLength::MU:
+ case Length::SP:
+ case Length::PT:
+ case Length::BP:
+ case Length::DD:
+ case Length::MM:
+ case Length::PC:
+ case Length::CC:
+ case Length::CM:
+ case Length::IN:
+ case Length::EX:
+ case Length::EM:
+ case Length::MU:
known_unit = true;
break;
default: