X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=bcb82ed0901335d70cd9218b0df91fc1a92db136;hb=47eb0452e3e3886da07ac65acf6e9ba76b741e32;hp=737262a7520d27aeed43277912e4e9b2a0a0c253;hpb=fd28958db04f162beeb2addabe496eaf6a04e98b;p=lyx.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 737262a752..bcb82ed090 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -235,8 +235,8 @@ dist_itinsetexamples_DATA = \
 
 jaexamplesdir = $(pkgdatadir)/examples/ja
 dist_jaexamples_DATA = \
-	examples/ja/Multilingual_Typesetting_%28CJKutf8%29.lyx \
-	examples/ja/Multilingual_Typesetting_%28platex%29.lyx \
+	examples/ja/Multilingual_Typesetting_with_CJKutf8.lyx \
+	examples/ja/Multilingual_Typesetting_with_platex.lyx \
 	examples/ja/Welcome.lyx
 
 jainsetexamplesdir = $(pkgdatadir)/examples/ja/Graphics_and_Insets
@@ -352,7 +352,6 @@ dist_examples_DATA = \
 articleexamplesdir = $(pkgdatadir)/examples/Articles
 dist_articleexamples_DATA = \
 	examples/Articles/Astronomy_%26_Astrophysics.lyx \
-	examples/Articles/American_Astronomical_Society_%28AASTeX_v._6%29.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 \
@@ -681,6 +680,7 @@ dist_images_DATA1X = \
 	images/tabular-feature_move-row-up.svgz \
 	images/tabular-feature_multicolumn.svgz \
 	images/tabular-feature_multirow.svgz \
+	images/tabular-feature_reset-formal-default.svgz \
 	images/tabular-feature_set-all-lines.svgz \
 	images/tabular-feature_set-longtabular.svgz \
 	images/tabular-feature_set-rotate-cell.svgz \
@@ -1963,6 +1963,7 @@ dist_imagesoxygen_DATA1X = \
 	images/oxygen/tabular-feature_move-row-up.svgz \
 	images/oxygen/tabular-feature_multicolumn.svgz \
 	images/oxygen/tabular-feature_multirow.svgz \
+	images/oxygen/tabular-feature_reset-formal-default.svgz \
 	images/oxygen/tabular-feature_set-all-lines.svgz \
 	images/oxygen/tabular-feature_set-border-lines.svgz \
 	images/oxygen/tabular-feature_set-inner-lines.svgz \
@@ -2161,6 +2162,7 @@ dist_imagesclassic_DATA = \
 	images/classic/tabular-feature_m-valign-top.png  \
 	images/classic/tabular-feature_multicolumn.png  \
 	images/classic/tabular-feature_multirow.png  \
+	images/classic/tabular-feature_reset-formal-default.png \
 	images/classic/tabular-feature_set-all-lines.png  \
 	images/classic/tabular-feature_set-border-lines.png  \
 	images/classic/tabular-feature_set-inner-lines.png  \
@@ -2397,6 +2399,7 @@ dist_layouts_DATA =\
 	layouts/revtex4.layout \
 	layouts/revtex4-1.layout \
 	layouts/rsphrase.module \
+	layouts/ruby.module \
 	layouts/sciposter.layout \
 	layouts/scrartcl.layout \
 	layouts/scrarticle-beamer.layout \
@@ -2532,11 +2535,9 @@ dist_templates_DATA = \
 
 articletemplatesdir = $(pkgdatadir)/templates/Articles
 dist_articletemplates_DATA = \
-	templates/Articles/American_Astronomical_Society_%28AASTeX_v._6%29.lyx \
 	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._6.lyx \
 	templates/Articles/Association_for_Computing_Machinery_%28ACM%29.lyx \
 	templates/Articles/Astronomy_%26_Astrophysics.lyx \
 	templates/Articles/Chinese_Article_%28CTeX%29.lyx \
@@ -2591,7 +2592,10 @@ dist_obsoletetemplates_DATA = \
 	templates/Obsolete/ACM_SIGGGRAPH_0.92_%28obsolete%29.lyx \
 	templates/Obsolete/ACM_SIGPLAN_%28Obsolete%29.lyx \
 	templates/Obsolete/ACM_SIG_Proceedings_%28SP,_Obsolete%29.lyx \
-	templates/Obsolete/American_Geophysical_Union_%28AGUTeX%29.lyx
+	templates/Obsolete/American_Astronomical_Society_%28AASTeX_v._6%29.lyx \
+	templates/Obsolete/American_Geophysical_Union_%28AGUTeX%29.lyx \
+	templates/Obsolete/American_Psychological_Association_%28APA%29,_v._6.lyx \
+	templates/Obsolete/Latex8_Article_%28Obsolete%29.lyx
 
 obsoletegbrieftemplatesdir = $(pkgdatadir)/templates/Obsolete/G-Brief_%28V._1,_Obsolete%29
 dist_obsoletegbrieftemplates_DATA = \
@@ -2637,6 +2641,24 @@ dist_ui_DATA = \
 	ui/stdmenus.inc \
 	ui/stdtoolbars.inc
 
+tabletemplatesdir = $(pkgdatadir)/tabletemplates
+dist_tabletemplates_DATA = \
+	tabletemplates/Formal_with_Footline.lyx \
+	tabletemplates/Formal_with_Footline_1x1.lyx \
+	tabletemplates/Formal_with_Footline_1x2.lyx \
+	tabletemplates/Formal_without_Footline.lyx \
+	tabletemplates/Formal_without_Footline_1x1.lyx \
+	tabletemplates/Formal_without_Footline_1x2.lyx \
+	tabletemplates/Grid_with_Head.lyx \
+	tabletemplates/Grid_with_Head_1x1.lyx \
+	tabletemplates/Grid_with_Head_1x2.lyx \
+	tabletemplates/No_Borders.lyx \
+	tabletemplates/No_Borders_1x1.lyx \
+	tabletemplates/No_Borders_1x2.lyx \
+	tabletemplates/Simple_Grid.lyx \
+	tabletemplates/Simple_Grid_1x1.lyx \
+	tabletemplates/Simple_Grid_1x2.lyx
+
 xtemplatesdir = $(pkgdatadir)/xtemplates
 dist_xtemplates_DATA = \
 	xtemplates/chess.xtemplate \
@@ -2751,6 +2773,7 @@ exampleandtemplate_files = \
 			   $(dist_srexamples_DATA) \
 			   $(dist_srmoduleexamples_DATA) \
 			   $(dist_svexamples_DATA) \
+			   $(dist_tabletemplates_DATA) \
 			   $(dist_thesistemplates_DATA) \
 			   $(dist_ukexamples_DATA) \
 			   $(dist_examples_DATA) \