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 --- .../brandeis-problemset/brandeis-problemset.cls | 50 ++++++++++++++-------- 1 file changed, 32 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex') 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