This patch is really the tip of the iceberg. I excluded the interesting part (that is the moved files). A 10M file would not be as fun to read...
What I did: * move xx_foo.ext to xx/foo.ext * update Makefile.am to make install work * minimally update scons_manifest.py (I'd be surprised to see it work). * update i18nLibFileSearch to use the new naming scheme, and keep temporarily some code that checks the old method. * update image paths in .lyx files * update name of files (examples in tutorial, for ex.) in lyx files What is definitely broken: * cmake (did not touch it) * TOC files (I am not sure how the code works) I would be surprised if nothing else was wrong. Jose, could I apply the patch so that we clean up the resulting mess? JMarc
Index: src/support/filetools.C =================================================================== --- src/support/filetools.C (révision 17340) +++ src/support/filetools.C (copie de travail) @@ -320,11 +320,21 @@ string l; lang = split(lang, l, ':'); while (!l.empty() && l != "C" && l != "POSIX") { - FileName const tmp = libFileSearch(dir, + FileName const tmp = libFileSearch(addPath(dir, token(l, '_', 0)), + name, ext); + if (!tmp.empty()) + return tmp; +#if 1 + // to be removed later (JMarc) + FileName const tmpold = libFileSearch(dir, token(l, '_', 0) + '_' + name, ext); - if (!tmp.empty()) - return tmp; + if (!tmpold.empty()) { + lyxerr << "i18nLibFileSearch: File `" << tmpold + << "' has been found by the old method" <<endl; + return tmpold; + } +#endif lang = split(lang, l, ':'); } Index: lib/doc/Makefile.am =================================================================== --- lib/doc/Makefile.am (révision 17340) +++ lib/doc/Makefile.am (copie de travail) @@ -4,73 +4,130 @@ EXTRA_DIST = depend.py doc_toc.py README.Documentation $(DEPENDFILE) $(docfiles) -docfiles = \ - cs_Tutorial.lyx \ +csdocdir = $(pkgdatadir)/doc/cs +dist_csdoc_DATA = \ + cs/Tutorial.lyx + +dadocdir = $(pkgdatadir)/doc/da +dist_dadoc_DATA = \ + da/Intro.lyx + +dedocdir = $(pkgdatadir)/doc/de +dist_dedoc_DATA = \ + de/Customization.lyx \ + de/Extended.lyx \ + de/FAQ.lyx \ + de/Intro.lyx \ + de/Tutorial.lyx \ + de/UserGuide.lyx + +esdocdir = $(pkgdatadir)/doc/es +dist_esdoc_DATA = \ + es/Intro.lyx \ + es/Tutorial.lyx \ + es/EmbeddedObjects.lyx + +eudocdir = $(pkgdatadir)/doc/eu +dist_eudoc_DATA = \ + eu/Customization.lyx \ + eu/Extended.lyx \ + eu/FAQ.lyx \ + eu/Intro.lyx \ + eu/Tutorial.lyx \ + eu/UserGuide.lyx + +frdocdir = $(pkgdatadir)/doc/fr +dist_frdoc_DATA = \ + fr/Customization.lyx \ + fr/Extended.lyx \ + fr/FAQ.lyx \ + fr/Intro.lyx \ + fr/Tutorial.lyx \ + fr/UserGuide.lyx + +gldocdir = $(pkgdatadir)/doc/gl +dist_gldoc_DATA = \ + gl/Intro.lyx \ + gl/Tutorial.lyx + +hedocdir = $(pkgdatadir)/doc/he +dist_hedoc_DATA = \ + he/Intro.lyx \ + he/Tutorial.lyx + +hudocdir = $(pkgdatadir)/doc/hu +dist_hudoc_DATA = \ + hu/Intro.lyx \ + hu/Tutorial.lyx + +itdocdir = $(pkgdatadir)/doc/it +dist_itdoc_DATA = \ + it/Customization.lyx \ + it/Intro.lyx \ + it/Tutorial.lyx \ + it/UserGuide.lyx + +nldocdir = $(pkgdatadir)/doc/nl +dist_nldoc_DATA = \ + nl/Intro.lyx \ + nl/Tutorial.lyx + +nbdocdir = $(pkgdatadir)/doc/nb +dist_nbdoc_DATA = \ + nb/Intro.lyx + +pldocdir = $(pkgdatadir)/doc/pl +dist_pldoc_DATA = \ + pl/Extended.lyx \ + pl/Intro.lyx \ + pl/Tutorial.lyx + +ptdocdir = $(pkgdatadir)/doc/pt +dist_ptdoc_DATA = \ + pt/Intro.lyx \ + pt/Tutorial.lyx + +rodocdir = $(pkgdatadir)/doc/ro +dist_rodoc_DATA = \ + ro/Intro.lyx + +rudocdir = $(pkgdatadir)/doc/ru +dist_rudoc_DATA = \ + ru/FAQ.lyx \ + ru/Intro.lyx \ + ru/Tutorial.lyx + +skdocdir = $(pkgdatadir)/doc/sk +dist_skdoc_DATA = \ + sk/Tutorial.lyx \ + sk/UserGuide.lyx + +sldocdir = $(pkgdatadir)/doc/sl +dist_sldoc_DATA = \ + sl/Intro.lyx \ + sl/Tutorial.lyx + +svdocdir = $(pkgdatadir)/doc/sv +dist_svdoc_DATA = \ + sv/Intro.lyx \ + sv/Tutorial.lyx + +docdir = $(pkgdatadir)/doc +dist_doc_DATA = \ Customization.lyx \ - da_Intro.lyx \ - de_Customization.lyx \ - de_Extended.lyx \ - de_FAQ.lyx \ - de_Intro.lyx \ - de_Tutorial.lyx \ - de_UserGuide.lyx \ DocStyle.lyx \ - es_Intro.lyx \ - es_Tutorial.lyx \ - es_EmbeddedObjects.lyx \ - eu_Customization.lyx \ - eu_Extended.lyx \ - eu_FAQ.lyx \ - eu_Intro.lyx \ - eu_Tutorial.lyx \ - eu_UserGuide.lyx \ EmbeddedObjects.lyx \ Extended.lyx \ FAQ.lyx \ - fr_Customization.lyx \ - fr_Extended.lyx \ - fr_FAQ.lyx \ - fr_Intro.lyx \ - fr_Tutorial.lyx \ - fr_UserGuide.lyx \ - gl_Intro.lyx \ - gl_Tutorial.lyx \ - he_Intro.lyx \ - he_Tutorial.lyx \ - hu_Intro.lyx \ - hu_Tutorial.lyx \ Intro.lyx \ - it_Customization.lyx \ - it_Intro.lyx \ - it_Tutorial.lyx \ - it_UserGuide.lyx \ LaTeXConfig.lyx.in \ - nl_Intro.lyx \ - nl_Tutorial.lyx \ - nb_Intro.lyx \ - pl_Extended.lyx \ - pl_Intro.lyx \ - pl_Tutorial.lyx \ - pt_Intro.lyx \ - pt_Tutorial.lyx \ Reference.lyx \ - ro_Intro.lyx \ - ru_FAQ.lyx \ - ru_Intro.lyx \ - ru_Tutorial.lyx \ - sk_Tutorial.lyx \ - sk_UserGuide.lyx \ - sl_Intro.lyx \ - sl_Tutorial.lyx \ - sv_Intro.lyx \ - sv_Tutorial.lyx \ Tutorial.lyx \ UserGuide.lyx \ escher-lsd.eps \ mobius.eps \ platypus.eps -docdir = $(pkgdatadir)/doc doc_DATA = $(docfiles) DEPENDFILE = $(srcdir)/Makefile.depend Index: lib/Makefile.am =================================================================== --- lib/Makefile.am (révision 17340) +++ lib/Makefile.am (copie de travail) @@ -4,8 +4,8 @@ CHMOD = chmod -dist_pkgdata_DATA = CREDITS chkconfig.ltx \ - external_templates encodings languages symbols syntax.default unicodesymbols +dist_pkgdata_DATA = CREDITS chkconfig.ltx external_templates encodings \ + languages symbols syntax.default unicodesymbols # Note that we "chmod 755" manually this file in install-data-hook. dist_pkgdata_PYTHON = configure.py @@ -33,23 +33,35 @@ images/math/misc.xbm \ images/math/varsz.xbm +debinddir = $(pkgdatadir)/bind/de +dist_debind_DATA = \ + bind/de/menus.bind + +fibinddir = $(pkgdatadir)/bind/fi +dist_fibind_DATA = \ + bind/fi/menus.bind + +ptbinddir = $(pkgdatadir)/bind/pt +dist_ptbind_DATA = \ + bind/pt/menus.bind + +svbinddir = $(pkgdatadir)/bind/sv +dist_svbind_DATA = \ + bind/sv/menus.bind + binddir = $(pkgdatadir)/bind dist_bind_DATA = \ bind/broadway.bind \ bind/cua.bind \ bind/cyrkeys.bind \ - bind/de_menus.bind \ bind/emacs.bind \ - bind/fi_menus.bind \ bind/greekkeys.bind \ bind/hollywood.bind \ bind/latinkeys.bind \ bind/mac.bind \ bind/math.bind \ bind/menus.bind \ - bind/pt_menus.bind \ bind/sciword.bind \ - bind/sv_menus.bind \ bind/xemacs.bind \ bind/aqua.bind @@ -76,6 +88,109 @@ clipart/without_fntright.pdf \ clipart/with_fntright.pdf +caexamplesdir = $(pkgdatadir)/examples/ca +dist_caexamples_DATA = \ + examples/ca/splash.lyx + +csexamplesdir = $(pkgdatadir)/examples/cs +dist_csexamples_DATA = \ + examples/cs/splash.lyx + +daexamplesdir = $(pkgdatadir)/examples/da +dist_daexamples_DATA = \ + examples/da/splash.lyx + +deexamplesdir = $(pkgdatadir)/examples/de +dist_deexamples_DATA = \ + examples/de/ItemizeBullets.lyx \ + examples/de/Lebenslauf.lyx \ + examples/de/Minipage.lyx \ + examples/de/TableExamples.lyx \ + examples/de/Waehrungen.lyx \ + examples/de/beispiel_gelyxt.lyx \ + examples/de/beispiel_roh.lyx \ + examples/de/decimal.lyx \ + examples/de/splash.lyx \ + examples/de/mathed.lyx \ + examples/de/multicol.lyx + +esexamplesdir = $(pkgdatadir)/examples/es +dist_esexamples_DATA = \ + examples/es/ejemplo_con_lyx.lyx \ + examples/es/ejemplo_sin_lyx.lyx \ + examples/es/splash.lyx + +euexamplesdir = $(pkgdatadir)/examples/eu +dist_euexamples_DATA = \ + examples/eu/adibide_gordina.lyx \ + examples/eu/adibide_lyx-atua.lyx \ + examples/eu/splash.lyx + +frexamplesdir = $(pkgdatadir)/examples/fr +dist_frexamples_DATA = \ + examples/fr/AlignementDecimal.lyx \ + examples/fr/CV.lyx \ + examples/fr/ExemplesTableaux.lyx \ + examples/fr/Foils.lyx \ + examples/fr/ListesPuces.lyx \ + examples/fr/Minipage.lyx \ + examples/fr/exemple_brut.lyx \ + examples/fr/exemple_lyxifie.lyx \ + examples/fr/mathed.lyx \ + examples/fr/multicol.lyx \ + examples/fr/splash.lyx + +glexamplesdir = $(pkgdatadir)/examples/gl +dist_glexamples_DATA = \ + examples/gl/exemplo_bruto.lyx \ + examples/gl/exemplo_lyxificado.lyx \ + examples/gl/splash.lyx + +heexamplesdir = $(pkgdatadir)/examples/he +dist_heexamples_DATA = \ + examples/he/example_raw.lyx \ + examples/he/he_example_lyxified.lyx \ + examples/he/he_example_raw.lyx + +huexamplesdir = $(pkgdatadir)/examples/hu +dist_huexamples_DATA = \ + examples/hu/splash.lyx + +itexamplesdir = $(pkgdatadir)/examples/it +dist_itexamples_DATA = \ + examples/it/ItemizeBullets.lyx \ + examples/it/splash.lyx + +nlexamplesdir = $(pkgdatadir)/examples/nl +dist_nlexamples_DATA = \ + examples/nl/multicol.lyx \ + examples/nl/opsommingstekens.lyx \ + examples/nl/splash.lyx \ + examples/nl/voorbeeld_ruw.lyx \ + examples/nl/voorbeeld_verlyxt.lyx + +plexamplesdir = $(pkgdatadir)/examples/pl +dist_plexamples_DATA = \ + examples/pl/splash.lyx + +ptexamplesdir = $(pkgdatadir)/examples/pt +dist_ptexamples_DATA = \ + examples/pt/splash.lyx + +roexamplesdir = $(pkgdatadir)/examples/ro +dist_roexamples_DATA = \ + examples/ro/splash.lyx + +ruexamplesdir = $(pkgdatadir)/examples/ru +dist_ruexamples_DATA = \ + examples/ru/splash.lyx + +slexamplesdir = $(pkgdatadir)/examples/sl +dist_slexamples_DATA = \ + examples/sl/primer_lyxan.lyx \ + examples/sl/primer_surov.lyx \ + examples/sl/splash.lyx + examplesdir = $(pkgdatadir)/examples dist_examples_DATA = \ examples/Foils.lyx \ @@ -99,77 +214,25 @@ examples/beamer-knight4-mask.png \ examples/beamer-knight4.png \ examples/beamerlyxexample1.lyx \ - examples/ca_splash.lyx \ examples/chess-article.lyx \ examples/chessgame.lyx \ - examples/cs_splash.lyx \ examples/currency.lyx \ examples/cv.lyx \ - examples/da_splash.lyx \ - examples/de_ItemizeBullets.lyx \ - examples/de_Lebenslauf.lyx \ - examples/de_Minipage.lyx \ - examples/de_TableExamples.lyx \ - examples/de_Waehrungen.lyx \ - examples/de_beispiel_gelyxt.lyx \ - examples/de_beispiel_roh.lyx \ - examples/de_decimal.lyx \ - examples/de_splash.lyx \ - examples/de_mathed.lyx \ - examples/de_multicol.lyx \ examples/decimal.lyx \ examples/docbook_article.lyx \ - examples/es_ejemplo_con_lyx.lyx \ - examples/es_ejemplo_sin_lyx.lyx \ - examples/es_splash.lyx \ - examples/eu_adibide_gordina.lyx \ - examples/eu_adibide_lyx-atua.lyx \ - examples/eu_splash.lyx \ examples/example_lyxified.lyx \ examples/example_raw.lyx \ - examples/fr_AlignementDecimal.lyx \ - examples/fr_CV.lyx \ - examples/fr_ExemplesTableaux.lyx \ - examples/fr_Foils.lyx \ - examples/fr_ListesPuces.lyx \ - examples/fr_Minipage.lyx \ - examples/fr_exemple_brut.lyx \ - examples/fr_exemple_lyxifie.lyx \ - examples/fr_mathed.lyx \ - examples/fr_multicol.lyx \ - examples/fr_splash.lyx \ - examples/gl_exemplo_bruto.lyx \ - examples/gl_exemplo_lyxificado.lyx \ - examples/gl_splash.lyx \ - examples/he_example_raw.lyx \ - examples/he_he_example_lyxified.lyx \ - examples/he_he_example_raw.lyx \ - examples/hu_splash.lyx \ examples/iecc05.fen \ examples/iecc07.fen \ examples/iecc12.fen \ - examples/it_ItemizeBullets.lyx \ - examples/it_splash.lyx \ examples/landslide.lyx \ examples/listerrors.lyx \ examples/mathed.lyx \ examples/multicol.lyx \ - examples/nl_multicol.lyx \ - examples/nl_opsommingstekens.lyx \ - examples/nl_splash.lyx \ - examples/nl_voorbeeld_ruw.lyx \ - examples/nl_voorbeeld_verlyxt.lyx \ examples/noweb2lyx.lyx \ - examples/pl_splash.lyx \ - examples/pt_splash.lyx \ - examples/ru_splash.lyx \ examples/script_form.lyx \ - examples/sl_primer_lyxan.lyx \ - examples/sl_primer_surov.lyx \ - examples/sl_splash.lyx \ examples/splash.lyx \ - examples/g-brief2.lyx \ - examples/ro_splash.lyx + examples/g-brief2.lyx imagesdir = $(pkgdatadir)/images dist_images_DATA = \ Index: development/scons/scons_manifest.py =================================================================== --- development/scons/scons_manifest.py (révision 17340) +++ development/scons/scons_manifest.py (copie de travail) @@ -1304,27 +1304,76 @@ lib_bind_files = Split(''' + de/menus.bind + fi/menus.bind + pt/menus.bind + sv/menus.bind broadway.bind cua.bind cyrkeys.bind - de_menus.bind emacs.bind - fi_menus.bind greekkeys.bind hollywood.bind latinkeys.bind mac.bind math.bind menus.bind - pt_menus.bind sciword.bind - sv_menus.bind xemacs.bind aqua.bind ''') lib_examples_files = Split(''' + ca/splash.lyx + cs/splash.lyx + da/splash.lyx + de/ItemizeBullets.lyx + de/Lebenslauf.lyx + de/Minipage.lyx + de/TableExamples.lyx + de/Waehrungen.lyx + de/beispiel_gelyxt.lyx + de/beispiel_roh.lyx + de/decimal.lyx + de/splash.lyx + de/mathed.lyx + de/multicol.lyx + es/ejemplo_con_lyx.lyx + es/ejemplo_sin_lyx.lyx + es/splash.lyx + eu/adibide_gordina.lyx + eu/adibide_lyx-atua.lyx + eu/splash.lyx + fr/AlignementDecimal.lyx + fr/CV.lyx + fr/ExemplesTableaux.lyx + fr/Foils.lyx + fr/ListesPuces.lyx + fr/Minipage.lyx + fr/exemple_brut.lyx + fr/exemple_lyxifie.lyx + fr/mathed.lyx + fr/multicol.lyx + fr/splash.lyx + he/example_raw.lyx + he/he_example_lyxified.lyx + he/he_example_raw.lyx + hu/splash.lyx + it/ItemizeBullets.lyx + it/splash.lyx + nl/multicol.lyx + nl/opsommingstekens.lyx + nl/splash.lyx + nl/voorbeeld_ruw.lyx + nl/voorbeeld_verlyxt.lyx + pl/splash.lyx + pt/splash.lyx + ru/splash.lyx + sl/primer_lyxan.lyx + sl/primer_surov.lyx + sl/splash.lyx + ro/splash.lyx Foils.lyx ItemizeBullets.lyx Literate.lyx @@ -1346,74 +1395,25 @@ beamer-knight4-mask.png beamer-knight4.png beamerlyxexample1.lyx - ca_splash.lyx chess-article.lyx chessgame.lyx - cs_splash.lyx currency.lyx cv.lyx - da_splash.lyx - de_ItemizeBullets.lyx - de_Lebenslauf.lyx - de_Minipage.lyx - de_TableExamples.lyx - de_Waehrungen.lyx - de_beispiel_gelyxt.lyx - de_beispiel_roh.lyx - de_decimal.lyx - de_splash.lyx - de_mathed.lyx - de_multicol.lyx decimal.lyx docbook_article.lyx - es_ejemplo_con_lyx.lyx - es_ejemplo_sin_lyx.lyx - es_splash.lyx - eu_adibide_gordina.lyx - eu_adibide_lyx-atua.lyx - eu_splash.lyx example_lyxified.lyx example_raw.lyx - fr_AlignementDecimal.lyx - fr_CV.lyx - fr_ExemplesTableaux.lyx - fr_Foils.lyx - fr_ListesPuces.lyx - fr_Minipage.lyx - fr_exemple_brut.lyx - fr_exemple_lyxifie.lyx - fr_mathed.lyx - fr_multicol.lyx - fr_splash.lyx - he_example_raw.lyx - he_he_example_lyxified.lyx - he_he_example_raw.lyx - hu_splash.lyx iecc05.fen iecc07.fen iecc12.fen - it_ItemizeBullets.lyx - it_splash.lyx landslide.lyx listerrors.lyx mathed.lyx multicol.lyx - nl_multicol.lyx - nl_opsommingstekens.lyx - nl_splash.lyx - nl_voorbeeld_ruw.lyx - nl_voorbeeld_verlyxt.lyx noweb2lyx.lyx - pl_splash.lyx - pt_splash.lyx - ru_splash.lyx script_form.lyx - sl_primer_lyxan.lyx - sl_primer_surov.lyx - sl_splash.lyx splash.lyx g-brief2.lyx - ro_splash.lyx ''') @@ -2259,63 +2259,63 @@ lib_doc_files = Split(''' - cs_Tutorial.lyx + cs/Tutorial.lyx + da/Intro.lyx + de/Customization.lyx + de/Extended.lyx + de/FAQ.lyx + de/Intro.lyx + de/Tutorial.lyx + de/UserGuide.lyx + es/Intro.lyx + es/Tutorial.lyx + es/EmbeddedObjects.lyx + eu/Customization.lyx + eu/Extended.lyx + eu/FAQ.lyx + eu/Intro.lyx + eu/Tutorial.lyx + eu/UserGuide.lyx + fr/Customization.lyx + fr/Extended.lyx + fr/FAQ.lyx + fr/Intro.lyx + fr/Tutorial.lyx + fr/UserGuide.lyx + he/Intro.lyx + he/Tutorial.lyx + hu/Intro.lyx + hu/Tutorial.lyx + it/Customization.lyx + it/Intro.lyx + it/Tutorial.lyx + it/UserGuide.lyx + nl/Intro.lyx + nl/Tutorial.lyx + nb/Intro.lyx + pl/Extended.lyx + pl/Intro.lyx + pl/Tutorial.lyx + pt/Intro.lyx + pt/Tutorial.lyx + ro/Intro.lyx + ru/FAQ.lyx + ru/Intro.lyx + ru/Tutorial.lyx + sk/Tutorial.lyx + sk/UserGuide.lyx + sl/Intro.lyx + sl/Tutorial.lyx + sv/Intro.lyx + sv/Tutorial.lyx Customization.lyx - da_Intro.lyx - de_Customization.lyx - de_Extended.lyx - de_FAQ.lyx - de_Intro.lyx - de_Tutorial.lyx - de_UserGuide.lyx DocStyle.lyx - es_Intro.lyx - es_Tutorial.lyx - es_EmbeddedObjects.lyx - eu_Customization.lyx - eu_Extended.lyx - eu_FAQ.lyx - eu_Intro.lyx - eu_Tutorial.lyx - eu_UserGuide.lyx EmbeddedObjects.lyx Extended.lyx FAQ.lyx - fr_Customization.lyx - fr_Extended.lyx - fr_FAQ.lyx - fr_Intro.lyx - fr_Tutorial.lyx - fr_UserGuide.lyx - he_Intro.lyx - he_Tutorial.lyx - hu_Intro.lyx - hu_Tutorial.lyx Intro.lyx - it_Customization.lyx - it_Intro.lyx - it_Tutorial.lyx - it_UserGuide.lyx LaTeXConfig.lyx.in - nl_Intro.lyx - nl_Tutorial.lyx - nb_Intro.lyx - pl_Extended.lyx - pl_Intro.lyx - pl_Tutorial.lyx - pt_Intro.lyx - pt_Tutorial.lyx Reference.lyx - ro_Intro.lyx - ru_FAQ.lyx - ru_Intro.lyx - ru_Tutorial.lyx - sk_Tutorial.lyx - sk_UserGuide.lyx - sl_Intro.lyx - sl_Tutorial.lyx - sv_Intro.lyx - sv_Tutorial.lyx Tutorial.lyx UserGuide.lyx escher-lsd.eps