Patchwork Fix the manual for old texinfo

login
register
mail settings
Submitter Szabolcs Nagy
Date Jan. 4, 2019, 11:23 a.m.
Message ID <791370bf-3dba-a387-f1d1-9a71bb397068@arm.com>
Download mbox | patch
Permalink /patch/30959/
State New
Headers show

Comments

Szabolcs Nagy - Jan. 4, 2019, 11:23 a.m.
Installing the manual fails with texinfo 4.13:

/S/manual/maint.texi:288: Unknown command `lbracechar'.
/S/manual/maint.texi:288: Misplaced {.
/S/manual/maint.texi:288: Misplaced }.
/S/manual/maint.texi:290: Unknown command `rbracechar'.
/S/manual/maint.texi:290: Misplaced {.
/S/manual/maint.texi:290: Misplaced }.
/S/manual/maint.texi:302: Unknown command `lbracechar'.
/S/manual/maint.texi:302: Misplaced {.
/S/manual/maint.texi:302: Misplaced }.
/S/manual/maint.texi:305: Unknown command `rbracechar'.
/S/manual/maint.texi:305: Misplaced {.
/S/manual/maint.texi:305: Misplaced }.
makeinfo: Removing output file `/B/manual/libc.info' due to errors; use --force to preserve.
make[2]: *** [Makefile:142: /B/manual/libc.info] Error 1

OK for master?

2019-01-04  Szabolcs Nagy  <szabolcs.nagy@arm.com>

	* manual/maint.texi: Use @{ and @}.
Florian Weimer - Jan. 4, 2019, 11:42 a.m.
* Szabolcs Nagy:

> 2019-01-04  Szabolcs Nagy  <szabolcs.nagy@arm.com>
>
> 	* manual/maint.texi: Use @{ and @}.

Tulio posted essentially the same patch last month.  Still looks okay to
me.

Thanks,
Florian
Szabolcs Nagy - Jan. 4, 2019, 11:46 a.m.
On 04/01/2019 11:42, Florian Weimer wrote:
> * Szabolcs Nagy:

> 

>> 2019-01-04  Szabolcs Nagy  <szabolcs.nagy@arm.com>

>>

>> 	* manual/maint.texi: Use @{ and @}.

> 

> Tulio posted essentially the same patch last month.  Still looks okay to

> me.


oh i missed that.

i committed my version now.

Patch

diff --git a/manual/maint.texi b/manual/maint.texi

index a1b8f62d14..ec234e15d7 100644

--- a/manual/maint.texi

+++ b/manual/maint.texi

@@ -285,9 +285,9 @@  and is compiled for both dual-time and single-time configuration classes.

 @smallexample
 struct tm *
 __localtime64 (const __time64_t *t)
-@lbracechar{}

+@{

   return __tz_convert (*t, 1, &_tmbuf);
-@rbracechar{}

+@}

 libc_hidden_def (__localtime64)
 @end smallexample
 
@@ -299,10 +299,10 @@  dual-time configurations:

 
 struct tm *
 localtime (const time_t *t)
-@lbracechar{}

+@{

   __time64_t t64 = *t;
   return __localtime64 (&t64);
-@rbracechar{}

+@}

 libc_hidden_def (localtime)
 
 #endif