From: Uwe Stöhr <uwestoehr@web.de>
Date: Sat, 17 May 2008 15:11:41 +0000 (+0000)
Subject: tex2lyx/preamble.cpp: handle also onecolumn and oneside as discussed
X-Git-Tag: 1.6.10~4765
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=fdea53d34be694350866b9209940d7696fa2b20c;p=features.git

tex2lyx/preamble.cpp: handle also onecolumn and oneside as discussed

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24811 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index 219918ad22..6f71f7f939 100644
--- a/src/tex2lyx/preamble.cpp
+++ b/src/tex2lyx/preamble.cpp
@@ -597,12 +597,22 @@ void parse_preamble(Parser & p, ostream & os,
 				opts.erase(it);
 			}
 			// paper sides
+			if ((it = find(opts.begin(), opts.end(), "oneside"))
+				 != opts.end()) {
+				h_papersides = "1";
+				opts.erase(it);
+			}
 			if ((it = find(opts.begin(), opts.end(), "twoside"))
 				 != opts.end()) {
 				h_papersides = "2";
 				opts.erase(it);
 			}
 			// paper columns
+			if ((it = find(opts.begin(), opts.end(), "onecolumn"))
+				 != opts.end()) {
+				h_papercolumns = "1";
+				opts.erase(it);
+			}
 			if ((it = find(opts.begin(), opts.end(), "twocolumn"))
 				 != opts.end()) {
 				h_papercolumns = "2";