The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 6e2d8cf10aad3585e5b1a375f2cb0767b60b9a86 Author: Georg Baum <[email protected]> Date: Tue Feb 26 21:38:27 2013 +0100 Fix sideset keyboard short cuts \sideset1 can't be entered via keyboard, so I renamed the commands. diff --git a/lib/Makefile.am b/lib/Makefile.am index b0a160e..a3a7df2 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1110,9 +1110,9 @@ dist_imagesmath_DATA = \ images/math/shortrightarrow.png \ images/math/shortuparrow.png \ images/math/sideset.png \ - images/math/sideset1.png \ - images/math/sideset2.png \ - images/math/sideset3.png \ + images/math/sidesetl.png \ + images/math/sidesetn.png \ + images/math/sidesetr.png \ images/math/sigma.png \ images/math/sigma2.png \ images/math/sim.png \ diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc index 416032a..c7172aa 100644 --- a/lib/ui/stdtoolbars.inc +++ b/lib/ui/stdtoolbars.inc @@ -184,9 +184,9 @@ ToolbarSet Item "Insert integral" "math-insert \int" Item "Insert product" "math-insert \prod" Item "Insert left/right side scripts" "math-insert \sideset" - Item "Insert right side scripts" "math-insert \sideset1" - Item "Insert left side scripts" "math-insert \sideset2" - Item "Insert side scripts" "math-insert \sideset3" + Item "Insert right side scripts" "math-insert \sidesetr" + Item "Insert left side scripts" "math-insert \sidesetl" + Item "Insert side scripts" "math-insert \sidesetn" Separator Item "Insert ( )" "math-delim ( )" Item "Insert [ ]" "math-delim [ ]" diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp index 3bea8e9..bf468e8 100644 --- a/src/mathed/MathFactory.cpp +++ b/src/mathed/MathFactory.cpp @@ -539,11 +539,11 @@ MathAtom createInsetMath(docstring const & s, Buffer * buf) if (s == "sideset") return MathAtom(new InsetMathSideset(buf, true, true)); // The following 3 string values are only for math toolbar use, no LaTeX names - if (s == "sideset1") + if (s == "sidesetr") return MathAtom(new InsetMathSideset(buf, false, true)); - if (s == "sideset2") + if (s == "sidesetl") return MathAtom(new InsetMathSideset(buf, true, false)); - if (s == "sideset3") + if (s == "sidesetn") return MathAtom(new InsetMathSideset(buf, false, false)); if (isSpecialChar(s)) return MathAtom(new InsetMathSpecialChar(s)); ----------------------------------------------------------------------- Summary of changes: lib/Makefile.am | 6 +++--- lib/images/math/{sideset2.png => sidesetl.png} | Bin 142 -> 142 bytes lib/images/math/{sideset3.png => sidesetn.png} | Bin 134 -> 134 bytes lib/images/math/{sideset1.png => sidesetr.png} | Bin 138 -> 138 bytes lib/ui/stdtoolbars.inc | 6 +++--- src/mathed/MathFactory.cpp | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) rename lib/images/math/{sideset2.png => sidesetl.png} (100%) rename lib/images/math/{sideset3.png => sidesetn.png} (100%) rename lib/images/math/{sideset1.png => sidesetr.png} (100%) hooks/post-receive -- The LyX Source Repository
