From a9aa077338c951ba3f5d90d923b4bb548dc7b3d8 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Tue, 2 Aug 2011 18:33:29 +0000 Subject: barr update git-svn-id: svn://tug.org/texlive/trunk@23323 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/barr/diagxy.tex | 83 ++++++++++++++++++--------- 1 file changed, 56 insertions(+), 27 deletions(-) (limited to 'Master/texmf-dist/tex/generic/barr') diff --git a/Master/texmf-dist/tex/generic/barr/diagxy.tex b/Master/texmf-dist/tex/generic/barr/diagxy.tex index df56836261f..ad94c880851 100644 --- a/Master/texmf-dist/tex/generic/barr/diagxy.tex +++ b/Master/texmf-dist/tex/generic/barr/diagxy.tex @@ -1,18 +1,36 @@ - \def\dated#1{\def\thedate{#1}}% - \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% - % use. If changed, it must be renamed. Inclusion in a commercial% - % software package is also permitted, but I would appreciate receiving a% - % free copy for my personal examination and use. There are no guarantees% - % that this package is good for anything. I have tested it with LaTeX 2e,% - % LaTeX 2.09 and Plain TeX. Although I know of no reason it will not work% - % with AMSTeX, I have not tested it.% - % Added 2003-05-10: I now know that the only clash is with \square in% - % amssymb, which should therefore be loaded first. If the amssymb% - % \square is required, you can \let\box\square and use \box instead.% - + %% diagxy.tex + %% Copyright 2001 Michael Barr + % + % This work may be distributed and/or modified under the + % conditions of the LaTeX Project Public License, either version 1.3 + % 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 + % version 2005/12/01 or later. + % + % This work has the LPPL maintenance status `maintained'. + % + % The Current Maintainer of this work is Michael Barr + % + % This work consists of this file diagxy.tex and the + % documentation/tutorial file diaxydoc.tex + % + + % This package has been tested and used under plain tex and latex2e + % without compatibility problems. There is one known incompatibility with + % amstex: the macro \square, which is central the package and I have been + % using since the first package before 1990, is also used by amstex for a + % small box (e.g. end of proof box). The way to overcome this is to load + % amstex first, then if you need that macro, place + % + % \let\Box\square + % + % in your file and then input diagxy. This is a front end for xy-pic and + % you must have that package installed to load this one. + +\def\dated#1{\def\thedate{#1}}% +\dated{2011-06-18}% \newcount\atcode \atcode=\catcode`\@% \catcode`\@=12% \input xy @@ -36,6 +54,7 @@ \newdir{) }{!/.9em/@^{)}*{ }}% \newdir{ (}{{ }*!/-.5em/@^{(}}% \newdir{d}{\object{.}} +\newdir{into}{{ }*!/-.5em/@^{(}}% Usage: into-> \newdimen\high% \newdimen\ul% @@ -761,10 +780,10 @@ \ratchet{\topw}{\botw}% \setmorphismwidth{\Nodee}{\Nodef}{\Labelg}{\botw}% \ratchet{\topw}{\botw}% -\square(\Xpos,\Ypos)|\Xd\Xe\Xf\Xg|/`#5`#6`#7/<\topw,\deltaX>% +\square(\Xpos,\Ypos)|\Xd\Xe\Xf\Xg|/`#5`#6`#7/<\topw,\deltaY>% [\Nodec`\Noded`\Nodee`\Nodef;`\Labele`\Labelf`\Labelg]% -\advance \Ypos by \deltaX% -\square(\Xpos,\Ypos)|\Xa\Xb\Xc\Xd|/#1`#2`#3`#4/<\topw,\deltaY>% +\advance \Ypos by \deltaY% +\square(\Xpos,\Ypos)|\Xa\Xb\Xc\Xd|/#1`#2`#3`#4/<\topw,\deltaX>% [\Nodea`\Nodeb`\Nodec`\Noded;\Labela`\Labelb`\Labelc`\Labeld]% }% @@ -842,8 +861,13 @@ \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\mon{\to/ >->/}% +\def\epi{\to/->>/}% +\def\toleft{\to/<-/}% +\def\monleft{\to/<-< /}% +\def\epileft{\to/<<-/}% + \def\rlimto{{% \font\xyatipfont=xyatip10 scaled 800 \font\xybtipfont=xybtip10 scaled 800 @@ -853,12 +877,6 @@ \font\xybtipfont=xybtip10 scaled 800 \raise 2pt\hbox{\,\xy\ar@{<-}(100,0) \endxy}\,}} -\def\mon{\to/ >->/}% -\def\epi{\to/->>/}% -\def\toleft{\to/<-/}% -\def\monleft{\to/<-< /}% -\def\epileft{\to/<<-/}% - \def\twopppp/#1`#2/<#3>^#4_#5{\:% \ifnum0=#3% @@ -991,7 +1009,7 @@ \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]% + \morphism(\xpos,\ypos)|\xe|/{##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/}% @@ -1208,3 +1226,14 @@ preamble -- eventually it should be added to xy.tex% }% \makeatother% +\endinput +tick: + +I write to mention, purely for your information, what finally worked +out best for me, namely: + +\arrow/@{>}|-*@{|}/[a`b;f] + +Also functional but with a slightly smaller "tick" is +\arrow/@{>}|-*@{+}/[a`b;f] + -- cgit v1.2.3