[LyX/master] Merge branch 'feature/docbook' into master
Thibaut Cuvelier
tcuvelier at lyx.org
Sat Sep 19 18:18:56 UTC 2020
commit 968f7e8cacac366fe86466c1ed74a3cd5fe3387c
Merge: 7470305 b5adcec
Author: Thibaut Cuvelier <tcuvelier at lyx.org>
Date: Sat Sep 19 20:44:16 2020 +0200
Merge branch 'feature/docbook' into master
CMakeLists.txt | 5 +
autotests/export/docbook/A0_Poster_Simple.lyx | 192 ++
autotests/export/docbook/A0_Poster_Simple.xml | 16 +
autotests/export/docbook/Additional_lyxcode.lyx | 535 ++++
autotests/export/docbook/Additional_lyxcode.xml | 75 +
autotests/export/docbook/Development.xml | 83 +-
autotests/export/docbook/Linguistics.lyx | 3209 ++++++++++++++++++++
autotests/export/docbook/Linguistics.xml | 337 ++
autotests/export/docbook/SciPoster.lyx | 867 ++++++
autotests/export/docbook/SciPoster.xml | 65 +
autotests/export/docbook/Tufte_Book.xml | 35 +-
autotests/export/docbook/basic.lyx | 33 +-
autotests/export/docbook/basic.xml | 364 ++--
autotests/export/docbook/basic_book.xml | 23 +-
.../export/docbook/bibliography_precooked.xml | 3 +-
.../docbook/bibliography_precooked_aastex.xml | 159 +-
.../export/docbook/description_list_nested.xml | 13 +-
autotests/export/docbook/deutsches_ert.xml | 17 +-
autotests/export/docbook/easy.lyx | 253 ++
autotests/export/docbook/easy.xml | 69 +
autotests/export/docbook/fonts_EmbeddedObjects.lyx | 288 ++
autotests/export/docbook/fonts_EmbeddedObjects.xml | 12 +
.../docbook/issue1732_charstyles-docbook.xml | 1 -
autotests/export/docbook/issue5165.xml | 5 +-
autotests/export/docbook/issue_infinite_loop.xml | 5 +-
autotests/export/docbook/labeling_list_nested.xml | 19 +-
autotests/export/docbook/list_depth.xml | 5 +-
autotests/export/docbook/listings.xml | 3 +-
autotests/export/docbook/lists.lyx | 144 +-
autotests/export/docbook/lists.xml | 122 +-
autotests/export/docbook/math_in_font.xml | 8 +-
autotests/export/docbook/mathml_ns_entities.xml | 29 +-
autotests/export/docbook/subfigures.xml | 35 +-
.../export/docbook/subfigures_EmbeddedObjects.lyx | 444 +++
.../export/docbook/subfigures_EmbeddedObjects.xml | 32 +
.../docbook/subfigures_boxes_EmbeddedObjects.lyx | 420 +++
.../docbook/subfigures_boxes_EmbeddedObjects.xml | 32 +
autotests/export/xhtml/A0_Poster_Simple.lyx | 192 ++
autotests/export/xhtml/A0_Poster_Simple.xhtml | 59 +
autotests/export/xhtml/zh_CN_Tutorial.lyx | 974 ++++++
autotests/export/xhtml/zh_CN_Tutorial.xhtml | 256 ++
development/DocBookToDo | 41 +
lib/configure.py | 58 +-
lib/doc/Customization.lyx | 719 +++++-
lib/generate_contributions.py | 2 +-
lib/layouts/aastex.layout | 48 +-
lib/layouts/aastex6.layout | 7 +-
lib/layouts/aastex62.layout | 7 +-
lib/layouts/beamer.layout | 4 +
lib/layouts/egs.layout | 4 +
lib/layouts/hollywood.layout | 1 +
lib/layouts/linguistics.module | 8 +
lib/layouts/logicalmkup.module | 9 +
lib/layouts/lyxmacros.inc | 3 +
lib/layouts/scrartcl.layout | 8 +-
lib/layouts/scrbook.layout | 4 +-
lib/layouts/scrclass.inc | 1 +
lib/layouts/shapepar.module | 18 +
lib/layouts/simplecv.layout | 2 +
lib/layouts/stdfloats.inc | 3 -
lib/layouts/stdinsets.inc | 39 +-
lib/layouts/stdlayouts.inc | 12 +-
lib/layouts/stdlists.inc | 3 +-
lib/layouts/stdsections.inc | 5 +-
lib/layouts/stdstarsections.inc | 14 +-
lib/layouts/stdstruct.inc | 8 +-
lib/layouts/stdtitle.inc | 6 +-
lib/layouts/svcommon.inc | 1 +
lib/layouts/theorems-ams-bytype.inc | 26 +
lib/layouts/theorems-ams-chap-bytype.inc | 26 +
lib/layouts/theorems-ams-extended-bytype.module | 64 +
.../theorems-ams-extended-chap-bytype.module | 64 +
lib/layouts/theorems-ams-extended.module | 64 +
lib/layouts/theorems-ams.inc | 26 +
lib/layouts/theorems-bytype.inc | 26 +
lib/layouts/theorems-case.inc | 2 +
lib/layouts/theorems-proof-std.inc | 2 +
lib/layouts/theorems-proof.inc | 2 +
lib/layouts/theorems-starred.inc | 28 +
lib/layouts/theorems-without-preamble.inc | 42 +
lib/layouts/theorems.inc | 28 +
lib/layouts/tufte-book.layout | 2 +
lib/scripts/convertDefault.py | 16 +-
lib/scripts/layout2layout.py | 12 +-
src/BiblioInfo.cpp | 2 +
src/Buffer.cpp | 13 +-
src/BufferView.cpp | 2 +-
src/Floating.cpp | 58 +-
src/Floating.h | 23 +-
src/Layout.cpp | 163 +-
src/Layout.h | 39 +-
src/Paragraph.cpp | 109 +-
src/Paragraph.h | 16 +-
src/ParagraphList.h | 11 +
src/TextClass.cpp | 15 +-
src/insets/InsetBibtex.cpp | 11 +-
src/insets/InsetBox.cpp | 35 +-
src/insets/InsetCaption.cpp | 3 +-
src/insets/InsetERT.cpp | 27 +-
src/insets/InsetFloat.cpp | 189 +-
src/insets/InsetIndex.cpp | 79 +-
src/insets/InsetLabel.cpp | 7 +-
src/insets/InsetLayout.cpp | 20 +
src/insets/InsetLayout.h | 16 +
src/insets/InsetListings.cpp | 4 +
src/insets/InsetMarginal.cpp | 1 +
src/insets/InsetNewline.cpp | 16 +-
src/mathed/InsetMathHull.cpp | 15 +-
src/output_docbook.cpp | 1291 ++++----
src/output_docbook.h | 24 +-
src/output_xhtml.cpp | 30 +-
src/xml.cpp | 114 +-
src/xml.h | 44 +-
113 files changed, 11902 insertions(+), 1378 deletions(-)
More information about the lyx-cvs
mailing list