Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
769e9d47
Commit
769e9d47
authored
Jun 30, 2010
by
Kenichi Handa
Browse files
Check FC_DUAL too. For such fonts, check width one by one.
parent
dabe1990
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
src/ChangeLog
src/ChangeLog
+7
-0
src/ftfont.c
src/ftfont.c
+1
-1
src/xftfont.c
src/xftfont.c
+1
-1
No files found.
src/ChangeLog
View file @
769e9d47
2009-06-17 Naohiro Aota <naota@elisp.net> (tiny change)
* xftfont.c (xftfont_open): Check font width one by one also when
spacing is dual.
* ftfont.c (ftfont_open): Ditto.
2010-06-30 Glenn Morris <rgm@gnu.org>
* s/sol2-6.h (INHIBIT_X11R6_XIM): Remove, handled by configure now.
...
...
src/ftfont.c
View file @
769e9d47
...
...
@@ -1262,7 +1262,7 @@ ftfont_open (f, entity, pixel_size)
spacing
=
XINT
(
AREF
(
entity
,
FONT_SPACING_INDEX
));
else
spacing
=
FC_PROPORTIONAL
;
if
(
spacing
!=
FC_PROPORTIONAL
)
if
(
spacing
!=
FC_PROPORTIONAL
&&
spacing
!=
FC_DUAL
)
font
->
min_width
=
font
->
average_width
=
font
->
space_width
=
(
scalable
?
ft_face
->
max_advance_width
*
size
/
upEM
:
ft_face
->
size
->
metrics
.
max_advance
>>
6
);
...
...
src/xftfont.c
View file @
769e9d47
...
...
@@ -429,7 +429,7 @@ xftfont_open (f, entity, pixel_size)
ascii_printable
[
i
]
=
' '
+
i
;
}
BLOCK_INPUT
;
if
(
spacing
!=
FC_PROPORTIONAL
)
if
(
spacing
!=
FC_PROPORTIONAL
&&
spacing
!=
FC_DUAL
)
{
font
->
min_width
=
font
->
average_width
=
font
->
space_width
=
xftfont
->
max_advance_width
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment