From 7756f177bd60a7df6e8900ffa6e0d448f0345895 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 15 Feb 2019 22:22:30 +0000 Subject: brandeis-problemset (15feb19) git-svn-id: svn://tug.org/texlive/trunk@50030 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/brandeis-problemset/README.md | 2 +- .../brandeis-problemset/brandeis-problemset.pdf | Bin 64966 -> 64099 bytes .../brandeis-problemset/brandeis-problemset.tex | 15 ++++++- .../doc/latex/brandeis-problemset/example.pdf | Bin 43970 -> 49206 bytes .../doc/latex/brandeis-problemset/example.tex | 14 ++++++ .../brandeis-problemset/brandeis-problemset.cls | 50 +++++++++++++-------- 6 files changed, 60 insertions(+), 21 deletions(-) diff --git a/Master/texmf-dist/doc/latex/brandeis-problemset/README.md b/Master/texmf-dist/doc/latex/brandeis-problemset/README.md index 00af4ab0311..1c8c654713e 100644 --- a/Master/texmf-dist/doc/latex/brandeis-problemset/README.md +++ b/Master/texmf-dist/doc/latex/brandeis-problemset/README.md @@ -13,4 +13,4 @@ brandeis-problemset.tex | Documentation source example.tex | Example problem set example.pdf | Example problem set README.md | This file -LICENSE.txt | LPPL 1.3c +LICENSE.txt | LPPL v1.3c diff --git a/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.pdf b/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.pdf index f170ae06c70..bc5bcfa7cc1 100644 Binary files a/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.pdf and b/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.pdf differ diff --git a/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.tex b/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.tex index 78359d38a0e..433dfb83c5a 100644 --- a/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.tex +++ b/Master/texmf-dist/doc/latex/brandeis-problemset/brandeis-problemset.tex @@ -21,7 +21,7 @@ \author{Rebecca Turner\thanks{Brandeis University; \email{rebeccaturner@brandeis.edu}}} \title{The \bps\ Document Class} -\date{2019/01/20} +\date{2019/02/14 0.4.4} \begin{document} \maketitle \begin{abstract} @@ -541,8 +541,19 @@ $\Rm{Foo}(a, n)$ computes $a^n$, and will run in $O(n)$ time always. \end{latexcode} \begin{changelog}[author=Rebecca Turner] +\begin{version}[v=0.4.4, date=2019-02-14] +\changed + \item Changed Times body copy font from \ctan{tex-gyre}'s Termes to + the newer \ctan{stix2-otf} (for \fontspecok) and \ctan{stix2-type1} + (for other \TeX\ engines) --- the \textsc{stix2} fonts are somewhat + unique amongst Times-likes in that they contain small caps. + + \item Redefined |\Re| to print in blackboard-bold. +\end{version} + \shortversion{v=0.4.3, date=2019-01-20, - changes={Fixed license typos, corrected documentation \textsc{pdf}.}} + changes={Fixed typos in license file, fixed distributed + documentation \extension{pdf}.}} \begin{version}[v=0.4.2, date=2019-01-19] \added diff --git a/Master/texmf-dist/doc/latex/brandeis-problemset/example.pdf b/Master/texmf-dist/doc/latex/brandeis-problemset/example.pdf index 92b74924a1c..4a3c0913b6f 100644 Binary files a/Master/texmf-dist/doc/latex/brandeis-problemset/example.pdf and b/Master/texmf-dist/doc/latex/brandeis-problemset/example.pdf differ diff --git a/Master/texmf-dist/doc/latex/brandeis-problemset/example.tex b/Master/texmf-dist/doc/latex/brandeis-problemset/example.tex index fac472c793d..820da555ef2 100644 --- a/Master/texmf-dist/doc/latex/brandeis-problemset/example.tex +++ b/Master/texmf-dist/doc/latex/brandeis-problemset/example.tex @@ -102,6 +102,20 @@ LOOP: STORE R2, @R1 ; *A = i \end{enumerate} \end{problem} +An example equation which defines $e$: +\begin{equation} + \exists! e \in \Re \left(\int_1^e \frac{1}{t} dt = 1\right). +\end{equation} + +The definition of the Mandelbrot set: +\begin{equation} +\begin{split} + c \in \mathbb{C},\, z_0 = 0, \\ + \lim_{n \to \infty} z_n = z_{n - 1}^2 + c \ne \infty + \implies c \in \mathcal{M} +\end{split} +\end{equation} + \begin{solution} The blue text here is a solution; it will disappear if the \Tt{solutions} class option is removed. diff --git a/Master/texmf-dist/tex/latex/brandeis-problemset/brandeis-problemset.cls b/Master/texmf-dist/tex/latex/brandeis-problemset/brandeis-problemset.cls index 81d8d2c3289..395c44e6458 100644 --- a/Master/texmf-dist/tex/latex/brandeis-problemset/brandeis-problemset.cls +++ b/Master/texmf-dist/tex/latex/brandeis-problemset/brandeis-problemset.cls @@ -1,4 +1,4 @@ -\ProvidesClass{brandeis-problemset}[2019/01/20 0.4.3 COSI Problem sets at Brandeis University] +\ProvidesClass{brandeis-problemset}[2019/02/14 0.4.4 COSI Problem sets at Brandeis University] % Description: A document class for Brandeis University's computer science % courses' problem sets % Homepage: https://github.com/9999years/brandeis-problemset @@ -8,11 +8,11 @@ % Copyright 2019 Rebecca Turner % % This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3c +% conditions of the LaTeX Project Public License, either version 1.3 % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX +% and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. @@ -67,10 +67,6 @@ \RequirePackage{titlesec} \RequirePackage{titletoc} -% math -\RequirePackage{amsmath} -\RequirePackage{mathtools} - % tables \RequirePackage{multirow} \RequirePackage{booktabs} @@ -95,24 +91,42 @@ \let\pseudocodesymbolfont\ttfamily % fonts +% NOTE: The order these packages are loaded in is very important. +% - unicode-math overwrites a bunch of commands, so should be loaded after +% amsmath and others +% - amsmath should be loaded after stix2 (not sure why, but the stix2 +% documentation specifies this) -- however, if we can use fontspec, we +% just load the stix2 fonts without the stix2 package itself, so we load +% amsmath before unicode-math (and the stix2 fonts) \iffontspec@ok + \RequirePackage{amsmath}[2013/01/14] + % unicode-math makes equations copy/pastable in pdf output \RequirePackage{unicode-math} - \setmainfont[ Extension = .otf, - UprightFont = *-regular, - BoldFont = *-bold, - ItalicFont = *-italic, - BoldItalicFont = *-bolditalic, - ]{texgyretermes} - - \setmathfont{XITSMath-Regular.otf} - \setmathfont{XITSMath-Bold.otf}[range={bfup->up,bfit->it}] + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldItalic, + ]{STIX2Text} + \setmathfont[ + Extension = .otf, + StylisticSet={ + 1, % better caligraphic forms + 8, % upright integrals + }, + ]{STIX2Math} \else - \RequirePackage{tgtermes} - \RequirePackage{stix} + \RequirePackage[upint]{stix2} + \RequirePackage{amsmath}[2013/01/14] \fi +% math +\RequirePackage{mathtools} + +% for whatever reason, redefining this here has no effect +\AtBeginDocument{\renewcommand{\Re}{\mathbb{R}}} + \ifproblemset@scheme % Language definition by Rebecca Turner and Andreas Stuhlmüller. \lstdefinelanguage[R5RS]{Scheme}{ -- cgit v1.2.3