/[gentoo-x86]/x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch
Gentoo

Contents of /x11-base/xorg-server/files/1.4-document-new-font-catalogs.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Mon Sep 28 07:41:03 2009 UTC (4 years, 10 months ago) by remi
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
x11-base/xorg-server: drop old ebuilds, prune ${FILESDIR}
(Portage version: 2.2_rc42/cvs/Linux i686)

1 diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
2 index aac3b51..c9ee019 100644
3 --- a/doc/Xserver.man.pre
4 +++ b/doc/Xserver.man.pre
5 @@ -508,8 +508,7 @@ its parent process after it has set up the various connection schemes.
6 \fIXdm\fP uses this feature to recognize when connecting to the server
7 is possible.
8 .SH FONTS
9 -The X server
10 -can obtain fonts from directories and/or from font servers.
11 +The X server can obtain fonts from directories and/or from font servers.
12 The list of directories and font servers
13 the X server uses when trying to open a font is controlled
14 by the \fIfont path\fP.
15 @@ -517,8 +516,45 @@ by the \fIfont path\fP.
16 The default font path is
17 __default_font_path__ .
18 .LP
19 +A special kind of directory can be specified using the the \fBcatalogue\fP:
20 +prefix. Directories specified this way can contain symlinks pointing to the
21 +real font directories. See the FONTPATH.D section for details.
22 +.LP
23 The font path can be set with the \fB\-fp\fP option or by \fIxset\fP(1)
24 after the server has started.
25 +.SH "FONTPATH.D"
26 +You can specify a special kind of font path in the form \fBcatalogue:<dir>\fR.
27 +The directory specified after the catalogue: prefix will be scanned for symlinks
28 +and each symlink destination will be added as a local fontfile FPE.
29 +.PP
30 +The symlink can be suffixed by attributes such as '\fBunscaled\fR', which
31 +will be passed through to the underlying fontfile FPE. The only exception is
32 +the newly introduced '\fBpri\fR' attribute, which will be used for ordering
33 +the font paths specified by the symlinks.
34 +
35 +An example configuration:
36 +
37 +.nf
38 + 75dpi:unscaled:pri=20 \-> /usr/share/X11/fonts/75dpi
39 + ghostscript:pri=60 \-> /usr/share/fonts/default/ghostscript
40 + misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc
41 + type1:pri=40 \-> /usr/share/X11/fonts/Type1
42 + type1:pri=50 \-> /usr/share/fonts/default/Type1
43 +.fi
44 +
45 +This will add /usr/share/X11/fonts/misc as the first FPE with the attribute
46 +'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with
47 +the attribute unscaled etc. This is functionally equivalent to setting
48 +the following font path:
49 +
50 +.nf
51 + /usr/share/X11/fonts/misc:unscaled,
52 + /usr/share/X11/fonts/75dpi:unscaled,
53 + /usr/share/X11/fonts/Type1,
54 + /usr/share/fonts/default/Type1,
55 + /usr/share/fonts/default/ghostscript
56 +.fi
57 +
58 .SH FILES
59 .TP 30
60 .I /etc/X\fBn\fP.hosts
61 diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
62 index ce54ea9..54d8eaa 100644
63 --- a/hw/xfree86/doc/man/xorg.conf.man.pre
64 +++ b/hw/xfree86/doc/man/xorg.conf.man.pre
65 @@ -293,15 +293,50 @@ server searches for font databases.
66 Multiple
67 .B FontPath
68 entries may be specified, and they will be concatenated to build up the
69 -fontpath used by the server. Font path elements may be either absolute
70 -directory paths, or a font server identifier.
71 +fontpath used by the server. Font path elements can be absolute
72 +directory paths, catalogue directories or a font server identifier. The
73 +formats of the later two are explained below:
74 +.PP
75 +.RS 7
76 +Catalogue directories:
77 +.PP
78 +.RS 4
79 +Catalogue directories can be specified using the prefix \fBcatalogue:\fR
80 +before the directory name. The directory can then be populated with
81 +symlinks pointing to the real font directories, using the following
82 +syntax in the symlink name:
83 +.PP
84 +.RS 4
85 +.IR <identifier> : [attribute]: pri= <priority>
86 +.RE
87 +.PP
88 +where
89 +.I <identifier>
90 +is an alphanumeric identifier,
91 +.I [attribute]
92 +is an attribute wich will be passed to the underlying FPE and
93 +.I <priority>
94 +is a number used to order the fontfile FPEs. Examples:
95 +.PP
96 +.RS 4
97 +.nf
98 +.I 75dpi:unscaled:pri=20 -> /usr/share/X11/fonts/75dpi
99 +.I gscript:pri=60 -> /usr/share/fonts/default/ghostscript
100 +.I misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc
101 +.fi
102 +.PP
103 +.RE .RE .RE
104 +.PP
105 +.RS 7
106 +Font server identifiers:
107 +.PP
108 +.RS 4
109 Font server identifiers have the form:
110 +.RS 4
111 .PP
112 -.RS 11
113 .IR <trans> / <hostname> : <port\-number>
114 .RE
115 .PP
116 -.RS 7
117 where
118 .I <trans>
119 is the transport type to use to connect to the font server (e.g.,
120 @@ -313,10 +348,11 @@ for a TCP/IP connection),
121 is the hostname of the machine running the font server, and
122 .I <port\-number>
123 is the port number that the font server is listening on (usually 7100).
124 +.RE
125 .PP
126 When this entry is not specified in the config file, the server falls back
127 to the compiled\-in default font path, which contains the following
128 -font path elements:
129 +font path elements (which can be set inside a catalogue directory):
130 .PP
131 .RS 4
132 .nf

  ViewVC Help
Powered by ViewVC 1.1.20