Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_43355755
engine
提交
73c0397d
E
engine
项目概览
weixin_43355755
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
73c0397d
编写于
10月 02, 2019
作者:
G
Gary Qian
提交者:
GitHub
10月 02, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Explain vertical font metrics and refactor UpdateLineMetrics. (#11795)
上级
327eb876
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
89 addition
and
33 deletion
+89
-33
third_party/txt/src/txt/paragraph_txt.cc
third_party/txt/src/txt/paragraph_txt.cc
+83
-33
third_party/txt/src/txt/paragraph_txt.h
third_party/txt/src/txt/paragraph_txt.h
+6
-0
未找到文件。
third_party/txt/src/txt/paragraph_txt.cc
浏览文件 @
73c0397d
...
@@ -1108,39 +1108,10 @@ void ParagraphTxt::Layout(double width) {
...
@@ -1108,39 +1108,10 @@ void ParagraphTxt::Layout(double width) {
double
max_ascent
=
strut_
.
ascent
+
strut_
.
half_leading
;
double
max_ascent
=
strut_
.
ascent
+
strut_
.
half_leading
;
double
max_descent
=
strut_
.
descent
+
strut_
.
half_leading
;
double
max_descent
=
strut_
.
descent
+
strut_
.
half_leading
;
double
max_unscaled_ascent
=
0
;
double
max_unscaled_ascent
=
0
;
auto
update_line_metrics
=
[
&
](
const
SkFontMetrics
&
metrics
,
const
TextStyle
&
style
,
PlaceholderRun
*
placeholder_run
)
{
if
(
!
strut_
.
force_strut
)
{
double
ascent
;
double
descent
;
if
(
style
.
has_height_override
)
{
// Scale the ascent and descent such that the sum of ascent and
// descent is `fontsize * style.height * style.font_size`.
double
metrics_height
=
-
metrics
.
fAscent
+
metrics
.
fDescent
;
ascent
=
(
-
metrics
.
fAscent
/
metrics_height
)
*
style
.
height
*
style
.
font_size
;
descent
=
(
metrics
.
fDescent
/
metrics_height
)
*
style
.
height
*
style
.
font_size
;
}
else
{
// Use the font-provided ascent, descent, and leading directly.
ascent
=
(
-
metrics
.
fAscent
+
metrics
.
fLeading
/
2
);
descent
=
(
metrics
.
fDescent
+
metrics
.
fLeading
/
2
);
}
ComputePlaceholder
(
placeholder_run
,
ascent
,
descent
);
max_ascent
=
std
::
max
(
ascent
,
max_ascent
);
max_descent
=
std
::
max
(
descent
,
max_descent
);
}
max_unscaled_ascent
=
std
::
max
(
placeholder_run
==
nullptr
?
-
metrics
.
fAscent
:
placeholder_run
->
baseline_offset
,
max_unscaled_ascent
);
};
for
(
const
PaintRecord
&
paint_record
:
paint_records
)
{
for
(
const
PaintRecord
&
paint_record
:
paint_records
)
{
update_line_metrics
(
paint_record
.
metrics
(),
paint_record
.
style
(),
UpdateLineMetrics
(
paint_record
.
metrics
(),
paint_record
.
style
(),
paint_record
.
GetPlaceholderRun
());
max_ascent
,
max_descent
,
max_unscaled_ascent
,
paint_record
.
GetPlaceholderRun
());
}
}
// If no fonts were actually rendered, then compute a baseline based on the
// If no fonts were actually rendered, then compute a baseline based on the
...
@@ -1151,7 +1122,8 @@ void ParagraphTxt::Layout(double width) {
...
@@ -1151,7 +1122,8 @@ void ParagraphTxt::Layout(double width) {
font
.
setTypeface
(
GetDefaultSkiaTypeface
(
style
));
font
.
setTypeface
(
GetDefaultSkiaTypeface
(
style
));
font
.
setSize
(
style
.
font_size
);
font
.
setSize
(
style
.
font_size
);
font
.
getMetrics
(
&
metrics
);
font
.
getMetrics
(
&
metrics
);
update_line_metrics
(
metrics
,
style
,
nullptr
);
UpdateLineMetrics
(
metrics
,
style
,
max_ascent
,
max_descent
,
max_unscaled_ascent
,
nullptr
);
}
}
// Calculate the baselines. This is only done on the first line.
// Calculate the baselines. This is only done on the first line.
...
@@ -1202,6 +1174,84 @@ void ParagraphTxt::Layout(double width) {
...
@@ -1202,6 +1174,84 @@ void ParagraphTxt::Layout(double width) {
longest_line_
=
max_right_
-
min_left_
;
longest_line_
=
max_right_
-
min_left_
;
}
}
void
ParagraphTxt
::
UpdateLineMetrics
(
const
SkFontMetrics
&
metrics
,
const
TextStyle
&
style
,
double
&
max_ascent
,
double
&
max_descent
,
double
&
max_unscaled_ascent
,
PlaceholderRun
*
placeholder_run
)
{
if
(
!
strut_
.
force_strut
)
{
double
ascent
;
double
descent
;
if
(
style
.
has_height_override
)
{
// Scale the ascent and descent such that the sum of ascent and
// descent is `fontsize * style.height * style.font_size`.
//
// The raw metrics do not add up to fontSize. The state of font
// metrics is a mess:
//
// Each font has 4 sets of vertical metrics:
//
// * hhea: hheaAscender, hheaDescender, hheaLineGap.
// Used by Apple.
// * OS/2 typo: typoAscender, typoDescender, typoLineGap.
// Used sometimes by Windows for layout.
// * OS/2 win: winAscent, winDescent.
// Also used by Windows, generally will be cut if extends past
// these metrics.
// * EM Square: ascent, descent
// Not actively used, but this defines the 'scale' of the
// units used.
//
// `Use Typo Metrics` is a boolean that, when enabled, prefers
// typo metrics over win metrics. Default is off. Enabled by most
// modern fonts.
//
// In addition to these different sets of metrics, there are also
// multiple strategies for using these metrics:
//
// * Adobe: Set hhea values to typo equivalents.
// * Microsoft: Set hhea values to win equivalents.
// * Web: Use hhea values for text, regardless of `Use Typo Metrics`
// The hheaLineGap is distributed half across the top and half
// across the bottom of the line.
// Exceptions:
// Windows: All browsers respect `Use Typo Metrics`
// Firefox respects `Use Typo Metrics`.
//
// This pertains to this code in that it is ambiguous which set of
// metrics we are actually using via SkFontMetrics. This in turn
// means that if we use the raw metrics, we will see differences
// between platforms as well as unpredictable line heights.
//
// A more thorough explanation is available at
// https://glyphsapp.com/tutorials/vertical-metrics
//
// Doing this ascent/descent normalization to the EM Square allows
// a sane, consistent, and reasonable line height to be specified,
// though it breaks with what is done by any of the platforms above.
double
metrics_height
=
-
metrics
.
fAscent
+
metrics
.
fDescent
;
ascent
=
(
-
metrics
.
fAscent
/
metrics_height
)
*
style
.
height
*
style
.
font_size
;
descent
=
(
metrics
.
fDescent
/
metrics_height
)
*
style
.
height
*
style
.
font_size
;
}
else
{
// Use the font-provided ascent, descent, and leading directly.
ascent
=
(
-
metrics
.
fAscent
+
metrics
.
fLeading
/
2
);
descent
=
(
metrics
.
fDescent
+
metrics
.
fLeading
/
2
);
}
ComputePlaceholder
(
placeholder_run
,
ascent
,
descent
);
max_ascent
=
std
::
max
(
ascent
,
max_ascent
);
max_descent
=
std
::
max
(
descent
,
max_descent
);
}
max_unscaled_ascent
=
std
::
max
(
placeholder_run
==
nullptr
?
-
metrics
.
fAscent
:
placeholder_run
->
baseline_offset
,
max_unscaled_ascent
);
};
double
ParagraphTxt
::
GetLineXOffset
(
double
line_total_advance
,
double
ParagraphTxt
::
GetLineXOffset
(
double
line_total_advance
,
size_t
line_number
,
size_t
line_number
,
bool
justify_line
)
{
bool
justify_line
)
{
...
...
third_party/txt/src/txt/paragraph_txt.h
浏览文件 @
73c0397d
...
@@ -359,6 +359,12 @@ class ParagraphTxt : public Paragraph {
...
@@ -359,6 +359,12 @@ class ParagraphTxt : public Paragraph {
bool
IsStrutValid
()
const
;
bool
IsStrutValid
()
const
;
void
UpdateLineMetrics
(
const
SkFontMetrics
&
metrics
,
const
TextStyle
&
style
,
double
&
max_ascent
,
double
&
max_descent
,
double
&
max_unscaled_ascent
,
PlaceholderRun
*
placeholder_run
);
// Calculate the starting X offset of a line based on the line's width and
// Calculate the starting X offset of a line based on the line's width and
// alignment.
// alignment.
double
GetLineXOffset
(
double
line_total_advance
,
double
GetLineXOffset
(
double
line_total_advance
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录