diff options
| author | Glenn Morris | 2012-05-02 22:04:07 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-05-02 22:04:07 -0400 |
| commit | fe76231124691dd3d9419c3c68f6d292f71c8386 (patch) | |
| tree | ea04b14d930dab0bf3ec1883478db03d8be602d0 | |
| parent | 0244c17ae63341234b50f81955fbf702fc46ea1a (diff) | |
| download | emacs-fe76231124691dd3d9419c3c68f6d292f71c8386.tar.gz emacs-fe76231124691dd3d9419c3c68f6d292f71c8386.zip | |
* doc/emacs/frames.texi (Fonts): Tweak line and page breaks.
Change cross-reference.
Use example rather than smallexample (these examples are not wide,
smallexample saves little vertical space, but makes things harder to
read).
| -rw-r--r-- | doc/emacs/ChangeLog | 3 | ||||
| -rw-r--r-- | doc/emacs/frames.texi | 46 |
2 files changed, 26 insertions, 23 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index f8c9c79cc81..033ce545a92 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2012-05-03 Glenn Morris <rgm@gnu.org> | 1 | 2012-05-03 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * frames.texi (Fonts): Tweak line and page breaks. | ||
| 4 | Use example rather than smallexample. Change cross-reference. | ||
| 5 | |||
| 3 | * buffers.texi (Buffers, Kill Buffer, Several Buffers) | 6 | * buffers.texi (Buffers, Kill Buffer, Several Buffers) |
| 4 | (Indirect Buffers): Tweak line- and page-breaks. | 7 | (Indirect Buffers): Tweak line- and page-breaks. |
| 5 | 8 | ||
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index 7b912ec9722..e0f8ca36286 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi | |||
| @@ -492,13 +492,13 @@ this for future sessions, click on @samp{Save Options} in the | |||
| 492 | @samp{Options} menu. | 492 | @samp{Options} menu. |
| 493 | 493 | ||
| 494 | @item | 494 | @item |
| 495 | Add a line to your init file (@pxref{Init File}), modifying the | 495 | Add a line to your init file, modifying the variable |
| 496 | variable @code{default-frame-alist} to specify the @code{font} | 496 | @code{default-frame-alist} to specify the @code{font} parameter |
| 497 | parameter (@pxref{Creating Frames}), like this: | 497 | (@pxref{Frame Parameters}), like this: |
| 498 | 498 | ||
| 499 | @smallexample | 499 | @example |
| 500 | (add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10")) | 500 | (add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10")) |
| 501 | @end smallexample | 501 | @end example |
| 502 | 502 | ||
| 503 | @cindex X defaults file | 503 | @cindex X defaults file |
| 504 | @cindex X resources file | 504 | @cindex X resources file |
| @@ -506,14 +506,14 @@ parameter (@pxref{Creating Frames}), like this: | |||
| 506 | Add an @samp{emacs.font} X resource setting to your X resource file, | 506 | Add an @samp{emacs.font} X resource setting to your X resource file, |
| 507 | like this: | 507 | like this: |
| 508 | 508 | ||
| 509 | @smallexample | 509 | @example |
| 510 | emacs.font: DejaVu Sans Mono-12 | 510 | emacs.font: DejaVu Sans Mono-12 |
| 511 | @end smallexample | 511 | @end example |
| 512 | 512 | ||
| 513 | @noindent | 513 | @noindent |
| 514 | You must restart X, or use the @command{xrdb} command, for the X | 514 | You must restart X, or use the @command{xrdb} command, for the X |
| 515 | resources file to take effect. @xref{Resources}. When specifying a | 515 | resources file to take effect. @xref{Resources}. Do not quote |
| 516 | font in your X resources file, you should not quote it. | 516 | font names in X resource files. |
| 517 | 517 | ||
| 518 | @item | 518 | @item |
| 519 | If you are running Emacs on the GNOME desktop, you can tell Emacs to | 519 | If you are running Emacs on the GNOME desktop, you can tell Emacs to |
| @@ -535,9 +535,9 @@ names the font that it's rendered in. | |||
| 535 | first is to use a @dfn{Fontconfig pattern}. Fontconfig patterns have | 535 | first is to use a @dfn{Fontconfig pattern}. Fontconfig patterns have |
| 536 | the following form: | 536 | the following form: |
| 537 | 537 | ||
| 538 | @smallexample | 538 | @example |
| 539 | @var{fontname}[-@var{fontsize}][:@var{name1}=@var{values1}][:@var{name2}=@var{values2}]... | 539 | @var{fontname}[-@var{fontsize}][:@var{name1}=@var{values1}][:@var{name2}=@var{values2}]... |
| 540 | @end smallexample | 540 | @end example |
| 541 | 541 | ||
| 542 | @noindent | 542 | @noindent |
| 543 | Within this format, any of the elements in braces may be omitted. | 543 | Within this format, any of the elements in braces may be omitted. |
| @@ -577,13 +577,13 @@ One of @samp{monospace}, @samp{proportional}, @samp{dual-width}, or | |||
| 577 | @noindent | 577 | @noindent |
| 578 | Here are some examples of Fontconfig patterns: | 578 | Here are some examples of Fontconfig patterns: |
| 579 | 579 | ||
| 580 | @smallexample | 580 | @example |
| 581 | Monospace | 581 | Monospace |
| 582 | Monospace-12 | 582 | Monospace-12 |
| 583 | Monospace-12:bold | 583 | Monospace-12:bold |
| 584 | DejaVu Sans Mono:bold:italic | 584 | DejaVu Sans Mono:bold:italic |
| 585 | Monospace-12:weight=bold:slant=italic | 585 | Monospace-12:weight=bold:slant=italic |
| 586 | @end smallexample | 586 | @end example |
| 587 | 587 | ||
| 588 | For a more detailed description of Fontconfig patterns, see the | 588 | For a more detailed description of Fontconfig patterns, see the |
| 589 | Fontconfig manual, which is distributed with Fontconfig and available | 589 | Fontconfig manual, which is distributed with Fontconfig and available |
| @@ -593,9 +593,9 @@ online at @url{http://fontconfig.org/fontconfig-user.html}. | |||
| 593 | The second way to specify a font is to use a @dfn{GTK font pattern}. | 593 | The second way to specify a font is to use a @dfn{GTK font pattern}. |
| 594 | These have the syntax | 594 | These have the syntax |
| 595 | 595 | ||
| 596 | @smallexample | 596 | @example |
| 597 | @var{fontname} [@var{properties}] [@var{fontsize}] | 597 | @var{fontname} [@var{properties}] [@var{fontsize}] |
| 598 | @end smallexample | 598 | @end example |
| 599 | 599 | ||
| 600 | @noindent | 600 | @noindent |
| 601 | where @var{fontname} is the family name, @var{properties} is a list of | 601 | where @var{fontname} is the family name, @var{properties} is a list of |
| @@ -619,10 +619,10 @@ omitted, a default width is used. | |||
| 619 | @noindent | 619 | @noindent |
| 620 | Here are some examples of GTK font patterns: | 620 | Here are some examples of GTK font patterns: |
| 621 | 621 | ||
| 622 | @smallexample | 622 | @example |
| 623 | Monospace 12 | 623 | Monospace 12 |
| 624 | Monospace Bold Italic 12 | 624 | Monospace Bold Italic 12 |
| 625 | @end smallexample | 625 | @end example |
| 626 | 626 | ||
| 627 | @cindex XLFD | 627 | @cindex XLFD |
| 628 | @cindex X Logical Font Description | 628 | @cindex X Logical Font Description |
| @@ -631,9 +631,9 @@ Logical Font Description}). This is the traditional method for | |||
| 631 | specifying fonts under X. Each XLFD consists of fourteen words or | 631 | specifying fonts under X. Each XLFD consists of fourteen words or |
| 632 | numbers, separated by dashes, like this: | 632 | numbers, separated by dashes, like this: |
| 633 | 633 | ||
| 634 | @smallexample | 634 | @example |
| 635 | -misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1 | 635 | -misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1 |
| 636 | @end smallexample | 636 | @end example |
| 637 | 637 | ||
| 638 | @noindent | 638 | @noindent |
| 639 | A wildcard character (@samp{*}) in an XLFD matches any sequence of | 639 | A wildcard character (@samp{*}) in an XLFD matches any sequence of |
| @@ -644,10 +644,10 @@ results, supply all 14 dashes and use wildcards only within a field. | |||
| 644 | Case is insignificant in an XLFD. The syntax for an XLFD is as | 644 | Case is insignificant in an XLFD. The syntax for an XLFD is as |
| 645 | follows: | 645 | follows: |
| 646 | 646 | ||
| 647 | @smallexample | 647 | @example |
| 648 | -@var{maker}-@var{family}-@var{weight}-@var{slant}-@var{widthtype}-@var{style}@dots{} | 648 | -@var{maker}-@var{family}-@var{weight}-@var{slant}-@var{widthtype}-@var{style}@dots{} |
| 649 | @dots{}-@var{pixels}-@var{height}-@var{horiz}-@var{vert}-@var{spacing}-@var{width}-@var{registry}-@var{encoding} | 649 | @dots{}-@var{pixels}-@var{height}-@var{horiz}-@var{vert}-@var{spacing}-@var{width}-@var{registry}-@var{encoding} |
| 650 | @end smallexample | 650 | @end example |
| 651 | 651 | ||
| 652 | @noindent | 652 | @noindent |
| 653 | The entries have the following meanings: | 653 | The entries have the following meanings: |
| @@ -706,9 +706,9 @@ nickname''. Certain fonts have shorter nicknames, which you can use | |||
| 706 | instead of a normal font specification. For instance, @samp{6x13} is | 706 | instead of a normal font specification. For instance, @samp{6x13} is |
| 707 | equivalent to | 707 | equivalent to |
| 708 | 708 | ||
| 709 | @smallexample | 709 | @example |
| 710 | -misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1 | 710 | -misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1 |
| 711 | @end smallexample | 711 | @end example |
| 712 | 712 | ||
| 713 | @cindex client-side fonts | 713 | @cindex client-side fonts |
| 714 | @cindex server-side fonts | 714 | @cindex server-side fonts |