Skip to content

Commit feb2885

Browse files
iorshiorsh
authored
Merge pull request #179 from fontforge/update_20251005
2 parents 27fdd0e + 97a0e1f commit feb2885

File tree

145 files changed

+4390
-3951
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+4390
-3951
lines changed

‎docs/_static/basic.css‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Sphinx stylesheet -- basic theme.
66
*
7-
* :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS.
7+
* :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
88
* :license: BSD, see LICENSE for details.
99
*
1010
*/
@@ -237,6 +237,10 @@ a.headerlink {
237237
visibility: hidden;
238238
}
239239

240+
a:visited {
241+
color: #551A8B;
242+
}
243+
240244
h1:hover > a.headerlink,
241245
h2:hover > a.headerlink,
242246
h3:hover > a.headerlink,
@@ -670,6 +674,16 @@ dd {
670674
margin-left: 30px;
671675
}
672676

677+
.sig dd {
678+
margin-top: 0px;
679+
margin-bottom: 0px;
680+
}
681+
682+
.sig dl {
683+
margin-top: 0px;
684+
margin-bottom: 0px;
685+
}
686+
673687
dl > dd:last-child,
674688
dl > dd:last-child > :last-child {
675689
margin-bottom: 0;
@@ -738,6 +752,14 @@ abbr, acronym {
738752
cursor: help;
739753
}
740754

755+
.translated {
756+
background-color: rgba(207, 255, 207, 0.2)
757+
}
758+
759+
.untranslated {
760+
background-color: rgba(255, 207, 207, 0.2)
761+
}
762+
741763
/* -- code displays --------------------------------------------------------- */
742764

743765
pre {

‎docs/_static/doctools.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Base JavaScript utilities for all Sphinx HTML documentation.
66
*
7-
* :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS.
7+
* :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
88
* :license: BSD, see LICENSE for details.
99
*
1010
*/

‎docs/_static/documentation_options.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
var DOCUMENTATION_OPTIONS = {
2-
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
1+
const DOCUMENTATION_OPTIONS = {
32
VERSION: '20230101',
43
LANGUAGE: 'en',
54
COLLAPSE_INDEX: false,

‎docs/_static/forkme_right_darkblue_121621.png‎

4.67 KB
Loading

‎docs/_static/language_data.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* This script contains the language-specific data used by searchtools.js,
66
* namely the list of stopwords, stemmer, scorer and splitter.
77
*
8-
* :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS.
8+
* :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
99
* :license: BSD, see LICENSE for details.
1010
*
1111
*/

‎docs/_static/pygments.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left:
2222
.highlight .cs { color: #8f5902; font-style: italic } /* Comment.Special */
2323
.highlight .gd { color: #a40000 } /* Generic.Deleted */
2424
.highlight .ge { color: #000000; font-style: italic } /* Generic.Emph */
25+
.highlight .ges { color: #000000 } /* Generic.EmphStrong */
2526
.highlight .gr { color: #ef2929 } /* Generic.Error */
2627
.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
2728
.highlight .gi { color: #00A000 } /* Generic.Inserted */

‎docs/_static/searchtools.js‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Sphinx JavaScript utilities for the full-text search.
66
*
7-
* :copyright: Copyright 2007-2022 by the Sphinx team, see AUTHORS.
7+
* :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
88
* :license: BSD, see LICENSE for details.
99
*
1010
*/
@@ -57,12 +57,13 @@ const _removeChildren = (element) => {
5757
const _escapeRegExp = (string) =>
5858
string.replace(/[.*+\-?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string
5959

60-
const _displayItem = (item, searchTerms) => {
60+
const _displayItem = (item, searchTerms, highlightTerms) => {
6161
const docBuilder = DOCUMENTATION_OPTIONS.BUILDER;
62-
const docUrlRoot = DOCUMENTATION_OPTIONS.URL_ROOT;
6362
const docFileSuffix = DOCUMENTATION_OPTIONS.FILE_SUFFIX;
6463
const docLinkSuffix = DOCUMENTATION_OPTIONS.LINK_SUFFIX;
6564
const showSearchSummary = DOCUMENTATION_OPTIONS.SHOW_SEARCH_SUMMARY;
65+
const contentRoot = document.documentElement.dataset.content_root
66+
?? DOCUMENTATION_OPTIONS.URL_ROOT;
6667

6768
const [docName, title, anchor, descr, score, _filename] = item;
6869

@@ -75,20 +76,24 @@ const _displayItem = (item, searchTerms) => {
7576
if (dirname.match(/\/index\/$/))
7677
dirname = dirname.substring(0, dirname.length - 6);
7778
else if (dirname === "index/") dirname = "";
78-
requestUrl = docUrlRoot + dirname;
79+
requestUrl = contentRoot + dirname;
7980
linkUrl = requestUrl;
8081
} else {
8182
// normal html builders
82-
requestUrl = docUrlRoot + docName + docFileSuffix;
83+
requestUrl = contentRoot + docName + docFileSuffix;
8384
linkUrl = docName + docLinkSuffix;
8485
}
8586
let linkEl = listItem.appendChild(document.createElement("a"));
8687
linkEl.href = linkUrl + anchor;
8788
linkEl.dataset.score = score;
8889
linkEl.innerHTML = title;
89-
if (descr)
90+
if (descr) {
9091
listItem.appendChild(document.createElement("span")).innerHTML =
9192
" (" + descr + ")";
93+
// highlight search terms in the description
94+
if (SPHINX_HIGHLIGHT_ENABLED) // set in sphinx_highlight.js
95+
highlightTerms.forEach((term) => _highlightText(listItem, term, "highlighted"));
96+
}
9297
else if (showSearchSummary)
9398
fetch(requestUrl)
9499
.then((responseData) => responseData.text())
@@ -97,6 +102,9 @@ const _displayItem = (item, searchTerms) => {
97102
listItem.appendChild(
98103
Search.makeSearchSummary(data, searchTerms)
99104
);
105+
// highlight search terms in the summary
106+
if (SPHINX_HIGHLIGHT_ENABLED) // set in sphinx_highlight.js
107+
highlightTerms.forEach((term) => _highlightText(listItem, term, "highlighted"));
100108
});
101109
Search.output.appendChild(listItem);
102110
};
@@ -115,14 +123,15 @@ const _finishSearch = (resultCount) => {
115123
const _displayNextItem = (
116124
results,
117125
resultCount,
118-
searchTerms
126+
searchTerms,
127+
highlightTerms,
119128
) => {
120129
// results left, load the summary and display it
121130
// this is intended to be dynamic (don't sub resultsCount)
122131
if (results.length) {
123-
_displayItem(results.pop(), searchTerms);
132+
_displayItem(results.pop(), searchTerms, highlightTerms);
124133
setTimeout(
125-
() => _displayNextItem(results, resultCount, searchTerms),
134+
() => _displayNextItem(results, resultCount, searchTerms, highlightTerms),
126135
5
127136
);
128137
}
@@ -360,7 +369,7 @@ const Search = {
360369
// console.info("search results:", Search.lastresults);
361370

362371
// print the results
363-
_displayNextItem(results, results.length, searchTerms);
372+
_displayNextItem(results, results.length, searchTerms, highlightTerms);
364373
},
365374

366375
/**
@@ -426,11 +435,14 @@ const Search = {
426435
filenames[match[0]],
427436
]);
428437
};
429-
Object.keys(objects).forEach((prefix) =>
438+
Object.keys(objects).forEach((prefix) => {
439+
if (!(objects[prefix] instanceof Array)) {
440+
objects[prefix] = Object.entries(objects[prefix]).map(([name, match]) => [...match, name]);
441+
}
430442
objects[prefix].forEach((array) =>
431443
objectSearchCallback(prefix, array)
432-
)
433-
);
444+
);
445+
});
434446
return results;
435447
},
436448

‎docs/_static/sphinx_highlight.js‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,19 @@ const _highlight = (node, addItems, text, className) => {
2929
}
3030

3131
span.appendChild(document.createTextNode(val.substr(pos, text.length)));
32+
const rest = document.createTextNode(val.substr(pos + text.length));
3233
parent.insertBefore(
3334
span,
3435
parent.insertBefore(
35-
document.createTextNode(val.substr(pos + text.length)),
36+
rest,
3637
node.nextSibling
3738
)
3839
);
3940
node.nodeValue = val.substr(0, pos);
41+
/* There may be more occurrences of search term in this node. So call this
42+
* function recursively on the remaining fragment.
43+
*/
44+
_highlight(rest, addItems, text, className);
4045

4146
if (isInSVG) {
4247
const rect = document.createElementNS(
@@ -140,5 +145,10 @@ const SphinxHighlight = {
140145
},
141146
};
142147

143-
_ready(SphinxHighlight.highlightSearchWords);
144-
_ready(SphinxHighlight.initEscapeListener);
148+
_ready(() => {
149+
/* Do not call highlightSearchWords() when we are on the search page.
150+
* It will highlight words from the *previous* search query.
151+
*/
152+
if (typeof Search === "undefined") SphinxHighlight.highlightSearchWords();
153+
SphinxHighlight.initEscapeListener();
154+
});

‎docs/appendices.html‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
21
<!DOCTYPE html>
32

4-
<html lang="en">
3+
<html lang="en" data-content_root="./">
54
<head>
65
<meta charset="utf-8" />
7-
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
87

98
<title>Appendices &#8212; FontForge 20230101 documentation</title>
10-
<link rel="stylesheet" type="text/css" href="_static/pygments.css" />
11-
<link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
12-
<script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
13-
<script src="_static/doctools.js"></script>
14-
<script src="_static/sphinx_highlight.js"></script>
15-
<link rel="shortcut icon" href="_static/fftype16.png"/>
9+
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=4f649999" />
10+
<link rel="stylesheet" type="text/css" href="_static/alabaster.css?v=cb25574f" />
11+
<script src="_static/documentation_options.js?v=00357e79"></script>
12+
<script src="_static/doctools.js?v=888ff710"></script>
13+
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
14+
<link rel="icon" href="_static/fftype16.png"/>
1615
<link rel="index" title="Index" href="genindex.html" />
1716
<link rel="search" title="Search" href="search.html" />
1817
<link rel="next" title="What on Earth Possessed me…" href="appendices/ff-history.html" />
@@ -34,7 +33,7 @@
3433
<div class="body" role="main">
3534

3635
<section id="appendices">
37-
<h1>Appendices<a class="headerlink" href="#appendices" title="Permalink to this heading"></a></h1>
36+
<h1>Appendices<a class="headerlink" href="#appendices" title="Link to this heading"></a></h1>
3837
<div class="toctree-wrapper compound">
3938
<ul>
4039
<li class="toctree-l1"><a class="reference internal" href="appendices/ff-history.html">What on Earth Possessed me…</a></li>
@@ -104,7 +103,7 @@ <h1>Appendices<a class="headerlink" href="#appendices" title="Permalink to this
104103
</ul>
105104
</div>
106105
<section id="japanese-documentation-outdated">
107-
<h2><a class="reference external" href="old/ja">Japanese documentation (outdated)</a><a class="headerlink" href="#japanese-documentation-outdated" title="Permalink to this heading"></a></h2>
106+
<h2><a class="reference external" href="old/ja">Japanese documentation (outdated)</a><a class="headerlink" href="#japanese-documentation-outdated" title="Link to this heading"></a></h2>
108107
<ul class="simple">
109108
<li><p><a class="reference external" href="old/ja/overview.html">Overview</a></p></li>
110109
</ul>
@@ -187,7 +186,7 @@ <h3 id="searchlabel">Quick search</h3>
187186
&copy;2000-2012 by George Williams, 2012-2020 by FontForge authors.
188187

189188
|
190-
Powered by <a href="http://sphinx-doc.org/">Sphinx 6.0.0</a>
189+
Powered by <a href="http://sphinx-doc.org/">Sphinx 7.2.6</a>
191190
&amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
192191

193192
</div>

‎docs/appendices/OFL-Unofficial.html‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
21
<!DOCTYPE html>
32

4-
<html lang="en">
3+
<html lang="en" data-content_root="../">
54
<head>
65
<meta charset="utf-8" />
7-
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
87

98
<title>Unofficial translations of the OFL &#8212; FontForge 20230101 documentation</title>
10-
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
11-
<link rel="stylesheet" type="text/css" href="../_static/alabaster.css" />
12-
<script data-url_root="../" id="documentation_options" src="../_static/documentation_options.js"></script>
13-
<script src="../_static/doctools.js"></script>
14-
<script src="../_static/sphinx_highlight.js"></script>
15-
<link rel="shortcut icon" href="../_static/fftype16.png"/>
9+
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=4f649999" />
10+
<link rel="stylesheet" type="text/css" href="../_static/alabaster.css?v=cb25574f" />
11+
<script src="../_static/documentation_options.js?v=00357e79"></script>
12+
<script src="../_static/doctools.js?v=888ff710"></script>
13+
<script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
14+
<link rel="icon" href="../_static/fftype16.png"/>
1615
<link rel="index" title="Index" href="../genindex.html" />
1716
<link rel="search" title="Search" href="../search.html" />
1817
<link rel="next" title="Open Font License in French" href="ofl/OFL-Unofficial-fr.html" />
@@ -34,7 +33,7 @@
3433
<div class="body" role="main">
3534

3635
<section id="unofficial-translations-of-the-ofl">
37-
<h1>Unofficial translations of the OFL<a class="headerlink" href="#unofficial-translations-of-the-ofl" title="Permalink to this heading"></a></h1>
36+
<h1>Unofficial translations of the OFL<a class="headerlink" href="#unofficial-translations-of-the-ofl" title="Link to this heading"></a></h1>
3837
<div class="toctree-wrapper compound">
3938
<ul>
4039
<li class="toctree-l1"><a class="reference internal" href="ofl/OFL-Unofficial-fr.html">Open Font License in French</a></li>
@@ -46,7 +45,7 @@ <h1>Unofficial translations of the OFL<a class="headerlink" href="#unofficial-tr
4645
</ul>
4746
</div>
4847
<section id="ofl-1-1">
49-
<h2>OFL 1.1<a class="headerlink" href="#ofl-1-1" title="Permalink to this heading"></a></h2>
48+
<h2>OFL 1.1<a class="headerlink" href="#ofl-1-1" title="Link to this heading"></a></h2>
5049
<dl class="object">
5150
<dt class="sig sig-object">
5251
<span class="sig-name descname"><span class="pre">English</span> <span class="pre">(eng)</span> <span class="pre">(official)</span></span></dt>
@@ -77,7 +76,7 @@ <h2>OFL 1.1<a class="headerlink" href="#ofl-1-1" title="Permalink to this headin
7776

7877
</section>
7978
<section id="ofl-1-0">
80-
<h2>OFL 1.0<a class="headerlink" href="#ofl-1-0" title="Permalink to this heading"></a></h2>
79+
<h2>OFL 1.0<a class="headerlink" href="#ofl-1-0" title="Link to this heading"></a></h2>
8180
<dl class="object">
8281
<dt class="sig sig-object">
8382
<span class="sig-name descname"><span class="pre">Vietnamese</span></span></dt>
@@ -88,7 +87,7 @@ <h2>OFL 1.0<a class="headerlink" href="#ofl-1-0" title="Permalink to this headin
8887
</section>
8988
<hr class="docutils" />
9089
<section id="how-about-translating-the-license-and-the-faq-into-other-languages">
91-
<h2>How about translating the license and the FAQ into other languages?<a class="headerlink" href="#how-about-translating-the-license-and-the-faq-into-other-languages" title="Permalink to this heading"></a></h2>
90+
<h2>How about translating the license and the FAQ into other languages?<a class="headerlink" href="#how-about-translating-the-license-and-the-faq-into-other-languages" title="Link to this heading"></a></h2>
9291
<blockquote>
9392
<div><p>SIL certainly recognises the need for people who are not familiar with
9493
English to be able to understand the OFL and this FAQ better in their own
@@ -229,7 +228,7 @@ <h3 id="searchlabel">Quick search</h3>
229228
&copy;2000-2012 by George Williams, 2012-2020 by FontForge authors.
230229

231230
|
232-
Powered by <a href="http://sphinx-doc.org/">Sphinx 6.0.0</a>
231+
Powered by <a href="http://sphinx-doc.org/">Sphinx 7.2.6</a>
233232
&amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.12</a>
234233

235234
</div>

0 commit comments

Comments
 (0)