anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Load mhchem if it is requested unconditionally, fix some typos

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36425 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2010-11-21 18:07:04 +00:00
parent dea050cb93
commit d89bde0652
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Buffer.cpp
View File

@ -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";

7
src/LaTeXFeatures.cpp
View File

@ -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";

2
src/Layout.cpp
View File

@ -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 },

2
src/LyXVC.h
View File

@ -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

2
src/frontends/qt4/GuiWorkArea.cpp
View File

@ -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

2
src/mathed/InsetMathGrid.h
View File

@ -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