[tz] [PATCH v2] tzfile.5: Fix indentation

[Alejandro Colomar]

Hi Paul!

Do I need to subscribe to write to the list?  I don't see my posts in
the archives.

On Sun, Mar 17, 2024 at 11:35:48AM -0700, Paul Eggert wrote:
> On 2024-03-17 05:43, Alejandro Colomar wrote:
> > RS after IP, if the indentation amount is not specified, takes the same
> > indentation that IP had.  The values being used were wrong, and by
> > removing them, we're fixing the indentation of the page.  Also, one RS
> > was not just incorrect, but completely unnecessary, and there was a
> > missing RE.
> 
> Thanks for the bug report. Unfortunately the proposed fix generates too much
> white space between the bullet and the tzh_timecnt entry, when generating
> PDF. I installed the attached patch instead, which fixes the wrong .RS/.RE
> nesting and indentation in a different way; hope it works for you too.

Ahh, sorry, I missed the 2 spaces of indent before the TP tags.

> From e555300159da0916b93cf36b5355910b1bdf080a Mon Sep 17 00:00:00 2001
> From: Paul Eggert <eggert at cs.ucla.edu>
> Date: Sun, 17 Mar 2024 11:26:48 -0700
> Subject: [PROPOSED] Fix .RS/.RE problem in tzfile.5
> 
> Problem reported by Alejandro Colomar.
> * tzfile.5: Fix improperly nested .RS/.RE that caused indenting to
> be slightly off, by adding an .RE and removing an .RS, and by
> fixing one of the .RS indentings.
> ---
>  tzfile.5 | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tzfile.5 b/tzfile.5
> index 867348d6..742c8af8 100644
> --- a/tzfile.5
> +++ b/tzfile.5
> @@ -42,7 +42,7 @@ or
>  Fifteen bytes containing zeros reserved for future use.
>  .IP \(bu
>  Six four-byte integer values, in the following order:
> -.RS "\w'  \(bu    'u"
> +.RS "\w'  \(bu  'u"

This is technically incorrect:

You already gained the first two spaces from the previous RS, in which
you're nested.  Remember that we have

 .RS "\w'  'u"
 .IP \(bu "\w'\(bu  'u"

a few lines above.  The second RS, by default, does the same as the
previous IP, that is, "\w'\(bu  'u".  What you want here is to change
that, to add two more spaces before the TP tag, to the right of the IP
indent.  So, what you want is

 .RS "\w'\(bu    'u"

>  .TP "\w'  'u"
>  .B tzh_ttisutcnt
>  The number of UT/local indicators stored in the file.
> @@ -66,6 +66,7 @@ in the file (must not be zero).
>  The number of bytes of time zone abbreviation strings
>  stored in the file.
>  .RE
> +.RE

LGTM.

>  .PP
>  The above header is followed by the following fields, whose lengths
>  depend on the contents of the header:
> @@ -134,7 +135,6 @@ Also, in realistic applications
>  is in the range [\-89999, 93599] (i.e., more than \-25 hours and less
>  than 26 hours); this allows easy support by implementations that
>  already support the POSIX-required range [\-24:59:59, 25:59:59].
> -.RS "\w'  'u"

LGTM.

>  .IP \(bu "\w'\(bu  'u"

You can remove the amount from this line.  Since we've removed the RS
call, now we're continuing the existing IP list.  I'll send a patch in a
moment.

Have a lovely day!
Alex

>  .B tzh_charcnt
>  bytes that represent time zone designations,
> -- 
> 2.40.1
> 


-- 
<https://www.alejandro-colomar.es/>
Looking for a remote C programming job at the moment.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://mm.icann.org/pipermail/tz/attachments/20240317/b123d5b7/signature-0001.asc>