Restructure glilypond-files, add debug code.

Rewrite text lines in runoff.man.

5 files changed, 41 insertions, 28 deletions

diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
index 9279cf0b..45eeaf2b 100644
--- a/contrib/glilypond/ChangeLog
+++ b/contrib/glilypond/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-10  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* glilypond.pl: Correct position information.  Add debug code.
+
+	* args.pl, oop_fh.pl, subs.pl: Correct position information.
+
 2013-04-25  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* Makefile.sub: minor corrections.
diff --git a/contrib/glilypond/args.pl b/contrib/glilypond/args.pl
index dbfe7562..1a007ba5 100644
--- a/contrib/glilypond/args.pl
+++ b/contrib/glilypond/args.pl
@@ -5,13 +5,13 @@
 my $License = q*
 groff_lilypond - integrate `lilypond' into `groff' files
 
-Source file position: `<groff-source>/contrib/lilypond/groff_lilypond.pl'
-Installed position: `<prefix>/bin/groff_lilypond'
+Source file position: `<groff-source>/contrib/glilypond/args.pl'
+Installed position: `<prefix>/lib/groff/glilypond'
 
 Copyright (C) 2013 Free Software Foundation, Inc.
   Written by Bernd Warken <groff-bernd.warken-72@web.de>
 
-Last update: 25 Apr 2013
+Last update: 10 May 2013
 
 This file is part of `GNU groff'.
 
@@ -34,9 +34,9 @@ directory of the `groff' source package.  If not, see
 ##### end legalese
 
 
-use strict;
-use warnings;
-use diagnostics;
+# use strict;
+# use warnings;
+# use diagnostics;
 
 use integer;
 
diff --git a/contrib/glilypond/glilypond.pl b/contrib/glilypond/glilypond.pl
index ba46a9a0..a40c8d64 100755
--- a/contrib/glilypond/glilypond.pl
+++ b/contrib/glilypond/glilypond.pl
@@ -2,10 +2,20 @@
 
 package main;
 
-use strict;
-use warnings;
-use diagnostics;
+########################################################################
+# debugging
+########################################################################
+
+# See `Mastering Perl', chapter 4.
+
+# use strict;
+# use warnings;
+# use diagnostics;
 
+use Carp;
+$SIG[__DIE__] = sub { &Carp::croak; };
+
+use Data::Dumper;
 
 ########################################################################
 # Legalese
@@ -15,13 +25,13 @@ our $Legalese;
 
 {
   use constant VERSION => 'v1.1'; # version of glilypond
-  use constant LASTUPDATE => '25 Apr 2013'; # date of last update
+  use constant LASTUPDATE => '10 May 2013'; # date of last update
 
 ### This constant `LICENSE' is the license for this file `GPL' >= 3
   use constant LICENSE => q*
 glilypond - integrate `lilypond' into `groff' files
 
-Source file position: `<groff-source>/contrib/lilypond/glilypond.pl'
+Source file position: `<groff-source>/contrib/glilypond/glilypond.pl'
 Installed position: `<prefix>/bin/glilypond'
 
 Copyright (C) 2013 Free Software Foundation, Inc.
@@ -132,14 +142,11 @@ BEGIN {
   require 'subs.pl';
 }
 
-
+die "test: ";
 ########################################################################
 # OOP declarations for some file handles
 ########################################################################
 
-package main;
-use strict;
-
 require 'oop_fh.pl';
 
 our $stdout = new FH_STDOUT();
diff --git a/contrib/glilypond/oop_fh.pl b/contrib/glilypond/oop_fh.pl
index e256221f..36ee4f73 100644
--- a/contrib/glilypond/oop_fh.pl
+++ b/contrib/glilypond/oop_fh.pl
@@ -3,13 +3,13 @@ my $License = q*
 # Legalese
 ########################################################################
 
-Source file position: `<groff-source>/contrib/lilypond/oop_fh.pl'
-Installed position: `<prefix>/lib/groff/lilypond/oop_fh.pl'
+Source file position: `<groff-source>/contrib/glilypond/oop_fh.pl'
+Installed position: `<prefix>/lib/groff/glilypond/oop_fh.pl'
 
 Copyright (C) 2013 Free Software Foundation, Inc.
   Written by Bernd Warken <groff-bernd.warken-72@web.de>
 
-Last update: 25 Apr 2013
+Last update: 10 May 2013
 
 This file is part of `glilypond', which is part of `GNU groff'.
 
@@ -34,9 +34,9 @@ directory of the `groff' source package.  If not, see
 ##### end legalese
 
 
-use strict;
-use warnings;
-use diagnostics;
+# use strict;
+# use warnings;
+# use diagnostics;
 
 use integer;
 
@@ -83,7 +83,7 @@ use integer;
   @FH_STDOUT::ISA = qw( _FH_WRITE_OPENED );
 
   sub new {
-    &_FH_WRITE_OPENED::new( '_FH_WRITE__OPENED', *STDOUT );
+    &_FH_WRITE_OPENED::new( '_FH_WRITE_OPENED', *STDOUT );
   }
 
 }				# end FH_STDOUT
diff --git a/contrib/glilypond/subs.pl b/contrib/glilypond/subs.pl
index 548224a5..fa713d14 100644
--- a/contrib/glilypond/subs.pl
+++ b/contrib/glilypond/subs.pl
@@ -5,13 +5,13 @@ my $License = q*
 
 Subroutines for `glilypond'.
 
-Source file position: `<groff-source>/contrib/lilypond/subs.pl'
-Installed position: `<prefix>/lib7groff/lilypond/subs.pl'
+Source file position: `<groff-source>/contrib/glilypond/subs.pl'
+Installed position: `<prefix>/lib/groff/glilypond/subs.pl'
 
 Copyright (C) 2013 Free Software Foundation, Inc.
   Written by Bernd Warken <groff-bernd.warken-72@web.de>
 
-  Last update: 25 Apr 2013
+  Last update: 10 May 2013
 
 This file is part of `glilypond', which is part of `GNU groff'.
 
@@ -34,9 +34,9 @@ directory of the `groff' source package.  If not, see
 ##### end legalese
 
 
-use strict;
-use warnings;
-use diagnostics;
+# use strict;
+# use warnings;
+# use diagnostics;
 
 use integer;
 use utf8;