texlive[52792] Master/texmf-dist: prerex (14nov19)

[commits+karl at tug.org]

Revision: 52792
          http://tug.org/svn/texlive?view=revision&revision=52792
Author:   karl
Date:     2019-11-14 22:53:35 +0100 (Thu, 14 Nov 2019)
Log Message:
-----------
prerex (14nov19)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/prerex/README
    trunk/Master/texmf-dist/doc/latex/prerex/intro.pdf
    trunk/Master/texmf-dist/doc/latex/prerex/intro.tex
    trunk/Master/texmf-dist/tex/latex/prerex/prerex.sty

Modified: trunk/Master/texmf-dist/doc/latex/prerex/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/prerex/README	2019-11-14 17:35:09 UTC (rev 52791)
+++ trunk/Master/texmf-dist/doc/latex/prerex/README	2019-11-14 21:53:35 UTC (rev 52792)
@@ -1,4 +1,4 @@
-prerex, version 2017-11-28. Macros for prerequisite charts, with
+prerex, version 2019-11-14. Macros for prerequisite charts, with
 associated editor and viewer applications.
 
 This package consists of 

Modified: trunk/Master/texmf-dist/doc/latex/prerex/intro.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/prerex/intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/prerex/intro.tex	2019-11-14 17:35:09 UTC (rev 52791)
+++ trunk/Master/texmf-dist/doc/latex/prerex/intro.tex	2019-11-14 21:53:35 UTC (rev 52792)
@@ -118,11 +118,6 @@
 
 \subsection{Prerex-Formatted  Prerequisite Charts}
 
-\subsubsection*{Where can I see prerex-formatted charts in use?}
-
-There are several charts for both specialized and multi-disciplinary programs
-on-line here: \myurl{http://www.cs.queensu.ca/undergraduate/prerequisites}.
-
 \subsubsection*{What file formats are used for prerex-formatted charts?}
 
 The charts themselves are best distributed in the Portable Document

Modified: trunk/Master/texmf-dist/tex/latex/prerex/prerex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/prerex/prerex.sty	2019-11-14 17:35:09 UTC (rev 52791)
+++ trunk/Master/texmf-dist/tex/latex/prerex/prerex.sty	2019-11-14 21:53:35 UTC (rev 52792)
@@ -1,6 +1,6 @@
 %% This is file 'prerex.sty'
 %%
-%% Copyright (C) 2006-14 R. D. Tennent, rdt at cs.queensu.ca
+%% Copyright (C) 2006-19 R. D. Tennent, rdt at cs.queensu.ca
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -13,7 +13,7 @@
 %% This work has the LPPL maintenance status "author-maintained".
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{prerex}[2014/03/22 v6.6.0 LaTeX style for prerequisite charts, pgf version]
+\ProvidesPackage{prerex}[2019/11/14 v6.7.0 LaTeX style for prerequisite charts, pgf version]
 %
 % Changelog is at the end of the file.
 %
@@ -442,13 +442,24 @@
 
 
 \def\@curved#1,#2,#3,#4;#5:{
-  \setcounter{@dy}{#2-#4}
-  \ifnum#3<#1 
-    \setcounter{@dx}{#1-#3}
-    \setcounter{@myangle}{(-#5) * \the at dx * \the at dy * 2}
-  \else 
-    \setcounter{@dx}{#3-#1}
-    \setcounter{@myangle}{#5 * \the at dx * \the at dy * 2}
+  \ifnum#4<#2
+    \setcounter{@dy}{#2-#4}
+    \ifnum#3<#1
+      \setcounter{@dx}{#1-#3}
+      \setcounter{@myangle}{-#5 * \the at dx * \the at dy * 2}
+    \else
+      \setcounter{@dx}{#3-#1}
+      \setcounter{@myangle}{#5 * \the at dx * \the at dy * 2}
+    \fi
+  \else  
+    \setcounter{@dy}{#4-#2}
+    \ifnum#3<#1
+      \setcounter{@dx}{#1-#3}
+      \setcounter{@myangle}{-#5 * \the at dx * \the at dy * 2}
+    \else
+      \setcounter{@dx}{#3-#1}
+      \setcounter{@myangle}{#5 * \the at dx * \the at dy * 2}
+    \fi
   \fi
   \setcounter{@myangle}{\the at myangle / ((\the at dx + \the at dy) * (\the at dx + \the at dy))}
   \setcounter{@inangle}{180 - \the at myangle}
@@ -474,13 +485,24 @@
 }
 
 \def\@curvedDashed#1,#2,#3,#4;#5:{
-  \setcounter{@dy}{#2-#4}
-  \ifnum#3<#1 
-    \setcounter{@dx}{#1-#3}
-    \setcounter{@myangle}{(-#5) * \the at dx * \the at dy * 2}
-  \else 
-    \setcounter{@dx}{#3-#1}
-    \setcounter{@myangle}{#5 * \the at dx * \the at dy * 2}
+  \ifnum#4<#2
+    \setcounter{@dy}{#2-#4}
+    \ifnum#3<#1
+      \setcounter{@dx}{#1-#3}
+      \setcounter{@myangle}{-#5 * \the at dx * \the at dy * 2}
+    \else
+      \setcounter{@dx}{#3-#1}
+      \setcounter{@myangle}{#5 * \the at dx * \the at dy * 2}
+    \fi
+  \else  
+    \setcounter{@dy}{#4-#2}
+    \ifnum#3<#1
+      \setcounter{@dx}{#1-#3}
+      \setcounter{@myangle}{-#5 * \the at dx * \the at dy * 2}
+    \else
+      \setcounter{@dx}{#3-#1}
+      \setcounter{@myangle}{#5 * \the at dx * \the at dy * 2}
+    \fi
   \fi
   \setcounter{@myangle}{\the at myangle / ((\the at dx + \the at dy) * (\the at dx + \the at dy))}
   \setcounter{@inangle}{180 - \the at myangle}
@@ -506,13 +528,24 @@
 }
 
 \def\@curvedDotted#1,#2,#3,#4;#5:{
-  \setcounter{@dy}{#2-#4}
-  \ifnum#3<#1 
-    \setcounter{@dx}{#1-#3}
-    \setcounter{@myangle}{(-#5) * \the at dx * \the at dy * 2}
-  \else 
-    \setcounter{@dx}{#3-#1}
-    \setcounter{@myangle}{#5 * \the at dx * \the at dy * 2}
+  \ifnum#4<#2
+    \setcounter{@dy}{#2-#4}
+    \ifnum#3<#1
+      \setcounter{@dx}{#1-#3}
+      \setcounter{@myangle}{-#5 * \the at dx * \the at dy * 2}
+    \else
+      \setcounter{@dx}{#3-#1}
+      \setcounter{@myangle}{#5 * \the at dx * \the at dy * 2}
+    \fi
+  \else  
+    \setcounter{@dy}{#4-#2}
+    \ifnum#3<#1
+      \setcounter{@dx}{#1-#3}
+      \setcounter{@myangle}{-#5 * \the at dx * \the at dy * 2}
+    \else
+      \setcounter{@dx}{#3-#1}
+      \setcounter{@myangle}{#5 * \the at dx * \the at dy * 2}
+    \fi
   \fi
   \setcounter{@myangle}{\the at myangle / ((\the at dx + \the at dy) * (\the at dx + \the at dy))}
   \setcounter{@inangle}{180 - \the at myangle}
@@ -600,6 +633,10 @@
 %
 % Changelog:
 %
+%  Versin 6.7.0
+%
+%    allow for curved upward arrows
+%
 %  Version 6.6.0
 %
 %    remove code to generate \jobname.map and \jobname.sh files