The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 8f7195a251341a2267fdca8db43b4c30e4b015fb
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Wed Jun 27 23:18:02 2012 +0200

    tex2lyx: fix a logic mistake
    
    Preamble.cpp: set missing begin position for the search; thanks Vincent for 
spotting

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index dc258ea..70fc2e6 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -1195,7 +1195,7 @@ void Preamble::parse(Parser & p, string const & 
forceclass,
                                // check if the option contains a scaling, if 
yes, extract it
                                string::size_type pos = fontopts.find("Scale");
                                if (pos != string::npos) {
-                                       string::size_type i = 
fontopts.find(',');
+                                       string::size_type i = 
fontopts.find(',', pos);
                                        if (i == string::npos)
                                                scale = 
scale_as_percentage(fontopts.substr(pos + 1));
                                        else

-----------------------------------------------------------------------

Summary of changes:
 src/tex2lyx/Preamble.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to