#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;
-
-using support::FileName;
-using support::libFileSearch;
-using support::isStrDbl;
-
// special columntypes
-extern std::map<char, int> special_columns;
+extern map<char, int> special_columns;
-std::map<string, vector<string> > used_packages;
+map<string, vector<string> > used_packages;
// needed to handle encodings with babel
bool one_language = true;
return convert<string>(100 * convert<double>(value));
}
// If the input string didn't match our expectations.
- // return the default value "100"
+ // 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" && !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
}
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
// also only set when there is not more then one babel language option
if (opts.find(",") == string::npos && one_language == true)
- h_inputencoding = opts;
+ 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() == "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