Cosmetics, typos and comments.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36492 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-11-25 16:53:56 +00:00
parent 3f6e6aff90
commit f27853ad41
9 changed files with 17 additions and 12 deletions

View File

@ -202,7 +202,7 @@ public:
bool readString(std::string const &);
/// Reloads the LyX file
ReadStatus reload();
//FIXME: The following two functions should be private
//FIXME: The following function should be private
//private:
/// read the header, returns number of unknown tokens
int readHeader(Lexer & lex);

View File

@ -13,8 +13,7 @@
namespace lyx {
/// Names of colors, including all logical colors
enum ColorCode
{
enum ColorCode {
/// No particular color---clear or default
Color_none,
/// The different text colors

View File

@ -370,7 +370,8 @@ private:
bool renameBuffer(Buffer & b, docstring const & newname);
///
bool saveBuffer(Buffer & b);
///
/// save and rename buffer to fn. If fn is empty, the buffer
/// is just saved as the filename it already has.
bool saveBuffer(Buffer & b, support::FileName const & fn);
/// closes a workarea, if close_buffer is true the buffer will
/// also be released, otherwise the buffer will be hidden.

View File

@ -495,7 +495,7 @@ void TocWidget::init(QString const & str)
new_index = typeCO->findData(decodeType(str));
// If everything else fails, settle on the table of contents which is
// guaranted to exist.
// guaranteed to exist.
if (new_index == -1) {
current_type_ = "tableofcontents";
new_index = typeCO->findData(current_type_);

View File

@ -99,13 +99,13 @@ void InsetCommand::draw(PainterInfo & pi, int x, int y) const
}
void InsetCommand::setParam(std::string const & name, docstring const & value)
void InsetCommand::setParam(string const & name, docstring const & value)
{
p_[name] = value;
}
docstring const & InsetCommand::getParam(std::string const & name) const
docstring const & InsetCommand::getParam(string const & name) const
{
return p_[name];
}

View File

@ -85,6 +85,11 @@ public:
bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
///
bool clickable(int, int) const { return hasSettings(); }
//@}
protected:
/// \name Methods relaying to the InsetCommandParams p_
//@{
///
docstring contextMenu(BufferView const & bv, int x, int y) const;
///

View File

@ -3361,7 +3361,7 @@ int InsetTabular::rowFromY(Cursor & cur, int y) const
row_type r = 0;
for (; r < tabular.nrows() && y > h; ++r)
h += tabular.rowAscent(r) + tabular.rowDescent(r)
+ tabular.interRowSpace(r);
+ tabular.interRowSpace(r);
return r - 1;
}

View File

@ -167,7 +167,7 @@ void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const
dim.des = dim1.height() - 5;
} else {
if (kind_ == CFRAC || kind_ == CFRACLEFT
|| kind_ == CFRACRIGHT || kind_ == DFRAC) {
|| kind_ == CFRACRIGHT || kind_ == DFRAC) {
// \cfrac and \dfrac are always in display size
StyleChanger dummy2(mi.base, LM_ST_DISPLAY);
cell(0).metrics(mi, dim0);
@ -407,7 +407,7 @@ void InsetMathFrac::validate(LaTeXFeatures & features) const
if (kind_ == NICEFRAC || kind_ == UNITFRAC || kind_ == UNIT)
features.require("units");
if (kind_ == CFRAC || kind_ == CFRACLEFT || kind_ == CFRACRIGHT
|| kind_ == DFRAC || kind_ == TFRAC)
|| kind_ == DFRAC || kind_ == TFRAC)
features.require("amsmath");
if (features.runparams().math_flavor == OutputParams::MathAsHTML)
// CSS adapted from eLyXer

View File

@ -465,7 +465,7 @@ void output_command_layout(ostream & os, Parser & p, bool outer,
parse_text_in_inset(p, os, FLAG_BRACK_LAST, outer, context);
end_inset(os);
eat_whitespace(p, os, context, false);
optargs++;
++optargs;
}
#if 0
// This is the code needed to parse required arguments, but
@ -482,7 +482,7 @@ void output_command_layout(ostream & os, Parser & p, bool outer,
parse_text_in_inset(p, os, FLAG_BRACE_LAST, outer, context);
end_inset(os);
eat_whitespace(p, os, context, false);
reqargs++;
++reqargs;
}
#endif
parse_text(p, os, FLAG_ITEM, outer, context);