commit ce8929e9b237af569934b434154d199634363268
Merge: 74f774d a7aef29
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Thu Jan 12 09:05:28 2017 +0100
Merge branch 'master' into biblatex2
lyx.1in | 5 +
src/insets/Inset.h | 12 +-
src/mathed/InsetMath.cpp | 39 ++-----
src/mathed/InsetMath.h | 12 +--
src/mathed/InsetMathBoldSymbol.cpp | 4 +-
src/mathed/InsetMathBox.cpp | 32 +++---
src/mathed/InsetMathBox.h | 4 +
src/mathed/InsetMathBrace.cpp | 2 -
src/mathed/InsetMathCancel.cpp | 5 +-
src/mathed/InsetMathCancelto.cpp | 11 +-
src/mathed/InsetMathClass.cpp | 4 +-
src/mathed/InsetMathColor.cpp | 4 +-
src/mathed/InsetMathComment.cpp | 4 +-
src/mathed/InsetMathDecoration.cpp | 5 +-
src/mathed/InsetMathEnsureMath.cpp | 2 -
src/mathed/InsetMathEnv.cpp | 4 +-
src/mathed/InsetMathFont.cpp | 4 +-
src/mathed/InsetMathFontOld.cpp | 4 +-
src/mathed/InsetMathFrac.cpp | 20 ++--
src/mathed/InsetMathFrac.h | 5 +-
src/mathed/InsetMathGrid.cpp | 3 -
src/mathed/InsetMathGrid.h | 7 +-
src/mathed/InsetMathHull.cpp | 6 +-
src/mathed/InsetMathLefteqn.cpp | 4 +-
src/mathed/InsetMathNest.h | 3 -
src/mathed/InsetMathOverset.cpp | 2 -
src/mathed/InsetMathPhantom.cpp | 5 +-
src/mathed/InsetMathRoot.cpp | 2 -
src/mathed/InsetMathScript.cpp | 2 -
src/mathed/InsetMathSideset.cpp | 2 -
src/mathed/InsetMathSize.cpp | 4 +-
src/mathed/InsetMathSqrt.cpp | 10 +-
src/mathed/InsetMathStackrel.cpp | 2 -
src/mathed/InsetMathUnderset.cpp | 2 -
src/mathed/InsetMathXArrow.cpp | 4 +-
src/mathed/MathMacro.cpp | 61 +++++++----
src/mathed/MathMacro.h | 4 +-
src/mathed/MathMacroTemplate.cpp | 2 -
src/mathed/MathRow.cpp | 116 +++++++++++++++-----
src/mathed/MathRow.h | 7 +-
src/tex2lyx/test/CJK.lyx.lyx | 2 +-
src/tex2lyx/test/CJKutf8.lyx.lyx | 2 +-
src/tex2lyx/test/DummyDocument.lyx.lyx | 2 +-
src/tex2lyx/test/Dummy~Document.lyx.lyx | 2 +-
src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx | 2 +-
src/tex2lyx/test/algo2e.lyx.lyx | 2 +-
.../test/box-color-size-space-align.lyx.lyx | 2 +-
src/tex2lyx/test/test-insets-basic.lyx.lyx | 9 ++-
src/tex2lyx/test/test-insets.lyx.lyx | 9 ++-
src/tex2lyx/test/test-memoir.lyx.lyx | 2 +-
src/tex2lyx/test/test-modules.lyx.lyx | 2 +-
src/tex2lyx/test/test-refstyle-theorems.lyx.lyx | 29 +++++-
src/tex2lyx/test/test-scr.lyx.lyx | 2 +-
src/tex2lyx/test/test-structure.lyx.lyx | 2 +-
src/tex2lyx/test/test.lyx.lyx | 4 +-
src/tex2lyx/test/verbatim.lyx.lyx | 2 +-
56 files changed, 271 insertions(+), 234 deletions(-)
