[Groff-commit] groff/contrib/lilypond ChangeLog groff_lilypond...

[Bernd Warken]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Bernd Warken <bwarken>  13/02/23 11:54:19

Modified files:
        contrib/lilypond: ChangeLog groff_lilypond.man groff_lilypond.pl 

Log message:
        Remove `.lilypond include' for lilypond regions, in groff parts it is 
still
        allowed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/lilypond/ChangeLog?cvsroot=groff&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/lilypond/groff_lilypond.man?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/lilypond/groff_lilypond.pl?cvsroot=groff&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/lilypond/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ChangeLog   23 Feb 2013 02:00:40 -0000      1.6
+++ ChangeLog   23 Feb 2013 11:54:18 -0000      1.7
@@ -1,5 +1,11 @@
 2013-02-23  Bernd Warken  <address@hidden>
 
+       * groff_lilypond_pl: Remove `.lilypond include' for lilypond
+       regions.  Within `groff' mode. it is still allowed.
+       * groff_lilypond.man: Update `.lilypond include'.
+
+2013-02-23  Bernd Warken  <address@hidden>
+
        New version v0.4 of groff_lilypond.
        * groff_lilypond_pl: Major rewrite.
        New options: --file_prefix, --temp_dir, and --license. 

Index: groff_lilypond.man
===================================================================
RCS file: /cvsroot/groff/groff/contrib/lilypond/groff_lilypond.man,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- groff_lilypond.man  23 Feb 2013 02:00:40 -0000      1.5
+++ groff_lilypond.man  23 Feb 2013 11:54:19 -0000      1.6
@@ -342,10 +342,14 @@
 .P
 Within a
 .FONT CI lilypond
-part, the content of all these files will be added to the actually
-generated
-.FONT CB .ly
-file.
+part, this inclusion is not possible.
+.
+So
+.FONT CB ".lilypond include"
+may not be used between
+.FONT CB ".lilypond start"
+and
+.FONT CB ".lilypond end" .R .
 .
 .
 .\" --------------------------------------------------------------------

Index: groff_lilypond.pl
===================================================================
RCS file: /cvsroot/groff/groff/contrib/lilypond/groff_lilypond.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- groff_lilypond.pl   23 Feb 2013 02:00:41 -0000      1.5
+++ groff_lilypond.pl   23 Feb 2013 11:54:19 -0000      1.6
@@ -9,7 +9,7 @@
 ########################################################################
 
 my $Version = 'v0.4'; # version of groff_lilypond
-my $LastUpdate = '22 Feb 2013';
+my $LastUpdate = '23 Feb 2013';
 
 
 my $License =    ### `$License' is the license for this file, `GPL' >= 3
@@ -331,7 +331,6 @@
 
 
                       'end' => sub {
-print STDERR "start: \n";
 
                         die "Line `.lilypond start' expected."
                           unless ( $lilypond_mode );
@@ -344,19 +343,20 @@
 
                       'include' => sub { # `.lilypond include file...'
 
+                        # this may not be used within lilypond mode
+                        next LILYPOND if ( $lilypond_mode );
+
                         my $file = &check_file( $arg2 );
                         next LILYPOND unless ( $file );
                         # file can be read now
 
-                        unless ( $lilypond_mode ) {
-                          # then FILELY must be opened
+                        # FILELY must be opened
                           $ly_number++;
                           $FileNumbered = $FilePrefix . $ly_number;
                           $FileLy =  $FileNumbered . '.ly';
 
                           open FILELY, ">", $FileLy or
-                            die "cannot open .ly file: $!";
-                        }
+                          die "cannot open `$FileLy' file: $!";
 
                         open FILE, "<", $file                # for reading
                           or die "File `$file' could not be read: $!";
@@ -366,10 +366,8 @@
                         }
                         close FILE;
 
-                        unless ($lilypond_mode) {
                           close FILELY;
                           &create_eps;
-                        } # end non-lilypond-mode
 
                         next LILYPOND;
                       }, # end `.lilypond include'
@@ -379,7 +377,7 @@
 
   sub check_file { # for argument of `.lilypond include'
     my $file = shift;
-print STDERR "##### $file\n";
+
     unless ( $file ) {
       print STDERR
        'Line ".lilypond include" without argument';
@@ -408,13 +406,17 @@
     if ( /^[.']\s*lilypond\s*(.*)\s*(.*)\s*$/ ) { # .lilypond ...
       my $arg1 = $1;
       my $arg2 = $2;
+
       if ( exists $lilypond_args{ $arg1 } ) {
        & { $lilypond_args{ $arg1 } }
+
       } else {
        # not a suitable argument of `.lilypond'
        print $_ . "\n";
       }
+
       next LILYPOND;
+
     }
 
     if ( $lilypond_mode ) { # do lilypond-mode