pfdicons (27jul21)

git-svn-id: svn://tug.org/texlive/trunk@60089 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 39 insertions, 23 deletions

diff --git a/Master/texmf-dist/doc/latex/pfdicons/README.txt b/Master/texmf-dist/doc/latex/pfdicons/README.txt
index 265780b2308..ba80a406dfe 100644
--- a/Master/texmf-dist/doc/latex/pfdicons/README.txt
+++ b/Master/texmf-dist/doc/latex/pfdicons/README.txt
@@ -4,7 +4,7 @@ Copyright 2021 Aaron Drews.
 
 Contact: <adrews@ucsd.edu>
 
-Current version: 1.0, 2021/07/23
+Current version: 1.0a, 2021/07/26
 
 
 ## Abstract
diff --git a/Master/texmf-dist/doc/latex/pfdicons/pfdicons-changelog.pdf b/Master/texmf-dist/doc/latex/pfdicons/pfdicons-changelog.pdf
index 92cbc1ae0c0..1cb364f7c12 100644
--- a/Master/texmf-dist/doc/latex/pfdicons/pfdicons-changelog.pdf
+++ b/Master/texmf-dist/doc/latex/pfdicons/pfdicons-changelog.pdf
diff --git a/Master/texmf-dist/doc/latex/pfdicons/pfdicons-changelog.tex b/Master/texmf-dist/doc/latex/pfdicons/pfdicons-changelog.tex
index 2c132336713..078b6499ff6 100644
--- a/Master/texmf-dist/doc/latex/pfdicons/pfdicons-changelog.tex
+++ b/Master/texmf-dist/doc/latex/pfdicons/pfdicons-changelog.tex
@@ -3,12 +3,22 @@
 
 \title{Changelog for \texttt{pfdicons} package}
 \author{Aaron Drews\\\texttt{adrews at ucsd dot edu}}
-\date{\today}
+\date{26 July, 2021}
 
 \begin{document}
 	\maketitle
 	
 	\begin{description}
+	\item[Version 1.0a, 2021/07/26:] Documentation updated
+	\begin{itemize}
+		\item Fixed a few typos in the stream crossing example of the Quick Reference.
+		\item Changed the revision date to be fixed (not using \texttt{\today}).
+		\item License normalized to LPPL 1.3c in both \texttt{pfdicons.sty} and \texttt{README.md}.
+		\item Forced a page break at Fluid transport to stop a runoff on pg. 10.
+		\item Incorporated the \texttt{accsupp} package to enable copy/paste without line numbers, and enabled \texttt{columns=fullflexible} to help minimize the number of erroneous whitespaces.
+		\item Fixed a few miscellaneous code alignment mistakes (remnants from an accidental ``hard line break'' in TeXstudio).
+	\end{itemize}
+		
 	\item[Version 1.0, 2021/07/23:] Initial release
 		
 	\begin{itemize}
diff --git a/Master/texmf-dist/doc/latex/pfdicons/pfdicons-doc.pdf b/Master/texmf-dist/doc/latex/pfdicons/pfdicons-doc.pdf
index bbcfdcc577e..6ae03dffb29 100644
--- a/Master/texmf-dist/doc/latex/pfdicons/pfdicons-doc.pdf
+++ b/Master/texmf-dist/doc/latex/pfdicons/pfdicons-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/pfdicons/pfdicons-doc.tex b/Master/texmf-dist/doc/latex/pfdicons/pfdicons-doc.tex
index c2ce6bd2fe9..f6eedd2f4c4 100644
--- a/Master/texmf-dist/doc/latex/pfdicons/pfdicons-doc.tex
+++ b/Master/texmf-dist/doc/latex/pfdicons/pfdicons-doc.tex
@@ -20,7 +20,14 @@
 	xrightmargin=4ex}
 \lstMakeShortInline|
 
-%\input{pfdicons.sty}
+% Attempt to improve copy/paste for code:
+\usepackage{accsupp}
+\lstset{numberstyle=\color{gray}\small\noncopynumber, columns=fullflexible} 
+\newcommand{\noncopynumber}[1]{
+	\BeginAccSupp{method=escape,ActualText={}}
+	#1\hspace{-1em}
+	\EndAccSupp{}
+}
 
 \newcommand\Tikz{Ti\textit{k}Z\xspace}
 \newcommand\redtt[1]{{\color{red}\texttt{#1}}}
@@ -29,7 +36,7 @@
 
 \title{The \boldtt{pfdicons} Package: Documentation}
 \author{\Large Aaron Drews\\ \texttt{adrews@ucsd.edu}}
-\date{v1.0 from \today}
+\date{v1.0a from 2021/07/26}
 \setcounter{tocdepth}{2}
 
 \begin{document}
@@ -1068,6 +1075,8 @@ The |vessel| shape provides a vertical cylinder as a generic vessel. Such a vess
 		};	
 	\end{tikzpicture}
 \end{figure}
+
+\newpage
 The |centrifugal pump| shape provides a circular element with a triangular base to represent a centrifugal pump. An additional half-circle can be added using the |unit int| key to indicate the pump inlet and a rectangular outlet direction can be added using the |unit ext| key.
 
 \begin{center}
@@ -1987,6 +1996,9 @@ You can also modify individual parameters while retaining others by passing addi
 
 \section{Examples}
 The following examples use the |pfdicons| package to replicate process flow diagrams and other diagrams found in several standard undergraduate textbooks. The examples are generally grouped according to the (approximate) course in which they occur: material and energy balances, thermodynamics, reaction engineering, separations, process controls, and capstone design.
+
+\textbf{Caution:} Sometimes copy/pasting example code will introduce artifacts (mostly whitespaces) into the pasted code which are not apparent in this document. If this occurs you can (1) check and remove any erroneous whitespaces in your pasted code, (2) type out the examples here by hand, or (3) copy the code directly from the |pfdicons-doc.tex| file on the CTAN page for this package.
+
 \subsection{Material and Energy Balances}
 \begin{enumerate}[itemindent=0.75in, leftmargin=0.25in, label=\textsc{\textbf{Example \arabic*:}}]
 	
@@ -2076,8 +2088,7 @@ The following examples use the |pfdicons| package to replicate process flow diag
 	\node [basic hx, rotate=90] (boiler) {};
 	\node [turbine, below right=1cm and 2cm of boiler] (turbine) {};
 	\node [basic hx, rotate=90, below left=of turbine] (cond) {};
-	\node [centrifugal pump, below left=of boiler, unit int=inlet south, unit 
-	ext=outlet north west] (pump) {};
+	\node [centrifugal pump, below left=of boiler, unit int=inlet south, unit ext=outlet north west] (pump) {};
 	
 	% Streams
 	\draw[->] (boiler.south) -| (turbine.nnw);
@@ -2381,12 +2392,9 @@ The following examples use the |pfdicons| package to replicate process flow diag
 	%\usetikzlibrary{decorations.pathmorphing}
 	% Units	
 	\node[column, unit int=numbered tray, scale=1.5] (c) {};
-	\node[vessel, rotate=90, unit int=liquid rotated, above right=8mm and 15mm 
-	of c, anchor=north] (drum) {};
+	\node[vessel, rotate=90, unit int=liquid rotated, above right=8mm and 15mm of c, anchor=north] (drum) {};
 	\node[basic hx, unit ext=util, above left=8mm and 5mm of drum.north] (cond) {};
-	\node[basic hx, unit int=U tube, unit ext=util, rotate=90, below 
-	right=5mm 
-	and 5mm of c, anchor=east] (reboil) {};
+	\node[basic hx, unit int=U tube, unit ext=util, rotate=90, below right=5mm and 5mm of c, anchor=east] (reboil) {};
 	
 	% Helpful points
 	\coordinate[left=3cm of c.west] (F);
@@ -2487,8 +2495,7 @@ The following examples use the |pfdicons| package to replicate process flow diag
 	% \usetikzlibrary{matrix}
 	
 	% Definitions
-	\tikzstyle{filter} = [tube reactor, unit int=packed, rotate=90, 
-	scale=0.75];
+	\tikzstyle{filter} = [tube reactor, unit int=packed, rotate=90, scale=0.75];
 	\tikzstyle{ads} = [tube reactor, unit int=packed, rotate=90];
 	\tikzstyle{pump} = [reciprocating pump, yscale=-1];	
 	
@@ -2777,7 +2784,7 @@ The following examples use the |pfdicons| package to replicate process flow diag
 \end{center}
 
 \begin{lstlisting}
-		\begin{tikzpicture}[font=\footnotesize]
+\begin{tikzpicture}[font=\footnotesize]
 	% Reduce stream label sizes
 	\tikzstyle{sid} = [diamond, draw, solid, fill=white, text badly centered, inner sep=1pt, font=\tiny]
 	
@@ -2828,14 +2835,12 @@ The following examples use the |pfdicons| package to replicate process flow diag
 	\draw[->] (V102.n) |- (C101.e);
 	\draw[->] (C101.w) -- node[valve, near start]{} node[sid,near end]{7} (R101.se) node[pos=0.5](n2){};	
 	
-	
 	% Cross stream 9 over 5
 	\path[spath/save=over1] (R101.w) |- (E102.w);
 	\path[spath/save=under1] (n2 |- C101) |- (n1 |- V103)  -| (n1 |- E101);
 	\tikzset{bridge={over1}{under1}}	
 	\draw[->, spath/use=over1] node[sid, pos=0.5]{9};
-	\draw[->, spath/use=under1] node[sid, pos=0.5]{5};
-	
+	\draw[->, spath/use=under1] node[sid, pos=0.5]{5};	
 	
 	% Cross stream 3 over 11
 	\path[spath/save=over2] (h2.e) -- (n1 |- h2);
@@ -2844,7 +2849,6 @@ The following examples use the |pfdicons| package to replicate process flow diag
 	\draw[->, spath/use=over2] node[sid, pos=0.2]{3};
 	\draw[->, spath/use=under2] node[sid, pos=0.4]{11};
 	
-	
 	% Unit labels
 	\node at (V101.center) {V-101};
 	\node[below] at (P101.s) {P-101};
@@ -3783,11 +3787,11 @@ The following examples use the |pfdicons| package to replicate process flow diag
 		\begin{lstlisting}
 \begin{tikzpicture}
 	\tikzset{bridge radius=8pt} % default 0pt=straight line
-	\path[->, spath/save=over] (0,1) -- (1,1);
-	\path[->, spath/save=under] (0.5,-0.5) -- (0.5,0.5);
+	\path[->, spath/save=over] (0,0) -- (2,0);
+	\path[->, spath/save=under] (1,-1) -- (1,1);
 	\tikzset{bridge={over}{under}}
 	\draw[->, spath/use=over] node[sid, pos=0.1]{1};
-	\draw[->, spath/use=under] node[sid, pos=0.1]{2};
+	\draw[->, spath/use=under] node[sid, pos=0.2]{2};
 \end{tikzpicture}
 		\end{lstlisting}
 	\end{minipage}\hspace{0.25in}
diff --git a/Master/texmf-dist/tex/latex/pfdicons/pfdicons.sty b/Master/texmf-dist/tex/latex/pfdicons/pfdicons.sty
index 7afe7d8a222..3a63bba9da4 100644
--- a/Master/texmf-dist/tex/latex/pfdicons/pfdicons.sty
+++ b/Master/texmf-dist/tex/latex/pfdicons/pfdicons.sty
@@ -7,7 +7,7 @@
 % 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.3 or later is part of all distributions of LaTeX
+% and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status “maintained”.
@@ -20,7 +20,9 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{pfdicons}[2021/07/23 PFD Icons package, v1.0]
+\ProvidesPackage{pfdicons}[2021/07/26 PFD Icons package, v1.0a]
+% v1.0: Initial release
+% v1.0a: Documentation updates (typos, copy/paste behavior, etc)
 
 \RequirePackage{tikz}
 \RequirePackage{ifthen}