From 62cc954b885f199f7be40833d48c670b86fcea7f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 20 Jul 2023 20:10:30 +0000 Subject: nostarch (20jul23) git-svn-id: svn://tug.org/texlive/trunk@67683 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/nostarch/README | 3 +++ Master/texmf-dist/doc/latex/nostarch/nostarch.pdf | Bin 317671 -> 318711 bytes Master/texmf-dist/doc/latex/nostarch/nssample.pdf | Bin 281744 -> 281542 bytes Master/texmf-dist/doc/latex/nostarch/nssample.tex | 1 + .../texmf-dist/source/latex/nostarch/nostarch.dtx | 19 ++++++++++++++++++- Master/texmf-dist/tex/latex/nostarch/nostarch.cls | 7 ++++++- Master/texmf-dist/tex/latex/nostarch/nshyper.sty | 2 +- 7 files changed, 29 insertions(+), 3 deletions(-) diff --git a/Master/texmf-dist/doc/latex/nostarch/README b/Master/texmf-dist/doc/latex/nostarch/README index 6e62ae5cf97..5a5b061798c 100644 --- a/Master/texmf-dist/doc/latex/nostarch/README +++ b/Master/texmf-dist/doc/latex/nostarch/README @@ -10,6 +10,9 @@ nshyper.sty and MakeIndex style nostarch.ist. CHANGES: +Version 2.4 + Better handling of URLs (thanks to David Carlisle) + Version 2.3 Compatibility with amsmath restored diff --git a/Master/texmf-dist/doc/latex/nostarch/nostarch.pdf b/Master/texmf-dist/doc/latex/nostarch/nostarch.pdf index 8bbf6de6865..fd8fb9bd5e6 100644 Binary files a/Master/texmf-dist/doc/latex/nostarch/nostarch.pdf and b/Master/texmf-dist/doc/latex/nostarch/nostarch.pdf differ diff --git a/Master/texmf-dist/doc/latex/nostarch/nssample.pdf b/Master/texmf-dist/doc/latex/nostarch/nssample.pdf index 76c6c302f01..5b5157d240e 100644 Binary files a/Master/texmf-dist/doc/latex/nostarch/nssample.pdf and b/Master/texmf-dist/doc/latex/nostarch/nssample.pdf differ diff --git a/Master/texmf-dist/doc/latex/nostarch/nssample.tex b/Master/texmf-dist/doc/latex/nostarch/nssample.tex index 5fbd1c5f8e3..1222b52997d 100644 --- a/Master/texmf-dist/doc/latex/nostarch/nssample.tex +++ b/Master/texmf-dist/doc/latex/nostarch/nssample.tex @@ -5,6 +5,7 @@ \usepackage{natbib} \usepackage{nshyper} \lstset{fancyvrb=true} +\usepackage{amsmath} \makeindex \begin{document} diff --git a/Master/texmf-dist/source/latex/nostarch/nostarch.dtx b/Master/texmf-dist/source/latex/nostarch/nostarch.dtx index 1e0c86ce012..762654a210a 100644 --- a/Master/texmf-dist/source/latex/nostarch/nostarch.dtx +++ b/Master/texmf-dist/source/latex/nostarch/nostarch.dtx @@ -717,7 +717,7 @@ %\ProvidesClass{nostarch} %\ProvidesPackage{nshyper} %<*!ist> -[2023/06/18 v2.3 Typesetting books for No Starch Press] +[2023/07/19 v2.4 Typesetting books for No Starch Press] % % \end{macrocode} % @@ -2911,6 +2911,8 @@ pagecolor=black,urlcolor=black,hyperindex=false]{hyperref} % \changes{v2.1}{2023/04/11}{Added slashes and double quote} % \changes{v2.3}{2023/06/18}{Moved out opening braces for % compatibility with amsmath} +% \changes{v2.4}{2023/07/19}{Restored opening brackets using David +% Carlisle's advice} % We add to macro special treatment of the chars with breaking URLs. % Slashes are interesting: we allow breaking after them, but not % before, even after other slashes or colons @@ -2931,6 +2933,10 @@ pagecolor=black,urlcolor=black,hyperindex=false]{hyperref} \do\'{\penalty\UrlBreakPenalty\mathchar39\relax}% \do\"{\penalty\UrlBreakPenalty\mathchar34\relax}% \do\+{\penalty\UrlBreakPenalty\mathchar43\relax}% + \do\<{\penalty\UrlBreakPenalty\mathchar60\relax}% + \do\[{\penalty\UrlBreakPenalty\mathchar91\relax}% + \do\({\penalty\UrlBreakPenalty\mathchar40\relax}% + \do\{{\penalty\UrlBreakPenalty\mathchar123\relax}% \do\/{\unpenalty\penalty\@M\mathchar47\penalty\UrlBreakPenalty}% } % \end{macrocode} @@ -2945,6 +2951,17 @@ pagecolor=black,urlcolor=black,hyperindex=false]{hyperref} % \end{macrocode} % \end{macro} % +% \begin{macro}{\Url@MathSetup} +% \changes{v2.4}{2023/07/19}{Added to the macro} +% Amsmath redefines math catcodes every math expression. This lead to +% incompatibility. By David Carlisle's advice, we reset this +% resetting. We add this to the macro that is called at the beginning +% of every url +% \begin{macrocode} +\g@addto@macro{\Url@MathSetup}{\let\resetMathstrut@\relax} +% \end{macrocode} +% \end{macro} +% %\subsection{Margin notes} %\label{sec:margins} % diff --git a/Master/texmf-dist/tex/latex/nostarch/nostarch.cls b/Master/texmf-dist/tex/latex/nostarch/nostarch.cls index d86aa1e8119..aa6ad67ce5a 100644 --- a/Master/texmf-dist/tex/latex/nostarch/nostarch.cls +++ b/Master/texmf-dist/tex/latex/nostarch/nostarch.cls @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{nostarch} -[2023/06/18 v2.3 Typesetting books for No Starch Press] +[2023/07/19 v2.4 Typesetting books for No Starch Press] \newif\ifnostarch@cfonts \nostarch@cfontstrue \DeclareOption{cfonts}{\nostarch@cfontstrue} @@ -1078,8 +1078,13 @@ \do\'{\penalty\UrlBreakPenalty\mathchar39\relax}% \do\"{\penalty\UrlBreakPenalty\mathchar34\relax}% \do\+{\penalty\UrlBreakPenalty\mathchar43\relax}% + \do\<{\penalty\UrlBreakPenalty\mathchar60\relax}% + \do\[{\penalty\UrlBreakPenalty\mathchar91\relax}% + \do\({\penalty\UrlBreakPenalty\mathchar40\relax}% + \do\{{\penalty\UrlBreakPenalty\mathchar123\relax}% \do\/{\unpenalty\penalty\@M\mathchar47\penalty\UrlBreakPenalty}% } +\g@addto@macro{\Url@MathSetup}{\let\resetMathstrut@\relax} \renewcommand*{\marginfont}{\sffamily\itshape\fontsize{8.5}{10}\selectfont} \renewcommand*{\marginnotevadjust}{-\baselineskip} \newcommand{\marginwingding}[1]{{\fontsize{10pt}{12pt}\selectfont \wingding{#1}}} diff --git a/Master/texmf-dist/tex/latex/nostarch/nshyper.sty b/Master/texmf-dist/tex/latex/nostarch/nshyper.sty index 193e90a98ba..aa81be4b625 100644 --- a/Master/texmf-dist/tex/latex/nostarch/nshyper.sty +++ b/Master/texmf-dist/tex/latex/nostarch/nshyper.sty @@ -36,7 +36,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \ProvidesPackage{nshyper} -[2023/06/18 v2.3 Typesetting books for No Starch Press] +[2023/07/19 v2.4 Typesetting books for No Starch Press] \RequirePackage[breaklinks,colorlinks,linkcolor=black, citecolor=black,pagecolor=black,urlcolor=black,hyperindex]{hyperref} \AtBeginDocument{% -- cgit v1.2.3