From abfe34304d7abe8f7549e3530209a83853aa9cc6 Mon Sep 17 00:00:00 2001
From: "Jiri (George) Lebl" <jiri.lebl@gmail.com>
Date: Wed, 10 Jun 2020 17:10:34 -0500
Subject: [PATCH] Fixes for HTML conversion, update README, move changes*html
 to web

---
 README.md           |  4 ++++
 changes-draft.html  | 18 ------------------
 changes2-draft.html | 19 -------------------
 convert-to-mbx.pl   |  8 ++++----
 realanal-html.xsl   | 13 +++++++++----
 5 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/README.md b/README.md
index d29bdcd..f753c1c 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,8 @@ Volume I and II are both in this directory
 * realanal2.tex is Volume II
 * The files above are just the "driver files", the actual contents are in the files ch-???.tex
 * realanal.tex must be complied first as realanal2.tex uses the realanal.aux file
+* The file realanal12.tex does both volumes together, currently that is only used
+  for the HTML conversion
 
 Notes on figures:
 
@@ -34,6 +36,8 @@ On the scripts:
 * publish.sh compiles the volume I file to pdf
 * publish2.sh compiles the volume II file to pdf
 * resizetocrownquatro.sh resize a PDF to crown quatro size using ghostscript
+* convert-to-mbx.sh (runs convert-to-mbx.pl) does the conversion to HTML through
+  PreTeXt, this is the only place that realanal12.tex is currently used.
 
 *Note:* The tex sources require a very recent LaTeX.  If your latex does not
 have a recent enough ocgx2 package, you can simply comment out that line in
diff --git a/changes-draft.html b/changes-draft.html
index d2e9056..0113bb2 100644
--- a/changes-draft.html
+++ b/changes-draft.html
@@ -1,19 +1 @@
 This file is a draft of the new changes for http://www.jirka.org/ra/changes.html
-
-
-<p>
-
-<ul>
-<li>Remove the note before exercise 7.2.12.  It is obsolete and could be
-confusing as we have already defined "subspace topology" above.
-<li>Note after Definition 0.3.13 that $R(f)=f(A)$.
-<li>Add very small example to composition of functions after Definition
-  0.3.18.
-<li>Add a couple of sentences about why existence of a bijection is
-  an equivalence relation.
-<li>Note why the only set with cardinality of 0 is the empty set.
-<li><b>Exercise 5.2.13 part d) replaced, part e) adds a hypothesis
-    (differentiable at 0)</b> (to fix errata)
-<li>Many minor language and style improvements as well as some minor
-  clarifications.
-</ul>
diff --git a/changes2-draft.html b/changes2-draft.html
index 771c32a..c8ee3f2 100644
--- a/changes2-draft.html
+++ b/changes2-draft.html
@@ -1,20 +1 @@
 This file is a draft of the new changes for http://www.jirka.org/ra/changes2.html
-
-<p>
-
-<ul>
-<li>Improve the introduction.
-<li>In the statement of inverse function theorem, remove the definition of $q$, it is not used.
-<li>In proof of second part of 10.4.3 (Riemann-Lebesgue) use $S_{1/k}$ rather than $S_k$ for
-consistency with the first part of the proof.
-<li>In the path integral chapter, consistently use the words "path integral"
-rather than sometimes "path integral" sometimes "line integral".
-<li>Mention that the nowhere differentiable function construction that we gave is due to Takagi
-(although it is the one given in Rudin, not the form of it usually attributed to Takagi).
-<li>Greatly simplify the function in Example 11.6.4.
-<li>In Exercise 11.6.1, the question should ask about there being no
-  subsequence that converges uniformly just like 11.6.2.  The question is
-  about why Arzelà-Ascoli fails.
-<li>Many minor language and style improvements as well as some minor
-  clarifications.
-</ul>
diff --git a/convert-to-mbx.pl b/convert-to-mbx.pl
index 0ccef34..ca676b9 100755
--- a/convert-to-mbx.pl
+++ b/convert-to-mbx.pl
@@ -811,13 +811,13 @@ sub read_paragraph {
 		my $theid = modify_id($1);
 		open_paragraph_if_not_open ();
 		print "(hyperref $theid $name)\n";
-		print $out "<xref ref=\"$theid\" text=\"title\">$name</xref>";
+		print $out "<xref ref=\"$theid\" text=\"custom\">$name</xref>";
 	} elsif ($para =~ s/^\\hyperlink\{(.*?)\}\{(.*?)\}//) {
 		my $name = do_line_subs($2);
 		my $theid = modify_id($1);
 		open_paragraph_if_not_open ();
 		print "(hyperlink $theid $name)\n";
-		print $out "<xref ref=\"$theid\" text=\"title\">$name</xref>";
+		print $out "<xref ref=\"$theid\" text=\"custom\">$name</xref>";
 	} elsif ($para =~ s/^\\emph\{//) {
 		print "(em start)\n";
 		open_paragraph_if_not_open();
@@ -1211,7 +1211,7 @@ sub read_paragraph {
 
 			$figure_num = $figure_num+1;
 			$the_num = get_figure_number ();
-			print $out "<figure xml:id=\"$theid\" number=\"$the_num\">\n";
+			print $out "<rahr/><figure xml:id=\"$theid\" number=\"$the_num\">\n";
 			print $out "  <caption>$caption</caption>\n";
 
 			do {
@@ -1235,7 +1235,7 @@ sub read_paragraph {
 					$num_errors++;
 				}
 			} while (not $figure eq "");
-			print $out "</figure>\n";
+			print $out "</figure><rahr/>\n";
 		} else {
 			print "\n\n\nHUH?\n\n\nNo end figure!\n\n$para\n\n";
 			$num_errors++;
diff --git a/realanal-html.xsl b/realanal-html.xsl
index c3ee8b2..de3237c 100644
--- a/realanal-html.xsl
+++ b/realanal-html.xsl
@@ -7,13 +7,13 @@
   <!-- ********************************************************* -->
   <!-- This requires editing the path based on your installation -->
   <!-- ********************************************************* -->
-  <xsl:import href="../../mathbook/xsl/mathbook-html.xsl"/>
+  <xsl:import href="../../mathbook/xsl/pretext-html.xsl"/>
 
   <!-- Intend output for rendering by html -->
   <!--<xsl:output method="html" />-->
 
   <!-- apply-imports applies also the original, apply-templates ignores the original-->
-  <!-- need hardcoded numbers on everything, so nonstandard mathbookxml -->
+  <!-- need hardcoded numbers on everything, so nonstandard pretext -->
   <xsl:template match="men|mrow|exercise|example|remark|theorem|lemma|proposition|corollary|principle|axiom|definition|chapter|appendix|section|subsection|subsubsection|figure" mode="number">
     <xsl:choose>
       <xsl:when test="@number">
@@ -25,7 +25,7 @@
     </xsl:choose>
   </xsl:template>
 
-  <!-- Want hardcoded reference labels so nonstandard mathbookxml -->
+  <!-- Want hardcoded reference labels so nonstandard pretext -->
   <xsl:template match="biblio" mode="serial-number">
     <xsl:choose>
       <xsl:when test="@tag">
@@ -59,11 +59,16 @@
     </xsl:if>
   </xsl:template>
 
-  <!-- need break, so nonstandard mathbookxml -->
+  <!-- need break, so nonstandard pretext -->
   <xsl:template match="rabr">
     <br/>
   </xsl:template>
 
+  <!-- need hr (so far only using to separate figures) so nonstandard pretext -->
+  <xsl:template match="rahr">
+    <hr/>
+  </xsl:template>
+
   <!-- need inline image, custom width, maxwidth, etc.., so nonstandard -->
   <!-- the image should be without extension .svg is appended -->
   <xsl:template match="raimage">