From ff1845c8557690d905ecb126d40c90e611602de5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 6 Aug 2014 22:48:53 +0000 Subject: chemmacros (6aug14) git-svn-id: svn://tug.org/texlive/trunk@34853 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/chemmacros/chemformula.sty | 181 +++++++++++---------- 1 file changed, 92 insertions(+), 89 deletions(-) (limited to 'Master/texmf-dist/tex/latex/chemmacros') diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty index e9c80e2027f..08fc18604f9 100644 --- a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty +++ b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty @@ -26,9 +26,9 @@ % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- \RequirePackage{ expl3 , xparse , l3keys2e , tikz , amsmath , xfrac , nicefrac , scrlfile } -\usetikzlibrary{arrows} -\def\chemformula@version{4.6} -\def\chemformula@date{2014/06/30} +\usetikzlibrary{arrows.meta} +\def\chemformula@version{4.7} +\def\chemformula@date{2014/08/04} \ProvidesExplPackage {chemformula} @@ -700,96 +700,95 @@ % arrow heads: % full tip for pairs -\pgfarrowsdeclare { cf } { cf } -{ - \dim_set:Nn \l__chemformula_arrow_head_dim - { 2.5pt + 2.5\pgflinewidth } - \pgfarrowsleftextend { -\l__chemformula_arrow_head_dim } - \pgfarrowsrightextend { .5\pgflinewidth } -} -{ - \dim_set:Nn \l__chemformula_arrow_head_dim - { 2.5pt + 2.5\pgflinewidth } - \pgfsetdash {} { 0pt } - \pgfsetroundjoin - \pgfsetroundcap - \pgfpathmoveto { \pgfpoint { 0pt } { 0pt } } - \pgfpathlineto - { - \pgfpoint - { -\l__chemformula_arrow_head_dim } - { .3\l__chemformula_arrow_head_dim } - } - \pgfpathlineto - { \pgfpoint { -.5\l__chemformula_arrow_head_dim } { 0pt } } - \pgfpathlineto - { - \pgfpoint - { -\l__chemformula_arrow_head_dim } - { -.3\l__chemformula_arrow_head_dim } - } - \pgfpathlineto { \pgfpoint { 0pt } { 0pt } } - \pgfusepathqfillstroke -} +\pgfarrowsdeclare { cf~internal } { cf~internal } + { + \dim_set:Nn \l__chemformula_arrow_head_dim + { 2.5pt + 2.5\pgflinewidth } + \pgfarrowsleftextend { -\l__chemformula_arrow_head_dim } + \pgfarrowsrightextend { .5\pgflinewidth } + } + { + \dim_set:Nn \l__chemformula_arrow_head_dim + { 2.5pt + 2.5\pgflinewidth } + \pgfsetdash {} { 0pt } + \pgfsetroundjoin + \pgfsetroundcap + \pgfpathmoveto { \pgfpoint { 0pt } { 0pt } } + \pgfpathlineto + { + \pgfpoint + { -\l__chemformula_arrow_head_dim } + { .3\l__chemformula_arrow_head_dim } + } + \pgfpathlineto + { \pgfpoint { -.5\l__chemformula_arrow_head_dim } { 0pt } } + \pgfpathlineto + { + \pgfpoint + { -\l__chemformula_arrow_head_dim } + { -.3\l__chemformula_arrow_head_dim } + } + \pgfpathlineto { \pgfpoint { 0pt } { 0pt } } + \pgfusepathqfillstroke + } % half tip on the left -\pgfarrowsdeclare { left~cf } { left~cf } -{ - \dim_set:Nn \l__chemformula_arrow_head_dim - { 2.5pt + 2.5\pgflinewidth } - \pgfarrowsleftextend { -\l__chemformula_arrow_head_dim } - \pgfarrowsrightextend { .5\pgflinewidth } -} -{ - \dim_set:Nn \l__chemformula_arrow_head_dim - { 2.5pt + 2.5\pgflinewidth } - \pgfsetdash {} { 0pt } - \pgfsetroundjoin - \pgfsetroundcap - \pgfpathmoveto { \pgfpoint { 0pt } { 0pt } } - \pgfpathlineto - { - \pgfpoint - { -\l__chemformula_arrow_head_dim } - { .3\l__chemformula_arrow_head_dim } - } - \pgfpathlineto { \pgfpoint { -.5\l__chemformula_arrow_head_dim } { 0pt } } - \pgfpathlineto { \pgfpoint { 0pt } { 0pt } } - \pgfusepathqfillstroke -} +\pgfarrowsdeclare { left~cf~internal } { left~cf~internal } + { + \dim_set:Nn \l__chemformula_arrow_head_dim + { 2.5pt + 2.5\pgflinewidth } + \pgfarrowsleftextend { -\l__chemformula_arrow_head_dim } + \pgfarrowsrightextend { .5\pgflinewidth } + } + { + \dim_set:Nn \l__chemformula_arrow_head_dim + { 2.5pt + 2.5\pgflinewidth } + \pgfsetdash {} { 0pt } + \pgfsetroundjoin + \pgfsetroundcap + \pgfpathmoveto { \pgfpoint { 0pt } { 0pt } } + \pgfpathlineto + { + \pgfpoint + { -\l__chemformula_arrow_head_dim } + { .3\l__chemformula_arrow_head_dim } + } + \pgfpathlineto { \pgfpoint { -.5\l__chemformula_arrow_head_dim } { 0pt } } + \pgfpathlineto { \pgfpoint { 0pt } { 0pt } } + \pgfusepathqfillstroke + } % half tip in the right -\pgfarrowsdeclare { right~cf } { right~cf } -{ - \dim_set:Nn \l__chemformula_arrow_head_dim - { 2.5pt + 2.5\pgflinewidth } - \pgfarrowsleftextend { -\l__chemformula_arrow_head_dim } - \pgfarrowsrightextend { .5\pgflinewidth } -} -{ - \dim_set:Nn \l__chemformula_arrow_head_dim - { 2.5pt + 2.5\pgflinewidth } - \pgfsetdash {} { 0pt } - \pgfsetroundjoin - \pgfsetroundcap - \pgfpathmoveto { \pgfpoint { 0pt } { 0pt } } - \pgfpathlineto - { - \pgfpoint - { -\l__chemformula_arrow_head_dim } - { -.3\l__chemformula_arrow_head_dim } - } - \pgfpathlineto { \pgfpoint { -.5\l__chemformula_arrow_head_dim } { 0pt } } - \pgfpathlineto { \pgfpoint { 0pt } { 0pt } } - \pgfusepathqfillstroke -} +\pgfarrowsdeclare { right~cf~internal } { right~cf~internal } + { + \dim_set:Nn \l__chemformula_arrow_head_dim + { 2.5pt + 2.5\pgflinewidth } + \pgfarrowsleftextend { -\l__chemformula_arrow_head_dim } + \pgfarrowsrightextend { .5\pgflinewidth } + } + { + \dim_set:Nn \l__chemformula_arrow_head_dim + { 2.5pt + 2.5\pgflinewidth } + \pgfsetdash {} { 0pt } + \pgfsetroundjoin + \pgfsetroundcap + \pgfpathmoveto { \pgfpoint { 0pt } { 0pt } } + \pgfpathlineto + { + \pgfpoint + { -\l__chemformula_arrow_head_dim } + { -.3\l__chemformula_arrow_head_dim } + } + \pgfpathlineto { \pgfpoint { -.5\l__chemformula_arrow_head_dim } { 0pt } } + \pgfpathlineto { \pgfpoint { 0pt } { 0pt } } + \pgfusepathqfillstroke + } -% a possibility to overwrite the arrow tips -- undocumented: -\providecommand*\pgfarrowsrenewalias[4]{% - \let\savedef\pgf@arrows@check@already - \def\pgf@arrows@check@already##1##2##3{##3}% - \pgfarrowsdeclarealias{#1}{#2}{#3}{#4}% - \let\pgf@arrows@check@already\savedef} +\pgfkeys{ + cf~ /.tip = {cf~internal} , + left~cf~ /.tip = {left~cf~internal} , + right~cf~ /.tip = {right~cf~internal} +} % -------------------------------------------------------------------------- % determine length in dependency of labels @@ -1024,7 +1023,7 @@ } \NewChemArrow { <==> } { - \draw[chemarrow,double~ equal~ sign~ distance,double,implies-implies] + \draw[chemarrow,double~ equal~ sign~ distance,double,Implies-Implies] (cf_arrow_start) -- (cf_arrow_end) ; % \node at ([yshift=-.2ex]cf_arrow_mid) { $\Leftrightarrow$ } ; } @@ -3099,6 +3098,10 @@ VERSION HISTORY `chemmacros/circled' - new option `chemformula/circletype' similar to `chemmacros/circletype' +2014/08/04 - version 4.7 - change dependency: pgf library `arrows.meta' + instead of `arrows' + - new arrow tip definition allows redeclaration to + other existing tips by \pgfkeys{cf/.tip=} % -------------------------------------------------------------------------- % TODO -- cgit v1.2.3