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 219918ad224de4d478a7169dae835140554e7b1a..6f71f7f93983623731308a4899ae2e3a0e4dd76c 100644 (file)
--- 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";