Load mhchem if it is requested unconditionally, fix some typos

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

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index f628e030e75fdd48596333ee56c162afa7c55f05..c7682d11ebba57a081850b3c538a00fed4938edf 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1614,7 +1614,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
 
                os << "\n<!-- Text Class Preamble -->\n"
                   << features.getTClassHTMLPreamble()
-                  << "\n<!-- Premable Snippets -->\n"
+                  << "\n<!-- Preamble Snippets -->\n"
                   << from_utf8(features.getPreambleSnippets());
 
                os << "\n<!-- Layout-provided Styles -->\n";

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 14faacca1fe00f5ab2b3a4057da582b8efd92360..c6516995c9b4d0cbb9742e32f1db6e2680890e0c 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -634,7 +634,7 @@ string const LaTeXFeatures::getPackages() const
        // FIXME: currently, we can only load packages and macros known
        // to LyX.
        // However, with the Require tag of layouts/custom insets,
-       // also inknown packages can be requested. They are silently
+       // also unknown packages can be requested. They are silently
        // swallowed now. We should change this eventually.
 
        //
@@ -768,8 +768,9 @@ string const LaTeXFeatures::getPackages() const
                packages << "\\PassOptionsToPackage{normalem}{ulem}\n"
                            "\\usepackage{ulem}\n";
 
-       if (mustProvide("mhchem") &&
-               params_.use_mhchem != BufferParams::package_off)
+       if (params_.use_mhchem == BufferParams::package_on ||
+           (mustProvide("mhchem") &&
+            params_.use_mhchem != BufferParams::package_off))
                packages << "\\PassOptionsToPackage{version=3}{mhchem}\n"
                            "\\usepackage{mhchem}\n";
 

diff --git a/src/Layout.cpp b/src/Layout.cpp
index b2d4d2e273edf688fafe62cacc2d6c77488cab9f..5ba77ce1c6d0c67a0c8983d6f4c4231b6b5ed5a9 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -184,7 +184,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
                { "htmllabel",      LT_HTMLLABEL },
                { "htmllabelattr",  LT_HTMLLABELATTR },
                { "htmllabelfirst", LT_HTMLLABELFIRST },
-               { "htmlpremable",   LT_HTMLPREAMBLE },
+               { "htmlpreamble",   LT_HTMLPREAMBLE },
                { "htmlstyle",      LT_HTMLSTYLE },
                { "htmltag",        LT_HTMLTAG },
                { "htmltitle",      LT_HTMLTITLE },

diff --git a/src/LyXVC.h b/src/LyXVC.h
index a75dc974536a638de450cdc8788db7c58fade6d9..55de93f103ff8f9f38d02031c1ea7017f6581f67 100644 (file)
--- a/src/LyXVC.h
+++ b/src/LyXVC.h
@@ -25,7 +25,7 @@ class VCS;
 class Buffer;
 
 /** Version Control for LyX.
-    This is the class giving the verison control features to LyX. It is
+    This is the class giving the version control features to LyX. It is
     intended to support different kinds of version control.
     The support in LyX is based loosely upon the version control in GNU Emacs,
     but is not as extensive as that one. See Extended Manual for a simple

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index ef79b02fe3e1c7b0f76ef3e8b53cbf8866bbe2af..89d18bcbd2ad91cbb0ea0203b731ec354e54891b 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -140,7 +140,7 @@ public:
                int r = rect_.right() - x_;
                int bot = rect_.bottom();
 
-               // draw vertica linel
+               // draw vertical line
                painter.fillRect(x_, y, CursorWidth, rect_.height(), color_);
 
                // draw RTL/LTR indication

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index 3b1b5a1c25109b1c6e072013d8f8457ac8b5a50b..ba5ebeacd418cad05b0343b0b686b0b510b67ea1 100644 (file)
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -73,8 +73,6 @@ public:
                ColInfo();
                /// currently possible: 'l', 'c', 'r'
                char align_;
-               /// cache for drawing
-               int h_offset;
                /// cached width
                mutable int width_;
                /// cached offset