@pretextbook/pretext-html 0.3.0 → 0.5.0

package/assets/xsl/extract-qrcode.xsl

@@ -54,7 +54,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- applying specializations below -->
 <xsl:import href="./extract-identity.xsl" />
 
-<xsl:output method="text" encoding="UTF-8"/>
+<xsl:output method="xml" encoding="UTF-8"/>
 
 <!-- Avoid Catch-22: default assembly/pre-processor provides output  -->
 <!-- for a conversion to a static format, but that format will       -->
@@ -74,13 +74,21 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <xsl:variable name="chunk-level" select="$html-chunk-level"/>
 <xsl:variable name="file-extension" select="'.html'"/>
 
+<!-- Wrap the ids below in a manifest of exactly the elements that  -->
+<!-- earn a QR code; the generator opens only these sidecar files.  -->
+<xsl:template match="*" mode="extraction-wrapper">
+    <pi:qrcodes>
+        <xsl:apply-imports/>
+    </pi:qrcodes>
+</xsl:template>
+
 <xsl:template match="audio[@source|@href]|video[@source|@href|@youtube|@youtubeplaylist|@vimeo]|interactive" mode="extraction">
     <!-- Sidecar XML file with pre-computed URLs for use      -->
     <!-- by pretext-assembly.xsl when building static         -->
     <!-- representations, and by the Python script when       -->
     <!-- generating QR code images.                           -->
     <xsl:variable name="the-id">
-        <xsl:apply-templates select="." mode="visible-id"/>
+        <xsl:apply-templates select="." mode="unique-id"/>
     </xsl:variable>
     <exsl:document href="{$the-id}-url.xml" method="xml">
         <pi:qrcode-urls>
@@ -95,6 +103,8 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             </pi:embed-iframe-url>
         </pi:qrcode-urls>
     </exsl:document>
+    <!-- record the id in the returned manifest (see the wrapper above) -->
+    <pi:qrcode id="{$the-id}"/>
 </xsl:template>
 
 </xsl:stylesheet>

package/assets/xsl/extract-sageplot.xsl

@@ -88,7 +88,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 <xsl:text>3d</xsl:text>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:message>PTX:ERROR:   a "sageplot" has a @variant attribute ("<xsl:value-of select="@variant"/>") for "<xsl:value-of select="$filebase"/>" whose value is not "2d" nor "3d".  The default ("2d") is being used, which could be incorrect</xsl:message>
+                <xsl:message>PTX:FALLBACK:   a "sageplot" has a @variant attribute ("<xsl:value-of select="@variant"/>") for "<xsl:value-of select="$filebase"/>" whose value is not "2d" nor "3d".  The default ("2d") is being used, which could be incorrect</xsl:message>
                 <xsl:text>2d</xsl:text>
             </xsl:otherwise>
         </xsl:choose>

package/assets/xsl/extract-trace.xsl

@@ -24,7 +24,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- processed into a trace by the  pretext/pretext  script. -->
 <!-- It produces text output, with one line per program:     -->
 <!--                                                         -->
-<!--     visible-id, language, source                        -->
+<!--     unique-id, language, source                         -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
     xmlns:xml="http://www.w3.org/XML/1998/namespace"
@@ -57,7 +57,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 
 <!-- Constructs a block of text for trace output                       -->
 <!-- Each of the following as its own line:                            -->
-<!--   visible-id                                                      -->
+<!--   unique-id                                                       -->
 <!--   runestone-id                                                    -->
 <!--   trace filename                                                  -->
 <!--   language                                                        -->
@@ -66,7 +66,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 <!-- Followed by 1 line per checkpoint question                        -->
 <!-- Block ends with blank line (double newline)                       -->
 <xsl:template match="program[@interactive = 'codelens']" mode="extraction">
-    <xsl:apply-templates select="." mode="visible-id"/>
+    <xsl:apply-templates select="." mode="unique-id"/>
     <xsl:text>&#xa;</xsl:text>
     <xsl:apply-templates select="." mode="runestone-id"/>
     <xsl:text>&#xa;</xsl:text>

package/assets/xsl/extract-youtube.xsl

@@ -56,7 +56,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:variable name="first-video-id" select="substring-before(concat(normalize-space(str:replace(@youtube, ',', ' ')), ' '), ' ')" />
     <xsl:value-of select="$first-video-id" />
     <xsl:text>,</xsl:text>
-    <xsl:apply-templates select="." mode="visible-id" />
+    <xsl:apply-templates select="." mode="unique-id" />
     <xsl:text>&#xa;</xsl:text>
 </xsl:template>
 

package/assets/xsl/latex/pretext-latex-texstyle.xsl

@@ -210,7 +210,6 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:call-template name="math-packages"/>
     <xsl:call-template name="pdfpages-package"/>
     <xsl:call-template name="semantic-macros"/>
-    <xsl:call-template name="exercises-and-solutions"/>
     <xsl:call-template name="chapter-start-number"/>
     <xsl:call-template name="equation-numbering"/>
     <xsl:call-template name="image-tcolorbox"/>
@@ -494,7 +493,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <xsl:text>{</xsl:text>
     <xsl:choose>
         <xsl:when test="@arg = 'unique-id'">
-            <xsl:value-of select="$ptx-node/@unique-id"/>
+            <xsl:value-of select="$ptx-node/@pi:unique-id"/>
         </xsl:when>
         <xsl:when test="@arg = 'ordinal'">
             <xsl:apply-templates select="$ptx-node" mode="texstyle-number"/>
@@ -512,7 +511,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:text>[</xsl:text>
         <xsl:choose>
             <xsl:when test="@opt = 'unique-id'">
-                <xsl:value-of select="$ptx-node/@unique-id"/>
+                <xsl:value-of select="$ptx-node/@pi:unique-id"/>
             </xsl:when>
             <xsl:when test="@arg = 'ordinal'">
                 <xsl:apply-templates select="$ptx-node" mode="texstyle-number"/>
@@ -524,7 +523,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
         <xsl:text>{</xsl:text>
         <xsl:choose>
             <xsl:when test="@arg = 'unique-id'">
-                <xsl:value-of select="$ptx-node/@unique-id"/>
+                <xsl:value-of select="$ptx-node/@pi:unique-id"/>
             </xsl:when>
             <xsl:when test="@arg = 'ordinal'">
                 <xsl:apply-templates select="$ptx-node" mode="texstyle-number"/>
@@ -624,7 +623,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
             </xsl:apply-templates>
         </xsl:when>
         <xsl:otherwise>
-            <xsl:message>PTX:WARNING: The @authority attribute on a keyword element (in a texstyle file) is required and must be "author" or "msc".  Found "@authority="<xsl:value-of select="@authority"/>". </xsl:message>
+            <xsl:message>PTX:ERROR:   The @authority attribute on a keyword element (in a texstyle file) is required and must be "author" or "msc".  Found "@authority="<xsl:value-of select="@authority"/>". </xsl:message>
         </xsl:otherwise>
     </xsl:choose>
 </xsl:template>

package/assets/xsl/localizations/README.md

@@ -17,9 +17,10 @@ You should have received a copy of the GNU General Public License
 along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************-->
 
-# PreTeXt Localizations
+PreTeXt Localizations
+=====================
 
-Each file in this directory provides translations of various strings used in titles and headings (and other places) to a specific language. Filenames reflect the code for language (lowercase) and then the code for the region (uppercase). This is a requirement.
+Each file in this directory provides translations of various strings used in titles and headings (and other places) to a specific language.  Filenames reflect the code for language (lowercase) and then the code for the region (uppercase).  This is a requirement.
 
 For each file of translations, the "language" attribute of the "locale" element used to reference the language code and the "string-id" of each "localization" element is the lookup key. Element content is the language-specific string. The English version ("en-US") is carefully documented, so additions of new languages do not necessarily require new documentation, though it could help other implementers. See `xsl/pretext-common.xsl` for the two routines which make use of this information, one is a named template and the other (largely) uses the name of an element as the string-id.
 
@@ -27,30 +28,29 @@ Some items peculiar to LaTeX are explained [here](http://www.tex.ac.uk/cgi-bin/t
 
 There is a [general overview of language tags](http://www.w3.org/International/articles/language-tags/) and the [Subtag Registry](http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry).
 
-Contibutions of new languages are always welcome and especially encouraged! Search on "Translation needed" to see where you can help. Use the en-US file as a template for a new language file, since it is always most complete. It is understood that certain English words and phrases have subtleties that can be very hard to capture in another language. Do your best to concoct a close approximation -- something should be better than nothing. And it might improve with additions from others later. We try to address some of this in the en-US file, so do be certain to look there for explanations of how these strings are employed. Comments about your own decisions, within the relevant language file, can be very helpful later.
+Contibutions of new languages are always welcome and especially encouraged! Search on "Translation needed" to see where you can help. Use the  en-US  file as a template for a new language file, since it is always most complete.  It is understood that certain English words and phrases have subtleties that can be very hard to capture in another language.  Do your best to concoct a close approximation -- something should be better than nothing.  And it might improve with additions from others later.  We try to address some of this in the  en-US  file, so do be certain to look there for explanations of how these strings are employed.  Comments about your own decisions, within the relevant language file, can be very helpful later.
 
-NEW LANGUAGES: for a new file to be effective, a single line needs to be added to the `xsl/localizations/localizations.xml` file. It should be obvious what to do by looking at the other lines of that file. If you create a new file, please include a "commented-out" line for any words you do not translate, and please use the **exact** style of commenting as elsewhere (one line per comment, indented). Including these, and using teh same style, greatly aids in maintenance and reliability.
+NEW LANGUAGES: for a new file to be effective, a single line needs to be added to the `xsl/localizations/localizations.xml` file.  It should be obvious what to do by looking at the other lines of that file.  If you create a new file, please include a "commented-out" line for any words you do not translate, and please use the **exact** style of commenting as elsewhere (one line per comment, indented).  Including these, and using teh same style, greatly aids in maintenance and reliability.
 
-Additions to incomplete files, or new files for additional languages, are very welcome and are a huge help in making PreTeXt useable for more authors. A GitHub pull request is preferable. If you do not know GitHub well, then emailing the entire language file (as an attachment) is very welcome and just as easy to deal with on our end. Please respect the order in the en-US file, it saves us time when we add new terms to each and every file. Thanks.
+Additions to incomplete files, or new files for additional languages, are very welcome and are a huge help in making PreTeXt useable for more authors.  A GitHub pull request is preferable.  If you do not know GitHub well, then emailing the entire language file (as an attachment) is very welcome and just as easy to deal with on our end.  Please respect the order in the en-US file, it saves us time when we add new terms to each and every file.  Thanks.
 
-To test, or use: place `xml:lang="es-ES"`, or similar, as an attribute on your `<pretext>` element. `en-US` is the default if no `@xml:lang` attribute is given on the `pretext` element.
+To test, or use: place  `xml:lang="es-ES"`, or similar, as an attribute on your `<pretext>` element.  `en-US` is the default if no `@xml:lang` attribute is given on the `pretext` element.
 
 Current (partially) implemented language codes and contributors
-
-- af-ZA, Afrikaans (South Africa), Dirk Basson
-- bg-BG, Bulgarian (Bulgaria), Boyko Bantchev
-- ca-ES, Catalan (Spain), Jordi Saludes
-- cs-CZ, Czech (Czechia), Jiří Lebl
-- de-DE, German (Germany), Karl-Dieter Crisman
-- es-ES, Spanish (Spain), Juan José Torrens
-- en-US, English (United States), Robert A. Beezer
-- fi-FI, Finnish (Finland), Lasse M. Manninen
-- fr-CA, French (Canada), Jean-Sébastien Turcotte
-- fr-FR, French (France), Thomas W. Judson, Julien Giol, Jean-Sébastien Turcotte
-- hu-HU, Hungarian (Hungary), Sándor Czirbusz
-- it-IT, Italian (Italy), Valerio Monti
-- ku-CKB, Rebin Muhammad, Kurdish (Central Kurdish)
-- nl-NL, Dutch (Netherlands), Gosia Wrzesinska
-- pt-BR, Portugese (Brazil), Igor Morgado, Vinicius Monego, Leon Silva
-- pt-PT, Portugese (Portugal), António Pereira
-- zh-HANS, Chinese Simplified (China), Hongqi Wang
+* af-ZA, Afrikaans (South Africa), Dirk Basson
+* bg-BG, Bulgarian (Bulgaria), Boyko Bantchev
+* ca-ES, Catalan (Spain), Jordi Saludes
+* cs-CZ, Czech (Czechia), Jiří Lebl
+* de-DE, German (Germany), Karl-Dieter Crisman
+* es-ES, Spanish (Spain), Juan José Torrens
+* en-US, English (United States), Robert A. Beezer
+* fi-FI, Finnish (Finland), Lasse M. Manninen
+* fr-CA, French (Canada), Jean-Sébastien Turcotte
+* fr-FR, French (France), Thomas W. Judson, Julien Giol, Jean-Sébastien Turcotte
+* hu-HU, Hungarian (Hungary), Sándor Czirbusz
+* it-IT, Italian (Italy), Valerio Monti
+* ku-CKB, Rebin Muhammad, Kurdish (Central Kurdish)
+* nl-NL, Dutch (Netherlands), Gosia Wrzesinska
+* pt-BR, Portugese (Brazil), Igor Morgado, Vinicius Monego, Leon Silva
+* pt-PT, Portugese (Portugal), António Pereira
+* zh-HANS, Chinese Simplified (China), Hongqi Wang