adjustments for lualatex and tagging

project-examples/calc12book-src/calc12book-chapter2.tex

@@ -1120,7 +1120,7 @@ \section{The Exponential and Natural Logarithm Functions}
 the number of cells $y(t)$ at time $t$ is increasing.
 \end{exmp}
 \begin{exmp}
-\piccaption[]{\label{fig:dccirc}}\parpic[r]{\includegraphics[bb=-24 -21 122 51,type=eps,ext=.0]{dccircuit}}
+\piccaption[]{\label{fig:dccirc}}\parpic[r]{\includegraphics[bb=-24 -21 122 51]{dccircuit.mps}}
 \noindent Another example is for the current $I$ in a simple series electric
 circuit with a constant direct current (DC) source of voltage $V$, a capacitor
 with capacitance $C$, a resistor with resistance $R$, and a switch, as in

project-examples/calc12book-src/calc12book-chapter4.tex

@@ -671,7 +671,7 @@ \section{Optimization}
 \suspend{enumerate}
 \probs{B}
 \resume{enumerate}[{[\bfseries 1.]}]
-\parpic[r]{\includegraphics[bb=-21 -15 117 60,type=eps,ext=.0]{circuit_4_1_ex}}
+\parpic[r]{\includegraphics[bb=-21 -15 117 60]{circuit_4_1_ex.mps}}
  \item In an electric circuit with a supplied voltage (emf) $E$, a resistor
   with resistance $r_0$, and an inductor with reactance $x_0$, suppose you want
   to add a second resistor. If $r$ represents the resistance of this second

project-examples/calc12book-src/calc12book-chapter8.tex

@@ -831,7 +831,7 @@ \section{Average Value of a Function}
   the square root of the average power. Calculate the rms of the waveform from
   part (a). Write your answer in decimal form as a percentage of the amplitude $A$.
  \end{enumerate}
-\parpic[r]{\includegraphics[bb=-23 -32 120 45,type=eps,ext=.0]{circuit_5_5_ex}}
+\parpic[r]{\includegraphics[bb=-23 -32 120 45]{circuit_5_5_ex.mps}}
  \item An electric circuit with a supplied voltage (electromotive force) $E$,
  a capacitor with capacitance $C$, and a resistor with resistance $R$, is shown in
  the picture on the right. When a switch $s$ in the circuit is opened at time

project-examples/calc12book-src/calc12book.pgf-plot.gnuplot

@@ -1,2 +1,2 @@
 set table "calc12book.pgf-plot.table"; set format "%.5f"
-set samples 200; plot [x=0:sqrt(pi)] sin(x*x)
+set samples 200.0; plot [x=0:sqrt(pi)] sin(x*x)

project-examples/calc12book-src/calc12book.tex

@@ -1,12 +1,22 @@
+\DocumentMetadata{
+  lang        = en,
+  pdfversion  = 2.0,
+  pdfstandard = ua-2,
+  pdfstandard = a-4,
+  testphase   = latest
+}
+
+
+\tagpdfsetup{math/mathml/structelem, math/mathml/AF=false, math/tex/AF=false, math/mathml/sources=}
+
 \documentclass[paper=letter,fontsize=11pt,headings=big,chapterprefix=false,
 appendixprefix,twoside,titlepage,open=any,numbers=noenddot,
 index=totoc]{scrbook}
 \usepackage[standardsections]{scrhack}
-\usepackage{etex}
-\usepackage[dvips,marginparwidth=0pt,marginparsep=0pt,headsep=12pt,inner=1.2in,
+\usepackage[,marginparwidth=0pt,marginparsep=0pt,headsep=12pt,inner=1.2in,
 outer=1.2in,top=1in,bottom=0.85in,includehead,bindingoffset=0pt,includefoot,
 vcentering,hcentering,ignoremp,portrait,letterpaper]{geometry}
-\usepackage[dvips]{graphicx}
+\usepackage{graphicx}
 \usepackage{float}
 \usepackage[intoc]{nomencl}
 \usepackage{xfrac}
@@ -18,22 +28,33 @@
 % Disable the \checkmark command from dingbat, to avoid conflict with amssymb's \checkmark
 \let\checkmark\relax
 \usepackage{cancel}
-\usepackage{amssymb}
-\usepackage{amsmath}
+\ifx\directlua\undefined
+  \usepackage{amssymb}
+  \usepackage{amsmath}
+\else
+  \usepackage{unicode-math}
+  \def\wideparen#1{\overparen{#1}}
+\fi
 \usepackage{amsthm}
 \usepackage{relsize}
 \usepackage{bigints}
 \usepackage{mathtools}
 %\usepackage[dvips,gray]{xcolor}
-\usepackage[dvips]{xcolor}
+\usepackage{xcolor}
+\usepackage{colortbl}\show\columncolor
 \usepackage[english]{babel}
 \usepackage{fancyvrb}
 \usepackage[titletoc]{appendix}
 \usepackage{imakeidx}
 \usepackage[unbalanced]{idxlayout}
-\usepackage[T1]{fontenc}
+\ifx\directlua\undefined
+  \usepackage[T1]{fontenc}
+  \usepackage{fouriernc}
+\else
+  \usepackage{fourier-otf}
+\fi
 \usepackage[scaled=0.80]{beramono}
-\usepackage{fouriernc,bm}
+\usepackage{bm}
 \usepackage{ragged2e}
 \usepackage{paralist}
 \usepackage{mdwlist}
@@ -54,7 +75,7 @@
 \usetikzlibrary{decorations.markings}
 \usetikzlibrary{decorations.pathmorphing}
 \usepackage{tkz-euclide}
-\usetkzobj{all}
+%\usetkzobj{all}
 \usepackage{picins}
 \usepackage{framed}
 \usepackage{nextpage}
@@ -67,7 +88,7 @@
 \usepackage[pdfproducer={GPL Ghostscript 9.55.0},pdfcreator={TeX Live 2020},
             pdfauthor={Michael Corral},pdftitle={Elementary Calculus},
             pdfsubject={Calculus},pdfkeywords={calculus},
-            pdfdisplaydoctitle=true,dvips,bookmarks,pdfborder={0 0 0},
+            pdfdisplaydoctitle=true,bookmarks,pdfborder={0 0 0},
             bookmarksnumbered=true,colorlinks=false]{hyperref}
 \usepackage{breakurl}
 \definecolor{captioncolor}{HTML}{000000}
@@ -303,6 +324,7 @@
 \renewcommand*\l@section{\@dottedtocline{1}{2.2em}{3.0em}}
 \makeatother
 \makeindex[intoc,options=-s myindex]
+\setlength{\headheight}{22.29259pt}\addtolength{\topmargin}{-0.02927pt}
 \begin{document}
 \VerbatimFootnotes
 \deffootnote[1em]{0em}{1em}{\textsuperscript{\thefootnotemark}}
@@ -324,7 +346,8 @@
 \end{tikzpicture}
 \end{flushright}
 \restoregeometry
-%Put the title page here
+\setlength{\headheight}{22.29259pt}\addtolength{\topmargin}{-0.02927pt}
+% Put the title page here
 \title{Elementary Calculus}
 \author{\textsf{\textbf{Michael Corral}}}
 \date{\large \textsf{\textsl{Schoolcraft College}}}
@@ -351,7 +374,7 @@
 \renewcommand{\sectionmark}[1]{\markright{#1}}
 \renewcommand{\qedsymbol}{\textsf{\textbf{\textsc{\small{QED}}}}}
 \fancyhf{}
-\setlength{\headheight}{22.26332pt}
+\setlength{\headheight}{22.6pt}\addtolength{\topmargin}{-0.3pt}
 \renewcommand{\headrulewidth}{0pt}
 \newlength{\fminilength}%
 \setlength{\fminilength}{\textwidth-2\fboxsep-2\fboxrule}%

project-examples/calc12book-src/circuit_4_1_ex.mps

@@ -0,0 +1,97 @@
+%!PS
+%%BoundingBox: -21 -15 117 60 
+%%HiResBoundingBox: -20.9126 -14.88187 116.42113 59.29868 
+%%Creator: MetaPost 1.902
+%%CreationDate: 2015.06.03:2318
+%%Pages: 1
+%*Font: pncri8r 9.26518 9.96265 45:8000000000041
+%*Font: pncr8r 7.04146 9.96265 30:8
+%%BeginProlog
+%%EndProlog
+%%Page: 1 1
+ 0 0 0 setrgbcolor
+-20.7134 13.70273 moveto
+(E) pncri8r 9.26518 fshow
+ 1.41733 0 dtransform exch truncate exch idtransform pop setlinewidth
+ [] 0 setdash 1 setlinecap 1 setlinejoin 10 setmiterlimit
+gsave newpath 0 0 moveto
+0 8.50392 lineto
+[0 1 -1 0 0 0] concat stroke grestore
+gsave newpath 0 25.51176 moveto
+0 34.01569 lineto
+[0 1 -1 0 0 0] concat stroke grestore
+ 0 1.41733 dtransform truncate idtransform setlinewidth pop
+gsave newpath 0 25.51176 moveto
+-2.25548 25.51176 -4.41832 24.61565 -6.01306 23.0209 curveto
+-7.6078 21.42616 -8.50392 19.26332 -8.50392 17.00784 curveto
+-8.50392 14.75237 -7.6078 12.58952 -6.01306 10.99478 curveto
+-4.41832 9.40004 -2.25548 8.50392 0 8.50392 curveto
+2.25548 8.50392 4.41832 9.40004 6.01306 10.99478 curveto
+7.6078 12.58952 8.50392 14.75237 8.50392 17.00784 curveto
+8.50392 19.26332 7.6078 21.42616 6.01306 23.0209 curveto
+4.41832 24.61565 2.25548 25.51176 0 25.51176 curveto closepath
+[0 1 -1 0 0 0] concat stroke grestore
+ 1.41733 0 dtransform exch truncate exch idtransform pop setlinewidth
+gsave newpath 0 11.33856 moveto
+0 22.67712 lineto
+[0 1 -1 0 0 0] concat stroke grestore
+ 0 1.41733 dtransform truncate idtransform setlinewidth pop
+gsave newpath 1.17383 18.29631 moveto
+0 22.67712 lineto
+-1.17383 18.29631 lineto
+ closepath
+gsave fill grestore
+[0 1 -1 0 0 0] concat stroke grestore
+112.00774 11.96895 moveto
+(r) pncri8r 9.26518 fshow
+gsave newpath 102.0474 34.01569 moveto
+102.0474 22.67712 lineto
+106.29936 21.2598 lineto
+97.79543 18.42516 lineto
+106.29936 15.59052 lineto
+97.79543 12.75587 lineto
+106.29936 9.92123 lineto
+97.79543 7.0866 lineto
+102.0474 5.66928 lineto
+102.0474 -5.66928 lineto
+[0 -1 1 0 0 0] concat stroke grestore
+21.14836 53.75635 moveto
+(r) pncri8r 9.26518 fshow
+25.76106 52.26195 moveto
+(0) pncr8r 7.04146 fshow
+newpath 5.66937 42.5196 moveto
+17.00793 42.5196 lineto
+18.42526 46.77158 lineto
+21.2599 38.26764 lineto
+24.09454 46.77158 lineto
+26.92918 38.26764 lineto
+29.76382 46.77158 lineto
+32.59846 38.26764 lineto
+34.01578 42.5196 lineto
+45.35434 42.5196 lineto stroke
+72.2119 54.89018 moveto
+(x) pncri8r 9.26518 fshow
+76.8445 53.39578 moveto
+(0) pncr8r 7.04146 fshow
+newpath 59.52771 42.5196 moveto
+65.19699 42.5196 lineto
+65.19699 46.29913 70.86627 46.29913 70.86627 42.5196 curveto
+70.86627 46.29913 76.53555 46.29913 76.53555 42.5196 curveto
+76.53555 46.29913 82.20483 46.29913 82.20483 42.5196 curveto
+82.20483 46.29913 87.87411 46.29913 87.87411 42.5196 curveto
+93.5434 42.5196 lineto stroke
+newpath 0 34.01569 moveto
+0 42.5196 lineto
+5.66937 42.5196 lineto stroke
+newpath 45.35434 42.5196 moveto
+59.52771 42.5196 lineto
+59.52771 42.5196 lineto stroke
+newpath 93.5434 42.5196 moveto
+102.0474 42.5196 lineto
+102.0474 34.01569 lineto stroke
+newpath 102.0474 -5.66928 moveto
+102.0474 -14.1732 lineto
+0 -14.1732 lineto
+0 0 lineto stroke
+showpage
+%%EOF

project-examples/calc12book-src/circuit_5_5_ex.mps

@@ -0,0 +1,77 @@
+%!PS
+%%BoundingBox: -23 -32 120 45 
+%%HiResBoundingBox: -22.61348 -31.88971 119.27043 44.65337 
+%%Creator: MetaPost 1.902
+%%CreationDate: 2015.12.07:0334
+%%Pages: 1
+%*Font: pncri8r 9.26518 9.96265 43:a001000000008
+%%BeginProlog
+%%EndProlog
+%%Page: 1 1
+ 0 0 0 setrgbcolor
+-22.41428 5.1988 moveto
+(E) pncri8r 9.26518 fshow
+ 1.41733 0 dtransform exch truncate exch idtransform pop setlinewidth
+ [] 0 setdash 1 setlinecap 1 setlinejoin 10 setmiterlimit
+gsave newpath 0 0 moveto
+0 6.80304 lineto
+[0 1 -1 0 0 0] concat stroke grestore
+gsave newpath 0 10.2048 moveto
+0 17.00784 lineto
+[0 1 -1 0 0 0] concat stroke grestore
+ 0 1.41733 dtransform truncate idtransform setlinewidth pop
+gsave newpath 3.40152 6.80304 moveto
+-3.40152 6.80304 lineto
+[0 1 -1 0 0 0] concat stroke grestore
+gsave newpath 10.2048 10.2048 moveto
+-10.2048 10.2048 lineto
+[0 1 -1 0 0 0] concat stroke grestore
+111.90804 -6.06505 moveto
+(R) pncri8r 9.26518 fshow
+gsave newpath 102.0474 17.00784 moveto
+102.0474 5.66928 lineto
+106.29936 4.25195 lineto
+97.79543 1.41731 lineto
+106.29936 -1.41733 lineto
+97.79543 -4.25197 lineto
+106.29936 -7.08661 lineto
+97.79543 -9.92125 lineto
+102.0474 -11.33856 lineto
+102.0474 -22.67712 lineto
+[0 -1 1 0 0 0] concat stroke grestore
+newpath 15.30717 25.51176 moveto
+21.25989 25.51176 lineto stroke
+newpath 29.76381 28.3464 moveto
+29.76381 25.51176 lineto
+35.71654 25.51176 lineto stroke
+newpath 21.25989 25.51176 moveto
+30.61426 31.46448 lineto stroke
+23.5542 35.88956 moveto
+(s) pncri8r 9.26518 fshow
+newpath 66.6143 25.51176 moveto
+75.11823 25.51176 lineto stroke
+newpath 77.95287 25.51176 moveto
+86.45679 25.51176 lineto stroke
+ 1.41733 0 dtransform exch truncate exch idtransform pop setlinewidth
+newpath 75.11823 18.42516 moveto
+75.11823 32.59837 lineto stroke
+newpath 77.95287 18.42516 moveto
+77.95287 32.59837 lineto stroke
+73.0436 37.87376 moveto
+(C) pncri8r 9.26518 fshow
+ 0 1.41733 dtransform truncate idtransform setlinewidth pop
+newpath 0 17.00784 moveto
+0 25.51176 lineto
+15.30717 25.51176 lineto stroke
+newpath 35.71654 25.51176 moveto
+66.6143 25.51176 lineto
+66.6143 25.51176 lineto stroke
+newpath 86.45679 25.51176 moveto
+102.0474 25.51176 lineto
+102.0474 17.00784 lineto stroke
+newpath 102.0474 -22.67712 moveto
+102.0474 -31.18105 lineto
+0 -31.18105 lineto
+0 0 lineto stroke
+showpage
+%%EOF