Compare commits
5 Commits
952502e690
...
3937ed4172
| Author | SHA1 | Date | |
|---|---|---|---|
| 3937ed4172 | |||
| 5e84ea2a06 | |||
| 312d0d37c6 | |||
| 5460d759b0 | |||
| 54e942c85f |
@@ -43,3 +43,23 @@
|
|||||||
@include font-raleway(400);
|
@include font-raleway(400);
|
||||||
@include font-raleway(700);
|
@include font-raleway(700);
|
||||||
@include font-stixgeneral();
|
@include font-stixgeneral();
|
||||||
|
|
||||||
|
/* Generated from chatgpt-adjust-fallback.py */
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family: "Raleway Fallback";
|
||||||
|
src: local("Arial");
|
||||||
|
size-adjust: 100.09%;
|
||||||
|
ascent-override: 94.00%;
|
||||||
|
descent-override: 23.40%;
|
||||||
|
line-gap-override: 0.00%;
|
||||||
|
}
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family: "Lora Fallback";
|
||||||
|
src: local("Times New Roman");
|
||||||
|
size-adjust: 111.79%;
|
||||||
|
ascent-override: 100.60%;
|
||||||
|
descent-override: 27.40%;
|
||||||
|
line-gap-override: 0.00%;
|
||||||
|
}
|
||||||
|
|||||||
@@ -67,12 +67,20 @@ p {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.button, input[type="submit"] {
|
.tag-list {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 0.5rem 0.25rem;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag {
|
||||||
@include var(color, text-color);
|
@include var(color, text-color);
|
||||||
padding: 0.5rem;
|
padding: 0.5rem;
|
||||||
border: 1px solid $primary-color;
|
border: 1px solid $primary-color;
|
||||||
transition: color 0.25s, background-color 0.25s;
|
transition: color 0.25s, background-color 0.25s;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
|
display: block;
|
||||||
|
|
||||||
&:focus {
|
&:focus {
|
||||||
outline: none;
|
outline: none;
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ $background-color-dark: #1b1d1f;
|
|||||||
$standard-border-width: .075rem;
|
$standard-border-width: .075rem;
|
||||||
$standard-border: $standard-border-width solid $border-color;
|
$standard-border: $standard-border-width solid $border-color;
|
||||||
|
|
||||||
$font-heading: "Lora", serif;
|
$font-heading: "Lora", "Lora Fallback", serif;
|
||||||
$font-body: "Raleway", serif;
|
$font-body: "Raleway", "Raleway Fallback", sans-serif;
|
||||||
$font-code: "Inconsolata", monospace, "STIXGeneral";
|
$font-code: "Inconsolata", monospace, "STIXGeneral";
|
||||||
|
|
||||||
$warning-background-color: #ffee99;
|
$warning-background-color: #ffee99;
|
||||||
|
|||||||
90
chatgpt-adjust-fallback.py
Normal file
90
chatgpt-adjust-fallback.py
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
"""
|
||||||
|
Generate @font-face settings to help make the fallback font look similar
|
||||||
|
to the non-fallback font.
|
||||||
|
|
||||||
|
Genererated by ChatGTP 5.2-instant. Not human-modified.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from fontTools.ttLib import TTFont
|
||||||
|
|
||||||
|
USE_TYPO_METRICS = 1 << 7
|
||||||
|
|
||||||
|
def get_metrics(path):
|
||||||
|
font = TTFont(path)
|
||||||
|
|
||||||
|
head = font["head"]
|
||||||
|
os2 = font["OS/2"]
|
||||||
|
hhea = font["hhea"]
|
||||||
|
|
||||||
|
use_typo = bool(os2.fsSelection & USE_TYPO_METRICS)
|
||||||
|
|
||||||
|
if use_typo:
|
||||||
|
asc = os2.sTypoAscender
|
||||||
|
desc = os2.sTypoDescender
|
||||||
|
gap = os2.sTypoLineGap
|
||||||
|
source = "OS/2.sTypo*"
|
||||||
|
else:
|
||||||
|
asc = hhea.ascent
|
||||||
|
desc = -hhea.descent
|
||||||
|
gap = hhea.lineGap
|
||||||
|
source = "hhea.*"
|
||||||
|
|
||||||
|
# x-height ALWAYS comes from OS/2
|
||||||
|
if not hasattr(os2, "sxHeight") or os2.sxHeight <= 0:
|
||||||
|
raise ValueError(f"{path} has no usable sxHeight")
|
||||||
|
|
||||||
|
x_height = os2.sxHeight
|
||||||
|
|
||||||
|
print("Source", path, source)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"unitsPerEm": head.unitsPerEm,
|
||||||
|
"ascender": asc,
|
||||||
|
"descender": desc,
|
||||||
|
"lineGap": gap,
|
||||||
|
"xHeight": x_height,
|
||||||
|
}
|
||||||
|
|
||||||
|
def compute_overrides(target, fallback):
|
||||||
|
# size-adjust: match x-height
|
||||||
|
size_adjust = (
|
||||||
|
(target["xHeight"] / target["unitsPerEm"]) /
|
||||||
|
(fallback["xHeight"] / fallback["unitsPerEm"])
|
||||||
|
)
|
||||||
|
|
||||||
|
# overrides: force target vertical metrics
|
||||||
|
ascent_override = target["ascender"] / target["unitsPerEm"]
|
||||||
|
descent_override = abs(target["descender"]) / target["unitsPerEm"]
|
||||||
|
line_gap_override = target["lineGap"] / target["unitsPerEm"]
|
||||||
|
|
||||||
|
return {
|
||||||
|
"size_adjust": size_adjust * 100,
|
||||||
|
"ascent_override": ascent_override * 100,
|
||||||
|
"descent_override": descent_override * 100,
|
||||||
|
"line_gap_override": line_gap_override * 100,
|
||||||
|
}
|
||||||
|
|
||||||
|
def emit_css(family_name, local_name, values):
|
||||||
|
return f"""
|
||||||
|
@font-face {{
|
||||||
|
font-family: "{family_name}";
|
||||||
|
src: local("{local_name}");
|
||||||
|
size-adjust: {values['size_adjust']:.2f}%;
|
||||||
|
ascent-override: {values['ascent_override']:.2f}%;
|
||||||
|
descent-override: {values['descent_override']:.2f}%;
|
||||||
|
line-gap-override: {values['line_gap_override']:.2f}%;
|
||||||
|
}}
|
||||||
|
""".strip()
|
||||||
|
|
||||||
|
# ---- Example usage ----
|
||||||
|
|
||||||
|
target = get_metrics("static/fonts/gen/Lora-Regular.woff2")
|
||||||
|
fallback = get_metrics("/System/Library/Fonts/Supplemental/Times New Roman.ttf")
|
||||||
|
|
||||||
|
values = compute_overrides(target, fallback)
|
||||||
|
|
||||||
|
print(emit_css(
|
||||||
|
family_name="Lora Fallback",
|
||||||
|
local_name="Times New Roman",
|
||||||
|
values=values,
|
||||||
|
))
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
{{ define "main" }}
|
{{ define "main" }}
|
||||||
<h2>{{ .Title }}</h2>
|
<h2>{{ .Title }}</h2>
|
||||||
<div class="post-subscript">
|
<div class="post-subscript">
|
||||||
<p>
|
<p class="tag-list">
|
||||||
{{- range (.GetTerms "tags") -}}
|
{{- range (.GetTerms "tags") -}}
|
||||||
<a class="button" href="{{ .Permalink }}">{{ .Title }}</a>
|
<a class="tag" href="{{ .Permalink }}">{{ .Title }}</a>
|
||||||
{{ end -}}
|
{{ end -}}
|
||||||
</p>
|
</p>
|
||||||
<p>{{ i18n "postedOn" (.Date.Format "January 2, 2006") }}.</p>
|
<p>{{ i18n "postedOn" (.Date.Format "January 2, 2006") }}.</p>
|
||||||
|
|||||||
@@ -58,6 +58,8 @@
|
|||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
{{ if .Params.bergamot }}
|
{{ if .Params.bergamot }}
|
||||||
|
<!-- Ensure later scripts keep the KaTeX CSS even if the page has no LaTeX !-->
|
||||||
|
<meta name="needs-latex">
|
||||||
<!-- Code to support the Bergamot JS widget -->
|
<!-- Code to support the Bergamot JS widget -->
|
||||||
<script defer src="{{ .Site.Params.katexJsUrl }}" crossorigin="anonymous"></script>
|
<script defer src="{{ .Site.Params.katexJsUrl }}" crossorigin="anonymous"></script>
|
||||||
{{ $katexComponentJs := resources.Get "js/katex-component.js" | resources.Minify }}
|
{{ $katexComponentJs := resources.Get "js/katex-component.js" | resources.Minify }}
|
||||||
|
|||||||
@@ -18,10 +18,12 @@
|
|||||||
{{- if .linkSeries -}}
|
{{- if .linkSeries -}}
|
||||||
{{- $term := index (.page.GetTerms "series") 0 -}}
|
{{- $term := index (.page.GetTerms "series") 0 -}}
|
||||||
{{- with $term -}}
|
{{- with $term -}}
|
||||||
|
{{- if (not ($term.Param "donotunique")) -}}
|
||||||
<div class="series-link">
|
<div class="series-link">
|
||||||
{{- partial "icon.html" "corner-down-right" -}}
|
{{- partial "icon.html" "corner-down-right" -}}
|
||||||
<p>{{- i18n "latestInSeries" }} <a href="{{ $term.Permalink }}">{{ $term.Title }}</a></p>
|
<p>{{- i18n "latestInSeries" }} <a href="{{ $term.Permalink }}">{{ $term.Title }}</a></p>
|
||||||
</div>
|
</div>
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
{{- end -}}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{{- if .Params.summary -}}
|
{{- if .Params.summary -}}
|
||||||
{{ .Params.summary }}
|
{{ .Params.summary | markdownify | plainify }}
|
||||||
{{- else -}}
|
{{- else -}}
|
||||||
{{ .Summary | plainify | truncate 180 }}
|
{{ .Summary | plainify | truncate 180 }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
{{- $tmpScratch := newScratch -}}
|
{{- $tmpScratch := newScratch -}}
|
||||||
{{- range $post := (where (where site.Pages.ByDate.Reverse "Section" "blog") ".Kind" "!=" "section") -}}
|
{{- range $post := (where (where site.Pages.ByDate.Reverse "Section" "blog") ".Kind" "!=" "section") -}}
|
||||||
{{- $term := index ($post.GetTerms "series") 0 -}}
|
{{- $term := index ($post.GetTerms "series") 0 -}}
|
||||||
{{- if $term -}}
|
{{- if (and $term (not ($term.Param "donotunique"))) -}}
|
||||||
{{- if not ($tmpScratch.Get $term.Permalink) -}}
|
{{- if not ($tmpScratch.Get $term.Permalink) -}}
|
||||||
{{- $tmpScratch.Set $term.Permalink true -}}
|
{{- $tmpScratch.Set $term.Permalink true -}}
|
||||||
{{- $scratch.Add "pages" $post -}}
|
{{- $scratch.Add "pages" $post -}}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<span class="sidenote">
|
<span class="sidenote">
|
||||||
<label class="sidenote-label" for="{{- .Get 1 -}}">{{- .Get 2 | markdownify -}}</label>
|
<label class="sidenote-label" for="{{- .Get 1 -}}">{{- .Get 2 | markdownify -}}</label>
|
||||||
|
{{- /* chomp trailing whitespace */ -}}
|
||||||
<input class="sidenote-checkbox" style="display: none;" type="checkbox" id="{{- .Get 1 -}}"></input>
|
<input class="sidenote-checkbox" style="display: none;" type="checkbox" id="{{- .Get 1 -}}"></input>
|
||||||
{{- if $offset := .Get 3 -}}
|
{{- if $offset := .Get 3 -}}
|
||||||
<span class="sidenote-content sidenote-{{- .Get 0 -}}" style="margin-top: {{- $offset -}}rem">
|
<span class="sidenote-content sidenote-{{- .Get 0 -}}" style="margin-top: {{- $offset -}}rem">
|
||||||
@@ -10,4 +11,6 @@
|
|||||||
{{- .Inner -}}
|
{{- .Inner -}}
|
||||||
<span class="sidenote-delimiter">]</span>
|
<span class="sidenote-delimiter">]</span>
|
||||||
</span>
|
</span>
|
||||||
|
{{- /* chomp trailing whitespace */ -}}
|
||||||
</span>
|
</span>
|
||||||
|
{{- /* chomp trailing whitespace */ -}}
|
||||||
|
|||||||
Reference in New Issue
Block a user