Re: [Rd] Bug#361968: Wrong name in manpage

2006-04-12 Thread friedrich . leisch

 On Tue, 11 Apr 2006 20:56:27 -0400,
 Duncan Murdoch (DM) wrote:

   On 4/11/2006 7:45 PM, Dirk Eddelbuettel wrote:
   R-devel'ers, 
   
   On 11 April 2006 at 10:24, Dirk Eddelbuettel wrote:
   | 
   | Kanru,
   | 
   | Thanks for the bugreport.
   | 
   | On 11 April 2006 at 22:03, Kanru Chen wrote:
   | | Package: r-base-core
   | | Version: 2.2.1.svn37668-1
   | | Severity: minor
   | | 
   | | In manpage of /usr/bin/R, the first, fourth and last line shows 
`VERSION'
   | | instead of `R'.
   
   I haven't seen any follow-up yet -- here is what it looks like (cut and
   pasted from Emacs man page viewer) and note the 'Version' in place of R:
   
   VERSION(1)FSF   
VERSION(1)
   
   NAME
   Version - a language for data analysis and graphics
   
   SYNOPSIS
   R [options] [ infile] [ outfile]
   R CMD command [arguments]
   
   DESCRIPTION
   Start  R,  a  system for statistical computation and graphics, with the
   specified options, or invoke an R tool via the 'R CMD' interface.
   [...]
   
   
   | | I believe it is a typo.
   | 
   | More likely something is wrong with how R.1 is autogenerated using 
help2man.
   | 
   | Incidentally, that `R --version' now starts its ouput with 'Version' 
rather
   | than R had bit us in the RPy builds where the version number was 
regexp'ed
   | out of the result, and was still expecting the line to start with R just 
like
   | help2man seems to expect the program name first. 
   
   It seems to stem from src/main/version.c:
   
   void attribute_hidden PrintVersionString(char *s)
   {
   if(strcmp(R_SVN_REVISION, unknown)==0)
   {
   sprintf(s, Version %s.%s %s (%s-%s-%s),
   R_MAJOR, R_MINOR, R_STATUS, R_YEAR, R_MONTH, R_DAY);
   }
   else{
   if(strlen(R_STATUS)==0){
   sprintf(s, Version %s.%s (%s-%s-%s),
   R_MAJOR, R_MINOR, R_YEAR, R_MONTH, R_DAY);
   }
   else{
   sprintf(s, Version %s.%s %s (%s-%s-%s r%s),
   R_MAJOR, R_MINOR, R_STATUS, R_YEAR, R_MONTH, R_DAY,
   R_SVN_REVISION);
   }
   }
   }
   
   Would replacing 'Version ...' with 'R (Version ...)' be an acceptable
   alternative ?

   I think the problem is that PrintVersion (a few lines up from there) 
   used to put the R in front; PrintVersionString doesn't include the R. 
   PrintVersionString is called from other places where the R would not be 
   appropriate, but PrintVersion is only called when acting on `R 
   --version' or synonyms.

   Fritz, I think this was your change in r36923 a few months ago.  Do you 
   have time to deal with it?

Yes, will do later today.

Best,
Fritz

__
R-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/r-devel


Re: [Rd] Bug#361968: Wrong name in manpage

2006-04-12 Thread friedrich . leisch

I've committed a fix for 2.3 affecting only R --version (don't want to
play with real R output during feature freeze), and a cleaner solution
for 2.4 which gets the startup message and --version even more in
sync.

Passes all checks for me, and the man page looks OK again. Thanks for
spotting the bug.

Best,
Fritz


 On Wed, 12 Apr 2006 13:53:08 +0200,
 friedrich leisch (fl) wrote:

 On Tue, 11 Apr 2006 20:56:27 -0400,
 Duncan Murdoch (DM) wrote:

   On 4/11/2006 7:45 PM, Dirk Eddelbuettel wrote:
   R-devel'ers, 
   
   On 11 April 2006 at 10:24, Dirk Eddelbuettel wrote:
   | 
   | Kanru,
   | 
   | Thanks for the bugreport.
   | 
   | On 11 April 2006 at 22:03, Kanru Chen wrote:
   | | Package: r-base-core
   | | Version: 2.2.1.svn37668-1
   | | Severity: minor
   | | 
   | | In manpage of /usr/bin/R, the first, fourth and last line shows 
`VERSION'
   | | instead of `R'.
   
   I haven't seen any follow-up yet -- here is what it looks like (cut and
   pasted from Emacs man page viewer) and note the 'Version' in place of R:
   
   VERSION(1)FSF   
VERSION(1)
   
   NAME
   Version - a language for data analysis and graphics
   
   SYNOPSIS
   R [options] [ infile] [ outfile]
   R CMD command [arguments]
   
   DESCRIPTION
   Start  R,  a  system for statistical computation and graphics, with the
   specified options, or invoke an R tool via the 'R CMD' interface.
   [...]
   
   
   | | I believe it is a typo.
   | 
   | More likely something is wrong with how R.1 is autogenerated using 
help2man.
   | 
   | Incidentally, that `R --version' now starts its ouput with 'Version' 
rather
   | than R had bit us in the RPy builds where the version number was 
regexp'ed
   | out of the result, and was still expecting the line to start with R 
just like
   | help2man seems to expect the program name first. 
   
   It seems to stem from src/main/version.c:
   
   void attribute_hidden PrintVersionString(char *s)
   {
   if(strcmp(R_SVN_REVISION, unknown)==0)
   {
   sprintf(s, Version %s.%s %s (%s-%s-%s),
   R_MAJOR, R_MINOR, R_STATUS, R_YEAR, R_MONTH, R_DAY);
   }
   else{
   if(strlen(R_STATUS)==0){
   sprintf(s, Version %s.%s (%s-%s-%s),
   R_MAJOR, R_MINOR, R_YEAR, R_MONTH, R_DAY);
   }
   else{
   sprintf(s, Version %s.%s %s (%s-%s-%s r%s),
   R_MAJOR, R_MINOR, R_STATUS, R_YEAR, R_MONTH, R_DAY,
   R_SVN_REVISION);
   }
   }
   }
   
   Would replacing 'Version ...' with 'R (Version ...)' be an acceptable
   alternative ?

   I think the problem is that PrintVersion (a few lines up from there) 
   used to put the R in front; PrintVersionString doesn't include the R. 
   PrintVersionString is called from other places where the R would not be 
   appropriate, but PrintVersion is only called when acting on `R 
   --version' or synonyms.

   Fritz, I think this was your change in r36923 a few months ago.  Do you 
   have time to deal with it?

   Yes, will do later today.

   Best,
   Fritz

   __
   R-devel@r-project.org mailing list
   https://stat.ethz.ch/mailman/listinfo/r-devel

__
R-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/r-devel


Re: [Rd] Bug#361968: Wrong name in manpage

2006-04-11 Thread Dirk Eddelbuettel

Kanru,

Thanks for the bugreport.

On 11 April 2006 at 22:03, Kanru Chen wrote:
| Package: r-base-core
| Version: 2.2.1.svn37668-1
| Severity: minor
| 
| In manpage of /usr/bin/R, the first, fourth and last line shows `VERSION'
| instead of `R'.
|
| I believe it is a typo.

More likely something is wrong with how R.1 is autogenerated using help2man.

Incidentally, that `R --version' now starts its ouput with 'Version' rather
than R had bit us in the RPy builds where the version number was regexp'ed
out of the result, and was still expecting the line to start with R just like
help2man seems to expect the program name first. 

Regards, Dirk


| -- System Information:
| Debian Release: testing/unstable
|   APT prefers unstable
|   APT policy: (500, 'unstable'), (1, 'experimental')
| Architecture: i386 (i686)
| Shell:  /bin/sh linked to /bin/bash
| Kernel: Linux 2.6.16-rc5
| Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: 
LC_ALL set to en_US.UTF-8)
| 
| Versions of packages r-base-core depends on:
| ii  atlas3-base [libblas.so.3 3.6.0-20   Automatically Tuned Linear 
Algebra
| ii  libbz2-1.01.0.3-2high-quality block-sorting file 
co
| ii  libc6 2.3.6-5GNU C Library: Shared libraries 
an
| ii  libgcc1   1:4.1.0-1  GCC support library
| ii  libgfortran0  4.0.3-1Runtime library for GNU Fortran 
ap
| ii  libice6   6.9.0.dfsg.1-6 Inter-Client Exchange library
| ii  libjpeg62 6b-12  The Independent JPEG Group's 
JPEG 
| ii  libpaper-utils1.1.14-7   Library for handling paper 
charact
| ii  libpcre3  6.4-1.1Perl 5 Compatible Regular 
Expressi
| ii  libpng12-01.2.8rel-5.1   PNG library - runtime
| ii  libreadline5  5.1-7  GNU readline and history 
libraries
| ii  libsm66.9.0.dfsg.1-6 X Window System Session 
Management
| ii  libx11-6  6.9.0.dfsg.1-6 X Window System protocol client 
li
| ii  libxt66.9.0.dfsg.1-6 X Toolkit Intrinsics
| ii  perl  5.8.8-4Larry Wall's Practical 
Extraction 
| ii  refblas3 [libblas.so.3]   1.2-8  Basic Linear Algebra Subroutines 
3
| ii  tcl8.48.4.12-1   Tcl (the Tool Command Language) 
v8
| ii  tk8.4 8.4.12-1   Tk toolkit for Tcl and X11, v8.4 
-
| ii  zlib-bin  1:1.2.3-11 compression library - sample 
progr
| ii  zlib1g1:1.2.3-11 compression library - runtime
| 
| Versions of packages r-base-core recommends:
| pn  r-base-dev  none   (no description available)
| ii  r-recommended   2.2.1.svn37668-1 GNU R collection of recommended 
pa
| 
| -- no debconf information
| 

-- 
Hell, there are no rules here - we're trying to accomplish something. 
  -- Thomas A. Edison

__
R-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/r-devel


Re: [Rd] Bug#361968: Wrong name in manpage

2006-04-11 Thread Dirk Eddelbuettel

R-devel'ers, 

On 11 April 2006 at 10:24, Dirk Eddelbuettel wrote:
| 
| Kanru,
| 
| Thanks for the bugreport.
| 
| On 11 April 2006 at 22:03, Kanru Chen wrote:
| | Package: r-base-core
| | Version: 2.2.1.svn37668-1
| | Severity: minor
| | 
| | In manpage of /usr/bin/R, the first, fourth and last line shows `VERSION'
| | instead of `R'.

I haven't seen any follow-up yet -- here is what it looks like (cut and
pasted from Emacs man page viewer) and note the 'Version' in place of R:

VERSION(1)FSF   VERSION(1)

NAME
   Version - a language for data analysis and graphics

SYNOPSIS
   R [options] [ infile] [ outfile]
   R CMD command [arguments]

DESCRIPTION
   Start  R,  a  system for statistical computation and graphics, with the
   specified options, or invoke an R tool via the 'R CMD' interface.
[...]


| | I believe it is a typo.
| 
| More likely something is wrong with how R.1 is autogenerated using help2man.
| 
| Incidentally, that `R --version' now starts its ouput with 'Version' rather
| than R had bit us in the RPy builds where the version number was regexp'ed
| out of the result, and was still expecting the line to start with R just like
| help2man seems to expect the program name first. 

It seems to stem from src/main/version.c:

void attribute_hidden PrintVersionString(char *s)
{
if(strcmp(R_SVN_REVISION, unknown)==0)
{
sprintf(s, Version %s.%s %s (%s-%s-%s),
R_MAJOR, R_MINOR, R_STATUS, R_YEAR, R_MONTH, R_DAY);
}
else{
if(strlen(R_STATUS)==0){
sprintf(s, Version %s.%s (%s-%s-%s),
R_MAJOR, R_MINOR, R_YEAR, R_MONTH, R_DAY);
}
else{
sprintf(s, Version %s.%s %s (%s-%s-%s r%s),
R_MAJOR, R_MINOR, R_STATUS, R_YEAR, R_MONTH, R_DAY,
R_SVN_REVISION);
}
}
}

Would replacing 'Version ...' with 'R (Version ...)' be an acceptable
alternative ?

Dirk


-- 
Hell, there are no rules here - we're trying to accomplish something. 
  -- Thomas A. Edison

__
R-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/r-devel


Re: [Rd] Bug#361968: Wrong name in manpage

2006-04-11 Thread Duncan Murdoch
On 4/11/2006 7:45 PM, Dirk Eddelbuettel wrote:
 R-devel'ers, 
 
 On 11 April 2006 at 10:24, Dirk Eddelbuettel wrote:
 | 
 | Kanru,
 | 
 | Thanks for the bugreport.
 | 
 | On 11 April 2006 at 22:03, Kanru Chen wrote:
 | | Package: r-base-core
 | | Version: 2.2.1.svn37668-1
 | | Severity: minor
 | | 
 | | In manpage of /usr/bin/R, the first, fourth and last line shows `VERSION'
 | | instead of `R'.
 
 I haven't seen any follow-up yet -- here is what it looks like (cut and
 pasted from Emacs man page viewer) and note the 'Version' in place of R:
 
 VERSION(1)FSF   VERSION(1)
 
 NAME
Version - a language for data analysis and graphics
 
 SYNOPSIS
R [options] [ infile] [ outfile]
R CMD command [arguments]
 
 DESCRIPTION
Start  R,  a  system for statistical computation and graphics, with the
specified options, or invoke an R tool via the 'R CMD' interface.
 [...]
 
 
 | | I believe it is a typo.
 | 
 | More likely something is wrong with how R.1 is autogenerated using help2man.
 | 
 | Incidentally, that `R --version' now starts its ouput with 'Version' rather
 | than R had bit us in the RPy builds where the version number was regexp'ed
 | out of the result, and was still expecting the line to start with R just 
 like
 | help2man seems to expect the program name first. 
 
 It seems to stem from src/main/version.c:
 
 void attribute_hidden PrintVersionString(char *s)
 {
 if(strcmp(R_SVN_REVISION, unknown)==0)
 {
 sprintf(s, Version %s.%s %s (%s-%s-%s),
 R_MAJOR, R_MINOR, R_STATUS, R_YEAR, R_MONTH, R_DAY);
 }
 else{
   if(strlen(R_STATUS)==0){
   sprintf(s, Version %s.%s (%s-%s-%s),
   R_MAJOR, R_MINOR, R_YEAR, R_MONTH, R_DAY);
   }
   else{
   sprintf(s, Version %s.%s %s (%s-%s-%s r%s),
   R_MAJOR, R_MINOR, R_STATUS, R_YEAR, R_MONTH, R_DAY,
   R_SVN_REVISION);
   }
 }
 }
 
 Would replacing 'Version ...' with 'R (Version ...)' be an acceptable
 alternative ?

I think the problem is that PrintVersion (a few lines up from there) 
used to put the R in front; PrintVersionString doesn't include the R. 
PrintVersionString is called from other places where the R would not be 
appropriate, but PrintVersion is only called when acting on `R 
--version' or synonyms.

Fritz, I think this was your change in r36923 a few months ago.  Do you 
have time to deal with it?

Duncan

__
R-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/r-devel