Russian layouttranslations reviewed by Yuriy, Dec 13 2017.

[lyx.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index f9d181db73c611b2ee0ec4771ccd4e2484de9224..ec23e57f1eadcbda44d8d2ac2533bc97601b017f 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -545,23 +545,19 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
                        // FIXME: this means LT_LABELSTRING_APPENDIX may only
                        // occur after LT_LABELSTRING
                        lex >> labelstring_;
-                       labelstring_ = trim(labelstring_);
                        labelstring_appendix_ = labelstring_;
                        break;
 
                case LT_ENDLABELSTRING:
                        lex >> endlabelstring_;
-                       endlabelstring_ = trim(endlabelstring_);
                        break;
 
                case LT_LABELSTRING_APPENDIX:
                        lex >> labelstring_appendix_;
-                       labelstring_appendix_ = trim(labelstring_appendix_);
                        break;
 
                case LT_LABELCOUNTER:
                        lex >> counter;
-                       counter = trim(counter);
                        break;
 
                case LT_PAR_GROUP:
@@ -1510,13 +1506,8 @@ string const & Layout::htmlitemattr() const
 
 string const & Layout::htmllabeltag() const
 {
-       if (htmllabeltag_.empty()) {
-               if (labeltype != LABEL_ABOVE &&
-                   labeltype != LABEL_CENTERED)
+       if (htmllabeltag_.empty())
                        htmllabeltag_ = "span";
-               else
-                       htmllabeltag_ = "div";
-       }
        return htmllabeltag_;
 }