From c17d6d7111c3e6e6d92d99ba3b5bf8caf4d5b911 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 12 Jun 2023 03:06:21 +0000 Subject: CTAN sync 202306120306 --- macros/latex/contrib/nostarch/README | 4 + macros/latex/contrib/nostarch/nostarch.dtx | 54 +++++-- macros/latex/contrib/nostarch/nostarch.pdf | Bin 350878 -> 317675 bytes macros/latex/contrib/nostarch/nssample.pdf | Bin 281557 -> 281327 bytes macros/latex/contrib/nostarch/tabletest.pdf | Bin 35332 -> 0 bytes macros/latex/contrib/nostarch/tabletest.tex | 215 ---------------------------- macros/latex/contrib/nostarch/urltest.pdf | Bin 18227 -> 0 bytes macros/latex/contrib/nostarch/urltest.tex | 8 -- 8 files changed, 47 insertions(+), 234 deletions(-) delete mode 100644 macros/latex/contrib/nostarch/tabletest.pdf delete mode 100644 macros/latex/contrib/nostarch/tabletest.tex delete mode 100644 macros/latex/contrib/nostarch/urltest.pdf delete mode 100644 macros/latex/contrib/nostarch/urltest.tex (limited to 'macros/latex/contrib/nostarch') diff --git a/macros/latex/contrib/nostarch/README b/macros/latex/contrib/nostarch/README index 96dc00c597..279b8973d8 100644 --- a/macros/latex/contrib/nostarch/README +++ b/macros/latex/contrib/nostarch/README @@ -10,6 +10,10 @@ nshyper.sty and MakeIndex style nostarch.ist. CHANGES: +Version 2.2 + New environments: note and aside + Subfigure package is now the default + Version 2.1 Urls now correspond to the requirements of NoStarch: italic font, low tilde, splitting according to the NoStarch rules diff --git a/macros/latex/contrib/nostarch/nostarch.dtx b/macros/latex/contrib/nostarch/nostarch.dtx index 56969391d5..ba0c42cdc2 100644 --- a/macros/latex/contrib/nostarch/nostarch.dtx +++ b/macros/latex/contrib/nostarch/nostarch.dtx @@ -450,18 +450,32 @@ % \DescribeMacro{itemize} % \DescribeMacro{enumerate} % \DescribeMacro{description} +% \DescribeMacro{aside} % \DescribeMacro{note} +% \DescribeMacro{warning} % The class offers standard |itemize|, |enumerate| and |description| -% environment. There is an environment specific for it: |note|. It -% is intended for ``asides'': +% environment. There are also special environments reserverd for +% asides. The |aside| environment has a mandatory argument: aside +% name. It typesets its contents in italics with the name in bold on +% the marginh: +% \begin{verbatim} +% \begin{aside}{Reminder} +% Do not forget to plug off the computer before doing any +% modifications! +% \end{aside} +% \end{verbatim} +% The environments |note| and |warning| are similar, but have +% pre-defined names NOTE and WARNING, e.g % \begin{verbatim} % \begin{note} % Do not forget to plug off the computer before doing any % modifications! % \end{note} +% \begin{warning} +% Do not forget to plug off the computer before doing any +% modifications! +% \end{warning} % \end{verbatim} -% The material in a |note| will be typeset in italics with bold -% ``NOTE'' on the margin. % % %\subsubsection{Tables and Figures} @@ -703,7 +717,7 @@ %\ProvidesClass{nostarch} %\ProvidesPackage{nshyper} %<*!ist> -[2023/04/08 v2.1 Typesetting books for No Starch Press] +[2023/06/10 v2.2 Typesetting books for No Starch Press] % % \end{macrocode} % @@ -804,7 +818,7 @@ pagecolor=black,urlcolor=black,hyperindex=false]{hyperref} fancyhdr, fancyvrb, booktabs, graphicx, listings, caption, makeidx, upquote, pifont, textcomp, xcolor, lmodern, nameref, float, amssymb, etoolbox, - setspace, marginnote, url} + setspace, marginnote, url, subfigure} \RequirePackage[framemethod=TikZ]{mdframed} \RequirePackage{soul} \RequirePackage[T1]{fontenc} @@ -2214,13 +2228,14 @@ pagecolor=black,urlcolor=black,hyperindex=false]{hyperref} % \end{macrocode} % \end{macro} % -% \begin{macro}{note} -% Note is a special environment for asides. It is in italics with -% the word ``NOTE'' on the margin: +% \begin{macro}{\aside} +% \changes{v2.2}{2023/06/10}{Added macro} +% An environment for asides. Italics with the name (the mandatory +% arg) on the margin % \begin{macrocode} -\newenvironment{note}{% +\newenvironment{aside}[1]{% \list{\makebox[0pt][r]{\dogma \fontsize{7.5pt}{12pt} - \colorbox{black}{\textcolor{white}{\sonote{NOTE}}}\hspace{2em}}}{\listparindent0pt\relax + \colorbox{black}{\textcolor{white}{\sonote{#1}}}\hspace{2em}}}{\listparindent0pt\relax \topsep9\p@\relax \itemindent0\p@\relax \rightmargin0\p@\relax @@ -2231,6 +2246,23 @@ pagecolor=black,urlcolor=black,hyperindex=false]{hyperref} % \end{macrocode} % \end{macro} % +% \begin{macro}{\note} +% \changes{v2.2}{2023/06/10}{Redefined using generic} +% Note is in italics with +% the word ``NOTE'' on the margin: +% \begin{macrocode} +\newenvironment{note}{\begin{aside}{NOTE}}{\end{aside}} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\warning} +% \changes{v2.2}{2023/06/10}{Defined using generic} +% Warning is in italics with +% the word ``WARNING'' on the margin: +% \begin{macrocode} +\newenvironment{warning}{\begin{aside}{WARNING}}{\end{aside}} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{plainlist} % \changes{v2.0}{2023/04/08}{Added macro} \newenvironment{plainlist}{% diff --git a/macros/latex/contrib/nostarch/nostarch.pdf b/macros/latex/contrib/nostarch/nostarch.pdf index d0b15ee893..d27608c590 100644 Binary files a/macros/latex/contrib/nostarch/nostarch.pdf and b/macros/latex/contrib/nostarch/nostarch.pdf differ diff --git a/macros/latex/contrib/nostarch/nssample.pdf b/macros/latex/contrib/nostarch/nssample.pdf index a6b476eba4..3d7d86418a 100644 Binary files a/macros/latex/contrib/nostarch/nssample.pdf and b/macros/latex/contrib/nostarch/nssample.pdf differ diff --git a/macros/latex/contrib/nostarch/tabletest.pdf b/macros/latex/contrib/nostarch/tabletest.pdf deleted file mode 100644 index 5ed27d9915..0000000000 Binary files a/macros/latex/contrib/nostarch/tabletest.pdf and /dev/null differ diff --git a/macros/latex/contrib/nostarch/tabletest.tex b/macros/latex/contrib/nostarch/tabletest.tex deleted file mode 100644 index b1e28864db..0000000000 --- a/macros/latex/contrib/nostarch/tabletest.tex +++ /dev/null @@ -1,215 +0,0 @@ -\documentclass[cfonts, nofontsdir]{nostarch} -\usepackage{nshyper} -\begin{document} - -Some examples of tables - - -\begin{table}[H] -\caption{Similar to Figures, Table Titles Also Should Break Within the Table's Width Instead of Extending the Full Page Width Like This}\index{kinds, meanings of} -\label{exampletable} -\begin{tabular}{ll} - \toprule - \thfont Col 1 & \thfont Col 2 \\ - \midrule - Lorem ipsum & dolor sit amet \\ - consectetur adipiscing & elit sed do \\ - eiusmod tempor & incididunt ut \\ - labore et dolore & magna aliqua \\ - ut enim ad & minim veniam \\ - \bottomrule -\end{tabular} -\end{table} - -A long table - -\begin{longtable}{ll} - \caption{A very long table. Its caption also wraps up like the - caption of figures and tables}\label{long table}\\ - \toprule - \thfont Col 1 & \thfont Col 2 \\ - \midrule - \endfirsthead - \caption[]{A very long table. Its caption also wraps up like the - caption of figures and tables continued\ldots}\\ - \toprule - \thfont Col 1 & \thfont Col 2 \\ - \midrule - \endhead - \bottomrule - \endfoot - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ - this table is & long! \\ -\end{longtable} - -Equations have unequal amounts of spacing above and below them. The -space before the following equation looks roughly twice as large as -after. -\begin{equation} -mean~tot = b + c ~ temp + d ~ temp^2. -\end{equation} - -Additionally, the amount of space before/after equations is not always -consistent. The below equation seems to have even more leading space -than the previous one. -\begin{equation} -mean~tot = b + c ~ temp + d ~ temp^2 + e ~ hum + f ~ hum^2 + g ~ temp -\times ~ hum. -\end{equation} - -We've been manually adding \lstinline{\vspace} commands to account for this, which is not an ideal solution. - - -\end{document} diff --git a/macros/latex/contrib/nostarch/urltest.pdf b/macros/latex/contrib/nostarch/urltest.pdf deleted file mode 100644 index 152b9e7170..0000000000 Binary files a/macros/latex/contrib/nostarch/urltest.pdf and /dev/null differ diff --git a/macros/latex/contrib/nostarch/urltest.tex b/macros/latex/contrib/nostarch/urltest.tex deleted file mode 100644 index 56368a2ce7..0000000000 --- a/macros/latex/contrib/nostarch/urltest.tex +++ /dev/null @@ -1,8 +0,0 @@ -\documentclass[cfonts, nofontsdir]{nostarch} -\usepackage{nshyper} -\begin{document} -\url{https://bilbo.dynip.com/~boris} - - -\fbox{\parbox{.8cm}{\url{https://bilbo.dynip.com/~boris_ddd=2345&aaaaaaa-b-c-c-c-cdddddddddd@ddddddddd!ddddd?dddddd|dddddd,ddddd;ddddd'dddddd+ddddddbbbbbb(aaaaaa)bbbbbb[aaaaaa]bbbbb{aaaaaa}bbbbb"aaaaaaaa:bbbbbbbbb///////////bbbbbbbbbbb}}} -\end{document} -- cgit v1.2.3