From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail
From: Sebastian Urban <mrsebastianurban@gmail.com>
Newsgroups: gmane.emacs.bugs
Subject: bug#35885: 25.2; Few mistakes in Emacs Manual (+ proposals)
Date: Sun, 10 May 2020 22:02:16 +0200
Message-ID: <c27a8c46-68d3-f9f4-2e92-05e0b6496b53@gmail.com>
References: <cf31e2b2-3ad4-57f0-8847-e5f01ff35fc8@gmail.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------72FA74A7A7D7E2689AD20026"
Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202";
	logging-data="93785"; mail-complaints-to="usenet@ciao.gmane.io"
User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:68.0) Gecko/20100101
 Thunderbird/68.8.0
Cc: 35885@debbugs.gnu.org
To: mrsebastianurban@gmail.com
Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun May 10 22:03:11 2020
Return-path: <bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org>
Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org
Original-Received: from lists.gnu.org ([209.51.188.17])
	by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
	(Exim 4.92)
	(envelope-from <bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org>)
	id 1jXsAI-000OIz-Rb
	for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 10 May 2020 22:03:11 +0200
Original-Received: from localhost ([::1]:40308 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org>)
	id 1jXsAH-00020r-Tl
	for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 10 May 2020 16:03:09 -0400
Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54504)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1jXsAA-00020j-Q3
 for bug-gnu-emacs@gnu.org; Sun, 10 May 2020 16:03:02 -0400
Original-Received: from debbugs.gnu.org ([209.51.188.43]:38958)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1jXsAA-0007LJ-Gn
 for bug-gnu-emacs@gnu.org; Sun, 10 May 2020 16:03:02 -0400
Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jXsAA-0007gG-ED
 for bug-gnu-emacs@gnu.org; Sun, 10 May 2020 16:03:02 -0400
X-Loop: help-debbugs@gnu.org
Resent-From: Sebastian Urban <mrsebastianurban@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@gnu.org
Resent-Date: Sun, 10 May 2020 20:03:02 +0000
Resent-Message-ID: <handler.35885.B35885.158914094829149@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 35885
X-GNU-PR-Package: emacs
Original-Received: via spool by 35885-submit@debbugs.gnu.org id=B35885.158914094829149
 (code B ref 35885); Sun, 10 May 2020 20:03:02 +0000
Original-Received: (at 35885) by debbugs.gnu.org; 10 May 2020 20:02:28 +0000
Original-Received: from localhost ([127.0.0.1]:50504 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1jXs9b-0007ZN-C5
 for submit@debbugs.gnu.org; Sun, 10 May 2020 16:02:28 -0400
Original-Received: from mail-lf1-f52.google.com ([209.85.167.52]:42099)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <mrsebastianurban@gmail.com>) id 1jXs9Y-0007Tk-Uf
 for 35885@debbugs.gnu.org; Sun, 10 May 2020 16:02:26 -0400
Original-Received: by mail-lf1-f52.google.com with SMTP id r17so2635753lff.9
 for <35885@debbugs.gnu.org>; Sun, 10 May 2020 13:02:24 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; 
 h=to:references:subject:in-reply-to:cc:from:message-id:date
 :user-agent:mime-version:content-language;
 bh=V+zo4tO8xOFl/xrtcQ4crk2PGny0P35J+GcEeBTiRw0=;
 b=j6/MrVySfR8VCLea9mvINrRK2kl0ZMELZhL0fjQMekFVffGBQD2Vu5fY0EL02YyojS
 P3EM5Ei3H+X8nP5VunMzOg84mIvtQAbyj+CPrXdYY3APQ1JenOUMHBlmlGYPBywPQH24
 YdtzdL1idh5o0bIppZqFwb/3ZhDKhuay4IwoWsrFN9ibNp0y1lkhTSng3MYUIZI0sLcl
 5/RDyRVs/+RNpOjyzHlykECcpeuGZp7a2Qycs8Bu3eFpQnYMgVSkTDwGpnPZskDPct18
 nHhLX24QMXlk7odzCUE1bBnz3zMQGyx+ecvb0wPxPvyA9buNa6wdfOzSmJb77DHGRCMy
 L3Cg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:to:references:subject:in-reply-to:cc:from
 :message-id:date:user-agent:mime-version:content-language;
 bh=V+zo4tO8xOFl/xrtcQ4crk2PGny0P35J+GcEeBTiRw0=;
 b=EWTo3HRXlqMCcYthf02gQ4xfyqFdncnycgnmX86s2xCafWPb5N8qLwJSLGL2rJ6Kd2
 CVBql2p9IDzd9k5u86BTyBvkhDJRWJpRZ7rB5Kda6FqVQufV88FswsNmUqh9Nd9DxiKE
 0iDbPxBrNl03j9F6tHvhNlTO7ZUfggdRttZQo7Ku5iWeWez9zveqEqKbTx6ns3kDD2kZ
 ZxkbIhA0n3Cu2VMcOJlAItZRCjQWdVeEbAVi0dRcXVecU5DFGqNAIXBQI2u5lBycPP9c
 PfyHGCgfAOzwS0bRxV3B26q+UrmNDKBKOg27HMhiSpapK3ZTsjON16KCR9IScU/5FTyz
 BSeA==
X-Gm-Message-State: AOAM5324dnL28qBHgydLtw8S/DJn6S1ufXTJajabD06qa/u46hmlSpFk
 YudnNtO/RZlsQuGC0J04f/X0KJwgbJ4=
X-Google-Smtp-Source: ABdhPJx6G8aCJp5lQrfAPu4LETsP5e6Vhcqhp1FuIMgVb/kW3KWW2bN2P5ZDZy4Rehh4K2dxIyOQGA==
X-Received: by 2002:ac2:59ce:: with SMTP id x14mr8507133lfn.183.1589140937964; 
 Sun, 10 May 2020 13:02:17 -0700 (PDT)
Original-Received: from [192.168.1.100] (ip-89-161-2-137.tel.tkb.net.pl. [89.161.2.137])
 by smtp.gmail.com with ESMTPSA id h22sm7647924ljb.65.2020.05.10.13.02.16
 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
 Sun, 10 May 2020 13:02:17 -0700 (PDT)
In-Reply-To: <cf31e2b2-3ad4-57f0-8847-e5f01ff35fc8@gmail.com>
Content-Language: en-GB
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: bug-gnu-emacs@gnu.org
List-Id: "Bug reports for GNU Emacs,
 the Swiss army knife of text editors" <bug-gnu-emacs.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-gnu-emacs>,
 <mailto:bug-gnu-emacs-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-gnu-emacs>
List-Post: <mailto:bug-gnu-emacs@gnu.org>
List-Help: <mailto:bug-gnu-emacs-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-gnu-emacs>,
 <mailto:bug-gnu-emacs-request@gnu.org?subject=subscribe>
Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org
Original-Sender: "bug-gnu-emacs"
 <bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org>
Xref: news.gmane.io gmane.emacs.bugs:180030
Archived-At: <http://permalink.gmane.org/gmane.emacs.bugs/180030>

This is a multi-part message in MIME format.
--------------72FA74A7A7D7E2689AD20026
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit

I'm revisiting this bug report, because, thanks to patches to
TEXINFO.TEX by Gavin Smith, I believe we can finally fix the issues
for good.  TEXINFO.TEX version >= 2020-05-10.15 is required.

Additionally bug about heading not appearing sometimes on last page of
the chapter (present in official PDF version updated for 26.3), was
fixed as well.


I decided to went through places pointed out in this report, to see if
any changes are needed, here are diffs based on master branch from
03.05.2020 (I also attached them):

------------------------- BASIC.TEXI START -------------------------
--- old/basic.texi	2020-05-03 01:28:18.576838200 +0200
+++ new/basic.texi	2020-05-05 23:07:21.487684600 +0200
@@ -115,7 +115,7 @@
  starting with @kbd{C-x 8}.  For example, @kbd{C-x 8 [} inserts @t{‘}
  which is Unicode code-point U+2018 @sc{left single quotation mark},
  sometimes called a left single ``curved quote'' or ``curly quote''.
-Similarly, @kbd{C-x 8 ]}, @kbd{C-x 8 @{} and @kbd{C-x 8 @}} insert the
+Similarly, @w{@kbd{C-x 8 ]}}, @kbd{C-x 8 @{} and @kbd{C-x 8 @}} 
insert the
  curved quotes @t{’}, @t{“} and @t{”}, respectively.  Also, a working
  @key{Alt} key acts like @kbd{C-x 8} (unless followed by @key{RET});
  e.g., @kbd{A-[} acts like @kbd{C-x 8 [} and inserts @t{‘}.  To see
@@ -146,11 +146,11 @@
  how many copies of the character to insert (@pxref{Arguments}).

    In addition, in some contexts, if you type a quotation using grave
-accent and apostrophe @kbd{`like this'}, it is converted to a form
-@t{‘like this’} using single quotation marks, even without @kbd{C-x 8}
-commands.  Similarly, typing a quotation @kbd{``like this''} using
-double grave accent and apostrophe converts it to a form @t{“like
-this”} using double quotation marks.  @xref{Quotation Marks}.
+accent and apostrophe @verb{|`like this'|}, it is converted to a form
+using single quotation marks @t{‘like this’}, even without @kbd{C-x 8}
+commands.  Similarly, typing a quotation using double grave accent and
+apostrophe @verb{|``like this''|}, converts it to a form using double
+quotation marks @w{@t{“like this”}}.  @xref{Quotation Marks}.

  @node Moving Point
  @section Changing the Location of Point
------------------------- BASIC.TEXI END -------------------------

1st change @w - in PDF this key is split on two pages, which looks
     	   	bad.
2nd change:
    - changed @kbd to @verb, because @kbd surrounds text with pair of
      curved quotes in plain text - result it ‘``like this''’, @verb
      doesn't do it;
    - @w, because last example is split between 2 lines;
    - I also moved examples to the end of part of the sentence, this
      way we have: description followed by an example, instead of
      example being in the middle of description.

------------------------- DSIPLAY.TEXI START -------------------------
--- old/display.texi	2020-05-03 01:29:34.852965900 +0200
+++ new/display.texi	2020-05-05 23:00:10.014126600 +0200
@@ -1629,10 +1629,10 @@
  @cindex curved quotes, and terminal capabilities
  @cindex @code{homoglyph} face

-Emacs tries to determine if the curved quotes @samp{‘} and @samp{’}
+Emacs tries to determine if the curved quotes @t{‘} and @t{’}
  can be displayed on the current display.  By default, if this seems to
-be so, then Emacs will translate the @acronym{ASCII} quotes (@samp{`}
-and @samp{'}), when they appear in messages and help texts, to these
+be so, then Emacs will translate the @acronym{ASCII} quotes @w{(@kbd{`}
+and @kbd{'})}, when they appear in messages and help texts, to these
  curved quotes.  You can influence or inhibit this translation by
  customizing the user option @code{text-quoting-style} (@pxref{Keys in
  Documentation,,, elisp, The Emacs Lisp Reference Manual}).
@@ -1641,7 +1641,7 @@
  known to look just like @acronym{ASCII} characters, they are shown
  with the @code{homoglyph} face.  Curved quotes that are known not to
  be displayable are shown as their @acronym{ASCII} approximations
-@t{`}, @t{'}, and @t{"} with the @code{homoglyph} face.
+@kbd{`}, @kbd{'}, and @kbd{"} with the @code{homoglyph} face.

  @node Cursor Display
  @section Displaying the Cursor
------------------------- DSIPLAY.TEXI END -------------------------

Basically, I got rid of @samp in favour of @t and @kbd; the @w
prevents line break after "`".

------------------------- MODES.TEXI START -------------------------
--- old/modes.texi	2020-05-03 01:32:48.773267500 +0200
+++ new/modes.texi	2020-05-05 20:23:41.217738900 +0200
@@ -207,7 +207,7 @@

  @item
  Electric Quote mode automatically converts quotation marks.  For
-example, it requotes text typed @kbd{`like this'} to text @t{‘like
+example, it requotes text typed @verb{|`like this'|} to text @t{‘like
  this’}.  You can control what kind of text it operates in, and you can
  disable it entirely in individual buffers.  @xref{Quotation Marks}.
------------------------- MODES.TEXI END -------------------------

Another example surrounded by unnecessary curved quotes in plain text,
fixed by using @verb.

------------------------- TEXT.TEXI START -------------------------
--- old/text.texi	2020-05-03 01:34:10.677385800 +0200
+++ new/text.texi	2020-05-05 23:47:52.987559000 +0200
@@ -421,13 +421,11 @@
  @cindex curved quotes
  @cindex guillemets
  @findex electric-quote-mode
-@c The funny quoting below is to make the printed version look
-@c correct.  FIXME.
    One common way to quote is the typewriter convention, which quotes
-using straight apostrophes @t{'like this'} or double-quotes @t{"like
-this"}.  Another common way is the curved quote convention, which uses
-left and right single or double quotation marks `@t{like this}' or
-``@t{like this}''@footnote{
+using straight apostrophes @verb{|'like this'|} or double-quotes
+@verb{|"like this"|}.  Another common way is the curved quote
+convention, which uses left and right single or double quotation marks
+@t{‘like this’} or @t{“like this”}@footnote{
  The curved single quote characters are U+2018 @sc{left single quotation
  mark} and U+2019 @sc{right single quotation mark}; the curved double 
quotes
  are U+201C @sc{left double quotation mark} and U+201D @sc{right double
@@ -445,7 +443,7 @@
  @code{electric-quote-chars}, a list of four characters, where the
  items correspond to the left single quote, the right single quote, the
  left double quote and the right double quote, respectively, whose
-default value is @code{'(?@r{`} ?@r{'} ?@r{``} ?@r{''})}.
+default value is @w{@code{'(@w{?}‘ @w{?}’ @w{?}“ @w{?}”)}}.

  @vindex electric-quote-paragraph
  @vindex electric-quote-comment
@@ -461,7 +459,7 @@

  @vindex electric-quote-replace-double
    You can also set the option @code{electric-quote-replace-double} to
-a non-@code{nil} value.  Then, typing @t{"} insert an appropriate
+a non-@code{nil} value.  Then, typing @kbd{"} insert an appropriate
  curved double quote depending on context: @t{“} at the beginning of
  the buffer or after a line break, whitespace, opening parenthesis, or
  quote character, and @t{”} otherwise.
@@ -473,7 +471,7 @@
  type @kbd{C-q `} or @kbd{C-q '} instead of @kbd{`} or @kbd{'}.  To
  insert a curved quote even when Electric Quote is disabled or
  inactive, you can type @kbd{C-x 8 [} for @t{‘}, @kbd{C-x 8 ]} for
-@t{’}, @kbd{C-x 8 @{} for ``, and @kbd{C-x 8 @}} for ''.
+@t{’}, @kbd{C-x 8 @{} for @t{“}, and @kbd{C-x 8 @}} for @t{”}.
  @xref{Inserting Text}.  Note that the value of
  @code{electric-quote-chars} does not affect these keybindings, they
  are not keybindings of @code{electric-quote-mode} but bound in
------------------------- TEXT.TEXI END -------------------------

- Quotes are fixed, so FIXME is no longer needed.
- Value of "electric-quote-chars" has so many @w, because:
   A.  To prevent splitting between lines, which happens;
   B.  ?‘ expands to ¿, so I had to prevent it (@w near ?’ ?“ ?”, are
   unnecessary, but I put them anyway for consistency and just in case
   something in the future change, i.e. for safety).


Optionally, I would also suggest replacing @kbd for ` ' `` '' with
@verb for the same reason as stated above, i.e. instead of ` in plain
text, with @kbd we're getting ‘`’, which looks quite interesting in
e.g. "Quotation Marks" section: "(...) it optionally converts ‘`’ to
‘, ‘'’ to ’, ‘``’ to “, and ‘''’ to ”."


 >> 2.  Header style should be changed.
 >> It shows page number in right upper corner on every page, but it
 >> should show it in right upper corner for odd (right-side) pages and in
 >> left upper corner for even (left-side) pages - just like in normal
 >> book.
 >>
 >> 3.  Add numbers to sections (& subsect.) for bookmark/navigation pane.
 >> When you open it in any PDF reader with manual loaded, it only shows
 >> names of sections, and without numbers it's difficult to navigate.
 >
 > These are beyond our control (well, unless we want to write a lot of
 > TeX glue in the manual): this is how Texinfo works.

With the up-to-date version of TEXINFO.TEX, header style could be
changed with this:

------------------------- EMACS.TEXI START -------------------------
--- old/emacs.texi       2020-05-10 21:24:52.351021900 +0200
+++ new/emacs.texi       2020-05-10 21:23:30.621478300 +0200
@@ -99,10 +99,13 @@

  @end titlepage

+@evenheading @thispage @| @|
+@oddheading @| @| @thispage

  @summarycontents
  @contents

+@headings double

  @ifnottex
  @node Top
------------------------- EMACS.TEXI END -------------------------

which will print this:
+--------------------------+ +------------------------+
| PAGE_NUM       DOC_TITLE | |CHAPTER        PAGE_NUM |

This is something I wanted to do in point 2.  It would certainly make
PDF look better.


As for chapters/sections numbering: chapters (level) will be numbered,
but sections won't for now (more opinions from other people are
needed).  As for me, chapter numeration (only) is good enough to mark
it as done.


Optional, further reading:

- quotes problem thread & PDF bookmarks numeration thread:
https://lists.gnu.org/archive/html/help-texinfo/2020-05/msg00005.html

- headers thread:
https://lists.gnu.org/archive/html/help-texinfo/2020-04/msg00000.html
CONTINUED
https://lists.gnu.org/archive/html/help-texinfo/2020-05/msg00000.html


S. U.

P.S.  If separate bug report is preferred, let me know, I'll send it
       again.

--------------72FA74A7A7D7E2689AD20026
Content-Type: text/plain; charset=UTF-8;
 name="basic.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="basic.diff"

LS0tIG9sZC9iYXNpYy50ZXhpCTIwMjAtMDUtMDMgMDE6Mjg6MTguNTc2ODM4MjAwICswMjAw
CisrKyBuZXcvYmFzaWMudGV4aQkyMDIwLTA1LTA1IDIzOjA3OjIxLjQ4NzY4NDYwMCArMDIw
MApAQCAtMTE1LDcgKzExNSw3IEBACiBzdGFydGluZyB3aXRoIEBrYmR7Qy14IDh9LiAgRm9y
IGV4YW1wbGUsIEBrYmR7Qy14IDggW30gaW5zZXJ0cyBAdHvigJh9CiB3aGljaCBpcyBVbmlj
b2RlIGNvZGUtcG9pbnQgVSsyMDE4IEBzY3tsZWZ0IHNpbmdsZSBxdW90YXRpb24gbWFya30s
CiBzb21ldGltZXMgY2FsbGVkIGEgbGVmdCBzaW5nbGUgYGBjdXJ2ZWQgcXVvdGUnJyBvciBg
YGN1cmx5IHF1b3RlJycuCi1TaW1pbGFybHksIEBrYmR7Qy14IDggXX0sIEBrYmR7Qy14IDgg
QHt9IGFuZCBAa2Jke0MteCA4IEB9fSBpbnNlcnQgdGhlCitTaW1pbGFybHksIEB3e0BrYmR7
Qy14IDggXX19LCBAa2Jke0MteCA4IEB7fSBhbmQgQGtiZHtDLXggOCBAfX0gaW5zZXJ0IHRo
ZQogY3VydmVkIHF1b3RlcyBAdHvigJl9LCBAdHvigJx9IGFuZCBAdHvigJ19LCByZXNwZWN0
aXZlbHkuICBBbHNvLCBhIHdvcmtpbmcKIEBrZXl7QWx0fSBrZXkgYWN0cyBsaWtlIEBrYmR7
Qy14IDh9ICh1bmxlc3MgZm9sbG93ZWQgYnkgQGtleXtSRVR9KTsKIGUuZy4sIEBrYmR7QS1b
fSBhY3RzIGxpa2UgQGtiZHtDLXggOCBbfSBhbmQgaW5zZXJ0cyBAdHvigJh9LiAgVG8gc2Vl
CkBAIC0xNDYsMTEgKzE0NiwxMSBAQAogaG93IG1hbnkgY29waWVzIG9mIHRoZSBjaGFyYWN0
ZXIgdG8gaW5zZXJ0IChAcHhyZWZ7QXJndW1lbnRzfSkuCiAKICAgSW4gYWRkaXRpb24sIGlu
IHNvbWUgY29udGV4dHMsIGlmIHlvdSB0eXBlIGEgcXVvdGF0aW9uIHVzaW5nIGdyYXZlCi1h
Y2NlbnQgYW5kIGFwb3N0cm9waGUgQGtiZHtgbGlrZSB0aGlzJ30sIGl0IGlzIGNvbnZlcnRl
ZCB0byBhIGZvcm0KLUB0e+KAmGxpa2UgdGhpc+KAmX0gdXNpbmcgc2luZ2xlIHF1b3RhdGlv
biBtYXJrcywgZXZlbiB3aXRob3V0IEBrYmR7Qy14IDh9Ci1jb21tYW5kcy4gIFNpbWlsYXJs
eSwgdHlwaW5nIGEgcXVvdGF0aW9uIEBrYmR7YGBsaWtlIHRoaXMnJ30gdXNpbmcKLWRvdWJs
ZSBncmF2ZSBhY2NlbnQgYW5kIGFwb3N0cm9waGUgY29udmVydHMgaXQgdG8gYSBmb3JtIEB0
e+KAnGxpa2UKLXRoaXPigJ19IHVzaW5nIGRvdWJsZSBxdW90YXRpb24gbWFya3MuICBAeHJl
ZntRdW90YXRpb24gTWFya3N9LgorYWNjZW50IGFuZCBhcG9zdHJvcGhlIEB2ZXJie3xgbGlr
ZSB0aGlzJ3x9LCBpdCBpcyBjb252ZXJ0ZWQgdG8gYSBmb3JtCit1c2luZyBzaW5nbGUgcXVv
dGF0aW9uIG1hcmtzIEB0e+KAmGxpa2UgdGhpc+KAmX0sIGV2ZW4gd2l0aG91dCBAa2Jke0Mt
eCA4fQorY29tbWFuZHMuICBTaW1pbGFybHksIHR5cGluZyBhIHF1b3RhdGlvbiB1c2luZyBk
b3VibGUgZ3JhdmUgYWNjZW50IGFuZAorYXBvc3Ryb3BoZSBAdmVyYnt8YGBsaWtlIHRoaXMn
J3x9LCBjb252ZXJ0cyBpdCB0byBhIGZvcm0gdXNpbmcgZG91YmxlCitxdW90YXRpb24gbWFy
a3MgQHd7QHR74oCcbGlrZSB0aGlz4oCdfX0uICBAeHJlZntRdW90YXRpb24gTWFya3N9Lgog
CiBAbm9kZSBNb3ZpbmcgUG9pbnQKIEBzZWN0aW9uIENoYW5naW5nIHRoZSBMb2NhdGlvbiBv
ZiBQb2ludAo=
--------------72FA74A7A7D7E2689AD20026
Content-Type: text/plain; charset=UTF-8;
 name="display.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="display.diff"

LS0tIG9sZC9kaXNwbGF5LnRleGkJMjAyMC0wNS0wMyAwMToyOTozNC44NTI5NjU5MDAgKzAy
MDAKKysrIG5ldy9kaXNwbGF5LnRleGkJMjAyMC0wNS0wNSAyMzowMDoxMC4wMTQxMjY2MDAg
KzAyMDAKQEAgLTE2MjksMTAgKzE2MjksMTAgQEAKIEBjaW5kZXggY3VydmVkIHF1b3Rlcywg
YW5kIHRlcm1pbmFsIGNhcGFiaWxpdGllcwogQGNpbmRleCBAY29kZXtob21vZ2x5cGh9IGZh
Y2UKIAotRW1hY3MgdHJpZXMgdG8gZGV0ZXJtaW5lIGlmIHRoZSBjdXJ2ZWQgcXVvdGVzIEBz
YW1we+KAmH0gYW5kIEBzYW1we+KAmX0KK0VtYWNzIHRyaWVzIHRvIGRldGVybWluZSBpZiB0
aGUgY3VydmVkIHF1b3RlcyBAdHvigJh9IGFuZCBAdHvigJl9CiBjYW4gYmUgZGlzcGxheWVk
IG9uIHRoZSBjdXJyZW50IGRpc3BsYXkuICBCeSBkZWZhdWx0LCBpZiB0aGlzIHNlZW1zIHRv
Ci1iZSBzbywgdGhlbiBFbWFjcyB3aWxsIHRyYW5zbGF0ZSB0aGUgQGFjcm9ueW17QVNDSUl9
IHF1b3RlcyAoQHNhbXB7YH0KLWFuZCBAc2FtcHsnfSksIHdoZW4gdGhleSBhcHBlYXIgaW4g
bWVzc2FnZXMgYW5kIGhlbHAgdGV4dHMsIHRvIHRoZXNlCitiZSBzbywgdGhlbiBFbWFjcyB3
aWxsIHRyYW5zbGF0ZSB0aGUgQGFjcm9ueW17QVNDSUl9IHF1b3RlcyBAd3soQGtiZHtgfQor
YW5kIEBrYmR7J30pfSwgd2hlbiB0aGV5IGFwcGVhciBpbiBtZXNzYWdlcyBhbmQgaGVscCB0
ZXh0cywgdG8gdGhlc2UKIGN1cnZlZCBxdW90ZXMuICBZb3UgY2FuIGluZmx1ZW5jZSBvciBp
bmhpYml0IHRoaXMgdHJhbnNsYXRpb24gYnkKIGN1c3RvbWl6aW5nIHRoZSB1c2VyIG9wdGlv
biBAY29kZXt0ZXh0LXF1b3Rpbmctc3R5bGV9IChAcHhyZWZ7S2V5cyBpbgogRG9jdW1lbnRh
dGlvbiwsLCBlbGlzcCwgVGhlIEVtYWNzIExpc3AgUmVmZXJlbmNlIE1hbnVhbH0pLgpAQCAt
MTY0MSw3ICsxNjQxLDcgQEAKIGtub3duIHRvIGxvb2sganVzdCBsaWtlIEBhY3Jvbnlte0FT
Q0lJfSBjaGFyYWN0ZXJzLCB0aGV5IGFyZSBzaG93bgogd2l0aCB0aGUgQGNvZGV7aG9tb2ds
eXBofSBmYWNlLiAgQ3VydmVkIHF1b3RlcyB0aGF0IGFyZSBrbm93biBub3QgdG8KIGJlIGRp
c3BsYXlhYmxlIGFyZSBzaG93biBhcyB0aGVpciBAYWNyb255bXtBU0NJSX0gYXBwcm94aW1h
dGlvbnMKLUB0e2B9LCBAdHsnfSwgYW5kIEB0eyJ9IHdpdGggdGhlIEBjb2Rle2hvbW9nbHlw
aH0gZmFjZS4KK0BrYmR7YH0sIEBrYmR7J30sIGFuZCBAa2JkeyJ9IHdpdGggdGhlIEBjb2Rl
e2hvbW9nbHlwaH0gZmFjZS4KIAogQG5vZGUgQ3Vyc29yIERpc3BsYXkKIEBzZWN0aW9uIERp
c3BsYXlpbmcgdGhlIEN1cnNvcgo=
--------------72FA74A7A7D7E2689AD20026
Content-Type: text/plain; charset=UTF-8;
 name="modes.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="modes.diff"

LS0tIG9sZC9tb2Rlcy50ZXhpCTIwMjAtMDUtMDMgMDE6MzI6NDguNzczMjY3NTAwICswMjAw
CisrKyBuZXcvbW9kZXMudGV4aQkyMDIwLTA1LTA1IDIwOjIzOjQxLjIxNzczODkwMCArMDIw
MApAQCAtMjA3LDcgKzIwNyw3IEBACiAKIEBpdGVtCiBFbGVjdHJpYyBRdW90ZSBtb2RlIGF1
dG9tYXRpY2FsbHkgY29udmVydHMgcXVvdGF0aW9uIG1hcmtzLiAgRm9yCi1leGFtcGxlLCBp
dCByZXF1b3RlcyB0ZXh0IHR5cGVkIEBrYmR7YGxpa2UgdGhpcyd9IHRvIHRleHQgQHR74oCY
bGlrZQorZXhhbXBsZSwgaXQgcmVxdW90ZXMgdGV4dCB0eXBlZCBAdmVyYnt8YGxpa2UgdGhp
cyd8fSB0byB0ZXh0IEB0e+KAmGxpa2UKIHRoaXPigJl9LiAgWW91IGNhbiBjb250cm9sIHdo
YXQga2luZCBvZiB0ZXh0IGl0IG9wZXJhdGVzIGluLCBhbmQgeW91IGNhbgogZGlzYWJsZSBp
dCBlbnRpcmVseSBpbiBpbmRpdmlkdWFsIGJ1ZmZlcnMuICBAeHJlZntRdW90YXRpb24gTWFy
a3N9LgogCg==
--------------72FA74A7A7D7E2689AD20026
Content-Type: text/plain; charset=UTF-8;
 name="text.diff"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="text.diff"

LS0tIG9sZC90ZXh0LnRleGkJMjAyMC0wNS0wMyAwMTozNDoxMC42NzczODU4MDAgKzAyMDAK
KysrIG5ldy90ZXh0LnRleGkJMjAyMC0wNS0wNSAyMzo0Nzo1Mi45ODc1NTkwMDAgKzAyMDAK
QEAgLTQyMSwxMyArNDIxLDExIEBACiBAY2luZGV4IGN1cnZlZCBxdW90ZXMKIEBjaW5kZXgg
Z3VpbGxlbWV0cwogQGZpbmRleCBlbGVjdHJpYy1xdW90ZS1tb2RlCi1AYyBUaGUgZnVubnkg
cXVvdGluZyBiZWxvdyBpcyB0byBtYWtlIHRoZSBwcmludGVkIHZlcnNpb24gbG9vawotQGMg
Y29ycmVjdC4gIEZJWE1FLgogICBPbmUgY29tbW9uIHdheSB0byBxdW90ZSBpcyB0aGUgdHlw
ZXdyaXRlciBjb252ZW50aW9uLCB3aGljaCBxdW90ZXMKLXVzaW5nIHN0cmFpZ2h0IGFwb3N0
cm9waGVzIEB0eydsaWtlIHRoaXMnfSBvciBkb3VibGUtcXVvdGVzIEB0eyJsaWtlCi10aGlz
In0uICBBbm90aGVyIGNvbW1vbiB3YXkgaXMgdGhlIGN1cnZlZCBxdW90ZSBjb252ZW50aW9u
LCB3aGljaCB1c2VzCi1sZWZ0IGFuZCByaWdodCBzaW5nbGUgb3IgZG91YmxlIHF1b3RhdGlv
biBtYXJrcyBgQHR7bGlrZSB0aGlzfScgb3IKLWBgQHR7bGlrZSB0aGlzfScnQGZvb3Rub3Rl
ewordXNpbmcgc3RyYWlnaHQgYXBvc3Ryb3BoZXMgQHZlcmJ7fCdsaWtlIHRoaXMnfH0gb3Ig
ZG91YmxlLXF1b3RlcworQHZlcmJ7fCJsaWtlIHRoaXMifH0uICBBbm90aGVyIGNvbW1vbiB3
YXkgaXMgdGhlIGN1cnZlZCBxdW90ZQorY29udmVudGlvbiwgd2hpY2ggdXNlcyBsZWZ0IGFu
ZCByaWdodCBzaW5nbGUgb3IgZG91YmxlIHF1b3RhdGlvbiBtYXJrcworQHR74oCYbGlrZSB0
aGlz4oCZfSBvciBAdHvigJxsaWtlIHRoaXPigJ19QGZvb3Rub3RlewogVGhlIGN1cnZlZCBz
aW5nbGUgcXVvdGUgY2hhcmFjdGVycyBhcmUgVSsyMDE4IEBzY3tsZWZ0IHNpbmdsZSBxdW90
YXRpb24KIG1hcmt9IGFuZCBVKzIwMTkgQHNje3JpZ2h0IHNpbmdsZSBxdW90YXRpb24gbWFy
a307IHRoZSBjdXJ2ZWQgZG91YmxlIHF1b3RlcwogYXJlIFUrMjAxQyBAc2N7bGVmdCBkb3Vi
bGUgcXVvdGF0aW9uIG1hcmt9IGFuZCBVKzIwMUQgQHNje3JpZ2h0IGRvdWJsZQpAQCAtNDQ1
LDcgKzQ0Myw3IEBACiBAY29kZXtlbGVjdHJpYy1xdW90ZS1jaGFyc30sIGEgbGlzdCBvZiBm
b3VyIGNoYXJhY3RlcnMsIHdoZXJlIHRoZQogaXRlbXMgY29ycmVzcG9uZCB0byB0aGUgbGVm
dCBzaW5nbGUgcXVvdGUsIHRoZSByaWdodCBzaW5nbGUgcXVvdGUsIHRoZQogbGVmdCBkb3Vi
bGUgcXVvdGUgYW5kIHRoZSByaWdodCBkb3VibGUgcXVvdGUsIHJlc3BlY3RpdmVseSwgd2hv
c2UKLWRlZmF1bHQgdmFsdWUgaXMgQGNvZGV7Jyg/QHJ7YH0gP0Byeyd9ID9AcntgYH0gP0By
eycnfSl9LgorZGVmYXVsdCB2YWx1ZSBpcyBAd3tAY29kZXsnKEB3ez994oCYIEB3ez994oCZ
IEB3ez994oCcIEB3ez994oCdKX19LgogCiBAdmluZGV4IGVsZWN0cmljLXF1b3RlLXBhcmFn
cmFwaAogQHZpbmRleCBlbGVjdHJpYy1xdW90ZS1jb21tZW50CkBAIC00NjEsNyArNDU5LDcg
QEAKIAogQHZpbmRleCBlbGVjdHJpYy1xdW90ZS1yZXBsYWNlLWRvdWJsZQogICBZb3UgY2Fu
IGFsc28gc2V0IHRoZSBvcHRpb24gQGNvZGV7ZWxlY3RyaWMtcXVvdGUtcmVwbGFjZS1kb3Vi
bGV9IHRvCi1hIG5vbi1AY29kZXtuaWx9IHZhbHVlLiAgVGhlbiwgdHlwaW5nIEB0eyJ9IGlu
c2VydCBhbiBhcHByb3ByaWF0ZQorYSBub24tQGNvZGV7bmlsfSB2YWx1ZS4gIFRoZW4sIHR5
cGluZyBAa2JkeyJ9IGluc2VydCBhbiBhcHByb3ByaWF0ZQogY3VydmVkIGRvdWJsZSBxdW90
ZSBkZXBlbmRpbmcgb24gY29udGV4dDogQHR74oCcfSBhdCB0aGUgYmVnaW5uaW5nIG9mCiB0
aGUgYnVmZmVyIG9yIGFmdGVyIGEgbGluZSBicmVhaywgd2hpdGVzcGFjZSwgb3BlbmluZyBw
YXJlbnRoZXNpcywgb3IKIHF1b3RlIGNoYXJhY3RlciwgYW5kIEB0e+KAnX0gb3RoZXJ3aXNl
LgpAQCAtNDczLDcgKzQ3MSw3IEBACiB0eXBlIEBrYmR7Qy1xIGB9IG9yIEBrYmR7Qy1xICd9
IGluc3RlYWQgb2YgQGtiZHtgfSBvciBAa2Jkeyd9LiAgVG8KIGluc2VydCBhIGN1cnZlZCBx
dW90ZSBldmVuIHdoZW4gRWxlY3RyaWMgUXVvdGUgaXMgZGlzYWJsZWQgb3IKIGluYWN0aXZl
LCB5b3UgY2FuIHR5cGUgQGtiZHtDLXggOCBbfSBmb3IgQHR74oCYfSwgQGtiZHtDLXggOCBd
fSBmb3IKLUB0e+KAmX0sIEBrYmR7Qy14IDggQHt9IGZvciBgYCwgYW5kIEBrYmR7Qy14IDgg
QH19IGZvciAnJy4KK0B0e+KAmX0sIEBrYmR7Qy14IDggQHt9IGZvciBAdHvigJx9LCBhbmQg
QGtiZHtDLXggOCBAfX0gZm9yIEB0e+KAnX0uCiBAeHJlZntJbnNlcnRpbmcgVGV4dH0uICBO
b3RlIHRoYXQgdGhlIHZhbHVlIG9mCiBAY29kZXtlbGVjdHJpYy1xdW90ZS1jaGFyc30gZG9l
cyBub3QgYWZmZWN0IHRoZXNlIGtleWJpbmRpbmdzLCB0aGV5CiBhcmUgbm90IGtleWJpbmRp
bmdzIG9mIEBjb2Rle2VsZWN0cmljLXF1b3RlLW1vZGV9IGJ1dCBib3VuZCBpbgo=
--------------72FA74A7A7D7E2689AD20026--