commit f6d4bce12303a2f30ea129ee86e7f7d879668260
Merge: 18d6701 a467671
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Tue Jan 3 21:49:56 2017 +0100

    Merge branch 'master' into biblatex2

 lib/doc/EmbeddedObjects.lyx                        |   37 +++++-
 lib/doc/UserGuide.lyx                              |  122 ++++++++++++++++++-
 lib/lyx2lyx/lyx_2_3.py                             |   89 ++++++++++++--
 lib/lyx2lyx/parser_tools.py                        |    7 +-
 lib/symbols                                        |   35 +++---
 src/Cursor.cpp                                     |   71 +++++++++++
 src/Cursor.h                                       |    9 ++
 src/MetricsInfo.cpp                                |   18 ++-
 src/MetricsInfo.h                                  |    5 +-
 src/frontends/qt4/GuiRef.cpp                       |   27 ++++-
 src/frontends/qt4/GuiRef.h                         |    2 +
 src/frontends/qt4/ui/RefUi.ui                      |  117 +++++++++++-------
 src/insets/Inset.h                                 |    2 +-
 src/insets/InsetRef.cpp                            |   41 +++++-
 src/insets/InsetRef.h                              |    2 +-
 src/mathed/InsetMathDecoration.cpp                 |   10 +--
 src/mathed/InsetMathGrid.cpp                       |   10 +--
 src/mathed/InsetMathNest.cpp                       |  131 +++++++++-----------
 src/mathed/InsetMathNest.h                         |    4 +-
 src/mathed/MathData.cpp                            |   14 ++
 src/mathed/MathData.h                              |    2 +
 src/mathed/MathMacro.cpp                           |   77 +++++++++---
 src/mathed/MathMacro.h                             |   13 ++-
 src/mathed/MathMacroArgument.cpp                   |   56 ++++++---
 src/mathed/MathMacroArgument.h                     |   32 ++++--
 src/mathed/MathParser.cpp                          |   10 +-
 src/tex2lyx/TODO.txt                               |    3 +
 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         |   16 +++-
 src/tex2lyx/test/test-insets.lyx.lyx               |   16 +++-
 src/tex2lyx/test/test-memoir.lyx.lyx               |    2 +-
 src/tex2lyx/test/test-modules.lyx.lyx              |    2 +-
 src/tex2lyx/test/test-refstyle-theorems.lyx.lyx    |   56 ++++++++-
 src/tex2lyx/test/test-scr.lyx.lyx                  |    2 +-
 src/tex2lyx/test/test-structure.lyx.lyx            |    2 +-
 src/tex2lyx/test/test.lyx.lyx                      |    6 +-
 src/tex2lyx/test/verbatim.lyx.lyx                  |    2 +-
 src/tex2lyx/text.cpp                               |    4 +
 src/version.h                                      |    4 +-
 45 files changed, 812 insertions(+), 260 deletions(-)

Reply via email to