* make/lilypond.fedora.spec.in (Group): remove

lilypond-pdfpc-helper.

* scripts/GNUmakefile (SEXECUTABLES): remove
lilypond-pdfpc-helper. Use lilypond-invoke-editor instead.

diff --git a/ChangeLog b/ChangeLog
index 52ac01a2427c0f909acabb685c62b81a408ef2c0..9c437edecdc1fafcd2108d28a114e473d8c0deae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-05-31  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * make/lilypond.fedora.spec.in (Group): remove
+       lilypond-pdfpc-helper.
+
+       * scripts/GNUmakefile (SEXECUTABLES): remove
+       lilypond-pdfpc-helper. Use lilypond-invoke-editor instead.
+
        * scm/font.scm (make-century-schoolbook-tree): add Mono as
        'typewriter family.
 

diff --git a/make/lilypond.fedora.spec.in b/make/lilypond.fedora.spec.in
index 0e451546e01a2e7382a87b31fbf74dd1d662ad79..d83a1de2ce735ba962430f58c7d1fd2d9a82d047 100644 (file)
--- a/make/lilypond.fedora.spec.in
+++ b/make/lilypond.fedora.spec.in
@@ -156,7 +156,6 @@ scrollkeeper-update
 %{_bindir}/lilypond-book
 %{_bindir}/mup2ly
 %{_bindir}/lilypond-ps2png
-%{_bindir}/lilypond-pdfpc-helper
 %{_bindir}/lilypond-invoke-editor
 
 %doc THANKS
@@ -179,7 +178,6 @@ scrollkeeper-update
 %{_mandir}/man1/lilypond-book.1.gz
 %{_mandir}/man1/mup2ly.1.gz
 %{_mandir}/man1/lilypond-ps2png.1.gz
-%{_mandir}/man1/lilypond-pdfpc-helper.1.gz
 %{_mandir}/man1/lilypond-invoke-editor.1.gz
 
 %{_datadir}/lilypond/@TOPLEVEL_VERSION@/

diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps
index 85434be8a8dca4d61e6ccdadcd5fce60d119647c..fff7dfd7528b822a22710fa9003a823011b41a1f 100644 (file)
--- a/ps/music-drawing-routines.ps
+++ b/ps/music-drawing-routines.ps
@@ -231,6 +231,33 @@ bind def
 } bind def
 
 
+%%%% JUNKME. use color & circle. 
+/draw_white_dot % x1 y2 R
+{
+%      0 360 arc fill stroke
+       0 360 arc closepath % fill stroke
+gsave
+ 1 setgray fill
+grestore
+%      0 360 arc closepath % fill stroke
+  0.05 setlinewidth 0 setgray stroke
+} bind def
+
+
+%% JUNKME: Use color.  
+/draw_white_text  % text scale font
+{
+  %font
+  findfont
+  %scale
+  exch scalefont setfont
+  1 setgray
+  0 0 moveto
+  %-0.05 -0.05 moveto
+  % text
+  show
+} bind def
+
 
 /draw_dashed_line % dash thickness dx dy
 {

diff --git a/scm/lily.scm b/scm/lily.scm
index 903df5b2f8e302276c588046f7bb0cbd9616a6b7..e427012ad1cb64593d81b3434dc7877e8ddfabc7 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -327,7 +327,7 @@ The syntax is the same as `define*-public'."
         (lambda () (ly:parse-file file-name))
         (lambda (x . args) (handler x file-name)))
 
-  (if #t
+  (if #f
       (dump-gc-protects)))
 
 (use-modules (scm editor))

diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
index 30ffc7f87046a9e0a7dcc4850738b180a14ad53a..330d34f915763e7a402a874cfc3c6874c78b78e0 100644 (file)
--- a/scripts/GNUmakefile
+++ b/scripts/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ..
 
-SEXECUTABLES=convert-ly lilypond-book abc2ly etf2ly mup2ly midi2ly lilypond-ps2png lilypond-pdfpc-helper lilypond-invoke-editor
+SEXECUTABLES=convert-ly lilypond-book abc2ly etf2ly mup2ly midi2ly lilypond-ps2png lilypond-invoke-editor
 
 STEPMAKE_TEMPLATES=script help2man po
 LOCALSTEPMAKE_TEMPLATES = lilypond

diff --git a/scripts/lilypond-pdfpc-helper.py b/scripts/lilypond-pdfpc-helper.py
deleted file mode 100644 (file)
index cfd086f..0000000
--- a/scripts/lilypond-pdfpc-helper.py
+++ /dev/null
@@ -1,112 +0,0 @@
-#!@PYTHON@
-import re
-import getopt
-import sys
-import os
-import string
-
-version = '@TOPLEVEL_VERSION@'
-
-localedir = '@localedir@'
-try:
-       import gettext
-       gettext.bindtextdomain ('lilypond', localedir)
-       gettext.textdomain ('lilypond')
-       _ = gettext.gettext
-except:
-       def _ (s):
-               return s
-       
-program_name = os.path.basename (sys.argv[0])
-print os.getcwd()
-def usage():
-       sys.stdout.write ('Usage: %s FILE:LINE:COLUMN' % program_name)
-       sys.stdout.write ('\n\n')
-       sys.stdout.write ('''PDF Point & Click helper.
-Start a text-editor when given textedit:///path/to/file:line:column URI.''')
-       sys.stdout.write ('\n\n')
-       sys.stdout.write (_ ("Report bugs to %s.") % "bug-lilypond@gnu.org")
-       sys.stdout.write ('\n')
-
-def print_version ():
-       sys.stdout.write (program_id ())
-       sys.stdout.write ('\n')
-       sys.stdout.write (_ ("""\
-This program is free software.  It is covered by the GNU General Public
-License and you are welcome to change it and/or distribute copies of it
-under certain conditions.  Invoke as `%s --warranty' for more
-information.
-""") % "lilypond")
-
-def program_id ():
-       return '%s (GNU LilyPond) %s' % (program_name, version)
-
-################################################################
-(options, files) = getopt.getopt (sys.argv[1:], 'hv', ['help','version'])
-
-for opt in options:
-       o = opt[0]
-       a = opt[1]
-       if o == '--help' or o == '-h':
-               usage ()
-               sys.exit (0)
-       if o == '--version' or o == '-v':
-               print_version ()
-               sys.exit (0)
-
-
-if not files:
-       usage()
-       sys.exit (1)
-       
-
-################################################################
-
-
-arg = files[0]
-
-arg = re.sub ('textedit://','', arg)
-
-match = re.match ('([^:]+):([^:]+):(.*)', arg)
-if not match:
-       sys.stderr.write (_("Not in FILE:LINE:COL format: ")
-                         + files[0])
-       sys.exit (1)
-
-(file, line, column) = tuple (match.groups())
-
-
-editor = ''
-try:
-       editor = os.environ['EDITOR']
-except KeyError:
-       pass
-ly_pc_editor = None
-try:
-       ly_pc_editor = os.environ['LYEDITOR']
-except KeyError:
-       pass
-
-
-if ly_pc_editor == None:
-       if  re.search ("emacs", editor):
-               ly_pc_editor = 'emacsclient --no-wait +%(line)s:%(column)s %(file)s'
-       elif re.search ('gvim', editor):
-               ly_pc_editor = 'gvim --remote +:%(line)s:norm%(column)s %(file)s'
-       elif re.search ('nedit', editor):
-               ly_pc_editor = 'nc -noask +%(line)s %(file)s'
-
-if not ly_pc_editor:
-       sys.stderr.write ("Need to set EDITOR or LYEDITOR")
-       sys.exit (1)
-
-command = ly_pc_editor % vars()
-
-print 'invoked with %s\ncalling %s\n' % (string.join (sys.argv),command)
-
-status = os.system (command)
-if status:
-       sys.stderr.write (_("Command failed: `%s' (status %d)") % (command, status) + '\n')
-
-
-