From 998c822a2adead0ad7c0886c5e8d647e646a1926 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 31 May 2005 15:44:49 +0000
Subject: [PATCH] * make/lilypond.fedora.spec.in (Group): remove
lilypond-pdfpc-helper.
* scripts/GNUmakefile (SEXECUTABLES): remove
lilypond-pdfpc-helper. Use lilypond-invoke-editor instead.
---
ChangeLog | 6 ++
make/lilypond.fedora.spec.in | 2 -
ps/music-drawing-routines.ps | 27 ++++++++
scm/lily.scm | 2 +-
scripts/GNUmakefile | 2 +-
scripts/lilypond-pdfpc-helper.py | 112 -------------------------------
6 files changed, 35 insertions(+), 116 deletions(-)
delete mode 100644 scripts/lilypond-pdfpc-helper.py
diff --git a/ChangeLog b/ChangeLog
index 52ac01a242..9c437edecd 100644
--- 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 0e451546e0..d83a1de2ce 100644
--- 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 85434be8a8..fff7dfd752 100644
--- 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 903df5b2f8..e427012ad1 100644
--- 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 30ffc7f870..330d34f915 100644
--- 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
index cfd086fe2f..0000000000
--- 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')
-
-
-
--
2.39.5