* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
+ * \author André Pönitz
* \author Jean-Marc Lasgouttes
+ * \author Uwe Stöhr
*
* Full author contact details are available in file CREDITS.
*/
#include "Layout.h"
#include "Length.h"
-#include "support/lstrings.h"
#include "support/convert.h"
+#include "support/FileName.h"
#include "support/filetools.h"
+#include "support/lstrings.h"
#include <iostream>
#include <map>
#include <sstream>
#include <vector>
-using std::cerr;
-using std::endl;
-using std::find;
-using std::map;
-using std::ostream;
-using std::ostringstream;
-using std::istringstream;
-using std::string;
-using std::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;
-
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",
+char const * const known_latex_commands[] = { "ref", "cite", "nocite", "label",
"index", "printindex", "pageref", "url", "vref", "vpageref", "prettyref",
"eqref", 0 };
"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;
}
}
-class isLayout : public std::unary_function<LayoutPtr, bool> {
+class isLayout : public unary_function<LayoutPtr, bool> {
public:
isLayout(string const name) : name_(name) {}
bool operator()(LayoutPtr const & ptr) const {
TextClass::const_iterator end = textclass.end();
TextClass::const_iterator
- it = std::find_if(beg, end, isLayout(name));
+ it = find_if(beg, end, isLayout(name));
return (it == end) ? LayoutPtr() : *it;
}
if (!after.empty()) {
before = p.getFullOpt();
if (natbibOrder && !before.empty())
- std::swap(before, after);
+ swap(before, after);
}
}
/// 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()),
Context & context)
{
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();
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;
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';
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() == "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() + '}';
+ 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");
projects / lyx.git / blobdiff