diff --git a/development/lyx3/LyX3-Tasks b/development/lyx3/LyX3-Tasks index 9e7ae39690..c31aba81ad 100644 --- a/development/lyx3/LyX3-Tasks +++ b/development/lyx3/LyX3-Tasks @@ -97,9 +97,6 @@ to make it into 0.14: - version.sty - cvs - sccs - o I am sure mathed improvements. (Alejandro's department) - - better macro support - - better amsmath support o character styles (similar to emph and noun) Will make a lot of small things conceptual instead of specific. Will be alot easier to change the diff --git a/lib/ui/default.ui b/lib/ui/default.ui index 9abaf12ea3..03aa55b0a0 100644 --- a/lib/ui/default.ui +++ b/lib/ui/default.ui @@ -336,7 +336,7 @@ Menuset Separator Item "About LyX|X" "help-aboutlyx" Separator - Item "TeX Infos" "help-Texinfo" + Item "TeX Information" "help-Texinfo" End End diff --git a/src/frontends/controllers/ControlTexinfo.C b/src/frontends/controllers/ControlTexinfo.C index 5c24917d4b..5dccb1afbd 100644 --- a/src/frontends/controllers/ControlTexinfo.C +++ b/src/frontends/controllers/ControlTexinfo.C @@ -69,7 +69,10 @@ namespace { string const sortEntries(string & str_in) { std::vector dbase = getVectorFromString(str_in,"\n"); - std::sort(dbase.begin(), dbase.end()); // sort entries + std::sort(dbase.begin(), dbase.end()); // sort entries + std::vector::iterator p = + std::unique(dbase.begin(), dbase.end()); // compact + dbase.erase(p, dbase.end()); // shrink return getStringFromVector(dbase,"\n"); }