Revert "DocBook: add new layout parameter DocBookWrapperMergeWithPrevious."

[lyx.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 44d30f3229fb8e41b7507cb7da2f750a381a68e9..010ef6fa12520e621e2b1e255bad02cf32b9c168 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -260,7 +260,8 @@ dist_japresentationexamples_DATA = \
 
 koexamplesdir = $(pkgdatadir)/examples/ko
 dist_koexamples_DATA = \
-       examples/ko/Welcome.lyx
+       examples/ko/Welcome.lyx \
+       examples/ko/cjk-ko-doc.lyx
 
 nbexamplesdir = $(pkgdatadir)/examples/nb
 dist_nbexamples_DATA = \
@@ -354,8 +355,7 @@ dist_articleexamples_DATA = \
        examples/Articles/Astronomy_%26_Astrophysics.lyx \
        examples/Articles/American_Astronomical_Society_%28AASTeX_v._6.2%29.lyx \
        examples/Articles/American_Chemical_Society_%28ACS%29.lyx \
-       examples/Articles/American_Mathematical_Society_%28AMS%29.lyx \
-       examples/Articles/DocBook_Article_%28SGML%29.lyx
+       examples/Articles/American_Mathematical_Society_%28AMS%29.lyx
 
 articlechessexamplesdir = $(pkgdatadir)/examples/Articles/Chess
 dist_articlechessexamples_DATA = \
@@ -501,6 +501,7 @@ dist_fonts_DATA = \
        fonts/cmmi10.ttf \
        fonts/cmr10.ttf \
        fonts/cmsy10.ttf \
+       fonts/dsrom10.ttf \
        fonts/esint10.ttf \
        fonts/eufm10.ttf \
        fonts/msam10.ttf \
@@ -565,6 +566,8 @@ dist_images_DATA1X = \
        images/changes-track.svgz \
        images/closetab.svgz \
        images/tab-group-close.svgz \
+       images/command-alternatives_outline-in_depth-increment.svgz \
+       images/command-alternatives_outline-out_depth-decrement.svgz \
        images/copy.svgz \
        images/cut.svgz \
        images/depth-decrement.svgz \
@@ -608,19 +611,14 @@ dist_images_DATA1X = \
        images/layout.svgz \
        images/layout-document.svgz \
        images/layout-paragraph.svgz \
-       images/layout_Description.svgz \
-       images/layout_Enumerate.svgz  \
-       images/layout_Itemize.svgz \
-       images/layout_List.svgz \
-       images/layout_LyX-Code.svgz \
-       images/layout_Chunk.svgz \
-       images/layout_Section.svgz \
+       images/layout-toggle_Chunk.svgz \
        images/layout-toggle_Description.svgz \
+       images/layout-toggle_Enumerate+rtl.svgz  \
        images/layout-toggle_Enumerate.svgz  \
        images/layout-toggle_Itemize.svgz \
+       images/layout-toggle_Labeling.svgz \
        images/layout-toggle_List.svgz \
        images/layout-toggle_LyX-Code.svgz \
-       images/layout-toggle_Chunk.svgz \
        images/layout-toggle_Section.svgz \
        images/lyxfiles-system.svgz \
        images/lyxfiles-user.svgz \
@@ -648,7 +646,9 @@ dist_images_DATA1X = \
        images/note-next.svgz \
        images/outline-down.svgz \
        images/outline-in.svgz \
+       images/outline-in+rtl.svgz \
        images/outline-out.svgz \
+       images/outline-out+rtl.svgz \
        images/outline-up.svgz \
        images/paste.svgz \
        images/redo.svgz \
@@ -1856,6 +1856,8 @@ dist_imagesoxygen_DATA1X = \
        images/oxygen/changes-output.svgz \
        images/oxygen/changes-track.svgz \
        images/oxygen/closetab.svgz \
+       images/oxygen/command-alternatives_outline-in_depth-increment.svgz \
+       images/oxygen/command-alternatives_outline-out_depth-decrement.svgz \
        images/oxygen/copy.svgz \
        images/oxygen/cut.svgz \
        images/oxygen/depth-decrement.svgz \
@@ -1896,17 +1898,12 @@ dist_imagesoxygen_DATA1X = \
        images/oxygen/layout-document.svgz \
        images/oxygen/layout-paragraph.svgz \
        images/oxygen/layout.svgz \
-       images/oxygen/layout_Chunk.svgz \
-       images/oxygen/layout_Description.svgz \
-       images/oxygen/layout_Enumerate.svgz \
-       images/oxygen/layout_Itemize.svgz \
-       images/oxygen/layout_List.svgz \
-       images/oxygen/layout_LyX-Code.svgz \
-       images/oxygen/layout_Section.svgz \
        images/oxygen/layout-toggle_Chunk.svgz \
        images/oxygen/layout-toggle_Description.svgz \
-       images/oxygen/layout-toggle_Enumerate.svgz \
+       images/oxygen/layout-toggle_Enumerate+rtl.svgz  \
+       images/oxygen/layout-toggle_Enumerate.svgz  \
        images/oxygen/layout-toggle_Itemize.svgz \
+       images/oxygen/layout-toggle_Labeling.svgz \
        images/oxygen/layout-toggle_List.svgz \
        images/oxygen/layout-toggle_LyX-Code.svgz \
        images/oxygen/layout-toggle_Section.svgz \
@@ -1935,7 +1932,9 @@ dist_imagesoxygen_DATA1X = \
        images/oxygen/note-next.svgz \
        images/oxygen/outline-down.svgz \
        images/oxygen/outline-in.svgz \
+       images/oxygen/outline-in+rtl.svgz \
        images/oxygen/outline-out.svgz \
+       images/oxygen/outline-out+rtl.svgz \
        images/oxygen/outline-up.svgz \
        images/oxygen/paste.svgz \
        images/oxygen/redo.svgz \
@@ -2066,6 +2065,8 @@ dist_imagesclassic_DATA = \
        images/classic/changes-output.png  \
        images/classic/changes-track.png  \
        images/classic/tab-group-close.png  \
+       images/classic/command-alternatives_outline-in_depth-increment.png \
+       images/classic/command-alternatives_outline-out_depth-decrement.png \
        images/classic/copy.png  \
        images/classic/cut.png  \
        images/classic/depth-decrement.png  \
@@ -2103,20 +2104,15 @@ dist_imagesclassic_DATA = \
        images/classic/layout-document.png  \
        images/classic/layout-paragraph.png  \
        images/classic/layout.png  \
-       images/classic/layout_Description.png  \
-       images/classic/layout_Enumerate.png  \
-       images/classic/layout_Itemize.png  \
-       images/classic/layout_List.png  \
-       images/classic/layout_LyX-Code.png  \
-       images/classic/layout_Chunk.png  \
-       images/classic/layout_Section.png  \
-       images/classic/layout-toggle_Description.png  \
-       images/classic/layout-toggle_Enumerate.png  \
-       images/classic/layout-toggle_Itemize.png  \
-       images/classic/layout-toggle_List.png  \
-       images/classic/layout-toggle_LyX-Code.png  \
        images/classic/layout-toggle_Chunk.png  \
-       images/classic/layout-toggle_Section.png  \
+       images/classic/layout-toggle_Description.png \
+       images/classic/layout-toggle_Enumerate+rtl.png  \
+       images/classic/layout-toggle_Enumerate.png  \
+       images/classic/layout-toggle_Itemize.png \
+       images/classic/layout-toggle_Labeling.png \
+       images/classic/layout-toggle_List.png \
+       images/classic/layout-toggle_LyX-Code.png \
+       images/classic/layout-toggle_Section.png \
        images/classic/marginalnote-insert.png  \
        images/classic/master-buffer-update.png  \
        images/classic/master-buffer-view.png  \
@@ -2140,7 +2136,9 @@ dist_imagesclassic_DATA = \
        images/classic/note-next.png  \
        images/classic/outline-down.png  \
        images/classic/outline-in.png  \
+       images/classic/outline-in+rtl.png  \
        images/classic/outline-out.png  \
+       images/classic/outline-out+rtl.png  \
        images/classic/outline-up.png  \
        images/classic/paste.png  \
        images/classic/redo.png  \
@@ -2261,12 +2259,6 @@ dist_layouts_DATA =\
        layouts/acmsiggraph-0-92.layout \
        layouts/AEA.layout \
        layouts/agutex.layout \
-       layouts/agu-dtd.layout \
-       layouts/agu_stdclass.inc \
-       layouts/agu_stdcounters.inc \
-       layouts/agu_stdlists.inc \
-       layouts/agu_stdsections.inc \
-       layouts/agu_stdtitle.inc \
        layouts/agums.layout \
        layouts/aguplus.inc \
        layouts/algorithm2e.module \
@@ -2275,6 +2267,8 @@ dist_layouts_DATA =\
        layouts/amsdefs.inc \
        layouts/apa.layout \
        layouts/apa6.layout \
+       layouts/apa7.layout \
+       layouts/apax.inc \
        layouts/arab-article.layout \
        layouts/article.layout \
        layouts/article-beamer.layout \
@@ -2288,7 +2282,6 @@ dist_layouts_DATA =\
        layouts/bxjsbook.layout \
        layouts/bxjsreport.layout \
        layouts/bxjsslide.layout \
-       layouts/changebars.module \
        layouts/chess.layout \
        layouts/chessboard.module \
        layouts/cl2emult.layout \
@@ -2297,21 +2290,11 @@ dist_layouts_DATA =\
        layouts/ctex-book.layout \
        layouts/ctex-report.layout \
        layouts/customHeadersFooters.module \
-       layouts/db_lyxmacros.inc \
-       layouts/db_stdclass.inc \
        layouts/db_stdcharstyles.inc \
-       layouts/db_stdcounters.inc \
-       layouts/db_stdlayouts.inc \
-       layouts/db_stdlists.inc \
-       layouts/db_stdsections.inc \
-       layouts/db_stdstarsections.inc \
-       layouts/db_stdstruct.inc \
-       layouts/db_stdtitle.inc \
        layouts/dinbrief.layout \
        layouts/docbook-book.layout \
        layouts/docbook-chapter.layout \
        layouts/docbook-section.layout \
-       layouts/docbook.layout \
        layouts/doublecol-new.layout \
        layouts/dtk.layout \
        layouts/ectaart.layout \
@@ -2319,6 +2302,7 @@ dist_layouts_DATA =\
        layouts/elsart.layout \
        layouts/elsarticle.layout \
        layouts/endnotes.module \
+       layouts/enotez.module \
        layouts/entcs.layout \
        layouts/enumitem.module \
        layouts/eqs-within-sections.module \
@@ -2334,6 +2318,7 @@ dist_layouts_DATA =\
        layouts/fix-cm.module \
        layouts/foils.layout \
        layouts/foottoend.module \
+       layouts/foottoenotez.module \
        layouts/frletter.layout \
        layouts/g-brief.layout \
        layouts/g-brief2.layout \
@@ -2398,7 +2383,10 @@ dist_layouts_DATA =\
        layouts/revtex.layout \
        layouts/revtex4.layout \
        layouts/revtex4-1.layout \
+       layouts/revtex4-2.layout \
+       layouts/revtex4-x.inc \
        layouts/rsphrase.module \
+       layouts/ruby.module \
        layouts/sciposter.layout \
        layouts/scrartcl.layout \
        layouts/scrarticle-beamer.layout \
@@ -2537,13 +2525,14 @@ dist_articletemplates_DATA = \
        templates/Articles/American_Astronomical_Society_%28AASTeX_v._6.2%29.lyx \
        templates/Articles/American_Economic_Association_%28AEA%29.lyx \
        templates/Articles/American_Psychological_Association_%28APA%29.lyx \
+       templates/Articles/American_Psychological_Association_%28APA%29,_v._7.lyx \
        templates/Articles/Association_for_Computing_Machinery_%28ACM%29.lyx \
        templates/Articles/Astronomy_%26_Astrophysics.lyx \
        templates/Articles/Chinese_Article_%28CTeX%29.lyx \
        templates/Articles/Copernicus_Publications_Manuscript_Preparation.lyx \
-       templates/Articles/DocBook_Article_%28SGML%29.lyx \
        templates/Articles/Econometrica.lyx \
        templates/Articles/Elsevier.lyx \
+       templates/Articles/Hebrew_Article_%28KOMA-Script%29.lyx \
        templates/Articles/IEEE_Transactions_Computer_Society.lyx \
        templates/Articles/IEEE_Transactions_Conference.lyx \
        templates/Articles/IEEE_Transactions_Journal.lyx \