prerex (14nov19)

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

4 files changed, 61 insertions, 29 deletions

diff --git a/Master/texmf-dist/doc/latex/prerex/README b/Master/texmf-dist/doc/latex/prerex/README
index 63bd10440e5..1990c45cea0 100644
--- a/Master/texmf-dist/doc/latex/prerex/README
+++ b/Master/texmf-dist/doc/latex/prerex/README
@@ -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 
diff --git a/Master/texmf-dist/doc/latex/prerex/intro.pdf b/Master/texmf-dist/doc/latex/prerex/intro.pdf
index 79fd0d517eb..72c0c78a4f1 100644
--- a/Master/texmf-dist/doc/latex/prerex/intro.pdf
+++ b/Master/texmf-dist/doc/latex/prerex/intro.pdf
diff --git a/Master/texmf-dist/doc/latex/prerex/intro.tex b/Master/texmf-dist/doc/latex/prerex/intro.tex
index f8fe305ebcc..2764fa2547f 100644
--- a/Master/texmf-dist/doc/latex/prerex/intro.tex
+++ b/Master/texmf-dist/doc/latex/prerex/intro.tex
@@ -118,11 +118,6 @@ Here are some of these:
 
 \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
diff --git a/Master/texmf-dist/tex/latex/prerex/prerex.sty b/Master/texmf-dist/tex/latex/prerex/prerex.sty
index 2acc9372e7f..5480354290a 100644
--- a/Master/texmf-dist/tex/latex/prerex/prerex.sty
+++ b/Master/texmf-dist/tex/latex/prerex/prerex.sty
@@ -1,6 +1,6 @@
 %% This is file 'prerex.sty'
 %%
-%% Copyright (C) 2006-14 R. D. Tennent, rdt@cs.queensu.ca
+%% Copyright (C) 2006-19 R. D. Tennent, rdt@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@dx * \the@dy * 2}
-  \else 
-    \setcounter{@dx}{#3-#1}
-    \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+  \ifnum#4<#2
+    \setcounter{@dy}{#2-#4}
+    \ifnum#3<#1
+      \setcounter{@dx}{#1-#3}
+      \setcounter{@myangle}{-#5 * \the@dx * \the@dy * 2}
+    \else
+      \setcounter{@dx}{#3-#1}
+      \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+    \fi
+  \else  
+    \setcounter{@dy}{#4-#2}
+    \ifnum#3<#1
+      \setcounter{@dx}{#1-#3}
+      \setcounter{@myangle}{-#5 * \the@dx * \the@dy * 2}
+    \else
+      \setcounter{@dx}{#3-#1}
+      \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+    \fi
   \fi
   \setcounter{@myangle}{\the@myangle / ((\the@dx + \the@dy) * (\the@dx + \the@dy))}
   \setcounter{@inangle}{180 - \the@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@dx * \the@dy * 2}
-  \else 
-    \setcounter{@dx}{#3-#1}
-    \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+  \ifnum#4<#2
+    \setcounter{@dy}{#2-#4}
+    \ifnum#3<#1
+      \setcounter{@dx}{#1-#3}
+      \setcounter{@myangle}{-#5 * \the@dx * \the@dy * 2}
+    \else
+      \setcounter{@dx}{#3-#1}
+      \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+    \fi
+  \else  
+    \setcounter{@dy}{#4-#2}
+    \ifnum#3<#1
+      \setcounter{@dx}{#1-#3}
+      \setcounter{@myangle}{-#5 * \the@dx * \the@dy * 2}
+    \else
+      \setcounter{@dx}{#3-#1}
+      \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+    \fi
   \fi
   \setcounter{@myangle}{\the@myangle / ((\the@dx + \the@dy) * (\the@dx + \the@dy))}
   \setcounter{@inangle}{180 - \the@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@dx * \the@dy * 2}
-  \else 
-    \setcounter{@dx}{#3-#1}
-    \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+  \ifnum#4<#2
+    \setcounter{@dy}{#2-#4}
+    \ifnum#3<#1
+      \setcounter{@dx}{#1-#3}
+      \setcounter{@myangle}{-#5 * \the@dx * \the@dy * 2}
+    \else
+      \setcounter{@dx}{#3-#1}
+      \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+    \fi
+  \else  
+    \setcounter{@dy}{#4-#2}
+    \ifnum#3<#1
+      \setcounter{@dx}{#1-#3}
+      \setcounter{@myangle}{-#5 * \the@dx * \the@dy * 2}
+    \else
+      \setcounter{@dx}{#3-#1}
+      \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+    \fi
   \fi
   \setcounter{@myangle}{\the@myangle / ((\the@dx + \the@dy) * (\the@dx + \the@dy))}
   \setcounter{@inangle}{180 - \the@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