diff options
author | Karl Berry <karl@freefriends.org> | 2023-06-11 20:42:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-06-11 20:42:19 +0000 |
commit | 33cbf2b7ec37c215af493d57165ec4ed89f6a0f4 (patch) | |
tree | 941c1e6ac82427234b703532e72bec0e03d7424d /Master/texmf-dist | |
parent | b263fa180cf5794a68c9f8bb8cfffc89763fd74c (diff) |
nostarch (11jun23)
git-svn-id: svn://tug.org/texlive/trunk@67333 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/nostarch/README | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/nostarch/nostarch.pdf | bin | 350878 -> 317675 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/nostarch/nssample.pdf | bin | 281557 -> 281327 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/nostarch/tabletest.pdf | bin | 35332 -> 0 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/nostarch/tabletest.tex | 215 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/nostarch/urltest.pdf | bin | 18227 -> 0 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/nostarch/urltest.tex | 8 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/nostarch/nostarch.dtx | 54 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/nostarch/nostarch.cls | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/nostarch/nshyper.sty | 2 |
10 files changed, 54 insertions, 239 deletions
diff --git a/Master/texmf-dist/doc/latex/nostarch/README b/Master/texmf-dist/doc/latex/nostarch/README index 96dc00c597a..279b8973d88 100644 --- a/Master/texmf-dist/doc/latex/nostarch/README +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/nostarch/nostarch.pdf b/Master/texmf-dist/doc/latex/nostarch/nostarch.pdf Binary files differindex d0b15ee893e..d27608c590e 100644 --- a/Master/texmf-dist/doc/latex/nostarch/nostarch.pdf +++ b/Master/texmf-dist/doc/latex/nostarch/nostarch.pdf diff --git a/Master/texmf-dist/doc/latex/nostarch/nssample.pdf b/Master/texmf-dist/doc/latex/nostarch/nssample.pdf Binary files differindex a6b476eba46..3d7d86418a9 100644 --- a/Master/texmf-dist/doc/latex/nostarch/nssample.pdf +++ b/Master/texmf-dist/doc/latex/nostarch/nssample.pdf diff --git a/Master/texmf-dist/doc/latex/nostarch/tabletest.pdf b/Master/texmf-dist/doc/latex/nostarch/tabletest.pdf Binary files differdeleted file mode 100644 index 5ed27d9915c..00000000000 --- a/Master/texmf-dist/doc/latex/nostarch/tabletest.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/nostarch/tabletest.tex b/Master/texmf-dist/doc/latex/nostarch/tabletest.tex deleted file mode 100644 index b1e28864dba..00000000000 --- a/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/nostarch/urltest.pdf b/Master/texmf-dist/doc/latex/nostarch/urltest.pdf Binary files differdeleted file mode 100644 index 152b9e7170f..00000000000 --- a/Master/texmf-dist/doc/latex/nostarch/urltest.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/nostarch/urltest.tex b/Master/texmf-dist/doc/latex/nostarch/urltest.tex deleted file mode 100644 index 56368a2ce7b..00000000000 --- a/Master/texmf-dist/doc/latex/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+dddddd<aaaaaa>bbbbbb(aaaaaa)bbbbbb[aaaaaa]bbbbb{aaaaaa}bbbbb"aaaaaaaa:bbbbbbbbb///////////bbbbbbbbbbb}}} -\end{document} diff --git a/Master/texmf-dist/source/latex/nostarch/nostarch.dtx b/Master/texmf-dist/source/latex/nostarch/nostarch.dtx index 56969391d59..ba0c42cdc22 100644 --- a/Master/texmf-dist/source/latex/nostarch/nostarch.dtx +++ b/Master/texmf-dist/source/latex/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 @@ %<class>\ProvidesClass{nostarch} %<nshyper>\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] %</!ist> % \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/Master/texmf-dist/tex/latex/nostarch/nostarch.cls b/Master/texmf-dist/tex/latex/nostarch/nostarch.cls index 2709e37d86e..fe9c247f0dd 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/04/08 v2.1 Typesetting books for No Starch Press] +[2023/06/10 v2.2 Typesetting books for No Starch Press] \newif\ifnostarch@cfonts \nostarch@cfontstrue \DeclareOption{cfonts}{\nostarch@cfontstrue} @@ -67,7 +67,7 @@ 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} @@ -732,9 +732,9 @@ \rightmargin0.5in\relax \leftmargin0.5in\relax}% \item\fontsize{9pt}{11pt}\selectfont}{\endlist} -\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 @@ -742,6 +742,8 @@ \labelwidth0\p@\relax \labelsep0\p@}% \item\itshape}{\vspace{-3pt}\endlist} +\newenvironment{note}{\begin{aside}{NOTE}}{\end{aside}} +\newenvironment{warning}{\begin{aside}{WARNING}}{\end{aside}} \newenvironment{plainlist}{% \renewcommand{\descriptionlabel}[1]{\hspace{\labelsep}\textbf{##1}} % Add em space to description label \begin{description}% diff --git a/Master/texmf-dist/tex/latex/nostarch/nshyper.sty b/Master/texmf-dist/tex/latex/nostarch/nshyper.sty index c92d319a5c3..da751c00616 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/04/08 v2.1 Typesetting books for No Starch Press] +[2023/06/10 v2.2 Typesetting books for No Starch Press] \RequirePackage[breaklinks,colorlinks,linkcolor=black, citecolor=black,pagecolor=black,urlcolor=black,hyperindex]{hyperref} \AtBeginDocument{% |