* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
- * \author Uwe Stöhr
+ * \author André Pönitz
+ * \author Uwe Stöhr
*
* Full author contact details are available in file CREDITS.
*/
#include "tex2lyx.h"
+#include "LayoutFile.h"
#include "Layout.h"
#include "Lexer.h"
#include "TextClass.h"
+
#include "support/convert.h"
+#include "support/FileName.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include <vector>
#include <map>
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using std::istringstream;
-using std::ostream;
-using std::ostringstream;
-using std::string;
-using std::vector;
-using std::cerr;
-using std::endl;
-using std::find;
+// special columntypes
+extern map<char, int> special_columns;
-using support::FileName;
-using support::libFileSearch;
-using support::isStrDbl;
+map<string, vector<string> > used_packages;
-// special columntypes
-extern std::map<char, int> special_columns;
+// needed to handle encodings with babel
+bool one_language = true;
-std::map<string, vector<string> > used_packages;
+// to avoid that the babel options overwrite the documentclass options
+bool documentclass_language;
namespace {
for (; *what; ++what) {
it = find(opts.begin(), opts.end(), *what);
if (it != opts.end()) {
+ documentclass_language = true;
if (it >= position) {
target = *what;
position = it;
}
- // remove found options from the list
- opts.erase(it);
}
}
}
+void delete_opt(vector<string> & opts, char const * const * what)
+{
+ if (opts.empty())
+ return;
+
+ // remove found options from the list
+ // do this after handle_opt to avoid potential memory leaks and to be able
+ // to find in every case the last language option
+ vector<string>::iterator it;
+ for (; *what; ++what) {
+ it = find(opts.begin(), opts.end(), *what);
+ if (it != opts.end())
+ opts.erase(it);
+ }
+}
+
+
/*!
* Split a package options string (keyval format) into a vector.
* Example input:
// Given is a string like "scaled=0.9", return 0.9 * 100
string const scale_as_percentage(string const & scale)
{
- string::size_type pos = scale.find('=');
- if (pos != string::npos) {
- string value = scale.substr(pos + 1);
- if (isStrDbl(value))
- return convert<string>(100 * convert<double>(value));
- }
- // If the input string didn't match our expectations.
- // return the default value "100"
- return "100";
+ string::size_type pos = scale.find('=');
+ if (pos != string::npos) {
+ string value = scale.substr(pos + 1);
+ if (isStrDbl(value))
+ return convert<string>(100 * convert<double>(value));
+ }
+ // If the input string didn't match our expectations.
+ // return the default value "100"
+ return "100";
}
// roman fonts
if (is_known(name, known_roman_fonts))
h_font_roman = name;
+
if (name == "fourier") {
h_font_roman = "utopia";
// when font uses real small capitals
}
if (name == "mathpazo")
h_font_roman = "palatino";
+
if (name == "mathptmx")
h_font_roman = "times";
+
// sansserif fonts
if (is_known(name, known_sans_fonts)) {
h_font_sans = name;
else if (name == "amsmath" || name == "amssymb")
h_use_amsmath = "1";
- else if (name == "babel")
- ; // ignore this
+
+ else if (name == "babel" && !opts.empty()) {
+ // check if more than one option was used - used later for inputenc
+ // in case inputenc is parsed before babel, set the encoding to auto
+ if (options.begin() != options.end() - 1) {
+ one_language = false;
+ h_inputencoding = "auto";
+ }
+ // only set the document language when there was not already one set
+ // via the documentclass options
+ // babel takes the the last language given in the documentclass options
+ // as document language. If there is no such language option, the last
+ // option of its \usepackage call is used.
+ if (documentclass_language == false) {
+ handle_opt(options, known_languages, h_language);
+ delete_opt(options, known_languages);
+ if (is_known(h_language, known_french_languages))
+ h_language = "french";
+ else if (is_known(h_language, known_german_languages))
+ h_language = "german";
+ else if (is_known(h_language, known_ngerman_languages))
+ h_language = "ngerman";
+ else if (is_known(h_language, known_russian_languages))
+ h_language = "russian";
+ else if (is_known(h_language, known_ukrainian_languages))
+ h_language = "ukrainian";
+ h_quotes_language = h_language;
+ }
+ }
else if (name == "fontenc")
; // ignore this
+
else if (name == "inputenc") {
// only set when there is not more than one inputenc option
// therefore check for the "," character
- if (opts.find(",") == string::npos)
- h_inputencoding = opts;
+ // also only set when there is not more then one babel language option
+ if (opts.find(",") == string::npos && one_language == true)
+ if (opts == "ascii")
+ //change ascii to auto to be in the unicode range, see
+ //http://bugzilla.lyx.org/show_bug.cgi?id=4719
+ h_inputencoding = "auto";
+ else
+ h_inputencoding = opts;
options.clear();
- } else if (name == "makeidx")
+ }
+ else if (name == "makeidx")
; // ignore this
+
else if (name == "verbatim")
; // ignore this
+
+ else if (name == "color")
+ // with the following command this package is only loaded when needed for
+ // undefined colors, since we only support the predefined colors
+ h_preamble << "\\@ifundefined{definecolor}\n {\\usepackage{color}}{}\n";
+
else if (name == "graphicx")
; // ignore this
+
+ else if (name == "setspace")
+ ; // ignore this
+
else if (is_known(name, known_languages)) {
if (is_known(name, known_french_languages))
h_language = "french";
else
h_language = name;
h_quotes_language = h_language;
-
- } else if (name == "natbib") {
+ }
+ else if (name == "natbib") {
h_cite_engine = "natbib_authoryear";
vector<string>::iterator it =
find(options.begin(), options.end(), "authoryear");
options.erase(it);
}
}
- } else if (name == "jurabib") {
+ }
+ else if (name == "jurabib")
h_cite_engine = "jurabib";
- } else if (options.empty())
+
+ else if (options.empty())
h_preamble << "\\usepackage{" << name << "}\n";
else {
h_preamble << "\\usepackage[" << opts << "]{" << name << "}\n";
options.clear();
}
-
// We need to do something with the options...
if (!options.empty())
cerr << "Ignoring options '" << join(options, ",")
} // anonymous namespace
-TextClass const parse_preamble(Parser & p, ostream & os, string const & forceclass)
+void parse_preamble(Parser & p, ostream & os,
+ string const & forceclass, TeX2LyXDocClass & tc)
{
// initialize fixed types
special_columns['D'] = 3;
p.setCatCode('@', catOther);
}
- else if (t.cs() == "newcommand" || t.cs() == "renewcommand"
- || t.cs() == "providecommand") {
+ else if (t.cs() == "newcommand"
+ || t.cs() == "renewcommand"
+ || t.cs() == "providecommand"
+ || t.cs() == "newlyxcommand") {
bool star = false;
if (p.next_token().character() == '*') {
p.get_token();
else if (t.cs() == "documentclass") {
vector<string> opts = split_options(p.getArg('[', ']'));
+ handle_opt(opts, known_fontsizes, h_paperfontsize);
+ delete_opt(opts, known_fontsizes);
+ // delete "pt" at the end
+ string::size_type i = h_paperfontsize.find("pt");
+ if (i != string::npos)
+ h_paperfontsize.erase(i);
+ // to avoid that the babel options overwrite the documentclass options
+ documentclass_language = false;
handle_opt(opts, known_languages, h_language);
+ delete_opt(opts, known_languages);
if (is_known(h_language, known_french_languages))
h_language = "french";
else if (is_known(h_language, known_german_languages))
h_language = "russian";
else if (is_known(h_language, known_ukrainian_languages))
h_language = "ukrainian";
- handle_opt(opts, known_fontsizes, h_paperfontsize);
- // delete "pt" at the end
- string::size_type i = h_paperfontsize.find("pt");
- if (i != string::npos)
- h_paperfontsize.erase(i);
h_quotes_language = h_language;
h_options = join(opts, ",");
h_textclass = p.getArg('{', '}');
else if (t.cs() == "setlength") {
string const name = p.verbatim_item();
string const content = p.verbatim_item();
- // Is this correct?
- if (name == "parskip")
- h_paragraph_separation = "skip";
- else if (name == "parindent")
- h_paragraph_separation = "skip";
- else
+ // the paragraphs are only not indented when \parindent is set to zero
+ if (name == "\\parindent" && content != "") {
+ if (content[0] == '0')
+ h_paragraph_separation = "skip";
+ } else if (name == "\\parskip") {
+ if (content == "\\smallskipamount")
+ h_defskip = "smallskip";
+ else if (content == "\\medskipamount")
+ h_defskip = "medskip";
+ else if (content == "\\bigskipamount")
+ h_defskip = "bigskip";
+ else
+ h_defskip = content;
+ } else
h_preamble << "\\setlength{" << name << "}{" << content << "}";
}
+ else if (t.cs() =="onehalfspacing")
+ h_spacing = "onehalf";
+
+ else if (t.cs() =="doublespacing")
+ h_spacing = "double";
+
+ else if (t.cs() =="setstretch")
+ h_spacing = "other " + p.verbatim_item();
+
else if (t.cs() == "begin") {
string const name = p.getArg('{', '}');
if (name == "document")
// Force textclass if the user wanted it
if (!forceclass.empty())
h_textclass = forceclass;
- if (noweb_mode && !lyx::support::prefixIs(h_textclass, "literate-"))
+ if (noweb_mode && !prefixIs(h_textclass, "literate-"))
h_textclass.insert(0, "literate-");
FileName layoutfilename = libFileSearch("layouts", h_textclass, "layout");
if (layoutfilename.empty()) {
cerr << "Error: Could not find layout file for textclass \"" << h_textclass << "\"." << endl;
exit(1);
}
- TextClass textclass;
- textclass.read(layoutfilename);
+ tc.read(layoutfilename);
if (h_papersides.empty()) {
ostringstream ss;
- ss << textclass.sides();
+ ss << tc.sides();
h_papersides = ss.str();
}
- end_preamble(os, textclass);
- return textclass;
+ end_preamble(os, tc);
}
// }])
projects / lyx.git / blobdiff