glilypond: change default to "pdf2eps"; several minor improvements.

3 files changed, 167 insertions, 70 deletions

diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
index 44aaa6d3e..242a56c92 100644
--- a/contrib/glilypond/ChangeLog
+++ b/contrib/glilypond/ChangeLog
@@ -1,3 +1,10 @@
+2015-09-10  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* glilypond.1.man: New default `pdf2eps'.  Several fixes.
+
+	* subs.pl: Replace `.PSPIC' by `$P_PIC'.  Set new default sub on
+	top.
+
 2015-08-22  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* glilypond.1.man: Rename `glilypond.man'.
diff --git a/contrib/glilypond/glilypond.1.man b/contrib/glilypond/glilypond.1.man
index e73f43a5a..af1bf3cae 100644
--- a/contrib/glilypond/glilypond.1.man
+++ b/contrib/glilypond/glilypond.1.man
@@ -14,7 +14,9 @@ glilypond \(em integrate lilypond parts into groff
 .\" --------------------------------------------------------------------
 .
 .de co
-Copyright \(co 2013-2014 Free Software Foundation, Inc.
+Copyright \(co 2013-2015 Free Software Foundation, Inc.
+
+Last update: 10 Sep 2015
 
 This file is part of glilypond, which is part of GNU groff, a free
 software project.
@@ -74,6 +76,9 @@ request, such that
 .BR groff (@MAN1EXT@)
 can transform it into a format that can be displayed directly.
 .
+.B .PDFPIC
+is available, but does on yet work with lilypond.
+.
 .
 .P
 Files in
@@ -84,6 +89,81 @@ can be provided as arguments.
 .
 .
 .\" --------------------------------------------------------------------
+.SH "WORKING GLILYPOND"
+.\" --------------------------------------------------------------------
+.
+Together with
+.BR .PSPIC ,
+.B glilypond can work only for
+.I troff
+devices without
+.I pdf
+and
+.I X
+devices.
+.
+.
+.P
+I.e. the following
+.B groff
+devices work,
+.BR -Tps ,
+.BR -Tdvi ,
+.BR -Thtml ,
+and
+.BR -Txhtml .
+.
+.
+.P
+I'm not sure about the
+.B ldp
+and
+.B lj4
+devices.
+.
+.
+.P
+In
+.BR groffer ,
+it is easier to use the following device options, either
+.
+.BR --ps ,
+.BR --div ,
+.BR --html,
+or
+.BR --xhtml .
+.
+.
+.P
+Unfortunately, the
+.B groff
+option
+.B -Tpdf
+does not work and the
+.B groffer
+default
+.I pdf
+works neither.
+.
+.
+.P
+But
+.B groffer
+has an additional
+.IR "pdf mode" ,
+not available in
+.BR groff .
+.
+It is based on the
+.I ps mode
+in
+.B groff
+and is called through
+.B groffer --pdf2
+.IR roff-file-with-lilypond .
+.
+.
+.\" --------------------------------------------------------------------
 .SH "OPTION OVERVIEW"
 .\" --------------------------------------------------------------------
 .
@@ -605,75 +685,10 @@ are needed for the display which can take a long time.
 .\" --------------------------------------------------------------------
 .
 .\" --------------------------------------------------------------------
-.SS "Mode ly2eps"
-.\" --------------------------------------------------------------------
-.
-This mode is the default.
-.
-It can also be chosen by the option
-.BR --ly2eps .
-.
-.
-.P
-In this mode, the
-.B .ly
-files are transformed by the
-.B lilypond
-program into many files of different formats, including
-.I eps
-files, using
-.RS
-.EX
-.BI "$ lilypond \-\-ps \-dbackend=eps \-dgs\-load\-fonts \-\-output=" file\-name
-.EE
-.RE
-for each
-.B .ly
-file.
-.
-The output
-.I file\-name
-must be provided without an extension, its directory is temporary.
-.
-.
-.P
-There are many
-.I EPS
-files created.
-.
-One having the complete transformed
-.B ly
-file, named
-.IB file\-name .eps \fR.\fP
-.
-.
-.P
-Moreover there are
-.I EPS
-files for each page, named
-.IB file\-name \- digit .eps \fR.\fP
-.
-.
-.P
-The last step to be done is replacing all
-.I lilypond
-parts by the collection of the corresponding
-.I EPS
-page files.
-.
-This is done by
-.I groff
-commands
-.EX
-.BI ".PSPIC " file-name \- digit .eps
-.EE
-.
-.
-.\" --------------------------------------------------------------------
 .SS "Mode pdf2eps"
 .\" --------------------------------------------------------------------
 .
-This mode can be chosen by the option
+This mode is the actual default and can also be chosen by the option
 .BR --pdf2eps .
 .
 .
@@ -761,6 +776,76 @@ command
 .
 .
 .\" --------------------------------------------------------------------
+.SS "Mode ly2eps"
+.\" --------------------------------------------------------------------
+.
+In earlier time, this mode was the default.
+.
+But now it does not work any more, so accept the new default
+.BR pdf2eps .
+.
+For testing, this mode can also be chosen by the
+.B glilypond
+option
+.BR --ly2eps .
+.
+.
+.P
+In this mode, the
+.B .ly
+files are transformed by the
+.B lilypond
+program into many files of different formats, including
+.I eps
+files, using
+.RS
+.EX
+.BI "$ lilypond \-\-ps \-dbackend=eps \-dgs\-load\-fonts \-\-output=" file\-name
+.EE
+.RE
+for each
+.B .ly
+file.
+.
+The output
+.I file\-name
+must be provided without an extension, its directory is temporary.
+.
+.
+.P
+There are many
+.I EPS
+files created.
+.
+One having the complete transformed
+.B ly
+file, named
+.IB file\-name .eps \fR.\fP
+.
+.
+.P
+Moreover there are
+.I EPS
+files for each page, named
+.IB file\-name \- digit .eps \fR.\fP
+.
+.
+.P
+The last step to be done is replacing all
+.I lilypond
+parts by the collection of the corresponding
+.I EPS
+page files.
+.
+This is done by
+.I groff
+commands
+.EX
+.BI ".PSPIC " file-name \- digit .eps
+.EE
+.
+.
+.\" --------------------------------------------------------------------
 .SH "THE GENERATED NEW ROFF STRUCTURE"
 .\" --------------------------------------------------------------------
 .
diff --git a/contrib/glilypond/subs.pl b/contrib/glilypond/subs.pl
index aa70dfea8..67e2c4f71 100644
--- a/contrib/glilypond/subs.pl
+++ b/contrib/glilypond/subs.pl
@@ -8,9 +8,11 @@ Subroutines for `glilypond'.
 Source file position: `<groff-source>/contrib/glilypond/subs.pl'
 Installed position: `<prefix>/lib/groff/glilypond/subs.pl'
 
-Copyright (C) 2013-2014  Free Software Foundation, Inc.
+Copyright (C) 2013-2015  Free Software Foundation, Inc.
   Written by Bernd Warken <groff-bernd.warken-72@web.de>
 
+Last update: 10 Sep 2015
+
 This file is part of `glilypond', which is part of `GNU groff'.
 
   `GNU groff' is free software: you can redistribute it and/or modify it
@@ -40,6 +42,9 @@ use integer;
 use utf8;
 use feature 'state';
 
+my $P_PIC;
+# $P_PIC = '.PDFPIC';
+$P_PIC = '.PSPIC';
 
 ########################################################################
 # subs for using several times
@@ -89,7 +94,7 @@ sub create_ly2eps {		       # `--ly2eps' default
 	  $file_path = File::Spec->catfile($eps_dir, $_);
 	}
       }
-      $out->print( '.PSPIC ' . $file_path );
+      $out->print( $P_PIC . ' ' . $file_path );
     }
   }				# end while readdir
   closedir( $dh );
@@ -144,7 +149,7 @@ sub create_pdf2eps {		       # `--pdf2eps'
     } # end Temp->{'eps_dir'}
   }
   # print into groff output
-  $out->print( '.PSPIC ' . $eps_path );
+  $out->print( $P_PIC . ' ' . $eps_path );
 }				# end sub create_pdf2eps()