diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 15a64733bf..743f4e996b 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -182,6 +182,11 @@ The following LyX key bindings have been changed: - sciword.bind was changed significantly (see #8364). The most important change is that "math-delim" commands now work under Windows. +The following LyX documents have been moved: + +- 'AEA', 'JASA', 'springer', and 'thesis' have been moved from templates + to examples (see #8643). + Changes with respect to external programs and libraries: -------------------------------------------------------- diff --git a/lib/Makefile.am b/lib/Makefile.am index bd841e0148..49cb071946 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -203,6 +203,34 @@ dist_slexamples_DATA = \ examples/sl/primer_surov.lyx \ examples/sl/splash.lyx +springerexamplesdir = $(pkgdatadir)/examples/springer +dist_springerexamples_DATA = \ + examples/springer/svjour3.lyx \ + examples/springer/svmono_acknow.lyx \ + examples/springer/svmono_acronym.lyx \ + examples/springer/svmono_appendix.lyx \ + examples/springer/svmono_book-master.lyx \ + examples/springer/svmono_chapter.lyx \ + examples/springer/svmono_dedication.lyx \ + examples/springer/svmono_foreword.lyx \ + examples/springer/svmono_glossary.lyx \ + examples/springer/svmono_part.lyx \ + examples/springer/svmono_preface.lyx + examples/springer/svmono_referenc.lyx \ + examples/springer/svmono_solutions.lyx \ + examples/springer/svmult_acknow.lyx \ + examples/springer/svmult_acronym.lyx \ + examples/springer/svmult_appendix.lyx \ + examples/springer/svmult_author.lyx \ + examples/springer/svmult_cblist.lyx \ + examples/springer/svmult_dedication.lyx \ + examples/springer/svmult_editor-master.lyx \ + examples/springer/svmult_foreword.lyx \ + examples/springer/svmult_glossary.lyx \ + examples/springer/svmult_part.lyx \ + examples/springer/svmult_preface.lyx \ + examples/springer/svmult_referenc.lyx + skexamplesdir = $(pkgdatadir)/examples/sk dist_skexamples_DATA = \ examples/sk/splash.lyx @@ -216,17 +244,30 @@ svexamplesdir = $(pkgdatadir)/examples/sv dist_svexamples_DATA = \ examples/sv/splash.lyx +thesisexamplesdir = $(pkgdatadir)/examples/thesis +dist_thesisexamples_DATA = \ + examples/thesis/Acknowledgments.lyx \ + examples/thesis/alpha.bst \ + examples/thesis/Appendix.lyx \ + examples/thesis/chapter-1.lyx \ + examples/thesis/chapter-2.lyx \ + examples/thesis/Summary.lyx \ + examples/thesis/thesis.lyx \ + examples/thesis/thesisExample.bib + ukexamplesdir = $(pkgdatadir)/examples/uk dist_ukexamples_DATA = \ examples/uk/splash.lyx examplesdir = $(pkgdatadir)/examples dist_examples_DATA = \ + examples/AEA.lyx \ examples/Braille.lyx \ examples/CV-image.eps \ examples/CV-image.png \ examples/Foils.lyx \ examples/ItemizeBullets.lyx \ + examples/JASA.lyx \ examples/Literate.lyx \ examples/aa_sample.lyx \ examples/aas_sample.lyx \ @@ -2069,7 +2110,6 @@ dist_templates_DATA = \ templates/aastex.lyx \ templates/ACM-siggraph.lyx \ templates/ACM-sigplan.lyx \ - templates/AEA.lyx \ templates/AGUTeX.lyx \ templates/AGU_article.lyx \ templates/APA.lyx \ @@ -2095,7 +2135,6 @@ dist_templates_DATA = \ templates/IJMPC.lyx \ templates/IJMPD.lyx \ templates/IOP-article.lyx \ - templates/JASA.lyx \ templates/JSS-article.lyx \ templates/kluwer.lyx \ templates/koma-letter2.lyx \ @@ -2107,45 +2146,6 @@ dist_templates_DATA = \ templates/revtex4-1.lyx \ templates/slides.lyx -springertemplatesdir = $(pkgdatadir)/templates/springer -dist_springertemplates_DATA = \ - templates/springer/svjour3.lyx \ - templates/springer/svmono_acknow.lyx \ - templates/springer/svmono_acronym.lyx \ - templates/springer/svmono_appendix.lyx \ - templates/springer/svmono_book-master.lyx \ - templates/springer/svmono_chapter.lyx \ - templates/springer/svmono_dedication.lyx \ - templates/springer/svmono_foreword.lyx \ - templates/springer/svmono_glossary.lyx \ - templates/springer/svmono_part.lyx \ - templates/springer/svmono_preface.lyx - templates/springer/svmono_referenc.lyx \ - templates/springer/svmono_solutions.lyx \ - templates/springer/svmult_acknow.lyx \ - templates/springer/svmult_acronym.lyx \ - templates/springer/svmult_appendix.lyx \ - templates/springer/svmult_author.lyx \ - templates/springer/svmult_cblist.lyx \ - templates/springer/svmult_dedication.lyx \ - templates/springer/svmult_editor-master.lyx \ - templates/springer/svmult_foreword.lyx \ - templates/springer/svmult_glossary.lyx \ - templates/springer/svmult_part.lyx \ - templates/springer/svmult_preface.lyx \ - templates/springer/svmult_referenc.lyx - -thesistemplatesdir = $(pkgdatadir)/templates/thesis -dist_thesistemplates_DATA = \ - templates/thesis/Acknowledgments.lyx \ - templates/thesis/alpha.bst \ - templates/thesis/Appendix.lyx \ - templates/thesis/chapter-1.lyx \ - templates/thesis/chapter-2.lyx \ - templates/thesis/Summary.lyx \ - templates/thesis/thesis.lyx \ - templates/thesis/thesisExample.bib - texdir = $(pkgdatadir)/tex dist_tex_DATA = \ tex/broadway.cls \ diff --git a/lib/templates/AEA.lyx b/lib/examples/AEA.lyx similarity index 100% rename from lib/templates/AEA.lyx rename to lib/examples/AEA.lyx diff --git a/lib/templates/JASA.lyx b/lib/examples/JASA.lyx similarity index 100% rename from lib/templates/JASA.lyx rename to lib/examples/JASA.lyx diff --git a/lib/templates/springer/svjour3.lyx b/lib/examples/springer/svjour3.lyx similarity index 100% rename from lib/templates/springer/svjour3.lyx rename to lib/examples/springer/svjour3.lyx diff --git a/lib/templates/springer/svmono_acknow.lyx b/lib/examples/springer/svmono_acknow.lyx similarity index 100% rename from lib/templates/springer/svmono_acknow.lyx rename to lib/examples/springer/svmono_acknow.lyx diff --git a/lib/templates/springer/svmono_acronym.lyx b/lib/examples/springer/svmono_acronym.lyx similarity index 100% rename from lib/templates/springer/svmono_acronym.lyx rename to lib/examples/springer/svmono_acronym.lyx diff --git a/lib/templates/springer/svmono_appendix.lyx b/lib/examples/springer/svmono_appendix.lyx similarity index 100% rename from lib/templates/springer/svmono_appendix.lyx rename to lib/examples/springer/svmono_appendix.lyx diff --git a/lib/templates/springer/svmono_book-master.lyx b/lib/examples/springer/svmono_book-master.lyx similarity index 100% rename from lib/templates/springer/svmono_book-master.lyx rename to lib/examples/springer/svmono_book-master.lyx diff --git a/lib/templates/springer/svmono_chapter.lyx b/lib/examples/springer/svmono_chapter.lyx similarity index 100% rename from lib/templates/springer/svmono_chapter.lyx rename to lib/examples/springer/svmono_chapter.lyx diff --git a/lib/templates/springer/svmono_dedication.lyx b/lib/examples/springer/svmono_dedication.lyx similarity index 100% rename from lib/templates/springer/svmono_dedication.lyx rename to lib/examples/springer/svmono_dedication.lyx diff --git a/lib/templates/springer/svmono_foreword.lyx b/lib/examples/springer/svmono_foreword.lyx similarity index 100% rename from lib/templates/springer/svmono_foreword.lyx rename to lib/examples/springer/svmono_foreword.lyx diff --git a/lib/templates/springer/svmono_glossary.lyx b/lib/examples/springer/svmono_glossary.lyx similarity index 100% rename from lib/templates/springer/svmono_glossary.lyx rename to lib/examples/springer/svmono_glossary.lyx diff --git a/lib/templates/springer/svmono_part.lyx b/lib/examples/springer/svmono_part.lyx similarity index 100% rename from lib/templates/springer/svmono_part.lyx rename to lib/examples/springer/svmono_part.lyx diff --git a/lib/templates/springer/svmono_preface.lyx b/lib/examples/springer/svmono_preface.lyx similarity index 100% rename from lib/templates/springer/svmono_preface.lyx rename to lib/examples/springer/svmono_preface.lyx diff --git a/lib/templates/springer/svmono_referenc.lyx b/lib/examples/springer/svmono_referenc.lyx similarity index 100% rename from lib/templates/springer/svmono_referenc.lyx rename to lib/examples/springer/svmono_referenc.lyx diff --git a/lib/templates/springer/svmono_solutions.lyx b/lib/examples/springer/svmono_solutions.lyx similarity index 100% rename from lib/templates/springer/svmono_solutions.lyx rename to lib/examples/springer/svmono_solutions.lyx diff --git a/lib/templates/springer/svmult_acknow.lyx b/lib/examples/springer/svmult_acknow.lyx similarity index 100% rename from lib/templates/springer/svmult_acknow.lyx rename to lib/examples/springer/svmult_acknow.lyx diff --git a/lib/templates/springer/svmult_acronym.lyx b/lib/examples/springer/svmult_acronym.lyx similarity index 100% rename from lib/templates/springer/svmult_acronym.lyx rename to lib/examples/springer/svmult_acronym.lyx diff --git a/lib/templates/springer/svmult_appendix.lyx b/lib/examples/springer/svmult_appendix.lyx similarity index 100% rename from lib/templates/springer/svmult_appendix.lyx rename to lib/examples/springer/svmult_appendix.lyx diff --git a/lib/templates/springer/svmult_author.lyx b/lib/examples/springer/svmult_author.lyx similarity index 100% rename from lib/templates/springer/svmult_author.lyx rename to lib/examples/springer/svmult_author.lyx diff --git a/lib/templates/springer/svmult_cblist.lyx b/lib/examples/springer/svmult_cblist.lyx similarity index 100% rename from lib/templates/springer/svmult_cblist.lyx rename to lib/examples/springer/svmult_cblist.lyx diff --git a/lib/templates/springer/svmult_dedication.lyx b/lib/examples/springer/svmult_dedication.lyx similarity index 100% rename from lib/templates/springer/svmult_dedication.lyx rename to lib/examples/springer/svmult_dedication.lyx diff --git a/lib/templates/springer/svmult_editor-master.lyx b/lib/examples/springer/svmult_editor-master.lyx similarity index 100% rename from lib/templates/springer/svmult_editor-master.lyx rename to lib/examples/springer/svmult_editor-master.lyx diff --git a/lib/templates/springer/svmult_foreword.lyx b/lib/examples/springer/svmult_foreword.lyx similarity index 100% rename from lib/templates/springer/svmult_foreword.lyx rename to lib/examples/springer/svmult_foreword.lyx diff --git a/lib/templates/springer/svmult_glossary.lyx b/lib/examples/springer/svmult_glossary.lyx similarity index 100% rename from lib/templates/springer/svmult_glossary.lyx rename to lib/examples/springer/svmult_glossary.lyx diff --git a/lib/templates/springer/svmult_part.lyx b/lib/examples/springer/svmult_part.lyx similarity index 100% rename from lib/templates/springer/svmult_part.lyx rename to lib/examples/springer/svmult_part.lyx diff --git a/lib/templates/springer/svmult_preface.lyx b/lib/examples/springer/svmult_preface.lyx similarity index 100% rename from lib/templates/springer/svmult_preface.lyx rename to lib/examples/springer/svmult_preface.lyx diff --git a/lib/templates/springer/svmult_referenc.lyx b/lib/examples/springer/svmult_referenc.lyx similarity index 100% rename from lib/templates/springer/svmult_referenc.lyx rename to lib/examples/springer/svmult_referenc.lyx diff --git a/lib/templates/thesis/Acknowledgments.lyx b/lib/examples/thesis/Acknowledgments.lyx similarity index 100% rename from lib/templates/thesis/Acknowledgments.lyx rename to lib/examples/thesis/Acknowledgments.lyx diff --git a/lib/templates/thesis/Appendix.lyx b/lib/examples/thesis/Appendix.lyx similarity index 100% rename from lib/templates/thesis/Appendix.lyx rename to lib/examples/thesis/Appendix.lyx diff --git a/lib/templates/thesis/Summary.lyx b/lib/examples/thesis/Summary.lyx similarity index 100% rename from lib/templates/thesis/Summary.lyx rename to lib/examples/thesis/Summary.lyx diff --git a/lib/templates/thesis/alpha.bst b/lib/examples/thesis/alpha.bst similarity index 100% rename from lib/templates/thesis/alpha.bst rename to lib/examples/thesis/alpha.bst diff --git a/lib/templates/thesis/chapter-1.lyx b/lib/examples/thesis/chapter-1.lyx similarity index 100% rename from lib/templates/thesis/chapter-1.lyx rename to lib/examples/thesis/chapter-1.lyx diff --git a/lib/templates/thesis/chapter-2.lyx b/lib/examples/thesis/chapter-2.lyx similarity index 100% rename from lib/templates/thesis/chapter-2.lyx rename to lib/examples/thesis/chapter-2.lyx diff --git a/lib/templates/thesis/thesis.lyx b/lib/examples/thesis/thesis.lyx similarity index 100% rename from lib/templates/thesis/thesis.lyx rename to lib/examples/thesis/thesis.lyx diff --git a/lib/templates/thesis/thesisExample.bib b/lib/examples/thesis/thesisExample.bib similarity index 100% rename from lib/templates/thesis/thesisExample.bib rename to lib/examples/thesis/thesisExample.bib