From ca5235fb2d419e41393e612567dd1c51c19e2e5b Mon Sep 17 00:00:00 2001
From: Valentin Villenave <valentin@villenave.net>
Date: Sun, 3 Oct 2010 17:36:26 +0200
Subject: [PATCH] Simple fix

As much as possible, avoid defining global variables in main.ly.
---
 lib/80-buildskel.scm | 15 ++++++++-------
 main.ly              |  2 +-
 scores/free/score.ly |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 scores/free/score.ly

diff --git a/lib/80-buildskel.scm b/lib/80-buildskel.scm
index 8f477a8..91a7ab1 100644
--- a/lib/80-buildskel.scm
+++ b/lib/80-buildskel.scm
@@ -64,7 +64,7 @@ markup exists."
                         part-timeline))
              >>
           #}
-          (begin (ly:debug-message "Variable ~a doesn't exist." mus-name)
+          (begin (ly:debug-message "Variable ~a doesn't exist." current-name)
                  (make-music 'Music 'void #t))))))
 
 (define newStaff
@@ -74,12 +74,13 @@ markup exists."
 ;; this staff (using appropriate suffixes)."
   (define-music-function (parser location name) (string?)
     (let* ((name (assoc-name lang:instruments name))
-           (music (ly:parser-lookup parser (string->symbol (string-append current-part name))))
+           (current-name (string-append current-part name))
+           (music (ly:parser-lookup parser (string->symbol current-name)))
            (instr (make-this-text name lang:instr-suffix))
            (short-instr (make-this-text name lang:short-instr-suffix))
            (lyrics (ly:parser-lookup parser
                                      (string->symbol
-                                      (string-append current-part name lang:lyrics-suffix)))))
+                                      (string-append current-name lang:lyrics-suffix)))))
       (if (ly:music? music)
           #{ <<
              \new Staff \with {
@@ -90,7 +91,7 @@ markup exists."
                $(if (ly:music? lyrics)
                   #{ \new Lyrics \lyricsto $name $lyrics #})
           >> #}
-          (begin (ly:debug-message "Variable ~a doesn't exist." mus-name)
+          (begin (ly:debug-message "Variable ~a doesn't exist." current-name)
               (make-music 'Music 'void #t))))))
 
 (define newLyrics
@@ -101,14 +102,14 @@ markup exists."
 ;; Create Lyrics contexts accordingly."
   (define-music-function (parser location name) (string?)
     (let* ((name (assoc-name lang:instruments name))
-           (mus-name (string-append current-part name)))
+           (current-name (string-append current-part name)))
       #{
         $(let* ((musiclist (list #{ {} #}))
                 (numlist (if (ly:get-option 'only-suffixed-varnames)
                             lang:numbers
                             (cons "" lang:numbers))))
           (map (lambda (x)
-                  (let* ((lyr-name (string-append mus-name lang:lyrics-suffix
+                  (let* ((lyr-name (string-append current-name lang:lyrics-suffix
                                                   (string-capitalize x)))
                         (lyrics (ly:parser-lookup parser (string->symbol lyr-name))))
                     (if (ly:music? lyrics)
@@ -131,7 +132,7 @@ markup exists."
                             lang:numbers
                             (cons "" lang:numbers))))
           (map (lambda (x)
-                  (let ((staff-name (string-append current-part mus-name (string-capitalize x))))
+                  (let ((staff-name (string-append current-part name (string-capitalize x))))
                      (append! musiclist (list
                         #{ \newStaff $staff-name #}))))
             lang:numbers)
diff --git a/main.ly b/main.ly
index ab052a5..3ce22bf 100644
--- a/main.ly
+++ b/main.ly
@@ -15,7 +15,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%% Language selection %%%%%%%%%%%%%%%%%%%%%%%%
 
 %% Source code language (see locale/ ) ----------------------------%
-input = "en"
+%input = "en"
 
 %% Edition localisation (if different) ----------------------------%
 %edition = "fr"
diff --git a/scores/free/score.ly b/scores/free/score.ly
new file mode 100644
index 0000000..df549eb
--- /dev/null
+++ b/scores/free/score.ly
@@ -0,0 +1 @@
+input = "en" 
-- 
2.11.4.GIT