From 3c4171577491479cedcaa33b54daf6a898bb9c8b Mon Sep 17 00:00:00 2001 From: Julien Rioux Date: Wed, 14 Dec 2011 00:20:41 +0000 Subject: [PATCH] Remove extra whitespace. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40497 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/tex2lyx/Preamble.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp index 6ef3aa886b..22bff1cc67 100644 --- a/src/tex2lyx/Preamble.cpp +++ b/src/tex2lyx/Preamble.cpp @@ -144,7 +144,7 @@ const char * const known_paper_sizes[] = { "a0paper", "b0paper", "c0paper", const char * const known_class_paper_sizes[] = { "a4paper", "a5paper", "executivepaper", "legalpaper", "letterpaper", 0}; -const char * const known_paper_margins[] = { "lmargin", "tmargin", "rmargin", +const char * const known_paper_margins[] = { "lmargin", "tmargin", "rmargin", "bmargin", "headheight", "headsep", "footskip", "columnsep", 0}; const char * const known_coded_paper_margins[] = { "leftmargin", "topmargin", @@ -684,7 +684,7 @@ void Preamble::handle_package(Parser &p, string const & name, delete_opt(options, known_languages); } else - h_preamble << "\\usepackage{babel}\n"; + h_preamble << "\\usepackage{babel}\n"; } else if (name == "fontenc") { @@ -768,7 +768,7 @@ void Preamble::handle_package(Parser &p, string const & name, if (options.empty()) h_preamble << "\\usepackage{" << name << "}"; else { - h_preamble << "\\usepackage[" << opts << "]{" + h_preamble << "\\usepackage[" << opts << "]{" << name << "}"; options.clear(); } @@ -1011,7 +1011,7 @@ void Preamble::parse(Parser & p, string const & forceclass, t.cat() == catParameter)) h_preamble << t.cs(); - else if (!in_lyx_preamble && + else if (!in_lyx_preamble && (t.cat() == catSpace || t.cat() == catNewline)) h_preamble << t.asInput(); @@ -1024,7 +1024,7 @@ void Preamble::parse(Parser & p, string const & forceclass, // magically switch encoding default if it looks like XeLaTeX static string const magicXeLaTeX = "% This document must be compiled with XeLaTeX "; - if (comment.size() > magicXeLaTeX.size() + if (comment.size() > magicXeLaTeX.size() && comment.substr(0, magicXeLaTeX.size()) == magicXeLaTeX && h_inputencoding == "auto") { cerr << "XeLaTeX comment found, switching to UTF8\n"; @@ -1221,7 +1221,7 @@ void Preamble::parse(Parser & p, string const & forceclass, vector::const_iterator it = vecnames.begin(); vector::const_iterator end = vecnames.end(); for (; it != end; ++it) - handle_package(p, trimSpaceAndEol(*it), options, + handle_package(p, trimSpaceAndEol(*it), options, in_lyx_preamble); } -- 2.39.2