barr update (13dec08)

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

2 files changed, 140 insertions, 79 deletions

diff --git a/Master/texmf-dist/tex/generic/barr/diagxy.tex b/Master/texmf-dist/tex/generic/barr/diagxy.tex
index b71b70e50bf..df56836261f 100644
--- a/Master/texmf-dist/tex/generic/barr/diagxy.tex
+++ b/Master/texmf-dist/tex/generic/barr/diagxy.tex
@@ -1,5 +1,5 @@
  \def\dated#1{\def\thedate{#1}}%
- \dated{2004-12-08}%
+ \dated{2008-01-21}%
  % This is a package of commutative diagram macros built on top of Xy-pic%
  % by Michael Barr (email:  barr@barrs.org).  Its use is unrestricted.  It%
  % may be freely distributed, unchanged, for non-commercial or commercial%
@@ -18,11 +18,24 @@
 \input xy
 \xyoption{arrow}
 \xyoption{curve}
+\catcode`\@=11
+ \newdimen\xydashw@@
+ \xydashw@@\xydashw@
+ \multiply\xydashw@@ by 7
+ \divide\xydashw@@ by 4
+\setbox\zerodotbox@=\hbox{\dimen@=.5\xydashw@@
+ \kern-\dimen@ \vrule width\xydashw@@ height\dimen@ depth\dimen@}
+\wd\zerodotbox@=\z@ \ht\zerodotbox@=\z@ \dp\zerodotbox@=\z@
+\catcode`\@=12
+
 
 \newdir{ >}{{ }*!/-.9em/@{>}}%
-\newdir{ (}{{ }*!/-.5em/@{(}}%
+ % \newdir{ (}{{ }*!/-.5em/@{(}}%
 \newdir^{ (}{{ }*!/-.5em/@^{(}}%
 \newdir{< }{!/.9em/@{<}*{ }}%
+\newdir{) }{!/.9em/@^{)}*{ }}%
+\newdir{ (}{{ }*!/-.5em/@^{(}}%
+\newdir{d}{\object{.}}
 
 \newdimen\high%
 \newdimen\ul%
@@ -61,9 +74,10 @@
 \else%
 \let\ifnextchar\@ifnextchar%
 \fi%
-\ifx\check@mathfonts\undefined%
-\else \check@mathfonts%
-\fi%
+ % \ifx\check@mathfonts\undefined%
+ % \else \check@mathfonts%
+ % \fi%
+\setbox0=\hbox{$x$}
 \newdimen\axis \axis=\fontdimen22\textfont2%
 \ul=.01em%
 \X@xbase =.01em%
@@ -214,6 +228,35 @@
     \ifnextchar<{\squarepppp(#1)|#2|/#3`#4`#5`#6/}%
     {\squarepppp(#1)|#2|/#3`#4`#5`#6/<\default,\default>}}%
 
+\def\diamondpppp(#1,#2)|#3|/#4`#5`#6`#7/<#8>[#9]{%
+\xpos#1\ypos#2%
+\def\next|##1##2##3##4|{%
+ \def\xa{##1}\def\xb{##2}\def\xc{##3}\def\xd{##4}\ignorespaces}%
+\next|#3|%
+\def\next<##1,##2>{\deltax=##1\deltay=##2\ignorespaces}%
+\next<#8>%
+\def\next[##1`##2`##3`##4;##5`##6`##7`##8]{%
+    \def\nodea{##1}\def\nodeb{##2}\def\nodec{##3}\def\noded{##4}%
+    \def\labela{##5}\def\labelb{##6}\def\labelc{##7}%
+\def\labeld{##8}\ignorespaces}%
+\next[#9]%
+\advance\ypos\deltay
+\morphism(\xpos,\ypos)|\xc|/{#6}/<\deltax,-\deltay>[\nodeb`\noded;\labelc]%
+\advance\xpos \deltax
+\advance\xpos \deltax
+\morphism(\xpos,\ypos)|\xd|/{#7}/<-\deltax,-\deltay>[\nodec`\noded;\labeld]%
+\advance\ypos\deltay \advance\xpos -\deltax
+\morphism(\xpos,\ypos)|\xa|/{#4}/<-\deltax,-\deltay>[\nodea`\nodeb;\labela]%
+\morphism(\xpos,\ypos)|\xb|/{#5}/<\deltax,-\deltay>[\nodea`\nodec;\labelb]%
+}
+\def\Diamond{\ifnextchar({\diamondp}{\diamondp(0,0)}}%
+\def\diamondp(#1){\ifnextchar|{\diamondpp(#1)}{\diamondpp(#1)|lrlr|}}%
+\def\diamondpp(#1)|#2|{\ifnextchar/{\diamondppp(#1)|#2|}%
+    {\diamondppp(#1)|#2|/>`>`>`>/}}%
+\def\diamondppp(#1)|#2|/#3`#4`#5`#6/{%
+    \ifnextchar<{\diamondpppp(#1)|#2|/#3`#4`#5`#6/}%
+    {\diamondpppp(#1)|#2|/#3`#4`#5`#6/<400,400>}}%
+
 \def\ptrianglepppp(#1,#2)|#3|/#4`#5`#6/<#7>[#8]{%
 \xpos#1\ypos#2%
 \def\next|##1##2##3|{\def\xa{##1}\def\xb{##2}\def\xc{##3}}%
@@ -409,7 +452,7 @@
     {\Ctrianglepppp(#1)|#2|/#3`#4`#5/<\default,\default>}}%
 
 \def\Dtriangle{\ifnextchar({\Dtrianglep}{\Dtrianglep(0,0)}}%
-\def\Dtrianglep(#1){\ifnextchar|{\Dtrianglepp(#1)}{\Dtrianglepp(#1)|alb|}}%
+\def\Dtrianglep(#1){\ifnextchar|{\Dtrianglepp(#1)}{\Dtrianglepp(#1)|lab|}}%
 \def\Dtrianglepp(#1)|#2|{\ifnextchar/{\Dtriangleppp(#1)|#2|}%
     {\Dtriangleppp(#1)|#2|/>`>`>/}}%
 \def\Dtriangleppp(#1)|#2|/#3`#4`#5/{%
@@ -788,7 +831,7 @@
 \def\topppp/#1/<#2>^#3_#4{\:%
 \ifnum#2=0%
    \setwdth{#3}{#4}\deltax=\wdth \divide \deltax by \ul%
-   \advance \deltax by \defaultmargin  \ratchet{\deltax}{200}%
+   \advance \deltax by \defaultmargin  \ratchet{\deltax}{100}%
 \else \deltax #2%
 \fi%
 \xy\ar@{#1}^{#3}_{#4}(\deltax,0) \endxy%
@@ -799,6 +842,16 @@
 \def\toop/#1/{\ifnextchar<{\topp/#1/}{\topp/#1/<0>}}%
 \def\to{\ifnextchar/{\toop}{\toop/>/}}%
 
+ % Here are special versions of \to meant to be used as
+ % \lim_{x\rlimto\infty} or simply as \lim\limits_\rlimto for colimits
+\def\rlimto{{%
+\font\xyatipfont=xyatip10 scaled 800
+\font\xybtipfont=xybtip10 scaled 800
+\raise 2pt\hbox{\,\xy\ar@{->}(100,0) \endxy}\,}}
+\def\llimto{{%
+\font\xyatipfont=xyatip10 scaled 800
+\font\xybtipfont=xybtip10 scaled 800
+\raise 2pt\hbox{\,\xy\ar@{<-}(100,0) \endxy}\,}}
 
 \def\mon{\to/ >->/}%
 \def\epi{\to/->>/}%
@@ -883,23 +936,35 @@
  \def\next<##1,##2>{\deltaX##1\deltaY##2}%
  \next<#7>%
  \def\next##1{\topw##1\relax%
- \ifodd\topw \def\zl{}\else\def\zl{\relax}\fi \divide\topw by 2
- \ifodd\topw \def\zk{}\else\def\zk{\relax}\fi \divide\topw by 2
- \ifodd\topw \def\zj{}\else\def\zj{\relax}\fi \divide\topw by 2
- \ifodd\topw \def\zi{}\else\def\zi{\relax}\fi \divide\topw by 2
- \ifodd\topw \def\zh{}\else\def\zh{\relax}\fi \divide\topw by 2
- \ifodd\topw \def\zg{}\else\def\zg{\relax}\fi \divide\topw by 2
- \ifodd\topw \def\zf{}\else\def\zf{\relax}\fi \divide\topw by 2
- \ifodd\topw \def\ze{}\else\def\ze{\relax}\fi \divide\topw by 2
- \ifodd\topw \def\zd{}\else\def\zd{\relax}\fi \divide\topw by 2
- \ifodd\topw \def\zc{}\else\def\zc{\relax}\fi \divide\topw by 2
+ \ifodd\topw \def\za{}\else\def\za{\relax}\fi \divide\topw by 2
  \ifodd\topw \def\zb{}\else\def\zb{\relax}\fi \divide\topw by 2
- \ifodd\topw \def\za{}\else\def\za{\relax}\fi}%
+ \ifodd\topw \def\zc{}\else\def\zc{\relax}\fi \divide\topw by 2
+ \ifodd\topw \def\zd{}\else\def\zd{\relax}\fi \divide\topw by 2
+ \ifodd\topw \def\ze{}\else\def\ze{\relax}\fi \divide\topw by 2
+ \ifodd\topw \def\zf{}\else\def\zf{\relax}\fi \divide\topw by 2
+ \ifodd\topw \def\zg{}\else\def\zg{\relax}\fi \divide\topw by 2
+ \ifodd\topw \def\zh{}\else\def\zh{\relax}\fi \divide\topw by 2
+ \ifodd\topw \def\zi{}\else\def\zi{\relax}\fi \divide\topw by 2
+ \ifodd\topw \def\zj{}\else\def\zj{\relax}\fi \divide\topw by 2
+ \ifodd\topw \def\zk{}\else\def\zk{\relax}\fi \divide\topw by 2
+ \ifodd\topw \def\zl{}\else\def\zl{\relax}\fi}%
+  % \ifodd\topw \def\zl{}\else\def\zl{\relax}\fi \divide\topw by 2
+  % \ifodd\topw \def\zk{}\else\def\zk{\relax}\fi \divide\topw by 2
+  % \ifodd\topw \def\zj{}\else\def\zj{\relax}\fi \divide\topw by 2
+  % \ifodd\topw \def\zi{}\else\def\zi{\relax}\fi \divide\topw by 2
+  % \ifodd\topw \def\zh{}\else\def\zh{\relax}\fi \divide\topw by 2
+  % \ifodd\topw \def\zg{}\else\def\zg{\relax}\fi \divide\topw by 2
+  % \ifodd\topw \def\zf{}\else\def\zf{\relax}\fi \divide\topw by 2
+  % \ifodd\topw \def\ze{}\else\def\ze{\relax}\fi \divide\topw by 2
+  % \ifodd\topw \def\zd{}\else\def\zd{\relax}\fi \divide\topw by 2
+  % \ifodd\topw \def\zc{}\else\def\zc{\relax}\fi \divide\topw by 2
+  % \ifodd\topw \def\zb{}\else\def\zb{\relax}\fi \divide\topw by 2
+  % \ifodd\topw \def\za{}\else\def\za{\relax}\fi}%
  \next{#6}%
  \def\next[##1`##2`##3`##4`##5`##6`##7`##8`##9]{%
- \def\nodea{##1}\def\nodeb{##2}\def\nodec{##3}%
- \def\noded{##4}\def\nodee{##5}\def\nodef{##6}%
- \def\nodeg{##7}\def\nodeh{##8}\def\nodei{##9}}%
+ \def\nodeA{##1}\def\nodeB{##2}\def\nodeC{##3}%
+ \def\nodeD{##4}\def\nodeE{##5}\def\nodeF{##6}%
+ \def\nodeG{##7}\def\nodeH{##8}\def\nodeI{##9}}%
  \next[#8]%
  \def\next[##1`##2`##3`##4`##5`##6`##7]{%
  \def\labela{##1}\def\labelb{##2}\def\labelc{##3}%
@@ -908,51 +973,50 @@
  \def\labelg{##1}\def\labelh{##2}\def\labeli{##3}%
  \def\labelj{##4}\def\labelk{##5}\def\labell{##6}}%
  \next[#9]%
- \def\next/##1`##2`##3`##4`##5`##6`##7/{%
-\morphism(\xpos,\ypos)|\xe|/{##5}/<\deltax,0>[\nodeg`\nodeh;\labele]%
- \ifx\zi\empty\relax \morphism(\xpos,\ypos)||/<-/<-\deltaX,0>[\nodeg`0;]\fi%
- \ifx\zd\empty\relax \morphism(\xpos,\ypos)||<0,-\deltaY>[\nodeg`0;]\fi%
- \advance\xpos by \deltax%
- \morphism(\xpos,\ypos)|\xf|/{##6}/<\deltax,0>[\nodeh`\nodei;\labelf]%
- \ifx\ze\empty\relax \morphism(\xpos,\ypos)||<0,-\deltaY>[\nodeh`0;]\fi%
- \advance\xpos by \deltax%
- \ifx\zf\empty\relax \morphism(\xpos,\ypos)||<0,-\deltaY>[\nodei`0;]\fi%
- \ifx\zl\empty\relax \morphism(\xpos,\ypos)||<\deltaX,0>[\nodei`0;]\fi%
- \advance\ypos by \deltay%
- \ifx\zk\empty\relax \morphism(\xpos,\ypos)||<\deltaX,0>[\nodef`0;]\fi%
- \advance\xpos by -\deltax%
- \morphism(\xpos,\ypos)|\xd|/{##4}/<\deltax,0>[\nodee`\nodef;\labeld]%
- \advance\xpos by -\deltax%
- \morphism(\xpos,\ypos)|\xc|/{##3}/<\deltax,0>[\noded`\nodee;\labelc]%
- \ifx\zh\empty\relax \morphism(\xpos,\ypos)||/<-/<-\deltaX,0>[\noded`0;]\fi%
- \advance\ypos by \deltay%
- \morphism(\xpos,\ypos)|\xa|/{##1}/<\deltax,0>[\nodea`\nodeb;\labela]%
- \ifx\zg\empty\relax \morphism(\xpos,\ypos)||/<-/<-\deltaX,0>[\nodea`0;]\fi%
- \ifx\za\empty\relax \morphism(\xpos,\ypos)||/<-/<0,\deltaY>[\nodea`0;]\fi%
- \advance\xpos by \deltax%
- \morphism(\xpos,\ypos)|\xb|/{##2}/<\deltax,0>[\nodeb`\nodec;\labelb]%
- \ifx\zb\empty\relax \morphism(\xpos,\ypos)||/<-/<0,\deltaY>[\nodeb`0;]\fi%
- \advance\xpos by \deltax%
- \ifx\zc\empty\relax \morphism(\xpos,\ypos)||/<-/<0,\deltaY>[\nodec`0;]\fi%
- \ifx\zj\empty\relax \morphism(\xpos,\ypos)||<\deltaX,0>[\nodec`0;]\fi%
- \nextt/##7/}%
- \def\nextt/##1`##2`##3`##4`##5`##6/{%
- \morphism(\xpos,\ypos)|\xi|/{##3}/<0,-\deltay>[\nodec`\nodef;\labeli]%
- \advance\xpos by -\deltax%
- \morphism(\xpos,\ypos)|\xh|/{##2}/<0,-\deltay>[\nodeb`\nodee;\labelh]%
- \advance\xpos by -\deltax%
- \morphism(\xpos,\ypos)|\xg|/{##1}/<0,-\deltay>[\nodea`\noded;\labelg]%
- \advance\ypos by -\deltay%
- \morphism(\xpos,\ypos)|\xj|/{##4}/<0,-\deltay>[\noded`\nodeg;\labelj]%
- \advance\xpos by \deltax%
- \morphism(\xpos,\ypos)|\xk|/{##5}/<0,-\deltay>[\nodee`\nodeh;\labelk]%
- \advance\xpos by \deltax%
- \morphism(\xpos,\ypos)|\xl|/{##6}/<0,-\deltay>[\nodef`\nodei;\labell]}%
+ \def\next/##1`##2`##3`##4`##5`##6`##7`##8/{%
+ \advance\ypos\deltay
+    \ifx\zf\empty \morphism(\xpos,\ypos)/<-/<-\deltaX,0>[\nodeD`0;]\fi
+ \morphism(\xpos,\ypos)|\xf|/{##6}/<\deltax,0>[\nodeD`\nodeE;\labelf]%
+    \advance \xpos\deltax
+    \morphism(\xpos,\ypos)|\xg|/{##7}/<\deltax,0>[\nodeE`\nodeF;\labelg]%
+    \ifx\zg\empty \advance\xpos \deltax
+        \morphism(\xpos,\ypos)<\deltaX,0>[\nodeF`0;]\fi
+    \xpos#1 \advance\ypos\deltay
+    \ifx\zd\empty \morphism(\xpos,\ypos)/<-/<-\deltaX,0>[\nodeA`0;]\fi
+    \ifx\za\empty \morphism(\xpos,\ypos)/<-/<0,\deltaY>[\nodeA`0;]\fi
+    \morphism(\xpos,\ypos)|\xa|/{##1}/<\deltax,0>[\nodeA`\nodeB;\labela]%
+ \morphism(\xpos,\ypos)|\xc|/{##3}/<0,-\deltay>[\nodeA`\nodeD;\labelc]%
+    \advance \xpos\deltax
+     \morphism(\xpos,\ypos)|\xb|/{##2}/<\deltax,0>[\nodeB`\nodeC;\labelb]%
+     \morphism(\xpos,\ypos)|\xd|/{##4}/<0,-\deltay>[\nodeB`\nodeE;\labeld]%
+     \ifx\zb\empty \morphism(\xpos,\ypos)/<-/<0,\deltaY>[\nodeB`0;]\fi
+     \advance\xpos\deltax
+ \morphism(\xpos,\ypos)|\xd|/{##5}/<0,-\deltay>[\nodeC`\nodeF;\labele]%
+     \ifx\zc\empty \morphism(\xpos,\ypos)/<-/<0,\deltaY>[\nodeC`0;]\fi
+     \ifx\ze\empty \morphism(\xpos,\ypos)<\deltaX,0>[\nodeC`0;]\fi
+   \nextt/##8/}%
+ \def\nextt/##1`##2`##3`##4`##5/{%
+ \xpos#1\ypos#2\relax%
+   \ifx\zh\empty \morphism(\xpos,\ypos)/<-/<-\deltaX,0>[\nodeG`0;]\fi
+   \ifx\zj\empty \morphism(\xpos,\ypos)<0,-\deltaY>[\nodeG`0;]\fi
+   \morphism(\xpos,\ypos)|\xk|/{##4}/<\deltax,0>[\nodeG`\nodeH;\labelk]%
+   \advance\xpos\deltax
+   \morphism(\xpos,\ypos)|\xl|/{##5}/<\deltax,0>[\nodeH`\nodeI;\labell]%
+   \ifx\zk\empty \morphism(\xpos,\ypos)<0,-\deltaY>[\nodeH`0;]\fi
+   \advance\xpos\deltax
+   \ifx\zi\empty \morphism(\xpos,\ypos)<\deltaX,0>[\nodeI`0;]\fi
+   \ifx\zl\empty \morphism(\xpos,\ypos)<0,-\deltaY>[\nodeI`0;]\fi
+   \xpos#1 \advance\ypos\deltay
+    \morphism(\xpos,\ypos)|\xh|/{##1}/<0,-\deltay>[\nodeD`\nodeG;\labelh]%
+    \advance \xpos\deltax
+    \morphism(\xpos,\ypos)|\xi|/{##2}/<0,-\deltay>[\nodeE`\nodeH;\labeli]%
+    \advance \xpos\deltax
+ \morphism(\xpos,\ypos)|\xj|/{##3}/<0,-\deltay>[\nodeF`\nodeI;\labelj]}%
  \next/#4/\ignorespaces}%
 
 \def\iiixiii{\ifnextchar({\iiixiiip}{\iiixiiip(0,0)}}%
 \def\iiixiiip(#1){\ifnextchar|{\iiixiiipp(#1)}%
-  {\iiixiiipp(#1)|aammbblmrlmr|}}%
+  {\iiixiiipp(#1)|aalmrmmlmrbb|}}%
 \def\iiixiiipp(#1)|#2|{\ifnextchar/{\iiixiiippp(#1)|#2|}%
     {\iiixiiippp(#1)|#2|/>`>`>`>`>`>`>`>`>`>`>`>/}}%
 \def\iiixiiippp(#1)|#2|/#3/{%
@@ -964,6 +1028,7 @@
    {\iiixiiipppppp(#1)|#2|/#3/<#4>{#5}}%
    {\iiixiiipppppp(#1)|#2|/#3/<#4>{#5}<400,400>}}%
 
+
 \def\iiixiipppppp(#1,#2)|#3|/#4/<#5>#6<#7>[#8;#9]{%
  \xpos#1\ypos#2\relax%
  \def\next|##1##2##3##4##5##6##7|{\def\xa{##1}\def\xb{##2}%
@@ -988,31 +1053,29 @@
  \def\labeld{##4}\def\labele{##5}\def\labelf{##6}\def\labelg{##7}}%
  \next[#9]%
  \def\next/##1`##2`##3`##4`##5`##6`##7/{%
- \ifx\zc\empty\relax\morphism(\xpos,\ypos)<\deltaX,0>[0`\noded;]\fi%
- \advance\xpos by\deltaX%
- \morphism(\xpos,\ypos)|\xc|/##3/<\deltax,0>[\noded`\nodee;\labelc]%
- \advance\xpos by \deltax%
- \morphism(\xpos,\ypos)|\xd|/##4/<\deltax,0>[\nodee`\nodef;\labeld]%
+ {\ifx\zc\empty\advance\xpos -\deltaX
+\relax\morphism(\xpos,\ypos)<\deltaX,0>[0`\noded;]\fi}%
+ \morphism(\xpos,\ypos)|\xf|/##6/<\deltax,0>[\noded`\nodee;\labelf]%
  \advance\xpos by \deltax%
- \ifx\zd\empty\relax  \morphism(\xpos,\ypos)<\deltaX,0>[\nodef`0;]\fi%
- \advance\xpos by -\deltaX  \advance\xpos by -\deltax
+ \morphism(\xpos,\ypos)|\xg|/##7/<\deltax,0>[\nodee`\nodef;\labelg]%
+ {\ifx\zd\empty \advance\xpos by \deltax
+\relax  \morphism(\xpos,\ypos)<\deltaX,0>[\nodef`0;]\fi}%
  \advance\xpos by -\deltax  \advance\ypos by \deltay
- \ifx\za\empty\relax\morphism(\xpos,\ypos)<\deltaX,0>[0`\nodea;]\fi%
- \advance\xpos by\deltaX%
+ {\ifx\za\empty\advance \xpos by -\deltaX
+\relax\morphism(\xpos,\ypos)<\deltaX,0>[0`\nodea;]\fi}%
  \morphism(\xpos,\ypos)|\xa|/##1/<\deltax,0>[\nodea`\nodeb;\labela]%
- \morphism(\xpos,\ypos)|\xe|/##5/<0,-\deltay>[\nodea`\noded;\labele]%
+ \morphism(\xpos,\ypos)|\xc|/##3/<0,-\deltay>[\nodea`\noded;\labelc]%
  \advance\xpos by \deltax%
  \morphism(\xpos,\ypos)|\xb|/##2/<\deltax,0>[\nodeb`\nodec;\labelb]%
- \morphism(\xpos,\ypos)|\xf|/##6/<0,-\deltay>[\nodeb`\nodee;\labelf]%
+ \morphism(\xpos,\ypos)|\xd|/##4/<0,-\deltay>[\nodeb`\nodee;\labeld]%
  \advance\xpos by \deltax%
- \morphism(\xpos,\ypos)|\xg|/##7/<0,-\deltay>[\nodec`\nodef;\labelg]%
+ \morphism(\xpos,\ypos)|\xe|/##5/<0,-\deltay>[\nodec`\nodef;\labele]%
  \ifx\zb\empty\relax \morphism(\xpos,\ypos)<\deltaX,0>[\nodec`0;]\fi}%
  \next/#4/\ignorespaces}%
 
-
 \def\iiixii{\ifnextchar({\iiixiip}{\iiixiip(0,0)}}%
 \def\iiixiip(#1){\ifnextchar|{\iiixiipp(#1)}%
-  {\iiixiipp(#1)|aabblmr|}}%
+  {\iiixiipp(#1)|aalmrbb|}}%
 \def\iiixiipp(#1)|#2|{\ifnextchar/{\iiixiippp(#1)|#2|}%
     {\iiixiippp(#1)|#2|/>`>`>`>`>`>`>/}}%
 \def\iiixiippp(#1)|#2|/#3/{%
@@ -1047,7 +1110,6 @@
 \def\Loop(#1,#2)#3(#4,#5){\POS(#1,#2)*+!!<0ex,\axis>{#3}\ar@(#4,#5)}%
 \def\iloop#1(#2,#3){\xy\Loop(0,0)#1(#2,#3)\endxy}%
 
-
 \catcode`\@=\atcode%
 \endinput%
 \entrymodifiers={+!!<0pt,\fontdimen22\textfont2>}%
@@ -1146,4 +1208,3 @@ preamble -- eventually it should be added to  xy.tex%
 }%
 \makeatother%
 
-
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 985db6fd120..090127ec3a2 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -34,7 +34,7 @@ my @WorkingTLP = qw(
           arydshln Asana-Math ascii assignment astro
           attachfile auncial-new aurical authoraftertitle authorindex
           auto-pst-pdf autoarea automata
-        babel babelbib bangtex barcodes bbcard bbding bbm bbold bclogo
+        babel babelbib bangtex barcodes barr bbcard bbding bbm bbold bclogo
           beamer beamer-contrib beamer-tut-pt beamerposter
           begriff bera betababel beton
           bez123 bezos bibhtml bibleref bibtopic bibtopicprefix