From: Sebastian Urban Date: Sun, 16 May 2021 13:29:39 +0000 (+0200) Subject: Improve some quotation quoting in the Emacs manual X-Git-Tag: emacs-28.0.90~2454 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf8b8cc6c57e051e11306aa9c409dc4ed8c442bc;p=emacs.git Improve some quotation quoting in the Emacs manual * doc/emacs/text.texi (Quotation Marks, Quotation Marks): * doc/emacs/display.texi (Text Display): Fix some issues when quoting quote marks and the like (bug#35885). * doc/emacs/emacs.texi: Switch on double-sided printing headings. Copyright-paperwork-exempt: yes --- diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index 4a34fd36c5d..666a479582a 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi @@ -112,7 +112,7 @@ just like digits. Case is ignored. @cindex curly quotes, inserting @cindex curved quotes, inserting A few common Unicode characters can be inserted via a command -starting with @kbd{C-x 8}. For example, @kbd{C-x 8 [} inserts @t{‘} +starting with @w{@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, @w{@kbd{C-x 8 ]}}, @kbd{C-x 8 @{} and @kbd{C-x 8 @}} insert the diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 58d08b43c0e..5fccdaa8343 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1649,10 +1649,10 @@ for details. @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{(@samp{`} +and @samp{'})}, 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}). @@ -1661,7 +1661,7 @@ Documentation,,, elisp, The Emacs Lisp Reference Manual}). 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. +@samp{`}, @samp{'}, and @samp{"} with the @code{homoglyph} face. @node Cursor Display @section Displaying the Cursor diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 590dc42d155..e0de3bb43aa 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -99,6 +99,7 @@ Cover art by Etienne Suvasa; cover design by Matt Lee. @end titlepage +@headings double @summarycontents @contents diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 2c9d486c331..f2fe2480154 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -421,13 +421,12 @@ beginning of a line. @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 +using straight apostrophes @samp{'like this'} or double-quotes @samp{"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{ +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 +444,7 @@ default quotes listed above, by customizing the variable @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{?}‘ ?’ ?“ ?”)}}. @vindex electric-quote-paragraph @vindex electric-quote-comment @@ -461,7 +460,7 @@ variables. @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 +472,7 @@ To toggle it globally, type 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