patch::: 1.3.131.jcn2

[lilypond.git] / ly / declarations-as.ly

diff --git a/ly/declarations-as.ly b/ly/declarations-as.ly
index 06acf86c1b606c338390048b28392b904e71d087..8c20b69d2a451159b728d1247d4f2a9b26e5b158 100644 (file)
--- a/ly/declarations-as.ly
+++ b/ly/declarations-as.ly
@@ -1,23 +1,11 @@
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% UGH UGH UGH UGHUGH FIXME
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -> duplication!
-
 breve = \duration #(make-duration -1 0)
-longa = \duration #'(make-duration -2 0 )
-maxima = \duration #'(make-duration  -3 0 )
-
-
-#(begin
-  (eval-string (ly-gulp-file "slur.scm"))
-  (eval-string (ly-gulp-file "generic-property.scm"))
-  (eval-string (ly-gulp-file "basic-properties.scm"))
- )
+longa = \duration #(make-duration -2 0 )
+maxima = \duration #(make-duration -3 0)
 
 \include "nederlands.ly"               % dutch
 \include "chord-modifiers.ly"
 \include "script.ly"
 
-
 % declarations for standard directions
 left = -1
 right = 1
@@ -27,28 +15,18 @@ start = -1
 stop = 1
 smaller = -1
 bigger = 1
-
 center=0
 
 break =  \penalty  -1000000; 
 noBreak =  \penalty 1000000; 
 \include "scale-definitions.ly"
 
-
 melisma = \property Staff.melismaBusy = ##t
 melismaEnd = \property Staff.melismaBusy = ##f
+papersize = "a4"
 
-%papersize = "a4"
-%\include "generic-paper.ly"
-
-#(eval-string (ly-gulp-file "paper.scm"))
-
-\paper {
-       texsetting = "";
-       pssetting = "";
-       scmsetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse;\n";% UGH. 
-}
-
+\include "engraver.ly"
+\include "generic-paper.ly"
 \include "paper-as9.ly"
 
 % ugh
@@ -60,7 +38,6 @@ melismaEnd = \property Staff.melismaBusy = ##f
 \include "property.ly"
 
 
-
 unusedEntry = \notes { c4 }            % reset default duration
 
 % music = "\melodic\relative c"