glilypond: version 1.3; make man-page compatible to doclifter

3 files changed, 68 insertions, 52 deletions

diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
index e8af4895b..079420c95 100644
--- a/contrib/glilypond/ChangeLog
+++ b/contrib/glilypond/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-06  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* glilypond.pl: New version 1.3
+
+	* glilypond.man: Make man-page compatible with doclifter.
+
 2014-07-04  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* glilypond.man: Transform to classical man-page style.
diff --git a/contrib/glilypond/glilypond.man b/contrib/glilypond/glilypond.man
index 1ced1e46c..ea63e91ca 100644
--- a/contrib/glilypond/glilypond.man
+++ b/contrib/glilypond/glilypond.man
@@ -1,6 +1,6 @@
 .TH glilypond @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
 .SH NAME
-glilypond \- integrate lilypond parts into groff
+glilypond \(em integrate lilypond parts into groff
 .
 .\" This .SH was moved to this place in order to appease `apropos'.
 .
@@ -8,67 +8,51 @@ glilypond \- integrate lilypond parts into groff
 .\" Legalese
 .\" --------------------------------------------------------------------
 .
-.de authors
-This file was written by Bernd Warken
-.MT groff\-bernd.warken\-72@web.de
-.ME .
-.
-Last update: 4 Jul 2014
-..
-.
-.
-.\" The following macro .copying contains the license information for this file.
-.de copying
-.nh
-.nf
-glilypond - integrate lilypond into groff files
+.ig
+glilypond - integrate `lilypond' parts into `groff' files
 
-Source file position: <groff-source>/contrib/lilypond/glilypond.man
-Installed position: <prefix>/share/man/man1/glilypond.1
+Source file position:  <groff_source_top>/contrib/glilypond.man
+Installed position:    <prefix>/share/man/man1/glilypond.1
 
-Copyright \(co 2013-2014
+This file was written by Bernd Warken <groff\-bernd.warken\-72@web.de>.
+.
+Last update: 5 Jul 2014
+
+Copyright 2013-2014
           Free Software Foundation, Inc.
 
-This file is part of GNU groff, a free software project.
+This file is part `glilypond', which is part of GNU `groff', a free
+software project.
 
-You can redistribute it and/or modify it under the terms of the
-.nh
-.B "GNU General Public License"
-.hy
-as published by the
-.nh
-.BR "Free Software Foundation" ,
-.hy
-version\~2.
+You can redistribute it and/or modify it under the terms of the "GNU
+General Public License version 2" as published by the "Free Software
+Foundation".
 
 The license text is available in the internet at
-.nh
-.UR http://\%www.gnu.org/\%licenses/\%gpl-2.0.html
-.UE .
-.hy
+<http://\%www.gnu.org/\%licenses/\%gpl-2.0.html>.
 ..
 .
-.
 .\" --------------------------------------------------------------------
 .\" Characters
 .\" --------------------------------------------------------------------
 .
-.ie t .char \[Ellipsis] \f[S]\N'188'\f[P]
-.el .char \[Ellipsis] \&.\|.\|.\&\
-.\" called by \[Ellipsis]
+.\" Ellipsis ...
+.ie t .ds EL \fS\N'188'\fP
+.el .ds EL \&.\|.\|.\&\
+.\" called with \*(EL
 .
 .ad l
 .
 .
 .\" --------------------------------------------------------------------
-.SH "SYNOPSIS"
+.SH SYNOPSIS
 .\" --------------------------------------------------------------------
 .
 .SY glilypond
-.OP "" options
-.OP -
-.OP --
-.OP "" "\%filespec \*[Ellipsis]"
+.OP \& options
+.OP \-
+.OP \-\-
+.OP \& "\%filespec \*(EL"
 .YS
 .
 .
@@ -107,15 +91,15 @@ can be provided as arguments.
 .nh
 .nf
 .TP
-.BR -? | -h | --help | --usage
+.BR \-? | \-h | \-\-help | \-\-usage
 Print help or usage information, then leave the program.
 .
 .TP
-.B --version
+.B \-\-version
 Print version information.
 .
 .TP
-.BR -l | --license
+.BR \-l | \-\-license
 Print license information.
 .fi
 .hy
@@ -126,7 +110,7 @@ Print license information.
 .\" --------------------------------------------------------------------
 .
 .TP
-.OP --ly2eps
+.OP \-\-ly2eps
 Here the
 .B lilypond
 program creates
@@ -137,7 +121,7 @@ This is the default.
 .
 .
 .TP
-.OP --pdf2eps
+.OP \-\-pdf2eps
 The program
 .B glilypond
 generates a
@@ -158,7 +142,7 @@ and
 .\" --------------------------------------------------------------------
 .
 .TP
-.BR -e | --eps_dir \fIdirectory_name\fP
+.BR \-e | \-\-eps_dir \fIdirectory_name\fP
 Normally all
 .I EPS
 files are sent to the temporary directory.
@@ -173,7 +157,7 @@ So at last, the temporary directory can be removed.
 .TP
 .BR -p | --prefix "\fI begin_of_name\fP"
 Normally all temporary files get names that start with the
-.BI ly \[Ellipsis]
+.BI ly \*(EL
 prefix.
 .
 With this option, you can freely change this prefix.
@@ -866,13 +850,39 @@ format.
 .\" --------------------------------------------------------------------
 .SH "AUTHORS"
 .\" --------------------------------------------------------------------
-.authors
+.
+This file was written by Bernd Warken
+.MT groff\-bernd.warken\-72@web.de
+.ME .
 .
 .
 .\" --------------------------------------------------------------------
 .SH "COPYING"
 .\" --------------------------------------------------------------------
-.copying
+.
+Copyright \(co 2013-2014
+          Free Software Foundation, Inc.
+.
+.P
+This file is part of GNU groff, a free software project.
+
+You can redistribute it and/or modify it under the terms of the
+.nh
+.B GNU General Public License
+version
+.B 2
+.RB ( GPL2 )
+.hy
+as published by the
+.nh
+.BR "Free Software Foundation" .
+.hy
+
+The license text is available in the internet at
+.nh
+.UR http://\%www.gnu.org/\%licenses/\%gpl-2.0.html
+.UE .
+.hy
 .
 .
 .\" --------------------------------------------------------------------
diff --git a/contrib/glilypond/glilypond.pl b/contrib/glilypond/glilypond.pl
index 85ec22091..a956dbec1 100755
--- a/contrib/glilypond/glilypond.pl
+++ b/contrib/glilypond/glilypond.pl
@@ -24,8 +24,8 @@ use Data::Dumper;
 our $Legalese;
 
 {
-  use constant VERSION => 'v1.2'; # version of glilypond
-  use constant LASTUPDATE => '1 Jan 2014'; # date of last update
+  use constant VERSION => 'v1.3'; # version of glilypond
+  use constant LASTUPDATE => '5 Jul 2014'; # date of last update
 
 ### This constant `LICENSE' is the license for this file `GPL' >= 2
   use constant LICENSE => q*