Merge commit 'origin' into includes

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index bddb9982a7e7a4c819c60f86d0d7024ff74541f7..086d80f09f4d2b3e86e8438d4311a7d352002dc6 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -80,6 +80,8 @@ on errors, and print a stack trace.")
     
     (resolution 101 "resolution for generating PNG bitmaps")
     (read-file-list #f "Read files to be processed from command line arguments")
+    (relative-includes #f "When processing an \\include command, look for the included file
+relative to the current file (instead of the root file)")
 
     (safe #f "Run safely")
     (strict-infinity-checking #f "If yes, crash on encountering Inf/NaN.")
@@ -87,8 +89,6 @@ on errors, and print a stack trace.")
     (separate-log-files #f "Output to FILE.log per file.")
     (trace-memory-frequency #f "Record Scheme cell usage this many times per second, and dump to file.")
     (trace-scheme-coverage #f "Record coverage of Scheme files") 
-    (ttf-verbosity 0
-                  "how much verbosity for TTF font embedding?")
     (show-available-fonts #f
                          "List font names available.")
     (verbose ,(ly:command-line-verbose?) "value for the --verbose flag")