wav2cdr (2.3.4-1) manpages.patch

Summary

 Makefile    |    2 
 help.-c     |  150 +++++++++++++++++++++++++++++------------------------------
 help.txt    |  150 +++++++++++++++++++++++++++++------------------------------
 wav2cdr.1   |   10 +--
 wav2cdr.txt |  152 +++++++++++++++++++++++++++++-------------------------------
 5 files changed, 231 insertions(+), 233 deletions(-)

    
download this patch

Patch contents

Description: A patch that fix some lintian warnings and deprecated binaries
Author: Edgar Antonio Palma de la Cruz <xbytemx@gmail.com>
---
Last-Update: 2011-07-05

--- wav2cdr-2.3.4.orig/Makefile
+++ wav2cdr-2.3.4/Makefile
@@ -129,7 +129,7 @@ AWK	= awk
 SED	= sed
 
 ## Strip backspace + following char
-CX	= cx -q bs
+CX	= col -bx
 
 
 
--- wav2cdr-2.3.4.orig/help.-c
+++ wav2cdr-2.3.4/help.-c
@@ -1,5 +1,7 @@
 "wav2cdr(1)                                                          wav2cdr(1)\n"
 "\n"
+"-e .ll 7.3i\n"
+"\n"
 "NAME\n"
 "       wav2cdr  -  converts  input in (or similar to) wav format to cdr format\n"
 "       suitable for writing onto audio CDs.\n"
@@ -47,26 +49,26 @@
 "\n"
 "       --fadein LEN\n"
 "              Fade in at the start over a duration of LEN.  The syntax for LEN\n"
-"              is the same as for a cut  number,  see  section  about  argument\n"
+"              is  the  same  as  for  a cut number, see section about argument\n"
 "              scanning below.  If cutting is active, fade-in is applied to the\n"
 "              beginning of each cut.\n"
 "\n"
-"              Fading in is performed by increasing the amplitude for  CD  sec-\n"
-"              tors  by  an  amount  derived  from  LEN over a duration of LEN.\n"
-"              --fadein 3 would result in the amplitude  of  the  first  sector\n"
-"              lowered  to 1/4, of the second sector to 2/4, and the third sec-\n"
-"              tor to 3/4. The fourth sector is unchanged and has then  reached\n"
+"              Fading  in  is performed by increasing the amplitude for CD sec-\n"
+"              tors by an amount derived from  LEN  over  a  duration  of  LEN.\n"
+"              --fadein  3  would  result  in the amplitude of the first sector\n"
+"              lowered to 1/4, of the second sector to 2/4, and the third  sec-\n"
+"              tor  to 3/4. The fourth sector is unchanged and has then reached\n"
 "              full amplitude.\n"
 "\n"
 "       --fadeout LEN\n"
-"              Fade  out at the end over a duration of LEN.  The syntax for LEN\n"
-"              is the same as for a cut  number,  see  section  about  argument\n"
+"              Fade out at the end over a duration of LEN.  The syntax for  LEN\n"
+"              is  the  same  as  for  a cut number, see section about argument\n"
 "              scanning below.  If cutting is active, fad-out is applied to the\n"
 "              end of each cut.\n"
 "\n"
-"              The computation is similar to --fadein. --fadein 3 would  result\n"
+"              The  computation is similar to --fadein. --fadein 3 would result\n"
 "              in the last 3 CD sectors having their amplitudes lowered to 3/4,\n"
-"              2/4, and 1/4. The (non-existant) following sector is assumed  to\n"
+"              2/4,  and 1/4. The (non-existant) following sector is assumed to\n"
 "              be silent.\n"
 "\n"
 "              To add silent sector(s) to the end of the audio file, use --end-\n"
@@ -74,14 +76,14 @@
 "\n"
 "              Fading out can only be performed if the input size can be deter-\n"
 "              mined (i.e. the input must be seekable and cannot be a pipe). If\n"
-"              cutting is active, the end of the cut is always  known  and  the\n"
+"              cutting  is  active,  the end of the cut is always known and the\n"
 "              fade-out can be applied.\n"
 "\n"
 "              If the fade-out starts before the fade-in is finished, both will\n"
 "              overlap, producing sensible results.\n"
 "\n"
 "       --fscale FLOAT\n"
-"              Scale data by FLOAT, i.e. multiply by FLOAT (1.0 does  nothing).\n"
+"              Scale data by FLOAT, i.e. multiply by FLOAT (1.0 does nothing).\n"
 "\n"
 "       -h, -u, --usage\n"
 "              Display usage.\n"
@@ -205,14 +207,14 @@
 "              Write data in cdr format (default). Sets the correct byte order.\n"
 "\n"
 "       --toraw\n"
-"              Write data in raw format. Byte order should  be  specified  with\n"
+"              Write  data  in  raw format. Byte order should be specified with\n"
 "              -o/-O (default big).\n"
 "\n"
 "       --towav\n"
 "              Write data in wav format. Sets the correct byte order.\n"
 "\n"
 "       --verbose\n"
-"              Produce  more  output.  Currently only used by --silencecuts and\n"
+"              Produce more output. Currently only used  by  --silencecuts  and\n"
 "              --silenceinfo.\n"
 "\n"
 "       --version, -V\n"
@@ -222,57 +224,57 @@
 "              names, or cut numbers if cutting is used.\n"
 "\n"
 "Command line option scanning:\n"
-"       From  left  to right. Later settings may override previous ones. Beware\n"
-"       to switch file formats before byte ordering, or a byte order  might  be\n"
-"       rejected  for the (then active) format. When not using cutting, remain-\n"
-"       ing arguments are used to fill up  input  and  output  filenames.  When\n"
-"       using  cutting, remaining arguments are assumed to be cut numbers. When\n"
-"       using negative cut numbers, use -- to terminate  option  processing  or\n"
-"       the  negative  numbers  can be mistaken as options (this is a must with\n"
+"       From left to right. Later settings may override previous  ones.  Beware\n"
+"       to  switch  file formats before byte ordering, or a byte order might be\n"
+"       rejected for the (then active) format. When not using cutting,  remain-\n"
+"       ing  arguments  are  used  to  fill up input and output filenames. When\n"
+"       using cutting, remaining arguments are assumed to be cut numbers.  When\n"
+"       using  negative  cut  numbers, use -- to terminate option processing or\n"
+"       the negative numbers can be mistaken as options (this is  a  must  with\n"
 "       GNU getopt()).\n"
 "\n"
 "       All options which take an argument denoting a time accept the following\n"
-"       number format. The number may be in decimal, octal (leading 0), or hex-\n"
-"       adecimal (leading 0x or 0X). A one-letter unit  may  be  following.  If\n"
+"       number format. The number may be in  decimal,  octal  (leading  0),  or\n"
+"       hexadecimal  (leading 0x or 0X). A one-letter unit may be following. If\n"
 "       there is space between the number and the unit, both must be quoted, as\n"
 "       in \x22""55 C\x22"". These units are recognised: b (bytes), C (audio CD sectors),\n"
-"       s  (seconds). When no unit is given, C is assumed. The progress display\n"
-"       might only show numbers in some of these units. Fractions  for  seconds\n"
+"       s (seconds). When no unit is given, C is assumed. The progress  display\n"
+"       might  only  show numbers in some of these units. Fractions for seconds\n"
 "       are allowed.\n"
 "\n"
-"       Negative  cut  numbers are only allowed if the input size can be deter-\n"
-"       mined (which will not be possible if the input comes from a pipe),  and\n"
-"       are  shown as the equivalent positive ones. If the last cut number is 0\n"
-"       it means the end of the file. If the input file size can not be  deter-\n"
+"       Negative cut numbers are only allowed if the input size can  be  deter-\n"
+"       mined  (which will not be possible if the input comes from a pipe), and\n"
+"       are shown as the equivalent positive ones. If the last cut number is  0\n"
+"       it  means the end of the file. If the input file size can not be deter-\n"
 "       mined the longest possible input (about 405 minutes) is substituted.\n"
 "\n"
 "       A filename of '-' is taken as stdin/stdout.\n"
 "\n"
-"       If  wav2cdr was compiled to use GNU getopt(), argument scanning is more\n"
+"       If wav2cdr was compiled to use GNU getopt(), argument scanning is  more\n"
 "       powerful and long options can be shortened to significance. Options are\n"
-"       also  re-ordered;  this  is nice but can be a trap. Use -- if in doubt,\n"
+"       also re-ordered; this is nice but can be a trap. Use --  if  in  doubt,\n"
 "       and don't mix options with filename or cut number arguments.\n"
 "\n"
 "Data formats:\n"
 "       All data handling currently assumes signed 16-bit integers, interleaved\n"
 "       for 2 channels, at a sampling rate of that of a CD. Only wav files with\n"
-"       these parameters can be read correctly. cdr files are in  that  format,\n"
-"       and  only  raw formats with these parameters can be processed. The only\n"
-"       flexibility allowed for raw is the byte order, which can  be  specified\n"
-"       for  both  reading  and  writing.  The byte ordering for wav and cdr is\n"
+"       these  parameters  can be read correctly. cdr files are in that format,\n"
+"       and only raw formats with these parameters can be processed.  The  only\n"
+"       flexibility  allowed  for raw is the byte order, which can be specified\n"
+"       for both reading and writing. The byte ordering  for  wav  and  cdr  is\n"
 "       fixed.\n"
 "\n"
 "Channel swapping:\n"
-"       Left and right channel are swapped, which is the same as swapping  con-\n"
+"       Left  and right channel are swapped, which is the same as swapping con-\n"
 "       secutive 16 bit values with each other. Also see 'CDR Format' below.\n"
 "\n"
 "Scaling / Volume change:\n"
-"       Scaling  can  be performed with either integer or floating point arith-\n"
-"       metic.  Integer arithmatic is faster but possibly not as precise.  Val-\n"
-"       ues  will  saturate  (i.e.  be  clipped), rather than be truncated. The\n"
-"       speed of this operation depends on the endianness of  the  input  data,\n"
-"       output  data,  and  host.  It  is slowest when bytes have to be swapped\n"
-"       before scaling and swapped back  after.   Negative  scale  factors  are\n"
+"       Scaling can be performed with either integer or floating  point  arith-\n"
+"       metic.   Integer arithmatic is faster but possibly not as precise. Val-\n"
+"       ues will saturate (i.e. be clipped),  rather  than  be  truncated.  The\n"
+"       speed  of  this  operation depends on the endianness of the input data,\n"
+"       output data, and host. It is slowest when  bytes  have  to  be  swapped\n"
+"       before  scaling  and  swapped  back  after.  Negative scale factors are\n"
 "       allowed but might be of dubious value.\n"
 "\n"
 "Mono / stereo:\n"
@@ -280,31 +282,31 @@
 "       is 2 channels with the same data. This can be useful in some cases.\n"
 "\n"
 "Output file naming:\n"
-"       Unless output is to stdout, the resulting filename is  the  name  given\n"
+"       Unless  output  is  to stdout, the resulting filename is the name given\n"
 "       with --outfile. A period and a 2-digit track number are appended.\n"
 "\n"
 "Input data splitting:\n"
-"       Input  data  can  be split into pieces resp. tracks. Currently cuts can\n"
-"       only be placed at multiples of audio CD sectors (at the  sector  bound-\n"
+"       Input data can be split into pieces resp. tracks.  Currently  cuts  can\n"
+"       only  be  placed at multiples of audio CD sectors (at the sector bound-\n"
 "       aries), whether the input format is cdr or not.\n"
 "\n"
-"       The  cuts are placed at the given positions, which must be in ascending\n"
-"       order (or equal). Negative numbers are counted  from  the  end  of  the\n"
-"       input  data.  This  only works if the input is seekable (Unix pipes are\n"
-"       not). Sectors of the input are numbered from  0.  Bytes  of  a  header,\n"
+"       The cuts are placed at the given positions, which must be in  ascending\n"
+"       order  (or  equal).  Negative  numbers  are counted from the end of the\n"
+"       input data. This only works if the input is seekable  (Unix  pipes  are\n"
+"       not).  Sectors  of  the  input  are numbered from 0. Bytes of a header,\n"
 "       which the input format might have, are not counted.\n"
 "\n"
-"       Any  number of cuts can be made, but only 99 tracks can be put on a CD.\n"
-"       All sectors before the first but not including the first sector  number\n"
+"       Any number of cuts can be made, but only 99 tracks can be put on a  CD.\n"
+"       All  sectors before the first but not including the first sector number\n"
 "       are discarded, as well as all sectors after and including the last sec-\n"
-"       tor number.  At least 2 sector numbers (cut numbers) must be given,  in\n"
+"       tor  number.  At least 2 sector numbers (cut numbers) must be given, in\n"
 "       which case one piece is cut out.\n"
 "\n"
-"       If  there are only 2 cut numbers (1 track to cut out) data can be writ-\n"
+"       If there are only 2 cut numbers (1 track to cut out) data can be  writ-\n"
 "       ten to stdout or file. More than one track can only be written to file,\n"
-"       the  track  number  will  be added as an extension to the filename.  To\n"
+"       the track number will be added as an extension  to  the  filename.   To\n"
 "       avoid the track number to be appended to the filename when only one cut\n"
-"       is  made,  don't use --outfile but write to stdout and use output redi-\n"
+"       is made, don't use --outfile but write to stdout and use  output  redi-\n"
 "       rection.\n"
 "\n"
 "        Example (assuming 50000 sectors in the input):\n"
@@ -315,19 +317,19 @@
 "                        40000-49999: discarded\n"
 "\n"
 "Cutting out silent intervals:\n"
-"       Assuming a digitised record is stored in record.wav, and is to  be  cut\n"
+"       Assuming  a  digitised record is stored in record.wav, and is to be cut\n"
 "       into tracks.\n"
 "\n"
 "         wav2cdr < record.wav > cuts --silencecuts --silencedelay 2s\n"
 "         wav2cdr < record.wav --of tracks --cut `cat cuts`\n"
 "\n"
-"       Will  store  the  tracks of the record in track.01, track.02, ..., with\n"
-"       the delay for cutting at a silent part set to 2 seconds. The  threshold\n"
-"       used  is  the  default. Note the `` syntax works under Unix and in this\n"
+"       Will store the tracks of the record in track.01,  track.02,  ...,  with\n"
+"       the  delay for cutting at a silent part set to 2 seconds. The threshold\n"
+"       used is the default. Note the `` syntax works under Unix  and  in  this\n"
 "       case puts the contents of file \x22""cuts\x22"" on the command line.\n"
 "\n"
 "Information about silences and actual sound parts:\n"
-"       --silenceinfo can be used in the same way as  --silencecuts.   It  pro-\n"
+"       --silenceinfo  can  be  used in the same way as --silencecuts.  It pro-\n"
 "       duces output like\n"
 "\n"
 "       (stdin):\n"
@@ -339,31 +341,31 @@
 "         DIFF  20603520 b,   8760 C,  116 s, 01:56.05 min\n"
 "          -->  21414960 b,   9105 C,  121 s, 02:01.02 min\n"
 "\n"
-"       showing  the beginning, length (\x22""DIFF\x22""), and end (\x22""-->\x22"") of both silent\n"
-"       (\x22""silnc\x22"") and and non-silent (\x22""AUDIO\x22"") intervals. This  is  useful  for\n"
+"       showing the beginning, length (\x22""DIFF\x22""), and end (\x22""-->\x22"") of both  silent\n"
+"       (\x22""silnc\x22"")  and  and  non-silent (\x22""AUDIO\x22"") intervals. This is useful for\n"
 "       examining existing tracks, but it can not be used with --cut.\n"
 "\n"
 "Messages:\n"
-"       Progress  messages and statistics are written to stderr when writing to\n"
-"       stdout, and to stdout when writing to file. It is currently not  possi-\n"
+"       Progress messages and statistics are written to stderr when writing  to\n"
+"       stdout,  and to stdout when writing to file. It is currently not possi-\n"
 "       ble to suppress this, other than by redirection to the bit bucket.\n"
 "\n"
 "Writing wav format:\n"
-"       Only  wav  files with 2 channels, 16 bits per sample, and audio CD sam-\n"
-"       pling rate can be written. If the input data is different, the  result-\n"
-"       ing  wav  file is incorrect. Scaling can be performed when writing wav.\n"
-"       Cutting can only be performed in multiples of an audio CD sector  size.\n"
+"       Only wav files with 2 channels, 16 bits per sample, and audio  CD  sam-\n"
+"       pling  rate can be written. If the input data is different, the result-\n"
+"       ing wav file is incorrect. Scaling can be performed when  writing  wav.\n"
+"       Cutting  can only be performed in multiples of an audio CD sector size.\n"
 "       When writing wav the output must be seekable (e.g. no pipes).\n"
 "\n"
 "CDR Format:\n"
 "       Raw sample data at a sampling rate of %li Hz. The channels are inter-\n"
-"       leaved.  The numbers are 16 bit signed integers with this  byte  order:\n"
-"       MSByte  Left,  LSByte Left, MSByte Right, LSByte Right.  The track size\n"
+"       leaved.   The  numbers are 16 bit signed integers with this byte order:\n"
+"       MSByte Left, LSByte Left, MSByte Right, LSByte Right.  The  track  size\n"
 "       must be a multiple of the sector size of %i bytes.  There are %i sec-\n"
 "       tors per second.\n"
 "\n"
 "BUGS / LIMITATIONS\n"
-"       All  operations  can  only be performed on a minimum of 1 CD block or a\n"
+"       All operations can only be performed on a minimum of 1 CD  block  or  a\n"
 "       multiple thereof.\n"
 "\n"
 "COPYRIGHT\n"
@@ -374,11 +376,9 @@
 "       formerly c/o EEE Dept, University of Canterbury\n"
 "       Christchurch, New Zealand\n"
 "\n"
-"       Permission granted to use and distribute this software free of  charge,\n"
+"       Permission  granted to use and distribute this software free of charge,\n"
 "       provided any improvements are sent back to the author. Comments and bug\n"
 "       reports welcome.  All rights reserved. Standard disclaimer applies.\n"
 "\n"
 "AUTHOR\n"
-"       Volker Kuhlmann\n"
-"\n"
-"wav2cdr                           18 Jan 2006                       wav2cdr(1)\n"
+"       Volker Kuhlmann (nlu+10\n"
--- wav2cdr-2.3.4.orig/help.txt
+++ wav2cdr-2.3.4/help.txt
@@ -1,5 +1,7 @@
 wav2cdr(1)                                                          wav2cdr(1)
 
+-e .ll 7.3i
+
 NAME
        wav2cdr  -  converts  input in (or similar to) wav format to cdr format
        suitable for writing onto audio CDs.
@@ -47,26 +49,26 @@ OPTIONS
 
        --fadein LEN
               Fade in at the start over a duration of LEN.  The syntax for LEN
-              is the same as for a cut  number,  see  section  about  argument
+              is  the  same  as  for  a cut number, see section about argument
               scanning below.  If cutting is active, fade-in is applied to the
               beginning of each cut.
 
-              Fading in is performed by increasing the amplitude for  CD  sec-
-              tors  by  an  amount  derived  from  LEN over a duration of LEN.
-              --fadein 3 would result in the amplitude  of  the  first  sector
-              lowered  to 1/4, of the second sector to 2/4, and the third sec-
-              tor to 3/4. The fourth sector is unchanged and has then  reached
+              Fading  in  is performed by increasing the amplitude for CD sec-
+              tors by an amount derived from  LEN  over  a  duration  of  LEN.
+              --fadein  3  would  result  in the amplitude of the first sector
+              lowered to 1/4, of the second sector to 2/4, and the third  sec-
+              tor  to 3/4. The fourth sector is unchanged and has then reached
               full amplitude.
 
        --fadeout LEN
-              Fade  out at the end over a duration of LEN.  The syntax for LEN
-              is the same as for a cut  number,  see  section  about  argument
+              Fade out at the end over a duration of LEN.  The syntax for  LEN
+              is  the  same  as  for  a cut number, see section about argument
               scanning below.  If cutting is active, fad-out is applied to the
               end of each cut.
 
-              The computation is similar to --fadein. --fadein 3 would  result
+              The  computation is similar to --fadein. --fadein 3 would result
               in the last 3 CD sectors having their amplitudes lowered to 3/4,
-              2/4, and 1/4. The (non-existant) following sector is assumed  to
+              2/4,  and 1/4. The (non-existant) following sector is assumed to
               be silent.
 
               To add silent sector(s) to the end of the audio file, use --end-
@@ -74,14 +76,14 @@ OPTIONS
 
               Fading out can only be performed if the input size can be deter-
               mined (i.e. the input must be seekable and cannot be a pipe). If
-              cutting is active, the end of the cut is always  known  and  the
+              cutting  is  active,  the end of the cut is always known and the
               fade-out can be applied.
 
               If the fade-out starts before the fade-in is finished, both will
               overlap, producing sensible results.
 
        --fscale FLOAT
-              Scale data by FLOAT, i.e. multiply by FLOAT (1.0 does  nothing).
+              Scale data by FLOAT, i.e. multiply by FLOAT (1.0 does nothing).
 
        -h, -u, --usage
               Display usage.
@@ -205,14 +207,14 @@ OPTIONS
               Write data in cdr format (default). Sets the correct byte order.
 
        --toraw
-              Write data in raw format. Byte order should  be  specified  with
+              Write  data  in  raw format. Byte order should be specified with
               -o/-O (default big).
 
        --towav
               Write data in wav format. Sets the correct byte order.
 
        --verbose
-              Produce  more  output.  Currently only used by --silencecuts and
+              Produce more output. Currently only used  by  --silencecuts  and
               --silenceinfo.
 
        --version, -V
@@ -222,57 +224,57 @@ OPTIONS
               names, or cut numbers if cutting is used.
 
 Command line option scanning:
-       From  left  to right. Later settings may override previous ones. Beware
-       to switch file formats before byte ordering, or a byte order  might  be
-       rejected  for the (then active) format. When not using cutting, remain-
-       ing arguments are used to fill up  input  and  output  filenames.  When
-       using  cutting, remaining arguments are assumed to be cut numbers. When
-       using negative cut numbers, use -- to terminate  option  processing  or
-       the  negative  numbers  can be mistaken as options (this is a must with
+       From left to right. Later settings may override previous  ones.  Beware
+       to  switch  file formats before byte ordering, or a byte order might be
+       rejected for the (then active) format. When not using cutting,  remain-
+       ing  arguments  are  used  to  fill up input and output filenames. When
+       using cutting, remaining arguments are assumed to be cut numbers.  When
+       using  negative  cut  numbers, use -- to terminate option processing or
+       the negative numbers can be mistaken as options (this is  a  must  with
        GNU getopt()).
 
        All options which take an argument denoting a time accept the following
-       number format. The number may be in decimal, octal (leading 0), or hex-
-       adecimal (leading 0x or 0X). A one-letter unit  may  be  following.  If
+       number format. The number may be in  decimal,  octal  (leading  0),  or
+       hexadecimal  (leading 0x or 0X). A one-letter unit may be following. If
        there is space between the number and the unit, both must be quoted, as
        in "55 C". These units are recognised: b (bytes), C (audio CD sectors),
-       s  (seconds). When no unit is given, C is assumed. The progress display
-       might only show numbers in some of these units. Fractions  for  seconds
+       s (seconds). When no unit is given, C is assumed. The progress  display
+       might  only  show numbers in some of these units. Fractions for seconds
        are allowed.
 
-       Negative  cut  numbers are only allowed if the input size can be deter-
-       mined (which will not be possible if the input comes from a pipe),  and
-       are  shown as the equivalent positive ones. If the last cut number is 0
-       it means the end of the file. If the input file size can not be  deter-
+       Negative cut numbers are only allowed if the input size can  be  deter-
+       mined  (which will not be possible if the input comes from a pipe), and
+       are shown as the equivalent positive ones. If the last cut number is  0
+       it  means the end of the file. If the input file size can not be deter-
        mined the longest possible input (about 405 minutes) is substituted.
 
        A filename of '-' is taken as stdin/stdout.
 
-       If  wav2cdr was compiled to use GNU getopt(), argument scanning is more
+       If wav2cdr was compiled to use GNU getopt(), argument scanning is  more
        powerful and long options can be shortened to significance. Options are
-       also  re-ordered;  this  is nice but can be a trap. Use -- if in doubt,
+       also re-ordered; this is nice but can be a trap. Use --  if  in  doubt,
        and don't mix options with filename or cut number arguments.
 
 Data formats:
        All data handling currently assumes signed 16-bit integers, interleaved
        for 2 channels, at a sampling rate of that of a CD. Only wav files with
-       these parameters can be read correctly. cdr files are in  that  format,
-       and  only  raw formats with these parameters can be processed. The only
-       flexibility allowed for raw is the byte order, which can  be  specified
-       for  both  reading  and  writing.  The byte ordering for wav and cdr is
+       these  parameters  can be read correctly. cdr files are in that format,
+       and only raw formats with these parameters can be processed.  The  only
+       flexibility  allowed  for raw is the byte order, which can be specified
+       for both reading and writing. The byte ordering  for  wav  and  cdr  is
        fixed.
 
 Channel swapping:
-       Left and right channel are swapped, which is the same as swapping  con-
+       Left  and right channel are swapped, which is the same as swapping con-
        secutive 16 bit values with each other. Also see 'CDR Format' below.
 
 Scaling / Volume change:
-       Scaling  can  be performed with either integer or floating point arith-
-       metic.  Integer arithmatic is faster but possibly not as precise.  Val-
-       ues  will  saturate  (i.e.  be  clipped), rather than be truncated. The
-       speed of this operation depends on the endianness of  the  input  data,
-       output  data,  and  host.  It  is slowest when bytes have to be swapped
-       before scaling and swapped back  after.   Negative  scale  factors  are
+       Scaling can be performed with either integer or floating  point  arith-
+       metic.   Integer arithmatic is faster but possibly not as precise. Val-
+       ues will saturate (i.e. be clipped),  rather  than  be  truncated.  The
+       speed  of  this  operation depends on the endianness of the input data,
+       output data, and host. It is slowest when  bytes  have  to  be  swapped
+       before  scaling  and  swapped  back  after.  Negative scale factors are
        allowed but might be of dubious value.
 
 Mono / stereo:
@@ -280,31 +282,31 @@ Mono / stereo:
        is 2 channels with the same data. This can be useful in some cases.
 
 Output file naming:
-       Unless output is to stdout, the resulting filename is  the  name  given
+       Unless  output  is  to stdout, the resulting filename is the name given
        with --outfile. A period and a 2-digit track number are appended.
 
 Input data splitting:
-       Input  data  can  be split into pieces resp. tracks. Currently cuts can
-       only be placed at multiples of audio CD sectors (at the  sector  bound-
+       Input data can be split into pieces resp. tracks.  Currently  cuts  can
+       only  be  placed at multiples of audio CD sectors (at the sector bound-
        aries), whether the input format is cdr or not.
 
-       The  cuts are placed at the given positions, which must be in ascending
-       order (or equal). Negative numbers are counted  from  the  end  of  the
-       input  data.  This  only works if the input is seekable (Unix pipes are
-       not). Sectors of the input are numbered from  0.  Bytes  of  a  header,
+       The cuts are placed at the given positions, which must be in  ascending
+       order  (or  equal).  Negative  numbers  are counted from the end of the
+       input data. This only works if the input is seekable  (Unix  pipes  are
+       not).  Sectors  of  the  input  are numbered from 0. Bytes of a header,
        which the input format might have, are not counted.
 
-       Any  number of cuts can be made, but only 99 tracks can be put on a CD.
-       All sectors before the first but not including the first sector  number
+       Any number of cuts can be made, but only 99 tracks can be put on a  CD.
+       All  sectors before the first but not including the first sector number
        are discarded, as well as all sectors after and including the last sec-
-       tor number.  At least 2 sector numbers (cut numbers) must be given,  in
+       tor  number.  At least 2 sector numbers (cut numbers) must be given, in
        which case one piece is cut out.
 
-       If  there are only 2 cut numbers (1 track to cut out) data can be writ-
+       If there are only 2 cut numbers (1 track to cut out) data can be  writ-
        ten to stdout or file. More than one track can only be written to file,
-       the  track  number  will  be added as an extension to the filename.  To
+       the track number will be added as an extension  to  the  filename.   To
        avoid the track number to be appended to the filename when only one cut
-       is  made,  don't use --outfile but write to stdout and use output redi-
+       is made, don't use --outfile but write to stdout and use  output  redi-
        rection.
 
         Example (assuming 50000 sectors in the input):
@@ -315,19 +317,19 @@ Input data splitting:
                         40000-49999: discarded
 
 Cutting out silent intervals:
-       Assuming a digitised record is stored in record.wav, and is to  be  cut
+       Assuming  a  digitised record is stored in record.wav, and is to be cut
        into tracks.
 
          wav2cdr < record.wav > cuts --silencecuts --silencedelay 2s
          wav2cdr < record.wav --of tracks --cut `cat cuts`
 
-       Will  store  the  tracks of the record in track.01, track.02, ..., with
-       the delay for cutting at a silent part set to 2 seconds. The  threshold
-       used  is  the  default. Note the `` syntax works under Unix and in this
+       Will store the tracks of the record in track.01,  track.02,  ...,  with
+       the  delay for cutting at a silent part set to 2 seconds. The threshold
+       used is the default. Note the `` syntax works under Unix  and  in  this
        case puts the contents of file "cuts" on the command line.
 
 Information about silences and actual sound parts:
-       --silenceinfo can be used in the same way as  --silencecuts.   It  pro-
+       --silenceinfo  can  be  used in the same way as --silencecuts.  It pro-
        duces output like
 
        (stdin):
@@ -339,31 +341,31 @@ Information about silences and actual so
          DIFF  20603520 b,   8760 C,  116 s, 01:56.05 min
           -->  21414960 b,   9105 C,  121 s, 02:01.02 min
 
-       showing  the beginning, length ("DIFF"), and end ("-->") of both silent
-       ("silnc") and and non-silent ("AUDIO") intervals. This  is  useful  for
+       showing the beginning, length ("DIFF"), and end ("-->") of both  silent
+       ("silnc")  and  and  non-silent ("AUDIO") intervals. This is useful for
        examining existing tracks, but it can not be used with --cut.
 
 Messages:
-       Progress  messages and statistics are written to stderr when writing to
-       stdout, and to stdout when writing to file. It is currently not  possi-
+       Progress messages and statistics are written to stderr when writing  to
+       stdout,  and to stdout when writing to file. It is currently not possi-
        ble to suppress this, other than by redirection to the bit bucket.
 
 Writing wav format:
-       Only  wav  files with 2 channels, 16 bits per sample, and audio CD sam-
-       pling rate can be written. If the input data is different, the  result-
-       ing  wav  file is incorrect. Scaling can be performed when writing wav.
-       Cutting can only be performed in multiples of an audio CD sector  size.
+       Only wav files with 2 channels, 16 bits per sample, and audio  CD  sam-
+       pling  rate can be written. If the input data is different, the result-
+       ing wav file is incorrect. Scaling can be performed when  writing  wav.
+       Cutting  can only be performed in multiples of an audio CD sector size.
        When writing wav the output must be seekable (e.g. no pipes).
 
 CDR Format:
        Raw sample data at a sampling rate of %li Hz. The channels are inter-
-       leaved.  The numbers are 16 bit signed integers with this  byte  order:
-       MSByte  Left,  LSByte Left, MSByte Right, LSByte Right.  The track size
+       leaved.   The  numbers are 16 bit signed integers with this byte order:
+       MSByte Left, LSByte Left, MSByte Right, LSByte Right.  The  track  size
        must be a multiple of the sector size of %i bytes.  There are %i sec-
        tors per second.
 
 BUGS / LIMITATIONS
-       All  operations  can  only be performed on a minimum of 1 CD block or a
+       All operations can only be performed on a minimum of 1 CD  block  or  a
        multiple thereof.
 
 COPYRIGHT
@@ -374,11 +376,9 @@ COPYRIGHT
        formerly c/o EEE Dept, University of Canterbury
        Christchurch, New Zealand
 
-       Permission granted to use and distribute this software free of  charge,
+       Permission  granted to use and distribute this software free of charge,
        provided any improvements are sent back to the author. Comments and bug
        reports welcome.  All rights reserved. Standard disclaimer applies.
 
 AUTHOR
-       Volker Kuhlmann
-
-wav2cdr                           18 Jan 2006                       wav2cdr(1)
+       Volker Kuhlmann (nlu+10
--- wav2cdr-2.3.4.orig/wav2cdr.1
+++ wav2cdr-2.3.4/wav2cdr.1
@@ -15,7 +15,7 @@ converts input in (or similar to) wav fo
 for writing onto audio CDs.
 .SH SYNOPSIS
 .B "wav2cdr"
-[\fIoptions\fP ...] [\fIinfile\fP [\fIoutfile\fP]] [--cut \fIcutnumber\fP ...]
+[\fIoptions\fP ...] [\fIinfile\fP [\fIoutfile\fP]] [\-\-cut \fIcutnumber\fP ...]
 .SH VERSION
 This man page describes wav2cdr version 2.3.4.
 .SH DESCRIPTION
@@ -298,11 +298,11 @@ If there are only 2 cut numbers (1 track
 written to stdout or file. More than one track can only be written to file, the
 track number will be added as an extension to the filename.
 To avoid the track number to be appended to the filename when only one cut is
-made, don't use \fI--outfile\fP but write to stdout and use output redirection.
+made, don't use \fI\-\-outfile\fP but write to stdout and use output redirection.
 
 .nf
  Example (assuming 50000 sectors in the input):
-    wav2cdr < INPUT --outfile NAME --cut 500 20000 40000
+    wav2cdr < INPUT \-\-outfile NAME \-\-cut 500 20000 40000
          sectors     0-  499: discarded
                    500-19999: saved to NAME.01
                  20000-39999: saved to NAME.02
@@ -313,8 +313,8 @@ Assuming a digitised record is stored in
 tracks.
 
 .nf
-  wav2cdr < record.wav > cuts --silencecuts --silencedelay 2s
-  wav2cdr < record.wav --of tracks --cut `cat cuts`
+  wav2cdr < record.wav > cuts \-\-silencecuts \-\-silencedelay 2s
+  wav2cdr < record.wav \-\-of tracks \-\-cut `cat cuts`
 .fi
 
 Will store the tracks of the record in track.01, track.02, ..., with the delay
--- wav2cdr-2.3.4.orig/wav2cdr.txt
+++ wav2cdr-2.3.4/wav2cdr.txt
@@ -2,6 +2,8 @@ wav2cdr(1)
 
 
 
+-e .ll 7.3i
+
 NAME
        wav2cdr  -  converts  input in (or similar to) wav format to cdr format
        suitable for writing onto audio CDs.
@@ -49,26 +51,26 @@ OPTIONS
 
        --fadein LEN
               Fade in at the start over a duration of LEN.  The syntax for LEN
-              is the same as for a cut  number,  see  section  about  argument
+              is  the  same  as  for  a cut number, see section about argument
               scanning below.  If cutting is active, fade-in is applied to the
               beginning of each cut.
 
-              Fading in is performed by increasing the amplitude for  CD  sec-
-              tors  by  an  amount  derived  from  LEN over a duration of LEN.
-              --fadein 3 would result in the amplitude  of  the  first  sector
-              lowered  to 1/4, of the second sector to 2/4, and the third sec-
-              tor to 3/4. The fourth sector is unchanged and has then  reached
+              Fading  in  is performed by increasing the amplitude for CD sec-
+              tors by an amount derived from  LEN  over  a  duration  of  LEN.
+              --fadein  3  would  result  in the amplitude of the first sector
+              lowered to 1/4, of the second sector to 2/4, and the third  sec-
+              tor  to 3/4. The fourth sector is unchanged and has then reached
               full amplitude.
 
        --fadeout LEN
-              Fade  out at the end over a duration of LEN.  The syntax for LEN
-              is the same as for a cut  number,  see  section  about  argument
+              Fade out at the end over a duration of LEN.  The syntax for  LEN
+              is  the  same  as  for  a cut number, see section about argument
               scanning below.  If cutting is active, fad-out is applied to the
               end of each cut.
 
-              The computation is similar to --fadein. --fadein 3 would  result
+              The  computation is similar to --fadein. --fadein 3 would result
               in the last 3 CD sectors having their amplitudes lowered to 3/4,
-              2/4, and 1/4. The (non-existant) following sector is assumed  to
+              2/4,  and 1/4. The (non-existant) following sector is assumed to
               be silent.
 
               To add silent sector(s) to the end of the audio file, use --end-
@@ -76,14 +78,14 @@ OPTIONS
 
               Fading out can only be performed if the input size can be deter-
               mined (i.e. the input must be seekable and cannot be a pipe). If
-              cutting is active, the end of the cut is always  known  and  the
+              cutting  is  active,  the end of the cut is always known and the
               fade-out can be applied.
 
               If the fade-out starts before the fade-in is finished, both will
               overlap, producing sensible results.
 
        --fscale FLOAT
-              Scale data by FLOAT, i.e. multiply by FLOAT (1.0 does  nothing).
+              Scale data by FLOAT, i.e. multiply by FLOAT (1.0 does nothing).
 
        -h, -u, --usage
               Display usage.
@@ -207,14 +209,14 @@ OPTIONS
               Write data in cdr format (default). Sets the correct byte order.
 
        --toraw
-              Write data in raw format. Byte order should  be  specified  with
+              Write  data  in  raw format. Byte order should be specified with
               -o/-O (default big).
 
        --towav
               Write data in wav format. Sets the correct byte order.
 
        --verbose
-              Produce  more  output.  Currently only used by --silencecuts and
+              Produce more output. Currently only used  by  --silencecuts  and
               --silenceinfo.
 
        --version, -V
@@ -224,57 +226,57 @@ OPTIONS
               names, or cut numbers if cutting is used.
 
 Command line option scanning:
-       From  left  to right. Later settings may override previous ones. Beware
-       to switch file formats before byte ordering, or a byte order  might  be
-       rejected  for the (then active) format. When not using cutting, remain-
-       ing arguments are used to fill up  input  and  output  filenames.  When
-       using  cutting, remaining arguments are assumed to be cut numbers. When
-       using negative cut numbers, use -- to terminate  option  processing  or
-       the  negative  numbers  can be mistaken as options (this is a must with
+       From left to right. Later settings may override previous  ones.  Beware
+       to  switch  file formats before byte ordering, or a byte order might be
+       rejected for the (then active) format. When not using cutting,  remain-
+       ing  arguments  are  used  to  fill up input and output filenames. When
+       using cutting, remaining arguments are assumed to be cut numbers.  When
+       using  negative  cut  numbers, use -- to terminate option processing or
+       the negative numbers can be mistaken as options (this is  a  must  with
        GNU getopt()).
 
        All options which take an argument denoting a time accept the following
-       number format. The number may be in decimal, octal (leading 0), or hex-
-       adecimal (leading 0x or 0X). A one-letter unit  may  be  following.  If
+       number format. The number may be in  decimal,  octal  (leading  0),  or
+       hexadecimal  (leading 0x or 0X). A one-letter unit may be following. If
        there is space between the number and the unit, both must be quoted, as
        in "55 C". These units are recognised: b (bytes), C (audio CD sectors),
-       s  (seconds). When no unit is given, C is assumed. The progress display
-       might only show numbers in some of these units. Fractions  for  seconds
+       s (seconds). When no unit is given, C is assumed. The progress  display
+       might  only  show numbers in some of these units. Fractions for seconds
        are allowed.
 
-       Negative  cut  numbers are only allowed if the input size can be deter-
-       mined (which will not be possible if the input comes from a pipe),  and
-       are  shown as the equivalent positive ones. If the last cut number is 0
-       it means the end of the file. If the input file size can not be  deter-
+       Negative cut numbers are only allowed if the input size can  be  deter-
+       mined  (which will not be possible if the input comes from a pipe), and
+       are shown as the equivalent positive ones. If the last cut number is  0
+       it  means the end of the file. If the input file size can not be deter-
        mined the longest possible input (about 405 minutes) is substituted.
 
        A filename of '-' is taken as stdin/stdout.
 
-       If  wav2cdr was compiled to use GNU getopt(), argument scanning is more
+       If wav2cdr was compiled to use GNU getopt(), argument scanning is  more
        powerful and long options can be shortened to significance. Options are
-       also  re-ordered;  this  is nice but can be a trap. Use -- if in doubt,
+       also re-ordered; this is nice but can be a trap. Use --  if  in  doubt,
        and don't mix options with filename or cut number arguments.
 
 Data formats:
        All data handling currently assumes signed 16-bit integers, interleaved
        for 2 channels, at a sampling rate of that of a CD. Only wav files with
-       these parameters can be read correctly. cdr files are in  that  format,
-       and  only  raw formats with these parameters can be processed. The only
-       flexibility allowed for raw is the byte order, which can  be  specified
-       for  both  reading  and  writing.  The byte ordering for wav and cdr is
+       these  parameters  can be read correctly. cdr files are in that format,
+       and only raw formats with these parameters can be processed.  The  only
+       flexibility  allowed  for raw is the byte order, which can be specified
+       for both reading and writing. The byte ordering  for  wav  and  cdr  is
        fixed.
 
 Channel swapping:
-       Left and right channel are swapped, which is the same as swapping  con-
+       Left  and right channel are swapped, which is the same as swapping con-
        secutive 16 bit values with each other. Also see 'CDR Format' below.
 
 Scaling / Volume change:
-       Scaling  can  be performed with either integer or floating point arith-
-       metic.  Integer arithmatic is faster but possibly not as precise.  Val-
-       ues  will  saturate  (i.e.  be  clipped), rather than be truncated. The
-       speed of this operation depends on the endianness of  the  input  data,
-       output  data,  and  host.  It  is slowest when bytes have to be swapped
-       before scaling and swapped back  after.   Negative  scale  factors  are
+       Scaling can be performed with either integer or floating  point  arith-
+       metic.   Integer arithmatic is faster but possibly not as precise. Val-
+       ues will saturate (i.e. be clipped),  rather  than  be  truncated.  The
+       speed  of  this  operation depends on the endianness of the input data,
+       output data, and host. It is slowest when  bytes  have  to  be  swapped
+       before  scaling  and  swapped  back  after.  Negative scale factors are
        allowed but might be of dubious value.
 
 Mono / stereo:
@@ -282,31 +284,31 @@ Mono / stereo:
        is 2 channels with the same data. This can be useful in some cases.
 
 Output file naming:
-       Unless output is to stdout, the resulting filename is  the  name  given
+       Unless  output  is  to stdout, the resulting filename is the name given
        with --outfile. A period and a 2-digit track number are appended.
 
 Input data splitting:
-       Input  data  can  be split into pieces resp. tracks. Currently cuts can
-       only be placed at multiples of audio CD sectors (at the  sector  bound-
+       Input data can be split into pieces resp. tracks.  Currently  cuts  can
+       only  be  placed at multiples of audio CD sectors (at the sector bound-
        aries), whether the input format is cdr or not.
 
-       The  cuts are placed at the given positions, which must be in ascending
-       order (or equal). Negative numbers are counted  from  the  end  of  the
-       input  data.  This  only works if the input is seekable (Unix pipes are
-       not). Sectors of the input are numbered from  0.  Bytes  of  a  header,
+       The cuts are placed at the given positions, which must be in  ascending
+       order  (or  equal).  Negative  numbers  are counted from the end of the
+       input data. This only works if the input is seekable  (Unix  pipes  are
+       not).  Sectors  of  the  input  are numbered from 0. Bytes of a header,
        which the input format might have, are not counted.
 
-       Any  number of cuts can be made, but only 99 tracks can be put on a CD.
-       All sectors before the first but not including the first sector  number
+       Any number of cuts can be made, but only 99 tracks can be put on a  CD.
+       All  sectors before the first but not including the first sector number
        are discarded, as well as all sectors after and including the last sec-
-       tor number.  At least 2 sector numbers (cut numbers) must be given,  in
+       tor  number.  At least 2 sector numbers (cut numbers) must be given, in
        which case one piece is cut out.
 
-       If  there are only 2 cut numbers (1 track to cut out) data can be writ-
+       If there are only 2 cut numbers (1 track to cut out) data can be  writ-
        ten to stdout or file. More than one track can only be written to file,
-       the  track  number  will  be added as an extension to the filename.  To
+       the track number will be added as an extension  to  the  filename.   To
        avoid the track number to be appended to the filename when only one cut
-       is  made,  don't use --outfile but write to stdout and use output redi-
+       is made, don't use --outfile but write to stdout and use  output  redi-
        rection.
 
         Example (assuming 50000 sectors in the input):
@@ -317,19 +319,19 @@ Input data splitting:
                         40000-49999: discarded
 
 Cutting out silent intervals:
-       Assuming a digitised record is stored in record.wav, and is to  be  cut
+       Assuming  a  digitised record is stored in record.wav, and is to be cut
        into tracks.
 
          wav2cdr < record.wav > cuts --silencecuts --silencedelay 2s
          wav2cdr < record.wav --of tracks --cut `cat cuts`
 
-       Will  store  the  tracks of the record in track.01, track.02, ..., with
-       the delay for cutting at a silent part set to 2 seconds. The  threshold
-       used  is  the  default. Note the `` syntax works under Unix and in this
+       Will store the tracks of the record in track.01,  track.02,  ...,  with
+       the  delay for cutting at a silent part set to 2 seconds. The threshold
+       used is the default. Note the `` syntax works under Unix  and  in  this
        case puts the contents of file "cuts" on the command line.
 
 Information about silences and actual sound parts:
-       --silenceinfo can be used in the same way as  --silencecuts.   It  pro-
+       --silenceinfo  can  be  used in the same way as --silencecuts.  It pro-
        duces output like
 
        (stdin):
@@ -341,31 +343,31 @@ Information about silences and actual so
          DIFF  20603520 b,   8760 C,  116 s, 01:56.05 min
           -->  21414960 b,   9105 C,  121 s, 02:01.02 min
 
-       showing  the beginning, length ("DIFF"), and end ("-->") of both silent
-       ("silnc") and and non-silent ("AUDIO") intervals. This  is  useful  for
+       showing the beginning, length ("DIFF"), and end ("-->") of both  silent
+       ("silnc")  and  and  non-silent ("AUDIO") intervals. This is useful for
        examining existing tracks, but it can not be used with --cut.
 
 Messages:
-       Progress  messages and statistics are written to stderr when writing to
-       stdout, and to stdout when writing to file. It is currently not  possi-
+       Progress messages and statistics are written to stderr when writing  to
+       stdout,  and to stdout when writing to file. It is currently not possi-
        ble to suppress this, other than by redirection to the bit bucket.
 
 Writing wav format:
-       Only  wav  files with 2 channels, 16 bits per sample, and audio CD sam-
-       pling rate can be written. If the input data is different, the  result-
-       ing  wav  file is incorrect. Scaling can be performed when writing wav.
-       Cutting can only be performed in multiples of an audio CD sector  size.
+       Only wav files with 2 channels, 16 bits per sample, and audio  CD  sam-
+       pling  rate can be written. If the input data is different, the result-
+       ing wav file is incorrect. Scaling can be performed when  writing  wav.
+       Cutting  can only be performed in multiples of an audio CD sector size.
        When writing wav the output must be seekable (e.g. no pipes).
 
 CDR Format:
        Raw sample data at a sampling rate of 44100 Hz. The channels are inter-
-       leaved.  The numbers are 16 bit signed integers with this  byte  order:
-       MSByte  Left,  LSByte Left, MSByte Right, LSByte Right.  The track size
+       leaved.   The  numbers are 16 bit signed integers with this byte order:
+       MSByte Left, LSByte Left, MSByte Right, LSByte Right.  The  track  size
        must be a multiple of the sector size of 2352 bytes.  There are 75 sec-
        tors per second.
 
 BUGS / LIMITATIONS
-       All  operations  can  only be performed on a minimum of 1 CD block or a
+       All operations can only be performed on a minimum of 1 CD  block  or  a
        multiple thereof.
 
 COPYRIGHT
@@ -376,13 +378,9 @@ COPYRIGHT
        formerly c/o EEE Dept, University of Canterbury
        Christchurch, New Zealand
 
-       Permission granted to use and distribute this software free of  charge,
+       Permission  granted to use and distribute this software free of charge,
        provided any improvements are sent back to the author. Comments and bug
        reports welcome.  All rights reserved. Standard disclaimer applies.
 
 AUTHOR
-       Volker Kuhlmann
-
-
-
-wav2cdr                           18 Jan 2006                       wav2cdr(1)
+       Volker Kuhlmann (nlu+10