fonttextsize in lispref/elisp.texi

fonttextsize in lispref/elisp.texi

[Lute Kamstra]

make elisp.dvi in lispref doesn't work for me anymore.  This is due to
the use of @fonttextsize in lispref/elisp.texi.  This command is not
defined in the most recent released version of texinfo.tex.
@fonttextsize is also used in man/emacs.texi.  It works there because
man/texinfo.tex was hacked to define fonttextsize.  Shall I copy
man/texinfo.tex to lispref/texinfo.tex?  Currently lispref does not
contain any version of texinfo.tex.

  Lute.

Re: fonttextsize in lispref/elisp.texi

[Richard Stallman]

      It works there because
    man/texinfo.tex was hacked to define fonttextsize.  Shall I copy
    man/texinfo.tex to lispref/texinfo.tex?

Please do.

Re: fonttextsize in lispref/elisp.texi

[Eli Zaretskii]

> From: Richard Stallman <rms@gnu.org>
> Date: Sun, 13 Aug 2006 13:52:57 -0400
> Cc: emacs-devel@gnu.org
> 
>       It works there because
>     man/texinfo.tex was hacked to define fonttextsize.  Shall I copy
>     man/texinfo.tex to lispref/texinfo.tex?
> 
> Please do.

Isn't it better to use -I switch to makeinfo to force it to use
man/texinfo.tex?

Re: fonttextsize in lispref/elisp.texi

[Lute Kamstra]

Eli Zaretskii <eliz@gnu.org> writes:

>>       It works there because
>>     man/texinfo.tex was hacked to define fonttextsize.  Shall I copy
>>     man/texinfo.tex to lispref/texinfo.tex?
>> 
>> Please do.
>
> Isn't it better to use -I switch to makeinfo to force it to use
> man/texinfo.tex?

I think so.  What about this patch?

  Lute.


Index: lispref/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/lispref/Makefile.in,v
retrieving revision 1.37
diff -c -r1.37 Makefile.in
*** lispref/Makefile.in 6 Feb 2006 11:55:09 -0000       1.37
--- lispref/Makefile.in 14 Aug 2006 08:14:56 -0000
***************
*** 27,32 ****
--- 27,33 ----
  VPATH=@srcdir@
  
  infodir = $(srcdir)/../info
+ mandir = $(srcdir)/../man
  
  TEXI2DVI = texi2dvi
  SHELL = /bin/sh
***************
*** 103,109 ****
        $(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp
  
  elisp.dvi: $(srcs)
!       $(TEXI2DVI) -I $(srcdir) $(srcdir)/elisp.texi
  
  # This is for use in a separate distro of the Emacs Lisp manual.
  install: elisp
--- 104,110 ----
        $(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp
  
  elisp.dvi: $(srcs)
!       $(TEXI2DVI) -I $(srcdir):$(mandir) $(srcdir)/elisp.texi
  
  # This is for use in a separate distro of the Emacs Lisp manual.
  install: elisp

Re: fonttextsize in lispref/elisp.texi

[Eli Zaretskii]

> Cc: rms@gnu.org, emacs-devel@gnu.org
> From: Lute Kamstra <Lute.Kamstra.lists@xs4all.nl>
> Date: Mon, 14 Aug 2006 10:27:39 +0200
> 
> > Isn't it better to use -I switch to makeinfo to force it to use
> > man/texinfo.tex?
> 
> I think so.  What about this patch?

Fine with me, but:

  1) please wait for Richart to approve it

  2) I think `mandir' is the wrong name for this, since that name is
     used for the directory where man pages are installed

> !       $(TEXI2DVI) -I $(srcdir):$(mandir) $(srcdir)/elisp.texi

  3) please use 2 separate -I switches in a row, since the `:'
     separator is not portable to non-Posix systems

Re: fonttextsize in lispref/elisp.texi

[Lute Kamstra]

Eli Zaretskii <eliz@gnu.org> writes:

>   2) I think `mandir' is the wrong name for this, since that name is
>      used for the directory where man pages are installed
>
>> !       $(TEXI2DVI) -I $(srcdir):$(mandir) $(srcdir)/elisp.texi
>
>   3) please use 2 separate -I switches in a row, since the `:'
>      separator is not portable to non-Posix systems

Thanks, I'll commit this patch then.

  Lute.


Index: lispref/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/lispref/Makefile.in,v
retrieving revision 1.37
diff -c -r1.37 Makefile.in
*** lispref/Makefile.in 6 Feb 2006 11:55:09 -0000       1.37
--- lispref/Makefile.in 20 Aug 2006 07:43:29 -0000
***************
*** 27,32 ****
--- 27,33 ----
  VPATH=@srcdir@
  
  infodir = $(srcdir)/../info
+ usermanualdir = $(srcdir)/../man
  
  TEXI2DVI = texi2dvi
  SHELL = /bin/sh
***************
*** 103,109 ****
        $(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp
  
  elisp.dvi: $(srcs)
!       $(TEXI2DVI) -I $(srcdir) $(srcdir)/elisp.texi
  
  # This is for use in a separate distro of the Emacs Lisp manual.
  install: elisp
--- 104,110 ----
        $(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp
  
  elisp.dvi: $(srcs)
!       $(TEXI2DVI) -I $(srcdir) -I $(usermanualdir) $(srcdir)/elisp.texi
  
  # This is for use in a separate distro of the Emacs Lisp manual.
  install: elisp

Re: fonttextsize in lispref/elisp.texi

[Lute Kamstra]

Could someone with access to Windows check if this patch fixes the
build problems for lispref/elisp.dvi on that platform?

  Lute.


Index: lispref/makefile.w32-in
===================================================================
RCS file: /cvsroot/emacs/emacs/lispref/makefile.w32-in,v
retrieving revision 1.14
diff -c -r1.14 makefile.w32-in
*** lispref/makefile.w32-in     6 Feb 2006 11:55:10 -0000       1.14
--- lispref/makefile.w32-in     21 Aug 2006 09:25:53 -0000
***************
*** 23,28 ****
--- 23,29 ----
  srcdir = .
  
  infodir = $(srcdir)/../info
+ usermanualdir = $(srcdir)/../man
  
  # Redefine `TEX' if `tex' does not invoke plain TeX.  For example:
  # TEX=platex
***************
*** 32,38 ****
  
  # The environment variable and its value to add $(srcdir) to the path
  # searched for TeX input files.
! texinputdir = $(srcdir)\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" /C
  
  # The name of the manual:
  VERSION=2.9
--- 33,39 ----
  
  # The environment variable and its value to add $(srcdir) to the path
  # searched for TeX input files.
! texinputdir = $(srcdir)\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(usermanualdir);$(TEXINPUTS)" /C
  
  # The name of the manual:
  VERSION=2.9

Re: fonttextsize in lispref/elisp.texi

[Richard Stallman]

    Isn't it better to use -I switch to makeinfo to force it to use
    man/texinfo.tex?

It makes little difference to me.