Patchwork libiberty: Fix "make pdf" for copying-lib.texi

login
register
mail settings
Submitter Tobias Burnus
Date Jan. 9, 2012, 2:59 p.m.
Message ID <4F0B00C6.70105@net-b.de>
Download mbox | patch
Permalink /patch/135034/
State New
Headers show

Comments

Tobias Burnus - Jan. 9, 2012, 2:59 p.m.
"make pdf" fails with:

libiberty/copying-lib.texi:481: This command can
  appear only outside of any environment, not in environment @enumerate.
@badenverr ...temp , not @inenvironment @thisenv }

@checkenv ...@ifx @thisenv @temp @else @badenverr
                                                   @fi
@sectionheading #1#2#3#4->{@checkenv {}
                                        @csname #2fonts@endcsname 
@rmisbold @...

@\heading ...tionheading {#1}{sec}{Yomitfromtoc}{}
                                                    
@suppressfirstparagraphin...
l.481 @heading NO WARRANTY


The patch below fixes the issue, but I am not sure whether the numbering 
should continue with "15.". (Which is the current result in "info" or 
when continuing with "enter".)

OK?

Tobias

PS: Does this need special care, e.g. for sourceware?


  @heading NO WARRANTY
@@ -483,6 +484,7 @@ and reuse of software generally.
  @center NO WARRANTY
  @end ifinfo

+@enumerate 15
  @item
  BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
  WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
Tobias Burnus - Jan. 19, 2012, 10:48 a.m.
* PING *

On 01/09/2012 03:59 PM, Tobias Burnus wrote:
> "make pdf" fails with:
>
> libiberty/copying-lib.texi:481: This command can
>  appear only outside of any environment, not in environment @enumerate.
> @badenverr ...temp , not @inenvironment @thisenv }
>
> @checkenv ...@ifx @thisenv @temp @else @badenverr
>                                                   @fi
> @sectionheading #1#2#3#4->{@checkenv {}
>                                        @csname #2fonts@endcsname 
> @rmisbold @...
>
> @\heading ...tionheading {#1}{sec}{Yomitfromtoc}{}
>                                                    
> @suppressfirstparagraphin...
> l.481 @heading NO WARRANTY
>
>
> The patch below fixes the issue, but I am not sure whether the 
> numbering should continue with "15.". (Which is the current result in 
> "info" or when continuing with "enter".)
>
> OK?
>
> Tobias
>
> PS: Does this need special care, e.g. for sourceware?
>
>
> --- a/libiberty/copying-lib.texi
> +++ b/libiberty/copying-lib.texi
> @@ -475,6 +475,7 @@ Software Foundation; we sometimes make exceptions 
> for this.  Our
>  decision will be guided by the two goals of preserving the free status
>  of all derivatives of our free software and of promoting the sharing
>  and reuse of software generally.
> +@end enumerate
>
>  @iftex
>  @heading NO WARRANTY
> @@ -483,6 +484,7 @@ and reuse of software generally.
>  @center NO WARRANTY
>  @end ifinfo
>
> +@enumerate 15
>  @item
>  BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
>  WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
>
DJ Delorie - Jan. 19, 2012, 7:30 p.m.
I have no problems running "make pdf" in libiberty.

texi2dvi (GNU Texinfo 4.13) 1.135
Tobias Burnus - Jan. 19, 2012, 7:59 p.m.
DJ Delorie wrote:
> I have no problems running "make pdf" in libiberty.
> texi2dvi (GNU Texinfo 4.13) 1.135

That's odd. I have exactly the same version and I get the following TeX 
error.

Tobias


texi2pdf /home/tob/projects/gcc-git/gcc/libiberty/libiberty.texi
This is pdfTeX, Version 3.1415926-2.3-1.40.12 (TeX Live 2011)
  restricted \write18 enabled.
entering extended mode
(/home/tob/projects/gcc-git/gcc/libiberty/libiberty.texi
(/usr/share/texmf/tex/texinfo/texinfo.tex
Loading texinfo [version 2011-05-23.16]: pdf, fonts, markup, glyphs,
page headings, tables, conditionals, indexing, sectioning, toc, 
environments,
defuns, macros, cross references, insertions,
(/usr/share/texmf/tex/generic/epsf/epsf.tex
This is `epsf.tex' v2.7.4 <14 February 2011>
) localization, formatting, and turning on texinfo input format.) 
[1{/var/lib/t
exmf/fonts/map/pdftex/updmap/pdftex.map}] [2] [-1] Chapter 1 Chapter 2 [1]
[2] (/home/tob/projects/gcc-git/gcc/libiberty/obstacks.texi Chapter 3 [3]
[4] Cross reference values unknown; you must run TeX again. [5] [6] [7]
[8] [9] [10] [11] [12] [13]) Chapter 4 [14]
(/home/tob/projects/gcc-git/gcc/libiberty/functions.texi [15] [16] [17]
[18] [19] [20] [21]
Underfull \hbox (badness 10000) in paragraph at lines 677--681
  []@textrm For ex-am-ple, if @textsl bin[]prefix @textrm is @texttt 
/alpha/beta
/gamma/gcc/delta[]@textrm , @textsl pre-fix @textrm is
[22] [23] [24] [25] [26] [27] [28] [29] [30] [31] [32] [33] [34] [35])
Appendix A [36] (/home/tob/projects/gcc-git/gcc/libiberty/copying-lib.texi
[37] [38] [39] [40] [41] [42]
/home/tob/projects/gcc-git/gcc/libiberty/copying-lib.texi:480: This 
command can
  appear only outside of any environment, not in environment @enumerate.
@badenverr ...temp , not @inenvironment @thisenv }

@checkenv ...@ifx @thisenv @temp @else @badenverr
                                                   @fi
@sectionheading #1#2#3#4->{@checkenv {}
                                        @csname #2fonts@endcsname 
@rmisbold @...

@\heading ...tionheading {#1}{sec}{Yomitfromtoc}{}
                                                    
@suppressfirstparagraphin...
l.480 @heading NO WARRANTY

?

Patch

--- a/libiberty/copying-lib.texi
+++ b/libiberty/copying-lib.texi
@@ -475,6 +475,7 @@  Software Foundation; we sometimes make exceptions 
for this.  Our
  decision will be guided by the two goals of preserving the free status
  of all derivatives of our free software and of promoting the sharing
  and reuse of software generally.
+@end enumerate

  @iftex