Skip to content

Commit 2ec2a3d

Browse files
committed
preparing for begin{exerciseset}
1 parent 4121413 commit 2ec2a3d

File tree

121 files changed

+1713
-1895
lines changed

Some content is hidden

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

121 files changed

+1713
-1895
lines changed

Calculus.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
\appendix
3232

33-
\makeexercisesection{Solutions To Selected Problems}
33+
\printsolutions{Solutions To Selected Problems}
3434

3535
\printindex
3636

CalculusI.tex

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
\setboolean{calc1included}{true}
21
\part*{Calculus I}
32

43

CalculusII.tex

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
\setboolean{calc2included}{true}
21
\part*{Calculus II}
32

43
\ifthenelse{\boolean{bsc}}{

CalculusIII.tex

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
\setboolean{calc3included}{true}
21
\part*{Calculus III}
32

43

apexNotes.txt

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### simple group (level 3) entered at line 589 ({) was in 08_Series
2+
### simple group (level 2) entered at line 131 ({) was in 07_Fluid_Force.tex
3+
### simple group (level 1) entered at line 496 ({) was in 07_Disk_Washer_Method.tex
4+
15

26
Ally complains that "This HTML file contains an invalid heading structure"
37
(image?) directories in Windows use a separator \ which becomes %5C in html, and breaks
@@ -57,7 +61,7 @@ Should the notebook be distributed with the text? Eventually. CC-BY-NC, same a
5761

5862

5963
My to do:
60-
find textit?, big[^lr]?
64+
find big|?
6165
pdfsizeopt to python 3?
6266
5.2: use something other than $\Delta x$ to represent a partition
6367
check units in center of mass calculations
@@ -80,3 +84,13 @@ My to do:
8084
vspace to addvspace, [small|med|big]skip to [small|med|big]break ?
8185

8286

87+
13.7 p832 margin note: "will may"
88+
89+
Fencing mismatches: \Big vs \big vs normal
90+
Example 5.5.1
91+
Key Idea 5.5.1
92+
Example 7.3.2
93+
Equation 12.2 (Section 12.5)
94+
Example 13.2.2
95+
Example 13.2.4
96+
Example 14.3.4

exercises/03_04_exset_02.tex

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
\exerciseset{In Exercises}{, a function $f(x)$ is given.
22
\lxenumerate{label=(\alph*)}
3-
% todo Tim be consistent about whether critical points and inflection points are in the domain or on the graph
43
\item Find the $x$ coordinates of the possible points of inflection of $f$.
54
\item Create a number line to determine the intervals on which $f$ is concave up or concave down.
65
\item Find the critical points of $f$ and use the Second Derivative Test, when possible, to determine the relative extrema.

exercises/06_02_exercises.tex

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
\draw[thick,draw={\colorone}](axis cs:-9.42,-3.14)--(axis cs:-3.14,3.14)
4646
(axis cs:-3.14,-3.14)--(axis cs:3.14,3.14)
4747
(axis cs:3.14,-3.14)--(axis cs:9.42,3.14);
48+
\draw(axis cs:-3.14,-3.14)circle[\colorone,fill={\colorone},radius=.1];
49+
\draw(axis cs:3.14,-3.14)circle[\colorone,fill={\colorone},radius=.1];
50+
\draw(axis cs:-3.14,3.14)circle[\colorone,fill={\colorone},radius=.1];
51+
\draw(axis cs:3.14,3.14)circle[\colorone,fill={\colorone},radius=.1];
4852
\end{axis}
4953
\node [right] at (myplot.right of origin) {\scriptsize $x$};
5054
\node [above] at (myplot.above origin) {\scriptsize $y$};

headers/APEX_format.tex

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040

4141
\RequirePackage{amsmath}
4242
\RequirePackage{amssymb} % todo ? https://tex.stackexchange.com/a/3000/107497 recommends dropping amssymb in favor of unicode-math
43+
% but then the font loading gets messed up with mathspec
44+
%\RequirePackage{unicode-math}
4345
\RequirePackage{amsthm}
4446

4547
\RequirePackage{graphicx}
@@ -56,6 +58,7 @@
5658
\lxDocumentID{apex}
5759

5860
\numberwithin{figure}{section}
61+
\numberwithin{equation}{section}
5962
\newcounter{savefigure}
6063

6164
\newtheoremstyle{apexExample}% name
@@ -87,7 +90,7 @@
8790
\theoremstyle{apex}
8891

8992
\makeatletter
90-
\renewenvironment{proof}[1][\proofname]{\par
93+
\renewenvironment{proof}[1][\proofname]{\pagebreak[2]\par
9194
\pushQED{\qed}%
9295
\normalfont \topsep6\p@\@plus6\p@\relax
9396
\trivlist
@@ -276,7 +279,8 @@
276279

277280

278281
\newcommand{\solution}{\bigbreak\par
279-
\makebox[65pt][l]{\textsc{\small\textbf{Solution\lxAddClass{solutionTag}}}}%
282+
\makebox[65pt][l]{\textsc{\small\textbf{Solution\lxAddClass{solutionTag}}}}%
283+
\nopagebreak%
280284
}
281285

282286
%% This is the no-star (regular) version of the example command.
@@ -294,7 +298,6 @@
294298

295299

296300
% try this for \begin{example}/\end{example}
297-
\newcommand{\eoehere}{}
298301
\newcommand{\drawexampleline}{}
299302
%\renewcommand{\examplestarred}[3]{%
300303
% \begin{exampleEnv}[#2]\label{#1}
@@ -311,6 +314,7 @@
311314
lines before break=5,
312315
before upper={\setlength{\parindent}{\saveparindent}\noindent},
313316
boxsep=0pt,
317+
bottom=2pt,
314318
overlay unbroken={
315319
\node[xshift=-2\marginlinelength,yshift=-.5\baselineskip]
316320
(start\arabic{example})at(frame.north west){};
@@ -518,12 +522,13 @@
518522

519523
\makeatletter
520524
\newcommand{\exercisesubsubsection}{%
521-
\@startsection{subsubsection}{3}{-1em}{\bigskipamount}{\bigskipamount}{\Large\textit}*}
525+
\closeenumerate%
526+
\@startsection{subsubsection}{3}{-1em}{\bigskipamount}{\bigskipamount}{\Large\textit}*}
522527
\makeatother
523528

524-
\newcommand{\printconcepts}{\closeenumerate\exercisesubsubsection{Terms and Concepts}}
525-
\newcommand{\printproblems}{\closeenumerate\exercisesubsubsection{Problems}}
526-
\newcommand{\printreview}{\closeenumerate\exercisesubsubsection{Review}}
529+
\newcommand{\printconcepts}{\exercisesubsubsection{Terms and Concepts}}
530+
\newcommand{\printproblems}{\exercisesubsubsection{Problems}}
531+
\newcommand{\printreview}{\exercisesubsubsection{Review}}
527532

528533
\newcommand{\inanswersection}{%
529534
\setboolean{printquestions}{false}%
@@ -560,7 +565,7 @@
560565
%%%%%%%%%%%%% end the text.
561566

562567

563-
\newcommand{\makeexercisesection}[2][\jobname]{%
568+
\newcommand{\printsolutions}[2][\jobname]{%
564569
%\showans\answrite
565570
% showans will write the contents of Calculus.answers to the log
566571
% in latexml, this needs to happen before closing
@@ -602,7 +607,7 @@
602607
\makeatother
603608

604609
\newcommand{\exautoref}[1]{%
605-
\hyperref[#1]{Exercise~\ref*{#1}}%
610+
\hyperref[#1]{Ex\-er\-cise~\ref*{#1}}%
606611
% {%
607612
% \renewcommand{\Itemautorefname}{Exercise}% localize the upcoming reference
608613
% \autoref{#1}%
@@ -621,7 +626,8 @@
621626
\small%
622627
\bigskip%
623628
\begin{multicols}{2}%
624-
\renewcommand{\Itemautorefname}{Exercise}% local b/c multicols = good
629+
\restartlist{enumerate}
630+
\renewcommand{\Itemautorefname}{Ex\-er\-cise}% local b/c multicols = good
625631
\input{#1}%
626632
\closeenumerate%
627633
\end{multicols}%
@@ -644,18 +650,17 @@
644650
\newcommand*{\answersForSection}[3]{%
645651
\ifthenelse{\equal{#1}{\lastanswerchapter}}{}{%
646652
\renewcommand{\lastanswerchapter}{#1}% apparently global. who knew?
647-
\section*{Chapter #1}
648653
\ifthenelse{\boolean{latexml}}{%
649654
}{%
650655
\belowpdfbookmark{Chapter #1}{solsol#1}%
651656
}
652657
% commandeer chapter and section numbering
653658
\setcounter{chapter}{#1}
654-
% \setcounter{answerchapter}{#1}
655-
% \setcounter{answersection}{0}
659+
\section*{Chapter \thechapter}
656660
}%
657661
\setcounter{section}{#2}
658-
\subsection*{\hyperref[exer#1.#2]{Exercises #1.#2}}\label{sol#1.#2}
662+
\subsection*{\hyperref[exer\thesection]{Exercises \thesection}}%
663+
\label{sol\thesection}
659664
\ifthenelse{\equal{#2}{0}}{%
660665
\loadAllAnswers{#3}
661666
}{%
@@ -676,20 +681,18 @@
676681
}
677682
\newcommand*{\loadAnswers}[1]{%
678683
\stepcounter{answersection}%
679-
\lxenumerate{leftmargin=1.5em}\input{#1}\end{enumerate}%
684+
\begin{enumerate}[leftmargin=1.5em]\input{#1}\end{enumerate}%
680685
\bigbreak%
681686
}
682687

683688
\newcommand{\openenumerate}{\ifthenelse{\boolean{printquestions}%
684689
\AND\NOT\boolean{enumopen}}{%
685690
\setboolean{enumopen}{true}%
686-
\lxenumerate{leftmargin=1.5em}%
687-
\setcounter{enumi}{\value{saveexerciseenum}}%
691+
\begin{enumerate}[leftmargin=1.5em,resume]%
688692
}{}}
689693

690694
\newcommand{\closeenumerate}{\ifthenelse{\boolean{printquestions}%
691695
\AND\boolean{enumopen}}{%
692-
\setcounter{saveexerciseenum}{\value{enumi}}%
693696
\end{enumerate}%
694697
\setboolean{enumopen}{false}%
695698
}{}}
@@ -698,23 +701,23 @@
698701
% and things went strange
699702
\newcommand{\exerciseset}[3]{\ifthenelse{\boolean{printquestions}}{%
700703
\closeenumerate%
701-
\stepcounter{saveexerciseenum}%
704+
\stepcounter{enumi}%
702705
\stepcounter{exercisesetcounter}%
703-
\ifthenelse{\isodd{\value{saveexerciseenum}}}{}{%
706+
\ifthenelse{\isodd{\value{enumi}}}{}{%
704707
\PackageInfo{apex}{%
705-
Exercise set \theexercisesetcounter\space begins with \arabic{saveexerciseenum}%
706-
% Section \thesection\space has an exercise set
707-
% beginning with \arabic{saveexerciseenum}%
708+
Exercise set \theexercisesetcounter\space begins with \arabic{enumi}%
708709
}%
709710
}%
710-
\noindent#1 \arabic{saveexerciseenum}--\ref*{enumiatendof\theexercisesetcounter}#2%
711-
\addtocounter{saveexerciseenum}{-1}\ignorespaces%
711+
\pagebreak[1]%
712+
\noindent#1 \arabic{enumi}--\ref*{enumiatendof\theexercisesetcounter}#2%
713+
\addtocounter{enumi}{-1}\ignorespaces%
714+
\nopagebreak%
712715
#3
716+
\pagebreak[1]%
713717
\label{enumiatendof\theexercisesetcounter}%
714718
\ifthenelse{\isodd{\value{enumi}}}{%
715719
\PackageInfo{apex}{%
716720
Exercise set \theexercisesetcounter\space ends with \arabic{enumi}%
717-
% Section \thesection\space has an exercise set ending with \arabic{enumi}%
718721
}%
719722
}{}%
720723
}{

headers/Header_Calculus.tex

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
\setboolean{abridgeConics}{true}
33

44
\usepackage[american]{babel}
5+
%\usepackage{polyglossia}
6+
%\setdefaultlanguage[american]{english}
7+
% that seemed to cause some strange errors
58

69
\newcommand{\monthYear}{%
710
\ifcase \month \or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space \number \year}
@@ -21,9 +24,6 @@
2124

2225
\usepackage{booktabs}
2326

24-
%\usepackage{esint}
25-
% for oiint in 14_Div_Thm, oint[ctr]clockwise in 14_Line_Integrals_Props
26-
2727
\setcounter{secnumdepth}{1}
2828
\setcounter{tocdepth}{1}
2929

@@ -116,6 +116,7 @@
116116
\setcounter{secnumdepth}{-1}
117117
\pagenumbering{arabic}
118118
\renewcommand{\thepage}{A.\arabic{page}}
119+
\renewcommand{\thechapter}{\arabic{chapter}}
119120
\part*{\appendixname}
120121
% \part*{Appendices\protect\thispagestyle{empty}}
121122
% \addcontentsline{toc}{part}{\appendixname}
@@ -308,10 +309,14 @@
308309
\ifthenelse{\boolean{xetex}}%
309310
{%
310311
\sffamily
311-
%%\usepackage{fontspec}
312+
% \usepackage{fontspec}
313+
% \usepackage{unicode-math}
312314
\usepackage{mathspec}
313315
\setallmainfonts[Mapping=tex-text]{Calibri}
314316
\setmainfont[Mapping=tex-text]{Calibri}
317+
% setallmainfonts claims to setmainfont. but it doesn't?
318+
% \setmathsfont[Mapping=tex-text]{Calibri}
319+
% \setmathrm[Mapping=tex-text]{Calibri}
315320
\setsansfont[Mapping=tex-text]{Calibri}
316321
\setmathsfont(Greek){[cmmi10]}
317322
}
@@ -332,31 +337,13 @@
332337
% {}
333338
334339
335-
\newboolean{calc1included}
336-
\newboolean{calc2included}
337-
\newboolean{calc3included}
338-
\setboolean{calc1included}{false}
339-
\setboolean{calc2included}{false}
340-
\setboolean{calc3included}{false}
341-
342340
\let\oldprintindex\printindex
343341
\renewcommand{\printindex}{%
344342
\cleardoublepage
345343
% \chapter{\indexname} % \printindex has its own heading
346344
\phantomsection
347345
% \iflatexml\chapter*{\indexname}\fi
348346
\addcontentsline{toc}{chapter}{\indexname}
349-
% set the ``see'' entries that shouldn't refer to a page number
350-
% \ifthenelse{\boolean{calc2included}}{%
351-
% \index{$"!$|see {factorial}} % 08 sequences
352-
% }{}
353-
% \ifthenelse{\boolean{calc3included}}{%
354-
% \index{perpendicular|see{orthogonal}} % 10 dot product
355-
% \index{nabla|see {del operator}} % 12 directional derivatives, 14 vector fields
356-
% \index{$\nabla$|see {del operator}} % 12 directional derivatives, 14 vector fields
357-
% \index{multiple integration|see{iterated integration}} % 13 iterated integrals
358-
% \index{$\dfrac{\partial (x,y,z)}{\partial (u,v,w)}$|see {Jacobian}} % 13 Jacobian
359-
% }{}
360347
\oldprintindex
361348
}
362349

headers/apex_style.sty

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
%\usepackage{lipsum} % not used
1313

1414
% make the space in the toc wide enough for 4 digit numbers
15-
\renewcommand\@pnumwidth{2em}
15+
\renewcommand\@pnumwidth{2.5em}
1616

1717
% The following helps create a ``List of Theorems'', ``Definitions'', and ``Key Ideas''. See http://tex.stackexchange.com/q/74857/107497
1818
%\usepackage{etoolbox}
@@ -106,18 +106,6 @@
106106
\newboolean{eoeencountered}
107107
\newcommand{\currentLabel}{notinexample}
108108

109-
%% thanks to Steven B. Segletes and egreg at
110-
%% http://tex.stackexchange.com/a/320586/107497
111-
%\newcommand{\eoehere}{%
112-
% \ifthenelse{\boolean{eoeencountered}}{%
113-
% \vspace{-\baselineskip}\nopagebreak%
114-
% }{%
115-
% \drawnode{e\currentLabel}{0}{0}%
116-
% \ltx@label{e\currentLabel}%
117-
% % \gdef\currentLabel{notinexample}%
118-
% \ifthenelse{\boolean{measuring@}}{}{\global\eoeencounteredtrue}%
119-
% }%
120-
%}
121109

122110
%\newcounter{pagebeforeend}
123111

@@ -140,7 +128,6 @@
140128
% }%
141129
% \noindent%
142130
% #3%
143-
% \eoehere%
144131
% \ifthenelse{\boolean{showexamplelines}}{%
145132
% \ifthenelse{\pageref{#1}=\pageref{e#1}}{%
146133
% \begin{tikzpicture}[remember picture,overlay]
@@ -218,12 +205,14 @@
218205
\ifthenelse{ #2 > 46800000 }{% 468e5
219206
\PackageWarningNoLine{apex}{mnote too high on page #3}%
220207
}{}%
221-
\ifthenelse{ #1 < 0 }{%
222-
\PackageWarningNoLine{apex}{mnote on left inner margin on page #3}%
223-
}{}%
224-
\ifthenelse{ #1 > 33000000 }{% 33e6
225-
\PackageWarningNoLine{apex}{mnote on right inner margin on page #3}% {: #1}%
226-
}{}%
208+
% marginnote doesn't misplace the margin on the next page, so these are no longer
209+
% necessary. But we'll keep them just in case
210+
% \ifthenelse{ #1 < 0 }{%
211+
% \PackageWarningNoLine{apex}{mnote on left inner margin on page #3}%
212+
% }{}%
213+
% \ifthenelse{ #1 > 33000000 }{% 33e6
214+
% \PackageWarningNoLine{apex}{mnote on right inner margin on page #3}% {: #1}%
215+
% }{}%
227216
\ifthenelse{ #3 = \previousmarginpage }{%
228217
\ifthenelse{\lengthtest{\previousmarginbottom < #2 sp}}{%
229218
\PackageWarningNoLine{apex}{mnote overlaps on page #3}% {: #2}%

0 commit comments

Comments
 (0)