anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-05 17:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

InsetNomencl.cpp: assure that the label width is never below the predefined value and that there is always enough space

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29773 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2009-05-21 22:18:08 +00:00
parent 8f3acbb484
commit ce473c810a
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/insets/InsetNomencl.cpp
View File

@ -171,7 +171,6 @@ docstring nomenclWidest(Buffer const & buffer)
int w = 0; int w = 0;
docstring symb; docstring symb;
InsetNomencl const * nomencl = 0; InsetNomencl const * nomencl = 0;
ParagraphList::const_iterator it = buffer.paragraphs().begin(); ParagraphList::const_iterator it = buffer.paragraphs().begin();
ParagraphList::const_iterator end = buffer.paragraphs().end(); ParagraphList::const_iterator end = buffer.paragraphs().end();
@ -186,15 +185,18 @@ docstring nomenclWidest(Buffer const & buffer)
continue; continue;
nomencl = static_cast<InsetNomencl const *>(inset); nomencl = static_cast<InsetNomencl const *>(inset);
docstring const symbol = nomencl->getParam("symbol"); docstring const symbol = nomencl->getParam("symbol");
// we can only check for the number of characters, since it is
// impossible to get the info that "iiiii" is smaller than "WW"
// we therefore output w times "W" as string ("W" is always the
// widest character)
int const wx = symbol.size(); int const wx = symbol.size();
if (wx > w) { if (wx > w)
w = wx; w = wx;
symb = symbol;
}
} }
} }
// return the widest symbol as w times a "W"
// return the widest symbol for (int n = 1; n <= w; ++n)
symb = symb + "W";
return symb; return symb;
} }
@ -202,12 +204,14 @@ docstring nomenclWidest(Buffer const & buffer)
int InsetPrintNomencl::latex(odocstream & os, OutputParams const &) const int InsetPrintNomencl::latex(odocstream & os, OutputParams const &) const
{ {
int lines = 0; int lines = 0;
// this must be output before the command \printnomenclature
docstring widest = nomenclWidest(buffer()); docstring widest = nomenclWidest(buffer());
// set the label width via nomencl's command \nomlabelwidth
// this must be output before the command \printnomenclature
if (!widest.empty()) { if (!widest.empty()) {
// set the label width via nomencl's command \nomlabelwidth // assure that the width is never below the predefined value of 1 cm
os << "\\settowidth{\\nomlabelwidth}{"; os << "\\settowidth{\\nomlabelwidth}{" << widest <<"}\n";
os << widest <<"}\n"; os << "\\ifthenelse{%\n \\lengthtest{\\nomlabelwidth < 1cm}}\n";
os << " {\\setlength{\\nomlabelwidth}{1cm}}\n {}\n";
++lines; ++lines;
} }
// output the command \printnomenclature // output the command \printnomenclature
@ -219,6 +223,8 @@ int InsetPrintNomencl::latex(odocstream & os, OutputParams const &) const
void InsetPrintNomencl::validate(LaTeXFeatures & features) const void InsetPrintNomencl::validate(LaTeXFeatures & features) const
{ {
features.require("nomencl"); features.require("nomencl");
// needed for InsetPrintNomencl::latex
features.require("ifthen");
} }