Initial patch

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 64605cb98022b12cf075372c82009251fcd9cc29..7a48f722d3de7532f04b6833206b07e6bd551609 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -1,7 +1,8 @@
 depth = ..
 
 NAME = documentation
-SUBDIRS=user bibliography pictures topdocs misc
+LANGS = fr # don't enable unpolished or broken translations
+SUBDIRS=user bibliography pictures topdocs misc po $(LANGS)
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
@@ -27,3 +28,20 @@ OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 # cd $(outdir) rule gets bit hairy for --srcdir configure builds
 txt-to-html:
        $(PYTHON) $(step-bindir)/text2html.py $(OUT_TXT_FILES)
+
+new-lang:
+       @if (( $$(file -b $(ISOLANG)) == directory )) 2>/dev/null; \
+       then echo "Error: $(ISOLANG) directory already exists. Exiting." ; \
+       exit 3 ; \
+       fi
+       mkdir -p $(ISOLANG)/user
+       echo "ISOLANG = $(ISOLANG)" > $(ISOLANG)/GNUmakefile
+       echo "depth = ../$(depth)" >> $(ISOLANG)/GNUmakefile
+       echo -e "\ninclude \$$(depth)/make/doc-lang/root.make\n" >> $(ISOLANG)/GNUmakefile
+       echo "ISOLANG = $(ISOLANG)" > $(ISOLANG)/user/GNUmakefile
+       echo "depth = ../../$(depth)" >> $(ISOLANG)/user/GNUmakefile
+       echo -e "\ninclude \$$(depth)/make/doc-lang/user.make\n" >> $(ISOLANG)/user/GNUmakefile
+       $(PYTHON) $(depth)/buildscripts/texi-langutils.py -d $(outdir) -b "UNTRANSLATED NODE: IGNORE ME" -o doc.pot --skeleton --gettext ../user/lilypond.tely
+       mv $(outdir)/*.*tely $(ISOLANG)/user
+       msgmerge -U po/lilypond-doc.pot $(outdir)/doc.pot
+       cp po/lilypond-doc.pot po/$(ISOLANG).po

diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely
index 9ad1949cad7ea92d7ef517cc28c341247849be7d..32afbd6f1bf2e9df3ddc562e8a450eb1c8ea305a 100644 (file)
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/user/notation-appendices.itely
@@ -189,13 +189,13 @@ accessed directly using text markup such as @code{g^\markup @{
 
 
 @ignore
-@node All context properties
+@n ode All context properties
 @a ppendixsec All context properties
 
 @i nclude context-properties.tely
 
 
-@node Layout properties
+@n ode Layout properties
 @ap pendixsec Layout properties
 
 @in clude layout-properties.tely

diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
index d19a9a4b74fcb8fb5c04904ff31bb24d6c830165..134345ef818d58bbd6ca17316c142655f9acc70e 100644 (file)
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -270,6 +270,7 @@ underscore = _
 LANGUAGES = (
     ('site', 'English'),
     ('nl', 'Nederlands'),
+    ('fr', 'French')
     )
 
 language_available = _ ("Other languages: %s.") % "%(language_menu)s"