commit 425c190d623daeb6d05bce1aa2244b548225305a
Merge: a751c5b 578f964
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Mon Jan 9 20:04:32 2017 +0100

    merge recent changes from master

 lib/doc/Customization.lyx           |  297 ++++++++++++++++++++++-
 lib/doc/Development.lyx             |    7 +-
 lib/examples/knitr.lyx              |   90 +++++++-
 lib/examples/sweave.lyx             |  470 +++++++++++++++++++++++++++++------
 lib/layouts/knitr.module            |    2 +
 lib/layouts/litinsets.inc           |    1 +
 lib/layouts/stdfloats.inc           |    4 +
 lib/layouts/stdinsets.inc           |   19 ++
 lib/layouts/sweave.module           |    4 +
 src/Paragraph.cpp                   |    6 +-
 src/Paragraph.h                     |    4 +-
 src/Text.cpp                        |   47 +++-
 src/Text.h                          |   13 +-
 src/TextClass.cpp                   |    4 +-
 src/TocBackend.cpp                  |   36 +++-
 src/TocBackend.h                    |   37 ++-
 src/frontends/qt4/Menus.cpp         |   22 +-
 src/frontends/qt4/qt_helpers.cpp    |   37 +--
 src/frontends/qt4/ui/BibtexAddUi.ui |  221 ++++++++++-------
 src/insets/Inset.cpp                |    1 +
 src/insets/InsetArgument.cpp        |   22 ++
 src/insets/InsetArgument.h          |    5 +
 src/insets/InsetBranch.cpp          |   18 +--
 src/insets/InsetBranch.h            |    3 +-
 src/insets/InsetCitation.cpp        |    5 +-
 src/insets/InsetCollapsable.cpp     |   38 +++-
 src/insets/InsetCollapsable.h       |    6 +
 src/insets/InsetExternal.cpp        |    7 +-
 src/insets/InsetFoot.cpp            |   18 --
 src/insets/InsetFoot.h              |    3 -
 src/insets/InsetGraphics.cpp        |    4 +-
 src/insets/InsetInclude.cpp         |   38 ++--
 src/insets/InsetIndex.cpp           |    4 +-
 src/insets/InsetMarginal.cpp        |   15 --
 src/insets/InsetMarginal.h          |    3 -
 src/insets/InsetNomencl.cpp         |    4 +-
 src/insets/InsetNote.cpp            |   20 --
 src/insets/InsetNote.h              |    3 -
 src/insets/InsetText.cpp            |   56 ++++-
 src/insets/InsetText.h              |    7 +
 src/mathed/InsetMathHull.cpp        |   33 +++-
 src/mathed/MathMacroTemplate.cpp    |    5 +-
 42 files changed, 1277 insertions(+), 362 deletions(-)

Reply via email to