Merge branch 'master' into lilypond/translation

Conflicts:
	scripts/build/create-weblinks-itexi.py

diff --combined make/website.make
index beaff7c8217f555e2ef12ec15829a4d88b71054c,2ac54c5a4308354298444f5cb3e8b5ce889ac0e8..7d6ed7cb84f1d6e107e6514d7526b2f27362ec50
--- 1/make/website.make
--- 2/make/website.make
+++ b/make/website.make
@@@ -16,18 -16,18 +16,18 @@@ ifeq ($(WEBSITE_ONLY_BUILD),1
    top-htaccess=$(trusted-dir)/lilypond.org.htaccess
    dir-htaccess=$(trusted-dir)/website-dir.htaccess
    TEXI2HTML_PROGRAM=$(HOME)/usr/bin/texi2html
-   EXAMPLES=$(HOME)/lilypond/media/ly-examples/
+   EXAMPLES=$(HOME)/lilypond/media/ly-examples
    PICTURES=$(HOME)/lilypond/media/pictures
  else
    ### for normal git
-   script-dir=$(top-src-dir)/scripts/build/
+   script-dir=$(top-src-dir)/scripts/build
    texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
    top-htaccess=$(top-src-dir)/Documentation/web/server/lilypond.org.htaccess
    dir-htaccess=$(top-src-dir)/Documentation/web/server/website-dir.htaccess
    include $(config_make)
    # I assume this is run from top-build-dir
-   EXAMPLES=Documentation/web/ly-examples/out-www/
-   PICTURES=Documentation/pictures/out-www/
+   EXAMPLES=Documentation/web/ly-examples/out-www
+   PICTURES=Documentation/pictures/out-www
  endif
  
  
@@@ -35,9 -35,8 +35,9 @@@
  OUT=out-website
  
  ### only update this when the language compiles correctly!
 -# LANGUAGES = (site, de, es, fr, hu, it, ja, nl)
 -WEB_LANGS = es fr it nl de hu ja
 +# LANGUAGES = (site, cs, de, es, fr, hu, it, ja, nl, zh)
 +#WEB_LANGS = de es fr hu it ja nl zh cs
 +WEB_LANGS = cs de es fr hu it ja nl zh
  
  TEXI2HTML=ONLY_WEB=1 TOP_SRC_DIR=$(top-src-dir) DEPTH=$(depth) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
  
@@@ -48,7 -47,7 +48,7 @@@ MASS_LINK=python $(script-dir)/mass-lin
  WEB_POST=python $(script-dir)/website_post.py
  WEB_BIBS=python $(script-dir)/bib2texi.py
  
- SERVER_FILES=$(top-src-dir)/Documentation/web/server/
+ SERVER_FILES=$(top-src-dir)/Documentation/web/server
  
  # don't include web
  MANUALS=$(wildcard $(top-src-dir)/Documentation/*.tely)
@@@ -65,7 -64,7 +65,7 @@@ website-version
  website-xrefs: website-version
        for l in '' $(WEB_LANGS); do \
                $(EXTRACT_TEXI_FILENAMES) \
-                       -I $(top-src-dir)/Documentation/ \
+                       -I $(top-src-dir)/Documentation \
                        -I $(top-src-dir)/Documentation/"$$l" \
                        -I $(OUT) -o $(OUT) --split=node \
                        $(top-src-dir)/Documentation/"$$l"/web.texi ;\
@@@ -75,20 -74,20 +75,20 @@@
                        d=`basename "$$b" .tely`; \
                        if [ -e "$$n" ] ; then \
                                $(EXTRACT_TEXI_FILENAMES) \
-                               -I $(top-src-dir)/Documentation/ \
+                               -I $(top-src-dir)/Documentation \
                                -I $(top-src-dir)/Documentation/"$$l" \
-                               -I $(top-src-dir)/Documentation/"$$l"/"$$d"/ \
+                               -I $(top-src-dir)/Documentation/"$$l"/"$$d" \
                                -I $(OUT) -o $(OUT) "$$n" ; \
                        fi ; \
                done; \
        done;
  
  website-bibs: website-version
-       BSTINPUTS=$(top-src-dir)/Documentation/web/ \
+       BSTINPUTS=$(top-src-dir)/Documentation/web \
                $(WEB_BIBS) -s web \
                -o $(OUT)/others-did.itexi \
                $(top-src-dir)/Documentation/web/others-did.bib
-       BSTINPUTS=$(top-src-dir)/Documentation/web/ \
+       BSTINPUTS=$(top-src-dir)/Documentation/web \
                $(WEB_BIBS) -s web \
                -o $(OUT)/we-wrote.itexi \
                $(top-src-dir)/Documentation/web/we-wrote.bib
@@@ -103,7 -102,7 +103,7 @@@ website-texinfo: website-version websit
                $(TEXI2HTML) --prefix=index \
                        --split=section \
                        --I=$(top-src-dir)/Documentation/"$$l" \
-                       --I=$(top-src-dir)/Documentation/ \
+                       --I=$(top-src-dir)/Documentation \
                        --I=$(OUT) \
                        $$langopt \
                        --init-file=$(texi2html-init-file) \
@@@ -115,11 -114,11 +115,11 @@@
  
  
  website-css:
-       cp $(top-src-dir)/Documentation/css/*.css $(OUT)/website/
+       cp $(top-src-dir)/Documentation/css/*.css $(OUT)/website
  
  website-pictures:
-       mkdir -p $(OUT)/website/pictures/
-       cp $(PICTURES)/* $(OUT)/website/pictures/
+       mkdir -p $(OUT)/website/pictures
+       cp $(PICTURES)/* $(OUT)/website/pictures
        ln -sf website/pictures $(OUT)/pictures
  
  website-examples:
@@@ -127,11 -126,11 +127,11 @@@
        cp $(EXAMPLES)/* $(OUT)/website/ly-examples
  
  web-post:
-       $(WEB_POST) $(OUT)/website/
+       $(WEB_POST) $(OUT)/website
  
  website: website-texinfo website-css website-pictures website-examples web-post
-       cp $(SERVER_FILES)/favicon.ico $(OUT)/website/
-       cp $(SERVER_FILES)/robots.txt $(OUT)/website/
+       cp $(SERVER_FILES)/favicon.ico $(OUT)/website
+       cp $(SERVER_FILES)/robots.txt $(OUT)/website
        cp $(top-htaccess) $(OUT)/.htaccess
        cp $(dir-htaccess) $(OUT)/website/.htaccess
  

diff --combined scripts/build/create-weblinks-itexi.py
index 5b38c0c96be770cc051e4dc644d3e1491d41e0d5,97a53694a290597d3949d945eda8b03c40e97118..c2f4554bbd2774670a5c5737007c05ce26f0f03e
--- 1/scripts/build/create-weblinks-itexi.py
--- 2/scripts/build/create-weblinks-itexi.py
+++ b/scripts/build/create-weblinks-itexi.py
@@@ -15,12 -15,11 +15,12 @@@ depth = "../
  ### translation data -- shouldn't be here; see issue
  ### http://code.google.com/p/lilypond/issues/detail?id=1050
  
 -langs = ['', 'de', 'es', 'fr', 'hu', 'it', 'ja', 'nl']
 +#langs = ['', 'cs', 'de', 'es', 'fr', 'hu', 'it', 'ja', 'nl', 'zh']
 +langs = ['', 'cs', 'de', 'es', 'fr', 'hu', 'it', 'ja', 'nl', 'zh']
  
  # Get/update node translations
  '''
 -for i in de es fr hu it ja nl; do
 +for i in cs de es fr hu it ja nl zh; do
      echo "'"$i"': {"
      (echo '--' ; grep -nH -B1 translationof Documentation/$i/web/* ) \
          | pytt '^--\n.*@(?:unnum|sub)[^ ]* (.*)\n.*@translationof (.*)\n' "'\2': '\1',\n" \
@@@ -120,20 -119,21 +120,19 @@@ translations = 
          'Snippets': 'Kódrészletek',
          'Web': 'Web',
          'Changes': 'Változások',
 -
 -        #TODO
          'Extending': 'Bővítés',
          'Internals': 'Belső működés',
          'Contributor': 'Közreműködés',
  
- # keep the spaces!
          ' (split HTML)': ' (HTML oldalak)',
          ' (big HTML)': ' (egy nagy HTML oldal)',
  
 -        'Regression tests for ': 'Regressziós tesztek a következőhöz: ',
 -        'PDF of regtests for ': 'Regressziós tesztek PDF formátumban a következőhöz: ',
 -        'MusicXML Regression tests for ': 'MusicXML regressziós tesztek a következőhöz: ',
 -        'PDF of MusicXML regtests for ': 'MusicXML regressziós tesztek PDF formátumban a következőhöz: ',
 +        'Regression tests for ': 'Regressziós tesztek - verzió: ',
 +        'PDF of regtests for ': 'PDF formátumban - verzió: ',
 +        'MusicXML Regression tests for ': 'MusicXML regressziós tesztek - verzió: ',
 +        'PDF of MusicXML regtests for ': 'PDF formátumban - verzió: ',
  
 -        'Doc tarball for ': 'Doc tarball a következőhöz: ',
 +        'Doc tarball for ': 'Tömörített csomag - verzió: ',
          ' (did not exist in 2.12)': ' (nem létezett a 2.12-es verzióban)',
          },
      'ja': {
@@@ -192,32 -192,6 +191,32 @@@
          'Doc tarball for ': 'Tarball met documentation voor ',
          ' (did not exist in 2.12)': ' (bestond nog niet in 2.12)',
       },
 +    'zh': {
 +        'Source': 0,
 +        'Learning': 0,
 +        'Music glossary': 0,
 +        'Essay': 0,
 +        'Notation': 0,
 +        'Usage': 0,
 +        'Snippets': 0,
 +        'Web': 0,
 +        'Changes': 0,
 +
 +        'Extending': 0,
 +        'Internals': 0,
 +        'Contributor': 0,
 +
 +        ' (split HTML)': 0,
 +        ' (big HTML)': 0,
 +
 +        'Regression tests for ': 0,
 +        'PDF of regtests for ': 0,
 +        'MusicXML Regression tests for ': 0,
 +        'PDF of MusicXML regtests for ': 0,
 +
 +        'Doc tarball for ': 0,
 +        ' (did not exist in 2.12)': 0,
 +        },
      }