[LyX master] Add \makeat switches to babel settings if necessary.

[Juergen Spitzmueller]

The branch, master, has been updated.

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

commit 4d5bef1bdcbe7a20d67613a793acb89f0e583bf6
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Wed Jul 18 12:41:53 2012 +0200

    Add \makeat switches to babel settings if necessary.
    
    Babel settings might contain @ characters. Check for this and wrap the 
settings into \makeatletter ... \makeatother switches if necessary (see 
discussion at #8265).

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index e86dc15..6de5db6 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -1026,7 +1026,10 @@ string const LaTeXFeatures::getBabelPresettings() const
        if (!params_.language->babel_presettings().empty())
                tmp << params_.language->babel_presettings() << '\n';
 
-       return tmp.str();
+       if (!contains(tmp.str(), '@'))
+               return tmp.str();
+
+       return "\\makeatletter\n" + tmp.str() + "\\makeatother\n";
 }
 
 
@@ -1042,7 +1045,10 @@ string const LaTeXFeatures::getBabelPostsettings() const
        if (!params_.language->babel_postsettings().empty())
                tmp << params_.language->babel_postsettings() << '\n';
 
-       return tmp.str();
+       if (!contains(tmp.str(), '@'))
+               return tmp.str();
+
+       return "\\makeatletter\n" + tmp.str() + "\\makeatother\n";
 }
 
 

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

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


hooks/post-receive
-- 
The LyX Source Repository