Skip to content

Commit b56692a

Browse files
oscarlevinoscarlevin
authored
fix xi-link failures (#251)
* fix xi-link failures * refresh pretext resoruces
1 parent 2fa8547 commit b56692a

26 files changed

Lines changed: 963 additions & 148 deletions

‎packages/completions/src/default-dev-schema.ts‎

Lines changed: 101 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1537,7 +1537,6 @@ export const defaultDevSchema: CompletionSchema = {
15371537
"etc",
15381538
"fillin",
15391539
"flat",
1540-
"fn",
15411540
"foreign",
15421541
"icon",
15431542
"ie",
@@ -1595,6 +1594,7 @@ export const defaultDevSchema: CompletionSchema = {
15951594
"timeofday",
15961595
"times",
15971596
"timesignature",
1597+
"tn",
15981598
"today",
15991599
"trademark",
16001600
"url",
@@ -8817,6 +8817,106 @@ export const defaultDevSchema: CompletionSchema = {
88178817
"elements": [],
88188818
"attributes": []
88198819
},
8820+
"tn": {
8821+
"elements": [
8822+
"abbr",
8823+
"acro",
8824+
"ad",
8825+
"alert",
8826+
"am",
8827+
"angles",
8828+
"articletitle",
8829+
"attr",
8830+
"bc",
8831+
"c",
8832+
"ca",
8833+
"chord",
8834+
"copyleft",
8835+
"copyright",
8836+
"custom",
8837+
"dataurl",
8838+
"dblbrackets",
8839+
"dblprime",
8840+
"degree",
8841+
"delete",
8842+
"doubleflat",
8843+
"doublesharp",
8844+
"eg",
8845+
"ellipsis",
8846+
"em",
8847+
"email",
8848+
"etal",
8849+
"etc",
8850+
"fillin",
8851+
"flat",
8852+
"foreign",
8853+
"icon",
8854+
"ie",
8855+
"init",
8856+
"insert",
8857+
"kbd",
8858+
"langle",
8859+
"latex",
8860+
"ldblbracket",
8861+
"lq",
8862+
"lsq",
8863+
"m",
8864+
"mdash",
8865+
"midpoint",
8866+
"minus",
8867+
"n",
8868+
"natural",
8869+
"nb",
8870+
"nbsp",
8871+
"ndash",
8872+
"obelus",
8873+
"permille",
8874+
"pf",
8875+
"phonomark",
8876+
"pilcrow",
8877+
"plusminus",
8878+
"pm",
8879+
"prefigure",
8880+
"pretext",
8881+
"prime",
8882+
"ps",
8883+
"pubtitle",
8884+
"q",
8885+
"quantity",
8886+
"rangle",
8887+
"rdblbracket",
8888+
"registered",
8889+
"rq",
8890+
"rsq",
8891+
"scaledeg",
8892+
"section-mark",
8893+
"servicemark",
8894+
"sharp",
8895+
"solidus",
8896+
"sq",
8897+
"stale",
8898+
"swungdash",
8899+
"tag",
8900+
"tage",
8901+
"taxon",
8902+
"term",
8903+
"tex",
8904+
"timeofday",
8905+
"times",
8906+
"timesignature",
8907+
"today",
8908+
"trademark",
8909+
"url",
8910+
"var",
8911+
"viz",
8912+
"vs",
8913+
"webwork",
8914+
"xelatex",
8915+
"xetex",
8916+
"xref"
8917+
],
8918+
"attributes": []
8919+
},
88208920
"today": {
88218921
"elements": [],
88228922
"attributes": []

‎packages/pretext-html/assets/upstream.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"repository": "PreTeXtBook/pretext",
44
"ref": "master"
55
},
6-
"refreshed": "2026-08-03T22:54:01.900Z"
6+
"refreshed": "2026-08-04T23:14:53.415Z"
77
}

‎packages/pretext-html/assets/xsl/extract-gdscript.xsl‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?xml version='1.0'?>
2+
3+
<!--********************************************************************
4+
Copyright 2026 Robert A. Beezer
5+
6+
This file is part of PreTeXt.
7+
8+
PreTeXt is free software: you can redistribute it and/or modify
9+
it under the terms of the GNU General Public License as published by
10+
the Free Software Foundation, either version 2 or version 3 of the
11+
License (at your option).
12+
13+
PreTeXt is distributed in the hope that it will be useful,
14+
but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
GNU General Public License for more details.
17+
18+
You should have received a copy of the GNU General Public License
19+
along with PreTeXt. If not, see <http://www.gnu.org/licenses/>.
20+
*********************************************************************-->
21+
22+
<!-- This stylesheet locates "program[@pck]" elements and prepares -->
23+
<!-- a file necessary to zip a "pck" for each activecode with -->
24+
<!-- GDScript. -->
25+
26+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
27+
xmlns:xml="http://www.w3.org/XML/1998/namespace"
28+
xmlns:exsl="http://exslt.org/common"
29+
xmlns:str="http://exslt.org/strings"
30+
extension-element-prefixes="exsl"
31+
>
32+
33+
<!-- Get internal ID's for filenames, etc -->
34+
<!-- Standard conversion groundwork -->
35+
<xsl:import href="./publisher-variables.xsl"/>
36+
<xsl:import href="./pretext-assembly.xsl"/>
37+
<xsl:import href="./pretext-common.xsl"/>
38+
39+
<!-- Get a "subtree" xml:id value -->
40+
<!-- Then walk the XML source tree -->
41+
<!-- applying specializations below -->
42+
<xsl:import href="./extract-identity.xsl" />
43+
<xsl:output method="text" encoding="UTF-8"/>
44+
45+
<!-- PreTeXt override: force dynamic exercise processing so that the -->
46+
<!-- "unique-id" template computes identifiers matching the interactive -->
47+
<!-- web target rather than a static print target. -->
48+
<xsl:variable name="exercise-style" select="'dynamic'"/>
49+
50+
<!-- Unique id, pck, scene name, and version as a comma-separated quadruple per line -->
51+
<xsl:template match="program[@pck and @interactive='activecode']" mode="extraction">
52+
<xsl:apply-templates select="." mode="unique-id" />
53+
<xsl:text>,</xsl:text>
54+
<xsl:value-of select="@pck" />
55+
<xsl:text>,</xsl:text>
56+
<xsl:value-of select="@scene" />
57+
<xsl:text>,</xsl:text>
58+
<xsl:value-of select="$godot.version" />
59+
<xsl:text>&#xa;</xsl:text> <!-- newline -->
60+
</xsl:template>
61+
</xsl:stylesheet>

‎packages/pretext-html/assets/xsl/pretext-assembly.xsl‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2955,6 +2955,39 @@ along with PreTeXt. If not, see <http://www.gnu.org/licenses/>.
29552955
</xsl:element>
29562956
</xsl:template>
29572957

2958+
<!-- 2026-07-31: a footnote within a "tabular" cell becomes a "tn" -->
2959+
<!-- table note, lettered and placed at the bottom of the table -->
2960+
<!-- (Notes to tables: CMoS 18th ed., 3.77-3.81; specific notes -->
2961+
<!-- at 3.80). Any identification attributes are orphaned: a -->
2962+
<!-- "tn" is not a cross-reference target. -->
2963+
<xsl:template match="tabular//fn" mode="repair">
2964+
<tn>
2965+
<xsl:apply-templates select="node()" mode="repair"/>
2966+
</tn>
2967+
</xsl:template>
2968+
2969+
<!-- A "tn" authored as a block sibling of a cell's paragraphs is -->
2970+
<!-- relocated to the tail of the paragraph it follows, where its -->
2971+
<!-- mark belongs typographically; conversions then treat every -->
2972+
<!-- "tn" as inline. A "tn" amid the mixed text of a cell is -->
2973+
<!-- already inline, and is untouched. -->
2974+
<xsl:template match="cell[p]/tn" mode="repair"/>
2975+
2976+
<xsl:template match="cell/p" mode="repair">
2977+
<xsl:copy>
2978+
<xsl:apply-templates select="@*|node()" mode="repair"/>
2979+
<xsl:apply-templates select="following-sibling::tn[count(preceding-sibling::p[1] | current()) = 1]" mode="tn-relocate"/>
2980+
</xsl:copy>
2981+
</xsl:template>
2982+
2983+
<!-- A faithful copy, since the "repair" mode on the same -->
2984+
<!-- element is its suppression at the original location. -->
2985+
<xsl:template match="cell/tn" mode="tn-relocate">
2986+
<xsl:copy>
2987+
<xsl:apply-templates select="@*|node()" mode="repair"/>
2988+
</xsl:copy>
2989+
</xsl:template>
2990+
29582991
<!-- 2026-07-30: an "event" is bibliographic content, so it -->
29592992
<!-- belongs in "bibinfo", already its home for slideshows. -->
29602993
<!-- Suppressed at its origin within "docinfo"... -->

‎packages/pretext-html/assets/xsl/pretext-common.xsl‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@ along with PreTeXt. If not, see <http://www.gnu.org/licenses/>.
8181
<!-- provisional cross-references show in red -->
8282
<xsl:param name="author.tools" select="''" />
8383

84+
<!-- The Godot engine version used for GDScript. Read both by the -->
85+
<!-- conversion to Runestone, for the Web Assembly shell, and by the -->
86+
<!-- "pck" extraction, which runs as a separate command. A default -->
87+
<!-- in each would let the two silently disagree. -->
88+
<xsl:param name="godot.version" select="'4.6.3'"/>
89+
8490
<!-- ######### -->
8591
<!-- Variables -->
8692
<!-- ######### -->
@@ -7387,6 +7393,8 @@ Book (with parts), "section" at level 3
73877393
<language name="basic" active="" listings="Basic" prism="basic"/>
73887394
<language name="c" active="c" listings="C" prism="c"/>
73897395
<language name="cpp" active="cpp" listings="C++" prism="cpp"/>
7396+
<!-- using Python as a closest match for now in listings. -->
7397+
<language name="gdscript" active="gdscript" listings="Python" prism="gdscript"/>
73907398
<language name="go" active="" listings="C" prism="go"/>
73917399
<language name="java" active="java" listings="Java" prism="java"/>
73927400
<language name="javascript" active="javascript" listings="" prism="javascript"/>
@@ -11902,6 +11910,13 @@ http://andrewmccarthy.ie/2014/11/06/swung-dash-in-latex/
1190211910
<xsl:with-param name="message" select="'the document-wide style of cross-reference text is now a &quot;text&quot; attribute on an &quot;xrefs&quot; element within &quot;docinfo/defaults&quot;, replacing the &quot;cross-references&quot; element. We will honor your intent, but please convert to the new form.'"/>
1190311911
</xsl:call-template>
1190411912
<!-- -->
11913+
<!-- 2026-07-31 a footnote within a "tabular" cell becomes a "tn" table note -->
11914+
<xsl:call-template name="deprecation-message">
11915+
<xsl:with-param name="occurrences" select="&quot;$document-root//tabular//fn&quot;" />
11916+
<xsl:with-param name="date-string" select="'2026-07-31'" />
11917+
<xsl:with-param name="message" select="'a footnote (&quot;fn&quot;) within a &quot;tabular&quot; cell is now a table note, the &quot;tn&quot; element, lettered and placed at the bottom of the table. We will honor your intent, but please convert to &quot;tn&quot;. Note that a table note is not part of the numbering of true footnotes, and is not a target for a cross-reference.'"/>
11918+
</xsl:call-template>
11919+
<!-- -->
1190511920
</xsl:template>
1190611921

1190711922
<!-- Miscellaneous -->

‎packages/pretext-html/assets/xsl/pretext-epub.xsl‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1403,11 +1403,6 @@
14031403
</xsl:template>
14041404

14051405
<!-- Footnotes -->
1406-
<!-- First disable the "footnote" popping routine used to -->
1407-
<!-- move the content out of HTML structures where it is -->
1408-
<!-- not welcome (e.g a "p" inside a "p"). -->
1409-
<xsl:template match="*" mode="pop-footnote-text"/>
1410-
14111406
<!-- Drop a marker as a superscript -->
14121407
<xsl:template match="fn">
14131408
<xsl:variable name="hid">

0 commit comments

Comments
 (0)