From: Joe Neeman <joeneeman@gmail.com>
Date: Wed, 31 Dec 2008 21:54:14 +0000 (+1100)
Subject: Merge commit 'origin' into includes
X-Git-Tag: release/2.12.2-1~32^2~17^2~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bb91de5b7f8c4f753452730101c2422946067cc3;hp=-c;p=lilypond.git

Merge commit 'origin' into includes
---

bb91de5b7f8c4f753452730101c2422946067cc3
diff --combined scm/lily.scm
index 2c1eb188e6,900c347c26..086d80f09f
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@@ -80,8 -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.")
@@@ -89,8 -87,6 +89,6 @@@
      (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")