Hello community, here is the log from the commit of package texlive-specs-i for openSUSE:Factory checked in at 2015-04-25 09:50:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-i (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-i.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-i" Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-i/texlive-specs-i.changes 2015-02-24 13:02:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.texlive-specs-i.new/texlive-specs-i.changes 2015-04-25 09:52:21.000000000 +0200 @@ -1,0 +2,72 @@ +Wed Apr 15 13:43:57 UTC 2015 - werner@suse.de + +- Handle unkown scripts + +------------------------------------------------------------------- +Tue Apr 14 13:53:08 UTC 2015 - werner@suse.de + +- Make sure that tabs are used within <<-EOF...EOF pair + +------------------------------------------------------------------- +Thu Apr 2 12:25:21 UTC 2015 - werner@suse.de + +- Package pas-cours: move runfiles from doc to working directory + +------------------------------------------------------------------- +Thu Apr 2 10:33:38 UTC 2015 - werner@suse.de + +- Handle rpmlintrc for each meta spec file its self + +------------------------------------------------------------------- +Wed Apr 1 16:47:12 UTC 2015 - werner@suse.de + +- The new TeXLive package layout had suppressed the detection of many + Provides which is fixed now. +- The null.tex is now in texlive-knuth-lib, therefore require + tex(null.tex) in luatex.requires and tex.requires instead of the + gone texlive-misc. + +------------------------------------------------------------------- +Wed Apr 1 07:47:29 UTC 2015 - werner@suse.de + +- Add exceltex.requires which now Requires perl(Spreadsheet::ParseExcel) + (boo#891617) +- Patch kpathsea_cnf.dif moved from texlive-specs-m to texlive-specs-l + +------------------------------------------------------------------- +Mon Mar 30 08:39:12 UTC 2015 - werner@suse.de + +- Add patch dvips_config.dif (boo#897284) +- Remove patch pgf_plain.dif as now upstream +- Remove patch latexdiff_env.dif as the affected file is gone +- Modified patches + luaotfload_varfonts.dif + tetex_scripts.dif + tex4ht_env.dif +- Removed files pst-node.moves and pst-plot.moves as now the files + are at the correct location + +------------------------------------------------------------------- +Thu Mar 26 14:05:48 UTC 2015 - werner@suse.de + +- Update to TeXLive 2014 (timestamp 20140525 revision 34252) + * Support DVIPDFMx + * [fix] avoid luatex crash under math_mode 'decimal' + * luaotfload: Fix incorrect handling of font file formats luaotfload) + * Sync with Context beta as of 2014-04-05 + * pdfTeX: sync with Knuth TeX 3.14159265, e-TeX 2.6 + * Many more ... + +------------------------------------------------------------------- +Fri Feb 27 12:33:49 UTC 2015 - coolo@suse.com + +- patch -p1 from within texmf-dist to avoid patching through symlinks + to please new patch + +------------------------------------------------------------------- +Thu Feb 26 13:30:39 UTC 2015 - coolo@suse.com + +- avoid bootstrap problems by ignoring built packages for packages + required by texlive + +------------------------------------------------------------------- Old: ---- fbs.tar.xz New: ---- fetamont.doc.tar.xz fetamont.tar.xz feupphdteses.doc.tar.xz feupphdteses.tar.xz fifo-stack.doc.tar.xz fifo-stack.tar.xz fira.doc.tar.xz fira.tar.xz ftcap.doc.tar.xz ftcap.tar.xz ftnxtra.doc.tar.xz ftnxtra.tar.xz texlive-specs-i-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-i.spec ++++++ ++++ 8362 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-i/texlive-specs-i.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-i.new/texlive-specs-i.spec ++++++ fc.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fc/fclfont.sty_old new/doc/fonts/fc/fclfont.sty_old --- old/doc/fonts/fc/fclfont.sty_old 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/fonts/fc/fclfont.sty_old 2014-01-26 23:32:51.000000000 +0100 @@ -0,0 +1,341 @@ +% This is FCLFONT.STY_OLD +\def\fileversion{v1.3} +\def\filedate{12-NOV-1994} +% +% (C) Copyright 1992, 1993, 1994 by J"org Knappen +% This file is part of the fc-package +% See fc.rme for more information +% +% J"org Knappen +% Institut f"ur Kernphysik +% Postfach 39 80 +% D-55099 Mainz +% knappen@vkpmzd.kph.uni-mainz.de +% +% Made by using dclfont.sty by Rainer Sch"opf and Frank Mittelbach +% +\immediate + \write\sixt@@n{Style-Option: `fclfont' \space + \fileversion\space <\filedate> (JK)} +\ifx\fontfamily\undefined + \let\fontfamily\family + \let\fontseries\series + \let\fontshape\shape + \let\fontsize\size +\fi +\def\newfont#1#2{\@ifdefinable#1{\global + \font#1=#2\relax}} +\def\symbol#1{\char #1\relax} +\def\@gobbletwo#1#2{} +\let\load\@gobbletwo +\def\@setsize#1#2#3#4{\@nomath#1% + \fontsize{#4}{#2}\selectfont} +\def\prm{\fontfamily\rmdefault\selectfont} +\def\psf{\fontfamily\sfdefault\selectfont} + +\def\psl{\fontshape\sldefault\selectfont} +\def\psc{\fontshape\scdefault\selectfont} +\def\pit{\fontshape\itdefault\selectfont} + +\def\pbf{\fontseries\bfdefault\selectfont} +\def\ptt{\fontseries\ttdefault\selectfont} +\def\em{\protect\pem} +\def\pem{\@nomath\em \ifdim \fontdimen\@ne\font >\z@ + \normalshape \else \it \fi} + \let\math@bgroup\begingroup + \def\math@egroup#1{#1\endgroup} + \ifx\lyfam\undefined + \new@mathgroup\lyfam + \define@mathgroup\mv@normal\lyfam + {lasy}{m}{n} + \define@mathgroup\mv@bold\lyfam + {lasy}{b}{n} + \edef\@tempa{\hexnumber@\lyfam} + \mathchardef\mho"0\@tempa 30 + \mathchardef\Join"3\@tempa 31 + \mathchardef\Box"0\@tempa 32 + \mathchardef\Diamond"0\@tempa 33 + \mathchardef\leadsto"3\@tempa 3B + \mathchardef\sqsubset"3\@tempa 3C + \mathchardef\sqsupset"3\@tempa 3D + \mathchardef\lhd"3\@tempa 01 + \mathchardef\unlhd"3\@tempa 02 + \mathchardef\rhd"3\@tempa 03 + \mathchardef\unrhd"3\@tempa 04 + \fi +\def\@accent@def#1#2#3{\expandafter\def + \csname @#1@\string#2@#1@\endcsname{#3}} +%grave +\def\`#1{\expandafter\ifx \csname @grave@\string#1@grave@\endcsname \relax + {\accent0 #1}\else \csname @grave@\string#1@grave@\endcsname\fi} +\let\@accii=\` +\@accent@def{grave}{e}{^^e8} +\@accent@def{grave}{o}{^^f2} +\@accent@def{grave}{E}{^^c8} +\@accent@def{grave}{O}{^^d2} +%acute +\def\'#1{\expandafter\ifx \csname @acute@\string#1@acute@\endcsname \relax + {\accent1 #1}\else \csname @acute@\string#1@acute@\endcsname\fi} +\let\@acci=\' +\@accent@def{acute}{n}{^^ab} +\@accent@def{acute}{e}{^^e9} +\@accent@def{acute}{m}{^^e4} +\@accent@def{acute}{N}{^^8b} +\@accent@def{acute}{E}{^^c9} +\@accent@def{acute}{M}{^^c4} +%check +\def\v#1{\expandafter\ifx \csname @check@\string#1@check@\endcsname \relax + {\accent7 #1}\else \csname @check@\string#1@check@\endcsname\fi} +\@accent@def{check}{e}{^^a5} +\@accent@def{check}{s}{^^b2} +\@accent@def{check}{o}{^^fc} +\@accent@def{check}{E}{^^85} +\@accent@def{check}{S}{^^92} +\@accent@def{check}{O}{^^dc} +%breve +\def\u#1{\expandafter\ifx \csname @breve@\string#1@breve@\endcsname \relax + {\accent8 #1}\else \csname @breve@\string#1@breve@\endcsname\fi} +%macron +\def\=#1{\expandafter\ifx \csname @macron@\string#1@macron@\endcsname \relax + {\accent9 #1}\else \csname @macron@\string#1@macron@\endcsname\fi} +\@accent@def{macron}{e}{^^ed} +\@accent@def{macron}{o}{^^fb} +\@accent@def{macron}{E}{^^cd} +\@accent@def{macron}{O}{^^db} +\let\@acciii=\= +%circumflex +\def\^#1{\expandafter\ifx \csname @circflx@\string#1@circflx@\endcsname \relax + {\accent2 #1}\else \csname @circflx@\string#1@circflx@\endcsname\fi} +%dot +\def\.#1{\expandafter\ifx \csname @dot@\string#1@dot@\endcsname \relax + {\accent10 #1}\else \csname @dot@\string#1@dot@\endcsname\fi} +\@accent@def{dot}{n}{^^b3} +\@accent@def{dot}{N}{^^93} +\@accent@def{dot}{o}{^^f3} +\@accent@def{dot}{e}{^^b8} +\@accent@def{dot}{O}{^^d3} +\@accent@def{dot}{E}{^^98} +\@accent@def{dot}{\i}{i} +\@accent@def{dot}{i}{i} +%Hungarian +\def\H#1{\expandafter\ifx \csname @Hung@\string#1@Hung@\endcsname \relax + {\accent5 #1}\else \csname @Hung@\string#1@Hung@\endcsname\fi} +%ring above +\def\r#1{\expandafter\ifx \csname @ring@\string#1@ring@\endcsname \relax + {\accent6 #1}\else \csname @ring@\string#1@ring@\endcsname\fi} +%tilde +\def\~#1{\expandafter\ifx \csname @tilde@\string#1@tilde@\endcsname \relax + {\accent3 #1}\else \csname @tilde@\string#1@tilde@\endcsname\fi} +\@accent@def{tilde}{a}{^^e3} +\@accent@def{tilde}{n}{^^f1} +\@accent@def{tilde}{o}{^^f5} +\@accent@def{tilde}{e}{^^ee} +\@accent@def{tilde}{^^a2}{^^e2} % open e +\@accent@def{tilde}{^^aa}{^^e5} % open o +\@accent@def{tilde}{i}{^^ef} +\@accent@def{tilde}{\i}{^^ef} +\@accent@def{tilde}{u}{^^fe} +\@accent@def{tilde}{E}{^^ce} +\@accent@def{tilde}{^^82}{^^c2} +\@accent@def{tilde}{^^8a}{^^c5} +\@accent@def{tilde}{I}{^^cf} +\@accent@def{tilde}{A}{^^c3} +\@accent@def{tilde}{N}{^^d1} +\@accent@def{tilde}{O}{^^d5} +\@accent@def{tilde}{U}{^^de} +%Umlaut +\def\"#1{\expandafter\ifx \csname @Umlaut@\string#1@Umlaut@\endcsname \relax + {\accent4 #1}\else \csname @Umlaut@\string#1@Umlaut@\endcsname\fi} +\@accent@def{Umlaut}{e}{^^eb} +\@accent@def{Umlaut}{o}{^^f6} +\@accent@def{Umlaut}{E}{^^cb} +\@accent@def{Umlaut}{O}{^^d6} +% +\def\pd#1{\null\oalign{#1\crcr\hidewidth.\hidewidth}} +\def\pb#1{\null\oalign{#1\crcr\hidewidth + \vbox to.2ex{\hbox{\char9}\vss}\hidewidth}} +% inserted \null to allow \d{} and \b{} -- was a bug in plain.tex +% ogonek (or kvist or polish hook) +\def\pk#1{\expandafter\ifx \csname @kvist@\string#1@kvist@\endcsname \relax + \kv@st#1\else \csname @kvist@\string#1@kvist@\endcsname\fi} +\def\kv@st#1{\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent12 #1% + \else{\ooalign{\hidewidth\char12\hidewidth\crcr\unhbox\z@}}\fi} +\def\k#1{\protect\pk#1} +% cedilla +\def\pc#1{\expandafter\ifx \csname @cedilla@\string#1@cedilla@\endcsname \relax + \c@dilla#1\else \csname @cedilla@\string#1@cedilla@\endcsname\fi} +\@accent@def{cedilla}{c}{^^e7} +\@accent@def{cedilla}{C}{^^c7} +\def\c@dilla#1{\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1% + \else{\ooalign{\hidewidth\char11\hidewidth\crcr\unhbox\z@}}\fi} +\def\c#1{\protect\pc#1} +% line below +\def\b#1{\expandafter\ifx \csname @uline@\string#1@uline@\endcsname \relax + \protect\pb#1\else \csname @uline@\string#1@uline@\endcsname \fi} +\@accent@def{uline}{e}{^^ec} +\@accent@def{uline}{o}{^^fa} +\@accent@def{uline}{n}{^^b4} +\@accent@def{uline}{E}{^^cc} +\@accent@def{uline}{O}{^^da} +\@accent@def{uline}{N}{^^94} +% dot below +\def\d#1{\expandafter\ifx \csname @dotu@\string#1@dotu@\endcsname \relax + \protect\pd#1\else \csname @dotu@\string#1@dotu@\endcsname \fi} +\@accent@def{dotu}{e}{^^b9} +\@accent@def{dotu}{i}{^^e1} +\@accent@def{dotu}{o}{^^f9} +\@accent@def{dotu}{s}{^^b5} +\@accent@def{dotu}{u}{^^fd} +\@accent@def{dotu}{E}{^^99} +\@accent@def{dotu}{I}{^^c1} +\@accent@def{dotu}{O}{^^d9} +\@accent@def{dotu}{S}{^^95} +\@accent@def{dotu}{U}{^^dd} +%%% \chardef\aa="0E5 +\def\aa{\accent6 a} +\chardef\ae="0E6 +\def\l{^^dfl} +\chardef\oe="0F7 +\chardef\o="0F8 +\chardef\ss="0FF +\def\SS{SS} +%%%% \chardef\AA="0C5 +\def\AA{\accent6 A} +\chardef\AE="0C6 +\def\L{^^dfL} +\chardef\OE="0D7 +\chardef\O="0D8 +\chardef\i="19 +\chardef\j="1A +% \def\pounds (see below) +\def\hbar{{\mathchar'11\mkern-9muh}} + +\def\letter#1#2{\catcode`#1=11 \catcode`#2=11 % + \uccode`#1=`#1 \lccode`#1=`#2 \sfcode`#1=999 % + \lccode`#2=`#2 \uccode`#2=`#1 \sfcode`#2=1000 } +% #1 is the uppercase, #2 the lowercase member of a pair +\letter{^^80}{^^a0} +\letter{^^81}{^^a1} +\letter{^^82}{^^a2} +\letter{^^83}{^^a3} +\letter{^^84}{^^a4} +\letter{^^85}{^^a5} +\letter{^^86}{^^a6} +\letter{^^87}{^^a7} +\letter{^^88}{^^a8} +\letter{^^89}{^^a9} +\letter{^^8a}{^^aa} +\letter{^^8b}{^^ab} +\letter{^^8c}{^^ac} +\letter{^^8d}{^^ad} +\letter{^^8e}{^^ae} +\letter{^^8f}{^^af} +\letter{^^90}{^^b0} +\letter{^^91}{^^b1} +\letter{^^92}{^^b2} +\letter{^^93}{^^b3} +\letter{^^94}{^^b4} +\letter{^^95}{^^b5} +\letter{^^96}{^^b6} +\letter{^^97}{^^b7} +\letter{^^98}{^^b8} +\letter{^^99}{^^b9} +\letter{^^9a}{^^ba} +\letter{^^9b}{^^bb} +\catcode`\^^9e=11 \lccode`\^^9e=`^^9e \uccode`\^^9e=`^^d0 \sfcode`\^^9e=999 % +% crossed d +\catcode`\^^9f=12 % +\catcode`\^^bc=12 % +\catcode`\^^bd=12 % +\catcode`\^^be=12 % +\catcode`\^^bf=12 % +\letter{^^c0}{^^e0} +\letter{^^c1}{^^e1} +\letter{^^c2}{^^e2} +\letter{^^c3}{^^e3} +\letter{^^c4}{^^e4} +\letter{^^c5}{^^e5} +\letter{^^c6}{^^e6} +\letter{^^c7}{^^e7} +\letter{^^c8}{^^e8} +\letter{^^c9}{^^e9} +\letter{^^ca}{^^ea} +\letter{^^cb}{^^eb} +\letter{^^cc}{^^ec} +\letter{^^cd}{^^ed} +\letter{^^ce}{^^ee} +\letter{^^cf}{^^ef} +\letter{^^d0}{^^f0} +\letter{^^d1}{^^f1} +\letter{^^d2}{^^f2} +\letter{^^d3}{^^f3} +\letter{^^d4}{^^f4} +\letter{^^d5}{^^f5} +\letter{^^d6}{^^f6} +\letter{^^d7}{^^f7} +\letter{^^d8}{^^f8} +\letter{^^d9}{^^f9} +\letter{^^da}{^^fa} +\letter{^^db}{^^fb} +\letter{^^dc}{^^fc} +\letter{^^dd}{^^fd} +\letter{^^de}{^^fe} +\catcode`\^^df=11 \lccode`\^^df=`^^df \uccode`\^^df=`^^df \sfcode`\^^df=999 % +\catcode`\^^ff=11 \lccode`\^^ff=`^^ff \uccode`\^^ff=`^^ff \sfcode`\^^ff=999 % +% cross piece for polish l and scharfes s +\catcode`\^^19=11 \lccode`\^^19=`^^19 \uccode`\^^19=`I % dotless i +\catcode`\^^1a=11 \lccode`\^^1a=`^^1a \uccode`\^^1a=`J % dotless j + +\define@mathgroup\mv@normal{0}{cmr}{m}{n} +\define@mathgroup\mv@bold{0}{cmr}{bx}{n} +\begingroup + \catcode`\= 11 + \gdef\mathrm{\use@mathgroup \=cmr \z@} +\endgroup +\def\rmdefault{fcr} +\def\sfdefault{fcss} +%\def\ttdefault{fctt} +\def\ttdefault{tt} + \ifx\greek@group\undefined + \new@mathgroup\greek@group + \define@mathgroup\mv@normal\greek@group{cmr}{m}{n} + \define@mathgroup\mv@bold\greek@group{cmr}{bx}{n} + \edef\@tempa{\hexnumber@\greek@group} + \mathchardef\Gamma="0\@tempa00 + \mathchardef\Delta="0\@tempa01 + \mathchardef\Theta="0\@tempa02 + \mathchardef\Lambda="0\@tempa03 + \mathchardef\Xi="0\@tempa04 + \mathchardef\Pi="0\@tempa05 + \mathchardef\Sigma="0\@tempa06 + \mathchardef\Upsilon="0\@tempa07 + \mathchardef\Phi="0\@tempa08 + \mathchardef\Psi="0\@tempa09 + \mathchardef\Omega="0\@tempa0A + \fi + \expandafter\ifx\csname fcr/m/n\endcsname\relax + \@input{fontdef.fc}\fi +\def\acute{\mathaccent"7001 } +\def\grave{\mathaccent"7000 } +\def\ddot{\mathaccent"7004 } +\def\tilde{\mathaccent"7003 } +\def\bar{\mathaccent"7009 } +\def\breve{\mathaccent"7008 } +\def\check{\mathaccent"7007 } +\def\hat{\mathaccent"7002 } +\def\vec{\mathaccent"017E } +\def\dot{\mathaccent"700A } +%% From lfonts.new +%% \changes{v1.1e}{90/01/25}{Completely redefined.} +\def\${\protect\pdollar} +\def\pdollar{\text{\ifdim \fontdimen\@ne\font >\z@ + \sl \else \normalshape \fi\char`\$}} +\def\pounds{{\protect\ppounds}} +\def\ppounds{\text{\ifdim \fontdimen\@ne\font >\z@ + \it \else \fontshape u\selectfont \fi \char'44}} +%% \changes{v1.1e}{90/01/25}{Macro added.} +%% \changes{v1.1k}{90/06/23}{Changed to `mbox.} +\def\text{\mbox} +\endinput +%% +%% End of file `fclfont.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fc.doc.tlpobj new/tlpkg/tlpobj/fc.doc.tlpobj --- old/tlpkg/tlpobj/fc.doc.tlpobj 2010-06-10 18:27:28.000000000 +0200 +++ new/tlpkg/tlpobj/fc.doc.tlpobj 2014-01-27 03:22:54.000000000 +0100 @@ -1,11 +1,12 @@ name fc.doc category Package -revision 15878 +revision 32796 shortdesc doc files of fc relocated 1 -docfiles size=24 +docfiles size=27 RELOC/doc/fonts/fc/fc.bug RELOC/doc/fonts/fc/fc.rme + RELOC/doc/fonts/fc/fclfont.sty_old RELOC/doc/fonts/fc/fctugbot.tex RELOC/doc/fonts/fc/fontdef.fc_old RELOC/doc/fonts/fc/licence.gnu ++++++ fc.tar.xz ++++++ Files old/fonts/tfm/jknappen/fc/fcbx10.tfm and new/fonts/tfm/jknappen/fc/fcbx10.tfm differ Files old/fonts/tfm/jknappen/fc/fcbx11.tfm and new/fonts/tfm/jknappen/fc/fcbx11.tfm differ Files old/fonts/tfm/jknappen/fc/fcbx12.tfm and new/fonts/tfm/jknappen/fc/fcbx12.tfm differ Files old/fonts/tfm/jknappen/fc/fcbx14.tfm and new/fonts/tfm/jknappen/fc/fcbx14.tfm differ Files old/fonts/tfm/jknappen/fc/fcbx17.tfm and new/fonts/tfm/jknappen/fc/fcbx17.tfm differ Files old/fonts/tfm/jknappen/fc/fcbx20.tfm and new/fonts/tfm/jknappen/fc/fcbx20.tfm differ Files old/fonts/tfm/jknappen/fc/fcbx25.tfm and new/fonts/tfm/jknappen/fc/fcbx25.tfm differ Files old/fonts/tfm/jknappen/fc/fcbx5.tfm and new/fonts/tfm/jknappen/fc/fcbx5.tfm differ Files old/fonts/tfm/jknappen/fc/fcbx6.tfm and new/fonts/tfm/jknappen/fc/fcbx6.tfm differ Files old/fonts/tfm/jknappen/fc/fcbx7.tfm and new/fonts/tfm/jknappen/fc/fcbx7.tfm differ Files old/fonts/tfm/jknappen/fc/fcbx8.tfm and new/fonts/tfm/jknappen/fc/fcbx8.tfm differ Files old/fonts/tfm/jknappen/fc/fcbx9.tfm and new/fonts/tfm/jknappen/fc/fcbx9.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxi10.tfm and new/fonts/tfm/jknappen/fc/fcbxi10.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxi11.tfm and new/fonts/tfm/jknappen/fc/fcbxi11.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxi12.tfm and new/fonts/tfm/jknappen/fc/fcbxi12.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxi14.tfm and new/fonts/tfm/jknappen/fc/fcbxi14.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxi17.tfm and new/fonts/tfm/jknappen/fc/fcbxi17.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxi20.tfm and new/fonts/tfm/jknappen/fc/fcbxi20.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxi25.tfm and new/fonts/tfm/jknappen/fc/fcbxi25.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxi5.tfm and new/fonts/tfm/jknappen/fc/fcbxi5.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxi6.tfm and new/fonts/tfm/jknappen/fc/fcbxi6.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxi7.tfm and new/fonts/tfm/jknappen/fc/fcbxi7.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxi8.tfm and new/fonts/tfm/jknappen/fc/fcbxi8.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxi9.tfm and new/fonts/tfm/jknappen/fc/fcbxi9.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxsl10.tfm and new/fonts/tfm/jknappen/fc/fcbxsl10.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxsl11.tfm and new/fonts/tfm/jknappen/fc/fcbxsl11.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxsl12.tfm and new/fonts/tfm/jknappen/fc/fcbxsl12.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxsl14.tfm and new/fonts/tfm/jknappen/fc/fcbxsl14.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxsl17.tfm and new/fonts/tfm/jknappen/fc/fcbxsl17.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxsl20.tfm and new/fonts/tfm/jknappen/fc/fcbxsl20.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxsl25.tfm and new/fonts/tfm/jknappen/fc/fcbxsl25.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxsl5.tfm and new/fonts/tfm/jknappen/fc/fcbxsl5.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxsl6.tfm and new/fonts/tfm/jknappen/fc/fcbxsl6.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxsl7.tfm and new/fonts/tfm/jknappen/fc/fcbxsl7.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxsl8.tfm and new/fonts/tfm/jknappen/fc/fcbxsl8.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxsl9.tfm and new/fonts/tfm/jknappen/fc/fcbxsl9.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxu10.tfm and new/fonts/tfm/jknappen/fc/fcbxu10.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxu11.tfm and new/fonts/tfm/jknappen/fc/fcbxu11.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxu12.tfm and new/fonts/tfm/jknappen/fc/fcbxu12.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxu14.tfm and new/fonts/tfm/jknappen/fc/fcbxu14.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxu17.tfm and new/fonts/tfm/jknappen/fc/fcbxu17.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxu20.tfm and new/fonts/tfm/jknappen/fc/fcbxu20.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxu25.tfm and new/fonts/tfm/jknappen/fc/fcbxu25.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxu5.tfm and new/fonts/tfm/jknappen/fc/fcbxu5.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxu6.tfm and new/fonts/tfm/jknappen/fc/fcbxu6.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxu7.tfm and new/fonts/tfm/jknappen/fc/fcbxu7.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxu8.tfm and new/fonts/tfm/jknappen/fc/fcbxu8.tfm differ Files old/fonts/tfm/jknappen/fc/fcbxu9.tfm and new/fonts/tfm/jknappen/fc/fcbxu9.tfm differ Files old/fonts/tfm/jknappen/fc/fccsc10.tfm and new/fonts/tfm/jknappen/fc/fccsc10.tfm differ Files old/fonts/tfm/jknappen/fc/fccsc11.tfm and new/fonts/tfm/jknappen/fc/fccsc11.tfm differ Files old/fonts/tfm/jknappen/fc/fccsc12.tfm and new/fonts/tfm/jknappen/fc/fccsc12.tfm differ Files old/fonts/tfm/jknappen/fc/fccsc14.tfm and new/fonts/tfm/jknappen/fc/fccsc14.tfm differ Files old/fonts/tfm/jknappen/fc/fccsc17.tfm and new/fonts/tfm/jknappen/fc/fccsc17.tfm differ Files old/fonts/tfm/jknappen/fc/fccsc20.tfm and new/fonts/tfm/jknappen/fc/fccsc20.tfm differ Files old/fonts/tfm/jknappen/fc/fccsc25.tfm and new/fonts/tfm/jknappen/fc/fccsc25.tfm differ Files old/fonts/tfm/jknappen/fc/fccsc5.tfm and new/fonts/tfm/jknappen/fc/fccsc5.tfm differ Files old/fonts/tfm/jknappen/fc/fccsc6.tfm and new/fonts/tfm/jknappen/fc/fccsc6.tfm differ Files old/fonts/tfm/jknappen/fc/fccsc7.tfm and new/fonts/tfm/jknappen/fc/fccsc7.tfm differ Files old/fonts/tfm/jknappen/fc/fccsc8.tfm and new/fonts/tfm/jknappen/fc/fccsc8.tfm differ Files old/fonts/tfm/jknappen/fc/fccsc9.tfm and new/fonts/tfm/jknappen/fc/fccsc9.tfm differ Files old/fonts/tfm/jknappen/fc/fci10.tfm and new/fonts/tfm/jknappen/fc/fci10.tfm differ Files old/fonts/tfm/jknappen/fc/fci11.tfm and new/fonts/tfm/jknappen/fc/fci11.tfm differ Files old/fonts/tfm/jknappen/fc/fci12.tfm and new/fonts/tfm/jknappen/fc/fci12.tfm differ Files old/fonts/tfm/jknappen/fc/fci14.tfm and new/fonts/tfm/jknappen/fc/fci14.tfm differ Files old/fonts/tfm/jknappen/fc/fci17.tfm and new/fonts/tfm/jknappen/fc/fci17.tfm differ Files old/fonts/tfm/jknappen/fc/fci20.tfm and new/fonts/tfm/jknappen/fc/fci20.tfm differ Files old/fonts/tfm/jknappen/fc/fci25.tfm and new/fonts/tfm/jknappen/fc/fci25.tfm differ Files old/fonts/tfm/jknappen/fc/fci5.tfm and new/fonts/tfm/jknappen/fc/fci5.tfm differ Files old/fonts/tfm/jknappen/fc/fci6.tfm and new/fonts/tfm/jknappen/fc/fci6.tfm differ Files old/fonts/tfm/jknappen/fc/fci7.tfm and new/fonts/tfm/jknappen/fc/fci7.tfm differ Files old/fonts/tfm/jknappen/fc/fci8.tfm and new/fonts/tfm/jknappen/fc/fci8.tfm differ Files old/fonts/tfm/jknappen/fc/fci9.tfm and new/fonts/tfm/jknappen/fc/fci9.tfm differ Files old/fonts/tfm/jknappen/fc/fcitt10.tfm and new/fonts/tfm/jknappen/fc/fcitt10.tfm differ Files old/fonts/tfm/jknappen/fc/fcitt11.tfm and new/fonts/tfm/jknappen/fc/fcitt11.tfm differ Files old/fonts/tfm/jknappen/fc/fcitt12.tfm and new/fonts/tfm/jknappen/fc/fcitt12.tfm differ Files old/fonts/tfm/jknappen/fc/fcitt14.tfm and new/fonts/tfm/jknappen/fc/fcitt14.tfm differ Files old/fonts/tfm/jknappen/fc/fcitt17.tfm and new/fonts/tfm/jknappen/fc/fcitt17.tfm differ Files old/fonts/tfm/jknappen/fc/fcitt20.tfm and new/fonts/tfm/jknappen/fc/fcitt20.tfm differ Files old/fonts/tfm/jknappen/fc/fcitt25.tfm and new/fonts/tfm/jknappen/fc/fcitt25.tfm differ Files old/fonts/tfm/jknappen/fc/fcitt5.tfm and new/fonts/tfm/jknappen/fc/fcitt5.tfm differ Files old/fonts/tfm/jknappen/fc/fcitt6.tfm and new/fonts/tfm/jknappen/fc/fcitt6.tfm differ Files old/fonts/tfm/jknappen/fc/fcitt7.tfm and new/fonts/tfm/jknappen/fc/fcitt7.tfm differ Files old/fonts/tfm/jknappen/fc/fcitt8.tfm and new/fonts/tfm/jknappen/fc/fcitt8.tfm differ Files old/fonts/tfm/jknappen/fc/fcitt9.tfm and new/fonts/tfm/jknappen/fc/fcitt9.tfm differ Files old/fonts/tfm/jknappen/fc/fcr10.tfm and new/fonts/tfm/jknappen/fc/fcr10.tfm differ Files old/fonts/tfm/jknappen/fc/fcr11.tfm and new/fonts/tfm/jknappen/fc/fcr11.tfm differ Files old/fonts/tfm/jknappen/fc/fcr12.tfm and new/fonts/tfm/jknappen/fc/fcr12.tfm differ Files old/fonts/tfm/jknappen/fc/fcr14.tfm and new/fonts/tfm/jknappen/fc/fcr14.tfm differ Files old/fonts/tfm/jknappen/fc/fcr17.tfm and new/fonts/tfm/jknappen/fc/fcr17.tfm differ Files old/fonts/tfm/jknappen/fc/fcr20.tfm and new/fonts/tfm/jknappen/fc/fcr20.tfm differ Files old/fonts/tfm/jknappen/fc/fcr25.tfm and new/fonts/tfm/jknappen/fc/fcr25.tfm differ Files old/fonts/tfm/jknappen/fc/fcr5.tfm and new/fonts/tfm/jknappen/fc/fcr5.tfm differ Files old/fonts/tfm/jknappen/fc/fcr6.tfm and new/fonts/tfm/jknappen/fc/fcr6.tfm differ Files old/fonts/tfm/jknappen/fc/fcr7.tfm and new/fonts/tfm/jknappen/fc/fcr7.tfm differ Files old/fonts/tfm/jknappen/fc/fcr8.tfm and new/fonts/tfm/jknappen/fc/fcr8.tfm differ Files old/fonts/tfm/jknappen/fc/fcr9.tfm and new/fonts/tfm/jknappen/fc/fcr9.tfm differ Files old/fonts/tfm/jknappen/fc/fcsibx10.tfm and new/fonts/tfm/jknappen/fc/fcsibx10.tfm differ Files old/fonts/tfm/jknappen/fc/fcsibx11.tfm and new/fonts/tfm/jknappen/fc/fcsibx11.tfm differ Files old/fonts/tfm/jknappen/fc/fcsibx12.tfm and new/fonts/tfm/jknappen/fc/fcsibx12.tfm differ Files old/fonts/tfm/jknappen/fc/fcsibx14.tfm and new/fonts/tfm/jknappen/fc/fcsibx14.tfm differ Files old/fonts/tfm/jknappen/fc/fcsibx17.tfm and new/fonts/tfm/jknappen/fc/fcsibx17.tfm differ Files old/fonts/tfm/jknappen/fc/fcsibx20.tfm and new/fonts/tfm/jknappen/fc/fcsibx20.tfm differ Files old/fonts/tfm/jknappen/fc/fcsibx25.tfm and new/fonts/tfm/jknappen/fc/fcsibx25.tfm differ Files old/fonts/tfm/jknappen/fc/fcsibx5.tfm and new/fonts/tfm/jknappen/fc/fcsibx5.tfm differ Files old/fonts/tfm/jknappen/fc/fcsibx6.tfm and new/fonts/tfm/jknappen/fc/fcsibx6.tfm differ Files old/fonts/tfm/jknappen/fc/fcsibx7.tfm and new/fonts/tfm/jknappen/fc/fcsibx7.tfm differ Files old/fonts/tfm/jknappen/fc/fcsibx8.tfm and new/fonts/tfm/jknappen/fc/fcsibx8.tfm differ Files old/fonts/tfm/jknappen/fc/fcsibx9.tfm and new/fonts/tfm/jknappen/fc/fcsibx9.tfm differ Files old/fonts/tfm/jknappen/fc/fcsitt10.tfm and new/fonts/tfm/jknappen/fc/fcsitt10.tfm differ Files old/fonts/tfm/jknappen/fc/fcsitt11.tfm and new/fonts/tfm/jknappen/fc/fcsitt11.tfm differ Files old/fonts/tfm/jknappen/fc/fcsitt12.tfm and new/fonts/tfm/jknappen/fc/fcsitt12.tfm differ Files old/fonts/tfm/jknappen/fc/fcsitt14.tfm and new/fonts/tfm/jknappen/fc/fcsitt14.tfm differ Files old/fonts/tfm/jknappen/fc/fcsitt17.tfm and new/fonts/tfm/jknappen/fc/fcsitt17.tfm differ Files old/fonts/tfm/jknappen/fc/fcsitt20.tfm and new/fonts/tfm/jknappen/fc/fcsitt20.tfm differ Files old/fonts/tfm/jknappen/fc/fcsitt25.tfm and new/fonts/tfm/jknappen/fc/fcsitt25.tfm differ Files old/fonts/tfm/jknappen/fc/fcsitt5.tfm and new/fonts/tfm/jknappen/fc/fcsitt5.tfm differ Files old/fonts/tfm/jknappen/fc/fcsitt6.tfm and new/fonts/tfm/jknappen/fc/fcsitt6.tfm differ Files old/fonts/tfm/jknappen/fc/fcsitt7.tfm and new/fonts/tfm/jknappen/fc/fcsitt7.tfm differ Files old/fonts/tfm/jknappen/fc/fcsitt8.tfm and new/fonts/tfm/jknappen/fc/fcsitt8.tfm differ Files old/fonts/tfm/jknappen/fc/fcsitt9.tfm and new/fonts/tfm/jknappen/fc/fcsitt9.tfm differ Files old/fonts/tfm/jknappen/fc/fcsl10.tfm and new/fonts/tfm/jknappen/fc/fcsl10.tfm differ Files old/fonts/tfm/jknappen/fc/fcsl11.tfm and new/fonts/tfm/jknappen/fc/fcsl11.tfm differ Files old/fonts/tfm/jknappen/fc/fcsl12.tfm and new/fonts/tfm/jknappen/fc/fcsl12.tfm differ Files old/fonts/tfm/jknappen/fc/fcsl14.tfm and new/fonts/tfm/jknappen/fc/fcsl14.tfm differ Files old/fonts/tfm/jknappen/fc/fcsl17.tfm and new/fonts/tfm/jknappen/fc/fcsl17.tfm differ Files old/fonts/tfm/jknappen/fc/fcsl20.tfm and new/fonts/tfm/jknappen/fc/fcsl20.tfm differ Files old/fonts/tfm/jknappen/fc/fcsl25.tfm and new/fonts/tfm/jknappen/fc/fcsl25.tfm differ Files old/fonts/tfm/jknappen/fc/fcsl5.tfm and new/fonts/tfm/jknappen/fc/fcsl5.tfm differ Files old/fonts/tfm/jknappen/fc/fcsl6.tfm and new/fonts/tfm/jknappen/fc/fcsl6.tfm differ Files old/fonts/tfm/jknappen/fc/fcsl7.tfm and new/fonts/tfm/jknappen/fc/fcsl7.tfm differ Files old/fonts/tfm/jknappen/fc/fcsl8.tfm and new/fonts/tfm/jknappen/fc/fcsl8.tfm differ Files old/fonts/tfm/jknappen/fc/fcsl9.tfm and new/fonts/tfm/jknappen/fc/fcsl9.tfm differ Files old/fonts/tfm/jknappen/fc/fcss10.tfm and new/fonts/tfm/jknappen/fc/fcss10.tfm differ Files old/fonts/tfm/jknappen/fc/fcss11.tfm and new/fonts/tfm/jknappen/fc/fcss11.tfm differ Files old/fonts/tfm/jknappen/fc/fcss12.tfm and new/fonts/tfm/jknappen/fc/fcss12.tfm differ Files old/fonts/tfm/jknappen/fc/fcss14.tfm and new/fonts/tfm/jknappen/fc/fcss14.tfm differ Files old/fonts/tfm/jknappen/fc/fcss17.tfm and new/fonts/tfm/jknappen/fc/fcss17.tfm differ Files old/fonts/tfm/jknappen/fc/fcss20.tfm and new/fonts/tfm/jknappen/fc/fcss20.tfm differ Files old/fonts/tfm/jknappen/fc/fcss25.tfm and new/fonts/tfm/jknappen/fc/fcss25.tfm differ Files old/fonts/tfm/jknappen/fc/fcss5.tfm and new/fonts/tfm/jknappen/fc/fcss5.tfm differ Files old/fonts/tfm/jknappen/fc/fcss6.tfm and new/fonts/tfm/jknappen/fc/fcss6.tfm differ Files old/fonts/tfm/jknappen/fc/fcss7.tfm and new/fonts/tfm/jknappen/fc/fcss7.tfm differ Files old/fonts/tfm/jknappen/fc/fcss8.tfm and new/fonts/tfm/jknappen/fc/fcss8.tfm differ Files old/fonts/tfm/jknappen/fc/fcss9.tfm and new/fonts/tfm/jknappen/fc/fcss9.tfm differ Files old/fonts/tfm/jknappen/fc/fcssbx10.tfm and new/fonts/tfm/jknappen/fc/fcssbx10.tfm differ Files old/fonts/tfm/jknappen/fc/fcssbx11.tfm and new/fonts/tfm/jknappen/fc/fcssbx11.tfm differ Files old/fonts/tfm/jknappen/fc/fcssbx12.tfm and new/fonts/tfm/jknappen/fc/fcssbx12.tfm differ Files old/fonts/tfm/jknappen/fc/fcssbx14.tfm and new/fonts/tfm/jknappen/fc/fcssbx14.tfm differ Files old/fonts/tfm/jknappen/fc/fcssbx17.tfm and new/fonts/tfm/jknappen/fc/fcssbx17.tfm differ Files old/fonts/tfm/jknappen/fc/fcssbx20.tfm and new/fonts/tfm/jknappen/fc/fcssbx20.tfm differ Files old/fonts/tfm/jknappen/fc/fcssbx25.tfm and new/fonts/tfm/jknappen/fc/fcssbx25.tfm differ Files old/fonts/tfm/jknappen/fc/fcssbx5.tfm and new/fonts/tfm/jknappen/fc/fcssbx5.tfm differ Files old/fonts/tfm/jknappen/fc/fcssbx6.tfm and new/fonts/tfm/jknappen/fc/fcssbx6.tfm differ Files old/fonts/tfm/jknappen/fc/fcssbx7.tfm and new/fonts/tfm/jknappen/fc/fcssbx7.tfm differ Files old/fonts/tfm/jknappen/fc/fcssbx8.tfm and new/fonts/tfm/jknappen/fc/fcssbx8.tfm differ Files old/fonts/tfm/jknappen/fc/fcssbx9.tfm and new/fonts/tfm/jknappen/fc/fcssbx9.tfm differ Files old/fonts/tfm/jknappen/fc/fcssi10.tfm and new/fonts/tfm/jknappen/fc/fcssi10.tfm differ Files old/fonts/tfm/jknappen/fc/fcssi11.tfm and new/fonts/tfm/jknappen/fc/fcssi11.tfm differ Files old/fonts/tfm/jknappen/fc/fcssi12.tfm and new/fonts/tfm/jknappen/fc/fcssi12.tfm differ Files old/fonts/tfm/jknappen/fc/fcssi14.tfm and new/fonts/tfm/jknappen/fc/fcssi14.tfm differ Files old/fonts/tfm/jknappen/fc/fcssi17.tfm and new/fonts/tfm/jknappen/fc/fcssi17.tfm differ Files old/fonts/tfm/jknappen/fc/fcssi20.tfm and new/fonts/tfm/jknappen/fc/fcssi20.tfm differ Files old/fonts/tfm/jknappen/fc/fcssi25.tfm and new/fonts/tfm/jknappen/fc/fcssi25.tfm differ Files old/fonts/tfm/jknappen/fc/fcssi5.tfm and new/fonts/tfm/jknappen/fc/fcssi5.tfm differ Files old/fonts/tfm/jknappen/fc/fcssi6.tfm and new/fonts/tfm/jknappen/fc/fcssi6.tfm differ Files old/fonts/tfm/jknappen/fc/fcssi7.tfm and new/fonts/tfm/jknappen/fc/fcssi7.tfm differ Files old/fonts/tfm/jknappen/fc/fcssi8.tfm and new/fonts/tfm/jknappen/fc/fcssi8.tfm differ Files old/fonts/tfm/jknappen/fc/fcssi9.tfm and new/fonts/tfm/jknappen/fc/fcssi9.tfm differ Files old/fonts/tfm/jknappen/fc/fcsstt10.tfm and new/fonts/tfm/jknappen/fc/fcsstt10.tfm differ Files old/fonts/tfm/jknappen/fc/fcsstt11.tfm and new/fonts/tfm/jknappen/fc/fcsstt11.tfm differ Files old/fonts/tfm/jknappen/fc/fcsstt12.tfm and new/fonts/tfm/jknappen/fc/fcsstt12.tfm differ Files old/fonts/tfm/jknappen/fc/fcsstt14.tfm and new/fonts/tfm/jknappen/fc/fcsstt14.tfm differ Files old/fonts/tfm/jknappen/fc/fcsstt17.tfm and new/fonts/tfm/jknappen/fc/fcsstt17.tfm differ Files old/fonts/tfm/jknappen/fc/fcsstt20.tfm and new/fonts/tfm/jknappen/fc/fcsstt20.tfm differ Files old/fonts/tfm/jknappen/fc/fcsstt25.tfm and new/fonts/tfm/jknappen/fc/fcsstt25.tfm differ Files old/fonts/tfm/jknappen/fc/fcsstt5.tfm and new/fonts/tfm/jknappen/fc/fcsstt5.tfm differ Files old/fonts/tfm/jknappen/fc/fcsstt6.tfm and new/fonts/tfm/jknappen/fc/fcsstt6.tfm differ Files old/fonts/tfm/jknappen/fc/fcsstt7.tfm and new/fonts/tfm/jknappen/fc/fcsstt7.tfm differ Files old/fonts/tfm/jknappen/fc/fcsstt8.tfm and new/fonts/tfm/jknappen/fc/fcsstt8.tfm differ Files old/fonts/tfm/jknappen/fc/fcsstt9.tfm and new/fonts/tfm/jknappen/fc/fcsstt9.tfm differ Files old/fonts/tfm/jknappen/fc/fctt10.tfm and new/fonts/tfm/jknappen/fc/fctt10.tfm differ Files old/fonts/tfm/jknappen/fc/fctt11.tfm and new/fonts/tfm/jknappen/fc/fctt11.tfm differ Files old/fonts/tfm/jknappen/fc/fctt12.tfm and new/fonts/tfm/jknappen/fc/fctt12.tfm differ Files old/fonts/tfm/jknappen/fc/fctt14.tfm and new/fonts/tfm/jknappen/fc/fctt14.tfm differ Files old/fonts/tfm/jknappen/fc/fctt17.tfm and new/fonts/tfm/jknappen/fc/fctt17.tfm differ Files old/fonts/tfm/jknappen/fc/fctt20.tfm and new/fonts/tfm/jknappen/fc/fctt20.tfm differ Files old/fonts/tfm/jknappen/fc/fctt25.tfm and new/fonts/tfm/jknappen/fc/fctt25.tfm differ Files old/fonts/tfm/jknappen/fc/fctt5.tfm and new/fonts/tfm/jknappen/fc/fctt5.tfm differ Files old/fonts/tfm/jknappen/fc/fctt6.tfm and new/fonts/tfm/jknappen/fc/fctt6.tfm differ Files old/fonts/tfm/jknappen/fc/fctt7.tfm and new/fonts/tfm/jknappen/fc/fctt7.tfm differ Files old/fonts/tfm/jknappen/fc/fctt8.tfm and new/fonts/tfm/jknappen/fc/fctt8.tfm differ Files old/fonts/tfm/jknappen/fc/fctt9.tfm and new/fonts/tfm/jknappen/fc/fctt9.tfm differ Files old/fonts/tfm/jknappen/fc/fcu10.tfm and new/fonts/tfm/jknappen/fc/fcu10.tfm differ Files old/fonts/tfm/jknappen/fc/fcu11.tfm and new/fonts/tfm/jknappen/fc/fcu11.tfm differ Files old/fonts/tfm/jknappen/fc/fcu12.tfm and new/fonts/tfm/jknappen/fc/fcu12.tfm differ Files old/fonts/tfm/jknappen/fc/fcu14.tfm and new/fonts/tfm/jknappen/fc/fcu14.tfm differ Files old/fonts/tfm/jknappen/fc/fcu17.tfm and new/fonts/tfm/jknappen/fc/fcu17.tfm differ Files old/fonts/tfm/jknappen/fc/fcu20.tfm and new/fonts/tfm/jknappen/fc/fcu20.tfm differ Files old/fonts/tfm/jknappen/fc/fcu25.tfm and new/fonts/tfm/jknappen/fc/fcu25.tfm differ Files old/fonts/tfm/jknappen/fc/fcu5.tfm and new/fonts/tfm/jknappen/fc/fcu5.tfm differ Files old/fonts/tfm/jknappen/fc/fcu6.tfm and new/fonts/tfm/jknappen/fc/fcu6.tfm differ Files old/fonts/tfm/jknappen/fc/fcu7.tfm and new/fonts/tfm/jknappen/fc/fcu7.tfm differ Files old/fonts/tfm/jknappen/fc/fcu8.tfm and new/fonts/tfm/jknappen/fc/fcu8.tfm differ Files old/fonts/tfm/jknappen/fc/fcu9.tfm and new/fonts/tfm/jknappen/fc/fcu9.tfm differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fc/fclfont.sty_old new/tex/latex/fc/fclfont.sty_old --- old/tex/latex/fc/fclfont.sty_old 2006-01-13 00:55:38.000000000 +0100 +++ new/tex/latex/fc/fclfont.sty_old 1970-01-01 01:00:00.000000000 +0100 @@ -1,341 +0,0 @@ -% This is FCLFONT.STY_OLD -\def\fileversion{v1.3} -\def\filedate{12-NOV-1994} -% -% (C) Copyright 1992, 1993, 1994 by J"org Knappen -% This file is part of the fc-package -% See fc.rme for more information -% -% J"org Knappen -% Institut f"ur Kernphysik -% Postfach 39 80 -% D-55099 Mainz -% knappen@vkpmzd.kph.uni-mainz.de -% -% Made by using dclfont.sty by Rainer Sch"opf and Frank Mittelbach -% -\immediate - \write\sixt@@n{Style-Option: `fclfont' \space - \fileversion\space <\filedate> (JK)} -\ifx\fontfamily\undefined - \let\fontfamily\family - \let\fontseries\series - \let\fontshape\shape - \let\fontsize\size -\fi -\def\newfont#1#2{\@ifdefinable#1{\global - \font#1=#2\relax}} -\def\symbol#1{\char #1\relax} -\def\@gobbletwo#1#2{} -\let\load\@gobbletwo -\def\@setsize#1#2#3#4{\@nomath#1% - \fontsize{#4}{#2}\selectfont} -\def\prm{\fontfamily\rmdefault\selectfont} -\def\psf{\fontfamily\sfdefault\selectfont} - -\def\psl{\fontshape\sldefault\selectfont} -\def\psc{\fontshape\scdefault\selectfont} -\def\pit{\fontshape\itdefault\selectfont} - -\def\pbf{\fontseries\bfdefault\selectfont} -\def\ptt{\fontseries\ttdefault\selectfont} -\def\em{\protect\pem} -\def\pem{\@nomath\em \ifdim \fontdimen\@ne\font >\z@ - \normalshape \else \it \fi} - \let\math@bgroup\begingroup - \def\math@egroup#1{#1\endgroup} - \ifx\lyfam\undefined - \new@mathgroup\lyfam - \define@mathgroup\mv@normal\lyfam - {lasy}{m}{n} - \define@mathgroup\mv@bold\lyfam - {lasy}{b}{n} - \edef\@tempa{\hexnumber@\lyfam} - \mathchardef\mho"0\@tempa 30 - \mathchardef\Join"3\@tempa 31 - \mathchardef\Box"0\@tempa 32 - \mathchardef\Diamond"0\@tempa 33 - \mathchardef\leadsto"3\@tempa 3B - \mathchardef\sqsubset"3\@tempa 3C - \mathchardef\sqsupset"3\@tempa 3D - \mathchardef\lhd"3\@tempa 01 - \mathchardef\unlhd"3\@tempa 02 - \mathchardef\rhd"3\@tempa 03 - \mathchardef\unrhd"3\@tempa 04 - \fi -\def\@accent@def#1#2#3{\expandafter\def - \csname @#1@\string#2@#1@\endcsname{#3}} -%grave -\def\`#1{\expandafter\ifx \csname @grave@\string#1@grave@\endcsname \relax - {\accent0 #1}\else \csname @grave@\string#1@grave@\endcsname\fi} -\let\@accii=\` -\@accent@def{grave}{e}{^^e8} -\@accent@def{grave}{o}{^^f2} -\@accent@def{grave}{E}{^^c8} -\@accent@def{grave}{O}{^^d2} -%acute -\def\'#1{\expandafter\ifx \csname @acute@\string#1@acute@\endcsname \relax - {\accent1 #1}\else \csname @acute@\string#1@acute@\endcsname\fi} -\let\@acci=\' -\@accent@def{acute}{n}{^^ab} -\@accent@def{acute}{e}{^^e9} -\@accent@def{acute}{m}{^^e4} -\@accent@def{acute}{N}{^^8b} -\@accent@def{acute}{E}{^^c9} -\@accent@def{acute}{M}{^^c4} -%check -\def\v#1{\expandafter\ifx \csname @check@\string#1@check@\endcsname \relax - {\accent7 #1}\else \csname @check@\string#1@check@\endcsname\fi} -\@accent@def{check}{e}{^^a5} -\@accent@def{check}{s}{^^b2} -\@accent@def{check}{o}{^^fc} -\@accent@def{check}{E}{^^85} -\@accent@def{check}{S}{^^92} -\@accent@def{check}{O}{^^dc} -%breve -\def\u#1{\expandafter\ifx \csname @breve@\string#1@breve@\endcsname \relax - {\accent8 #1}\else \csname @breve@\string#1@breve@\endcsname\fi} -%macron -\def\=#1{\expandafter\ifx \csname @macron@\string#1@macron@\endcsname \relax - {\accent9 #1}\else \csname @macron@\string#1@macron@\endcsname\fi} -\@accent@def{macron}{e}{^^ed} -\@accent@def{macron}{o}{^^fb} -\@accent@def{macron}{E}{^^cd} -\@accent@def{macron}{O}{^^db} -\let\@acciii=\= -%circumflex -\def\^#1{\expandafter\ifx \csname @circflx@\string#1@circflx@\endcsname \relax - {\accent2 #1}\else \csname @circflx@\string#1@circflx@\endcsname\fi} -%dot -\def\.#1{\expandafter\ifx \csname @dot@\string#1@dot@\endcsname \relax - {\accent10 #1}\else \csname @dot@\string#1@dot@\endcsname\fi} -\@accent@def{dot}{n}{^^b3} -\@accent@def{dot}{N}{^^93} -\@accent@def{dot}{o}{^^f3} -\@accent@def{dot}{e}{^^b8} -\@accent@def{dot}{O}{^^d3} -\@accent@def{dot}{E}{^^98} -\@accent@def{dot}{\i}{i} -\@accent@def{dot}{i}{i} -%Hungarian -\def\H#1{\expandafter\ifx \csname @Hung@\string#1@Hung@\endcsname \relax - {\accent5 #1}\else \csname @Hung@\string#1@Hung@\endcsname\fi} -%ring above -\def\r#1{\expandafter\ifx \csname @ring@\string#1@ring@\endcsname \relax - {\accent6 #1}\else \csname @ring@\string#1@ring@\endcsname\fi} -%tilde -\def\~#1{\expandafter\ifx \csname @tilde@\string#1@tilde@\endcsname \relax - {\accent3 #1}\else \csname @tilde@\string#1@tilde@\endcsname\fi} -\@accent@def{tilde}{a}{^^e3} -\@accent@def{tilde}{n}{^^f1} -\@accent@def{tilde}{o}{^^f5} -\@accent@def{tilde}{e}{^^ee} -\@accent@def{tilde}{^^a2}{^^e2} % open e -\@accent@def{tilde}{^^aa}{^^e5} % open o -\@accent@def{tilde}{i}{^^ef} -\@accent@def{tilde}{\i}{^^ef} -\@accent@def{tilde}{u}{^^fe} -\@accent@def{tilde}{E}{^^ce} -\@accent@def{tilde}{^^82}{^^c2} -\@accent@def{tilde}{^^8a}{^^c5} -\@accent@def{tilde}{I}{^^cf} -\@accent@def{tilde}{A}{^^c3} -\@accent@def{tilde}{N}{^^d1} -\@accent@def{tilde}{O}{^^d5} -\@accent@def{tilde}{U}{^^de} -%Umlaut -\def\"#1{\expandafter\ifx \csname @Umlaut@\string#1@Umlaut@\endcsname \relax - {\accent4 #1}\else \csname @Umlaut@\string#1@Umlaut@\endcsname\fi} -\@accent@def{Umlaut}{e}{^^eb} -\@accent@def{Umlaut}{o}{^^f6} -\@accent@def{Umlaut}{E}{^^cb} -\@accent@def{Umlaut}{O}{^^d6} -% -\def\pd#1{\null\oalign{#1\crcr\hidewidth.\hidewidth}} -\def\pb#1{\null\oalign{#1\crcr\hidewidth - \vbox to.2ex{\hbox{\char9}\vss}\hidewidth}} -% inserted \null to allow \d{} and \b{} -- was a bug in plain.tex -% ogonek (or kvist or polish hook) -\def\pk#1{\expandafter\ifx \csname @kvist@\string#1@kvist@\endcsname \relax - \kv@st#1\else \csname @kvist@\string#1@kvist@\endcsname\fi} -\def\kv@st#1{\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent12 #1% - \else{\ooalign{\hidewidth\char12\hidewidth\crcr\unhbox\z@}}\fi} -\def\k#1{\protect\pk#1} -% cedilla -\def\pc#1{\expandafter\ifx \csname @cedilla@\string#1@cedilla@\endcsname \relax - \c@dilla#1\else \csname @cedilla@\string#1@cedilla@\endcsname\fi} -\@accent@def{cedilla}{c}{^^e7} -\@accent@def{cedilla}{C}{^^c7} -\def\c@dilla#1{\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1% - \else{\ooalign{\hidewidth\char11\hidewidth\crcr\unhbox\z@}}\fi} -\def\c#1{\protect\pc#1} -% line below -\def\b#1{\expandafter\ifx \csname @uline@\string#1@uline@\endcsname \relax - \protect\pb#1\else \csname @uline@\string#1@uline@\endcsname \fi} -\@accent@def{uline}{e}{^^ec} -\@accent@def{uline}{o}{^^fa} -\@accent@def{uline}{n}{^^b4} -\@accent@def{uline}{E}{^^cc} -\@accent@def{uline}{O}{^^da} -\@accent@def{uline}{N}{^^94} -% dot below -\def\d#1{\expandafter\ifx \csname @dotu@\string#1@dotu@\endcsname \relax - \protect\pd#1\else \csname @dotu@\string#1@dotu@\endcsname \fi} -\@accent@def{dotu}{e}{^^b9} -\@accent@def{dotu}{i}{^^e1} -\@accent@def{dotu}{o}{^^f9} -\@accent@def{dotu}{s}{^^b5} -\@accent@def{dotu}{u}{^^fd} -\@accent@def{dotu}{E}{^^99} -\@accent@def{dotu}{I}{^^c1} -\@accent@def{dotu}{O}{^^d9} -\@accent@def{dotu}{S}{^^95} -\@accent@def{dotu}{U}{^^dd} -%%% \chardef\aa="0E5 -\def\aa{\accent6 a} -\chardef\ae="0E6 -\def\l{^^dfl} -\chardef\oe="0F7 -\chardef\o="0F8 -\chardef\ss="0FF -\def\SS{SS} -%%%% \chardef\AA="0C5 -\def\AA{\accent6 A} -\chardef\AE="0C6 -\def\L{^^dfL} -\chardef\OE="0D7 -\chardef\O="0D8 -\chardef\i="19 -\chardef\j="1A -% \def\pounds (see below) -\def\hbar{{\mathchar'11\mkern-9muh}} - -\def\letter#1#2{\catcode`#1=11 \catcode`#2=11 % - \uccode`#1=`#1 \lccode`#1=`#2 \sfcode`#1=999 % - \lccode`#2=`#2 \uccode`#2=`#1 \sfcode`#2=1000 } -% #1 is the uppercase, #2 the lowercase member of a pair -\letter{^^80}{^^a0} -\letter{^^81}{^^a1} -\letter{^^82}{^^a2} -\letter{^^83}{^^a3} -\letter{^^84}{^^a4} -\letter{^^85}{^^a5} -\letter{^^86}{^^a6} -\letter{^^87}{^^a7} -\letter{^^88}{^^a8} -\letter{^^89}{^^a9} -\letter{^^8a}{^^aa} -\letter{^^8b}{^^ab} -\letter{^^8c}{^^ac} -\letter{^^8d}{^^ad} -\letter{^^8e}{^^ae} -\letter{^^8f}{^^af} -\letter{^^90}{^^b0} -\letter{^^91}{^^b1} -\letter{^^92}{^^b2} -\letter{^^93}{^^b3} -\letter{^^94}{^^b4} -\letter{^^95}{^^b5} -\letter{^^96}{^^b6} -\letter{^^97}{^^b7} -\letter{^^98}{^^b8} -\letter{^^99}{^^b9} -\letter{^^9a}{^^ba} -\letter{^^9b}{^^bb} -\catcode`\^^9e=11 \lccode`\^^9e=`^^9e \uccode`\^^9e=`^^d0 \sfcode`\^^9e=999 % -% crossed d -\catcode`\^^9f=12 % -\catcode`\^^bc=12 % -\catcode`\^^bd=12 % -\catcode`\^^be=12 % -\catcode`\^^bf=12 % -\letter{^^c0}{^^e0} -\letter{^^c1}{^^e1} -\letter{^^c2}{^^e2} -\letter{^^c3}{^^e3} -\letter{^^c4}{^^e4} -\letter{^^c5}{^^e5} -\letter{^^c6}{^^e6} -\letter{^^c7}{^^e7} -\letter{^^c8}{^^e8} -\letter{^^c9}{^^e9} -\letter{^^ca}{^^ea} -\letter{^^cb}{^^eb} -\letter{^^cc}{^^ec} -\letter{^^cd}{^^ed} -\letter{^^ce}{^^ee} -\letter{^^cf}{^^ef} -\letter{^^d0}{^^f0} -\letter{^^d1}{^^f1} -\letter{^^d2}{^^f2} -\letter{^^d3}{^^f3} -\letter{^^d4}{^^f4} -\letter{^^d5}{^^f5} -\letter{^^d6}{^^f6} -\letter{^^d7}{^^f7} -\letter{^^d8}{^^f8} -\letter{^^d9}{^^f9} -\letter{^^da}{^^fa} -\letter{^^db}{^^fb} -\letter{^^dc}{^^fc} -\letter{^^dd}{^^fd} -\letter{^^de}{^^fe} -\catcode`\^^df=11 \lccode`\^^df=`^^df \uccode`\^^df=`^^df \sfcode`\^^df=999 % -\catcode`\^^ff=11 \lccode`\^^ff=`^^ff \uccode`\^^ff=`^^ff \sfcode`\^^ff=999 % -% cross piece for polish l and scharfes s -\catcode`\^^19=11 \lccode`\^^19=`^^19 \uccode`\^^19=`I % dotless i -\catcode`\^^1a=11 \lccode`\^^1a=`^^1a \uccode`\^^1a=`J % dotless j - -\define@mathgroup\mv@normal{0}{cmr}{m}{n} -\define@mathgroup\mv@bold{0}{cmr}{bx}{n} -\begingroup - \catcode`\= 11 - \gdef\mathrm{\use@mathgroup \=cmr \z@} -\endgroup -\def\rmdefault{fcr} -\def\sfdefault{fcss} -%\def\ttdefault{fctt} -\def\ttdefault{tt} - \ifx\greek@group\undefined - \new@mathgroup\greek@group - \define@mathgroup\mv@normal\greek@group{cmr}{m}{n} - \define@mathgroup\mv@bold\greek@group{cmr}{bx}{n} - \edef\@tempa{\hexnumber@\greek@group} - \mathchardef\Gamma="0\@tempa00 - \mathchardef\Delta="0\@tempa01 - \mathchardef\Theta="0\@tempa02 - \mathchardef\Lambda="0\@tempa03 - \mathchardef\Xi="0\@tempa04 - \mathchardef\Pi="0\@tempa05 - \mathchardef\Sigma="0\@tempa06 - \mathchardef\Upsilon="0\@tempa07 - \mathchardef\Phi="0\@tempa08 - \mathchardef\Psi="0\@tempa09 - \mathchardef\Omega="0\@tempa0A - \fi - \expandafter\ifx\csname fcr/m/n\endcsname\relax - \@input{fontdef.fc}\fi -\def\acute{\mathaccent"7001 } -\def\grave{\mathaccent"7000 } -\def\ddot{\mathaccent"7004 } -\def\tilde{\mathaccent"7003 } -\def\bar{\mathaccent"7009 } -\def\breve{\mathaccent"7008 } -\def\check{\mathaccent"7007 } -\def\hat{\mathaccent"7002 } -\def\vec{\mathaccent"017E } -\def\dot{\mathaccent"700A } -%% From lfonts.new -%% \changes{v1.1e}{90/01/25}{Completely redefined.} -\def\${\protect\pdollar} -\def\pdollar{\text{\ifdim \fontdimen\@ne\font >\z@ - \sl \else \normalshape \fi\char`\$}} -\def\pounds{{\protect\ppounds}} -\def\ppounds{\text{\ifdim \fontdimen\@ne\font >\z@ - \it \else \fontshape u\selectfont \fi \char'44}} -%% \changes{v1.1e}{90/01/25}{Macro added.} -%% \changes{v1.1k}{90/06/23}{Changed to `mbox.} -\def\text{\mbox} -\endinput -%% -%% End of file `fclfont.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fc.tlpobj new/tlpkg/tlpobj/fc.tlpobj --- old/tlpkg/tlpobj/fc.tlpobj 2010-06-10 18:27:29.000000000 +0200 +++ new/tlpkg/tlpobj/fc.tlpobj 2014-01-27 03:22:54.000000000 +0100 @@ -1,13 +1,13 @@ name fc category Package -revision 15878 +revision 32796 shortdesc Fonts for African languages. relocated 1 -longdesc The fonts are provided as MetaFont source, in the familiar +longdesc The fonts are provided as Metafont source, in the familiar longdesc arrangement of lots of (autogenerated) preamble files and a longdesc modest set of glyph specifications. (A similar arrangement longdesc appears in the ec and lh font bundles.) -runfiles size=594 +runfiles size=591 RELOC/fonts/source/jknappen/fc/b-fcbx.mf RELOC/fonts/source/jknappen/fc/b-fcbxi.mf RELOC/fonts/source/jknappen/fc/b-fcbxsl.mf @@ -487,7 +487,6 @@ RELOC/fonts/tfm/jknappen/fc/fcu8.tfm RELOC/fonts/tfm/jknappen/fc/fcu9.tfm RELOC/tex/latex/fc/fclfont.sty - RELOC/tex/latex/fc/fclfont.sty_old RELOC/tex/latex/fc/fcuse.sty RELOC/tex/latex/fc/t4cmr.fd RELOC/tex/latex/fc/t4cmss.fd @@ -496,6 +495,6 @@ RELOC/tex/latex/fc/t4fcr.fd RELOC/tex/latex/fc/t4phonet.sty catalogue-ctan /fonts/jknappen/fc -catalogue-date 2009-08-26 22:28:30 +0200 +catalogue-date 2012-05-29 13:27:24 +0200 catalogue-license gpl2 catalogue-version 1.4 ++++++ featpost.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-i/featpost.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-i.new/featpost.doc.tar.xz differ: char 25, line 1 ++++++ featpost.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metapost/featpost/featpost3Dplus2D.mp new/metapost/featpost/featpost3Dplus2D.mp --- old/metapost/featpost/featpost3Dplus2D.mp 2012-04-17 00:46:29.000000000 +0200 +++ new/metapost/featpost/featpost3Dplus2D.mp 2013-08-05 01:27:56.000000000 +0200 @@ -7,7 +7,7 @@ % P. J�rgensen % S. Pakin % -% Copyright (C) 2012 +% Copyright (C) 2013 % This set of macros adds a lot of features to % the MetaPost language and eases the production of @@ -23,7 +23,7 @@ % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the % GNU General Public License for more details. - message "Preloading FeatPost macros, version 0.8.6"; + message "Preloading FeatPost macros, version 0.8.7"; warningcheck := 0; background := 0.987white; @@ -64,9 +64,6 @@ % Can't have both true SphericalDistortion := false; % Kind of lens % - ShadowOn := false; % Some objects may block the light and - HoriZon := 0; % cast a shadow on a horizontal plane at this Z - VGAborder := (182.05,210.00)-- % This definition assumes (412.05,210.00)-- % ShiftV = 105.00mm(1,1) (412.05,382.05)-- % Use: gs -r200 and you @@ -83,7 +80,9 @@ SubColor := 0.35white; % fillfacewithlight LightSource := 10*(4,-3,4); % This also OverRidePolyhedricColor:=false; % And also this - + ShadowOn := false; % Some objects may block the light and + HoriZon := 0; % cast a shadow on a horizontal plane at this Z + TableC0 := 0.85white; % grey %% G N U P L O T TableC1 := red; % red %% TableC2 := ( 0.2, 0.2, 1.0 ); % blue %% colors @@ -107,8 +106,8 @@ Nobjects := 0; % getready and doitnow - TDAtiplen := 0.05; % tdarrow - TDAhalftipbase := 0.02; % Three-Dimensional + TDAtiplen := 0.05; % tdarrow and tdcircarrow + TDAhalftipbase := 0.02; % Three-Dimensional (Circular) TDAhalfthick := 0.01; % Arrow NCL := 0; % closedline @@ -240,7 +239,7 @@ enddef; % The following routine is used by circularsheet and may be used to -% rotate vectors elliptically. +% rotate vectors elliptically. Also used by tdcircarrow. vardef planarrotation( expr VecX, VecY, TheAngle ) = ( VecX*cosd( TheAngle ) + VecY*sind( TheAngle ) ) @@ -664,7 +663,7 @@ endgroup enddef; -% 3D arrow. +% 3D straight arrow. def tdarrow(expr FromPos, ToTip ) = begingroup @@ -695,6 +694,41 @@ endgroup enddef; +% 3D circular arrow. + + def tdcircarrow(expr CenterPos, AngulMom, Ray, StartAngle, Amplituda ) = + begingroup + save veca, vecb, vecc, vecd, a, b, c, d, p, stepa, numa, anga, angb; + save signus, ca, da, i; + color veca, vecb, vecc, vecd; + pair a, b, c, d, ca, da, aa; + numeric stepa, numa, anga, angb, signus, i; + path p; + signus = Amplituda/abs(Amplituda); + stepa = 6signus; %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% DANGER. + vecd = ncrossprod( CenterPos-f, AngulMom ); + vecc = ncrossprod( vecd, AngulMom ); + anga = signus*180*(TDAhalfthick/TDAhalftipbase)*TDAtiplen/(3.14159*Ray); + angb = signus*180*TDAtiplen/(3.14159*Ray); + numa = StartAngle+Amplituda; + a = rp(Ray*planarrotation(vecc,vecd,StartAngle+anga)); + b = rp(Ray*planarrotation(vecc,vecd,numa+angb)); + c = rp((Ray+TDAhalftipbase)*planarrotation(vecc,vecd,numa)); + d = rp((Ray-TDAhalftipbase)*planarrotation(vecc,vecd,numa)); + ca = rp((Ray+TDAhalfthick)*planarrotation(vecc,vecd,numa)); + da = rp((Ray-TDAhalfthick)*planarrotation(vecc,vecd,numa)); + aa = rp((Ray-TDAhalfthick)*planarrotation(vecc,vecd,StartAngle)); + p = for i=StartAngle step stepa until numa: + rp((Ray+TDAhalfthick)*planarrotation(vecc,vecd,i)).. + endfor ca--c--b--d--da.. + for i=numa-stepa step -stepa until StartAngle: + rp((Ray-TDAhalfthick)*planarrotation(vecc,vecd,i)).. + endfor aa--a--cycle; + unfill p; + draw p + endgroup + enddef; + % Draw lines with a better expression of three-dimensionality. def emptyline(expr JoinP,ThickenFactor,OutCol,InCol,theN,EmptyFrac,sN)(text LinFunc) = @@ -834,7 +868,7 @@ begingroup save ind; numeric ind; - ( for ind=1 upto 36: + ( for ind=0 upto 35: rp( CenterPos+planarrotation(OneAxe,OtherAxe,ind*10) )... endfor cycle ) endgroup @@ -1387,7 +1421,11 @@ enddef; % Probably the last algorithm I'm going to write for featpost... -% Wrong. The last is ultraimprovertex. +% Wrong. The last is ultraimprovertex. +% Wrong again. The last is necplusimprovertex. +% And again wrong. The last is tdcircarrow. +% Well, what can I say, really the last is ellipsoid. +% Wait! It is torushadow! def spheroidshadow( expr CentrPoi, NorthPoleVec, Ray ) = begingroup @@ -1490,6 +1528,78 @@ endgroup enddef; +% Another brute-force algorythm. It's advisable to use three orthogonal axes. + + def ellipsoid( expr Centr, AxOne, AxTwo, AxThr ) = + begingroup + save count, i, j, axx, axy, cyc, cy, di, leng; + numeric count, i, j, leng; + color axx, axy, di[]; + path cy, cyc[]; + di1 = AxOne; + di2 = AxTwo; + di3 = AxThr; + count = 0; + for i=1 upto 3: + if i=1: + axx := di2; + axy := di3; + elseif i=2: + axx := di1; + axy := di3; + else: + axx := di1; + axy := di2; + fi; + for j=5 step 10 until 175: + cyc[incr(count)] = ellipticpath( Centr, di[i], + Centr + planarrotation( axx, axy, j ) ); + endfor; + endfor; + cy = cyc1; + for i=2 upto count-1: + cy := twocyclestogether( cy, cyc[i] ); + endfor; + leng = (length cy) - 1; + ( point 0 of cy for i = 1 upto leng: ..point i of cy endfor ..cycle ) + endgroup + enddef; + + def ellipsoidshadow( expr Centr, AxOne, AxTwo, AxThr ) = + begingroup + save count, i, j, axx, axy, cyc, cy, di, leng; + numeric count, i, j, leng; + color axx, axy, di[]; + path cy, cyc[]; + di1 = AxOne; + di2 = AxTwo; + di3 = AxThr; + count = 0; + for i=1 upto 3: + if i=1: + axx := di2; + axy := di3; + elseif i=2: + axx := di1; + axy := di3; + else: + axx := di1; + axy := di2; + fi; + for j=5 step 10 until 175: + cyc[incr(count)] = ellipticshadowpath( Centr, di[i], + Centr + planarrotation( axx, axy, j ) ); + endfor; + endfor; + cy = cyc1; + for i=2 upto count-1: + cy := twocyclestogether( cy, cyc[i] ); + endfor; + leng = (length cy) - 1; + ( point 0 of cy for i = 1 upto leng: ..point i of cy endfor ..cycle ) + endgroup + enddef; + % You can't see through this hole. f must not be on the hole axis. % Not yet documented because "buildcycle" doesn't work properly. @@ -1761,6 +1871,9 @@ save tmoment; color tmoment; angstep= 4; %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% DANGER! + if ShadowOn: + torushadow( Tcenter, Tmoment, Bray, Sray ); + fi; viewline = f-Tcenter; if cdotprod( viewline, Tmoment ) < 0: tmoment = -Tmoment; @@ -1872,6 +1985,28 @@ endgroup enddef; +% The shadow of a torus + + def torushadow( expr Tcenter, Tmoment, Bray, Sray ) = + begingroup + save theplace, viewline, tmoment, refpair, sideaxe, nearaxe, i; + color theplace, viewline, tmoment, refpair, sideaxe, nearaxe; + numeric i; + viewline = f-Tcenter; + if cdotprod( viewline, Tmoment ) < 0: + tmoment = -Tmoment; + else: + tmoment = Tmoment; + fi; + sideaxe = Bray*ncrossprod( tmoment, viewline ); + nearaxe = Bray*ncrossprod( sideaxe, tmoment ); + for i=1 upto 60: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% DANGER! + theplace := Tcenter + planarrotation( sideaxe, nearaxe, 6i ); %% + fill rigorousfearshadowpath( theplace, Sray ); + endfor; + endgroup + enddef; + % Take a "quarter" of a donut % (no longer under construction but contains a bug). @@ -3615,37 +3750,117 @@ enddef; % The approximation of the intersection of a plane, an infinite cylinder (tube) -% and a spheroid +% and a spheroid (an oblate spheroid, a prolate spheroid or a perfect sphere) def ultraimprovertex( expr PlanPoi, PlanDir, BaseCenter, Radius, LenVec, CentrPoi, NorthPoleVec, Ray, IniV ) = begingroup save trypoi, auxa, auxb, auxc, auxd, plandi, cyldi, factry, focn, focs; - save norpoldi, major; + save norpoldi, major, majortmp, nordi, tmpdi; color trypoi, auxa, auxb, auxc, auxd, plandi, cyldi, focn, focs; - color norpoldi; - numeric factry, major; + color norpoldi, nordi, tmpdi; + numeric factry, major, majortmp; trypoi = IniV; factry = 0.25; plandi = N(PlanDir); cyldi = N(LenVec); norpoldi = N(NorthPoleVec); major = conorm(NorthPoleVec); - focn = CentrPoi+(major+-+Ray)*norpoldi; - focs = CentrPoi-(major+-+Ray)*norpoldi; + if major>Ray: + focn := CentrPoi+(major+-+Ray)*norpoldi; + focs := CentrPoi-(major+-+Ray)*norpoldi; + fi; for j=1 upto 50: + if major<Ray: + tmpdi := trypoi-CentrPoi; + nordi := N(tmpdi-cdotprod(tmpdi,norpoldi)*norpoldi); + focn := CentrPoi+(Ray+-+major)*nordi; + focs := CentrPoi-(Ray+-+major)*nordi; + elseif major=Ray: + focn := CentrPoi; + focs := CentrPoi; + fi; auxa := plandi*cdotprod(PlanPoi-trypoi,plandi); auxb := cyldi*cdotprod(trypoi-BaseCenter,cyldi)-trypoi+BaseCenter; auxb := N(auxb)*(conorm(auxb)-Radius); auxc := focn-trypoi; auxd := focs-trypoi; - auxc := N(auxc+auxd)*(conorm(auxc)+conorm(auxd)-2*major); + if major>Ray: + auxc := (N(auxc)+N(auxd))*(conorm(auxc)+conorm(auxd)-2*major); + else: + auxc := (N(auxc)+N(auxd))*(conorm(auxc)+conorm(auxd)-2*Ray); + fi; trypoi := trypoi+factry*(auxa+auxb+auxc); endfor; ( trypoi ) endgroup enddef; +% The approximation of the intersection of a plane and two prolate spheroids + + def necplusimprovertex( expr PlanPoi, PlanDir, + CentrPoiA, NorthPoleVecA, RayA, + CentrPoiB, NorthPoleVecB, RayB, IniV ) = + begingroup + save trypoi, auxa, auxb, auxc, auxd, plandi, factry, focni, focsi; + save norpoldi, norpoldj, maior, major, focnj, focsj, auxe; + color trypoi, auxa, auxb, auxc, auxd, plandi, focni, focsi, focnj, focsj; + color norpoldi, norpoldj, auxe; + numeric factry, maior, major; + trypoi = IniV; + factry = 0.25; + plandi = N(PlanDir); + norpoldi = N(NorthPoleVecA); + maior = conorm(NorthPoleVecA); + norpoldj = N(NorthPoleVecB); + major = conorm(NorthPoleVecB); + focni = CentrPoiA+(maior+-+RayA)*norpoldi; + focsi = CentrPoiA-(maior+-+RayA)*norpoldi; + focnj = CentrPoiB+(major+-+RayB)*norpoldj; + focsj = CentrPoiB-(major+-+RayB)*norpoldj; + for j=1 upto 50: + auxa := plandi*cdotprod(PlanPoi-trypoi,plandi); + auxb := focni-trypoi; + auxe := focsi-trypoi; + auxc := focnj-trypoi; + auxd := focsj-trypoi; + auxb := (N(auxb)+N(auxe))*(conorm(auxb)+conorm(auxe)-2*maior); + auxc := (N(auxc)+N(auxd))*(conorm(auxc)+conorm(auxd)-2*major); + trypoi := trypoi+factry*(auxa+auxb+auxc); + endfor; + ( trypoi ) + endgroup + enddef; + +% The approximation of the intersection of a straight line and +% one prolate spheroid + + def intersectprolatespheroid( expr CentrPoi, NorthPoleVec, Ray, + LinePoi, LineDir ) = + begingroup + save trypoi, factry, linedi, norpol, focn, focs, maior, j; + save auxa, auxb, auxc, auxd; + color trypoi, linedi, norpol, focn, focs; + color auxa, auxb, auxc, auxd; + numeric factry, maior, j; + trypoi = LinePoi; + factry = 0.25; + linedi = N(LineDir); + norpol = N(NorthPoleVec); + maior = conorm(NorthPoleVec); + focn = CentrPoi+(maior+-+Ray)*norpol; + focs = CentrPoi-(maior+-+Ray)*norpol; + for j=1 upto 50: + auxb := focn-trypoi; + auxd := focs-trypoi; + auxa := (N(auxb)+N(auxd))*(conorm(auxb)+conorm(auxd)-2*maior); + auxc := linedi*cdotprod(auxa,linedi); + trypoi := trypoi+factry*auxc; + endfor; + ( trypoi ) + endgroup + enddef; + % Minimization routine for scalar functions like y=f(x) where an initial % triplet (x1,x2,x3) with x1<x2<x3 is given as a parabolic squeleton that % provides a way to search for the smallest value of y (if iterated) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/featpost.tlpobj new/tlpkg/tlpobj/featpost.tlpobj --- old/tlpkg/tlpobj/featpost.tlpobj 2013-03-12 04:36:54.000000000 +0100 +++ new/tlpkg/tlpobj/featpost.tlpobj 2013-08-05 03:19:24.000000000 +0200 @@ -1,15 +1,15 @@ name featpost category Package -revision 29349 +revision 31346 shortdesc MetaPost macros for 3D. relocated 1 longdesc These macros allow the production of three-dimensional schemes longdesc containing: angles, circles, cylinders, cones and spheres, longdesc among other things. -runfiles size=33 +runfiles size=35 RELOC/metapost/featpost/featpost.mp RELOC/metapost/featpost/featpost3Dplus2D.mp catalogue-ctan /graphics/metapost/contrib/macros/featpost -catalogue-date 2012-05-08 21:36:46 +0200 +catalogue-date 2013-07-31 08:21:57 +0200 catalogue-license gpl -catalogue-version 0.8.6 +catalogue-version 0.8.7 ++++++ fifinddo-info.source.tar.xz ++++++ ++++++ findhyph.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/findhyph.1 new/texmf-dist/doc/man/man1/findhyph.1 --- old/texmf-dist/doc/man/man1/findhyph.1 2012-11-23 23:47:22.000000000 +0100 +++ new/texmf-dist/doc/man/man1/findhyph.1 2013-06-25 01:47:34.000000000 +0200 @@ -124,13 +124,13 @@ .\" ======================================================================== .\" .IX Title "FINDHYPH 1" -.TH FINDHYPH 1 "2012-11-21" "perl v5.10.1" "" +.TH FINDHYPH 1 "2013-06-18" "perl v5.10.1" "" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l .nh .SH "NAME" -\&\fBfindhyph\fR \*(-- find words hyphenated by TeX in a document +\&\fBfindhyph\fR \- find words hyphenated by TeX in a document .SH "INSTALLATION" .IX Header "INSTALLATION" Copy \fBfindhyph\fR or \fBfindhyph.bat\fR (depending on \s-1OS\s0 used) to a directory @@ -138,6 +138,10 @@ \&\f(CW\*(C`/usr/bin/\*(C'\fR for Unix-like systems or in \s-1PATH\s0 when using \fBfindhyph.bat\fR. .SH "SYNOPSIS" .IX Header "SYNOPSIS" +\&\fBfindhyph [options]\fR \fIfoo.log\fR +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +To use this program: .IP "1)" 4 .IX Item "1)" set \f(CW\*(C`\etracingparagraphs=1\*(C'\fR in a TeX document \fIfoo.tex\fR and run: @@ -236,6 +240,11 @@ .IP "\(bu" 4 improved example definition of the \f(CW\*(C`\esetlooseness\*(C'\fR macro (thanks to Karl Berry) +.PP +3.3 (2013\-06\-18) +.IX Subsection "3.3 (2013-06-18)" +.IP "\(bu" 4 +fixed the manual page as suggested by Eric S. Raymond .SH "LICENSE" .IX Header "LICENSE" This program is free software; you can redistribute it and/or modify Files old/texmf-dist/doc/man/man1/findhyph.man1.pdf and new/texmf-dist/doc/man/man1/findhyph.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/findhyph/findhyph.bat new/texmf-dist/doc/support/findhyph/findhyph.bat --- old/texmf-dist/doc/support/findhyph/findhyph.bat 2012-11-23 23:47:22.000000000 +0100 +++ new/texmf-dist/doc/support/findhyph/findhyph.bat 2013-06-25 01:47:34.000000000 +0200 @@ -220,7 +220,7 @@ =head1 NAME -B<findhyph> -- find words hyphenated by TeX in a document +B<findhyph> - find words hyphenated by TeX in a document =head1 INSTALLATION @@ -230,6 +230,13 @@ =head1 SYNOPSIS +B<findhyph [options]> F<foo.log> + + +=head1 DESCRIPTION + +To use this program: + =over 4 =item 1) @@ -386,6 +393,16 @@ =back +=head4 3.3 (2013-06-18) + +=over 4 + +=item * + +fixed the manual page as suggested by Eric S. Raymond + +=back + =head1 LICENSE This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/findhyph/findhyph.txt new/texmf-dist/doc/support/findhyph/findhyph.txt --- old/texmf-dist/doc/support/findhyph/findhyph.txt 2012-11-23 23:47:22.000000000 +0100 +++ new/texmf-dist/doc/support/findhyph/findhyph.txt 2013-06-25 01:47:34.000000000 +0200 @@ -1,5 +1,5 @@ NAME - findhyph -- find words hyphenated by TeX in a document + findhyph - find words hyphenated by TeX in a document INSTALLATION Copy findhyph or findhyph.bat (depending on OS used) to a directory @@ -7,6 +7,11 @@ "/usr/bin/" for Unix-like systems or in PATH when using findhyph.bat. SYNOPSIS + findhyph [options] foo.log + +DESCRIPTION + To use this program: + 1) set "\tracingparagraphs=1" in a TeX document foo.tex and run: 2) tex foo.tex @@ -90,6 +95,9 @@ * improved example definition of the "\setlooseness" macro (thanks to Karl Berry) + 3.3 (2013-06-18) + * fixed the manual page as suggested by Eric S. Raymond + LICENSE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/findhyph.doc.tlpobj new/tlpkg/tlpobj/findhyph.doc.tlpobj --- old/tlpkg/tlpobj/findhyph.doc.tlpobj 2013-04-08 21:25:41.000000000 +0200 +++ new/tlpkg/tlpobj/findhyph.doc.tlpobj 2013-06-25 03:21:44.000000000 +0200 @@ -1,6 +1,6 @@ name findhyph.doc category Package -revision 29725 +revision 30915 shortdesc doc files of findhyph docfiles size=11 texmf-dist/doc/man/man1/findhyph.1 ++++++ findhyph.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/findhyph/findhyph new/texmf-dist/scripts/findhyph/findhyph --- old/texmf-dist/scripts/findhyph/findhyph 2012-11-23 23:47:22.000000000 +0100 +++ new/texmf-dist/scripts/findhyph/findhyph 2013-06-25 01:47:34.000000000 +0200 @@ -207,7 +207,7 @@ =head1 NAME -B<findhyph> -- find words hyphenated by TeX in a document +B<findhyph> - find words hyphenated by TeX in a document =head1 INSTALLATION @@ -217,6 +217,13 @@ =head1 SYNOPSIS +B<findhyph [options]> F<foo.log> + + +=head1 DESCRIPTION + +To use this program: + =over 4 =item 1) @@ -373,6 +380,16 @@ =back +=head4 3.3 (2013-06-18) + +=over 4 + +=item * + +fixed the manual page as suggested by Eric S. Raymond + +=back + =head1 LICENSE This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/findhyph.tlpobj new/tlpkg/tlpobj/findhyph.tlpobj --- old/tlpkg/tlpobj/findhyph.tlpobj 2013-04-08 21:25:41.000000000 +0200 +++ new/tlpkg/tlpobj/findhyph.tlpobj 2013-06-25 03:21:45.000000000 +0200 @@ -1,6 +1,6 @@ name findhyph category Package -revision 29725 +revision 30915 shortdesc Find hyphenated words in a document. longdesc Findhyph is a Perl script that will analyse the log file from longdesc running your document with \tracingparagraphs=1 set. The output @@ -10,6 +10,6 @@ runfiles size=3 texmf-dist/scripts/findhyph/findhyph catalogue-ctan /support/findhyph -catalogue-date 2012-11-23 11:17:42 +0100 +catalogue-date 2013-06-21 02:36:55 +0200 catalogue-license gpl -catalogue-version 3.2 +catalogue-version 3.3 ++++++ flowfram.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flowfram/CHANGES new/doc/latex/flowfram/CHANGES --- old/doc/latex/flowfram/CHANGES 2012-11-13 01:16:56.000000000 +0100 +++ new/doc/latex/flowfram/CHANGES 2014-05-16 01:15:16.000000000 +0200 @@ -1,5 +1,12 @@ flowfram change log +1.15 (2014/05/15) : + + * Now allows \Shapepar as a valid shape command + + * Modified \@setcol so that it sets \linewidth as well as + \textwidth + 1.14 (2012/11/10) : * Now loads xkeyval rather than keyval diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flowfram/README new/doc/latex/flowfram/README --- old/doc/latex/flowfram/README 2012-11-13 01:16:56.000000000 +0100 +++ new/doc/latex/flowfram/README 2014-05-16 01:15:16.000000000 +0200 @@ -1,9 +1,11 @@ -LaTeX Package : flowfram v1.14 +LaTeX Package : flowfram v1.15 -Last Modified : 2012-11-10 +Last Modified : 2014-05-15 Author : Nicola Talbot +Package FAQ : http://www.dickimaw-books.com/faqs/flowframfaq.html + Files : flowfram.dtx - documented source file flowfram.ins - installation script flowfram.perl - LaTeX2HTML style file (see below) @@ -44,7 +46,7 @@ frames unless other packages (such as frames.perl) are used. This material is subject to the LaTeX Project Public License. -See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license. +See http://www.ctan.org/license/lppl1.3 for the details of that license. http://www.dickimaw-books.com/ Files old/doc/latex/flowfram/ffuserguide.pdf and new/doc/latex/flowfram/ffuserguide.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/flowfram/ffuserguide.tex new/doc/latex/flowfram/ffuserguide.tex --- old/doc/latex/flowfram/ffuserguide.tex 2012-11-13 01:16:56.000000000 +0100 +++ new/doc/latex/flowfram/ffuserguide.tex 2014-05-16 01:15:16.000000000 +0200 @@ -364,9 +364,9 @@ \begin{document}\label{top} \title{Creating Flow Frames for Posters, Brochures or -Magazines using flowfram.sty version 1.14} +Magazines using flowfram.sty version 1.15} \author{Nicola L. C. Talbot} -\date{2012-11-10} +\date{2014-05-15} % swap frames around for title page \ffswapoddeven*{main} @@ -1641,15 +1641,15 @@ that the \gls{bbox} will still appear as a rectangle despite the \gls{frame}['s] shape setting. You may use either \TeX's -\cmdname{parshape} command, or the \cmdname{shapepar} -command defined in Donald~Arseneau's \sty{shapepar} -package (if using \cmdname{shapepar}, remember to include +\cmdname{parshape} command, or the +\cmdname{shapepar}\slash\cmdname{Shapepar} +commands defined in Donald~Arseneau's \sty{shapepar} +package (if using \cmdname{shapepar} or \cmdname{Shapepar}, remember to include the \sty{shapepar} package.) -Note that it is better to use \cmdname{parshape} instead -of \cmdname{shapepar} as the latter is more restrictive and -requires more processing. However, \cmdname{shapepar} provides -greater flexibility in the type of shape that can be used. +The \cmdname{shapepar} or \cmdname{Shapepar} commands provide +greater flexibility in the type of shape that can be used. However, +be aware of the advice given in the \sty{shapepar} documentation. \begin{description} \item[\cmdname{parshape}] With \cmdname{parshape} you can not have cut-outs in the middle, @@ -1661,14 +1661,16 @@ to allow sectioning commands (but not \cmdname{chapter} or \cmdname{part}). -\item[\cmdname{shapepar}] With \cmdname{shapepar} you may +\item[\cmdname{shapepar}/\cmdname{Shapepar}] With \cmdname{shapepar} +or \cmdname{Shapepar} you may have cut-outs, but you may not have any sectioning commands, paragraph breaks, vertical spacing or mathematics. You can simulate a paragraph break using \cmdname{simpar}, but this is not recommended. The size of the shape depends on the amount of text, so the shape will expand or contract as you -add or delete text. See the \sty{shapepar} documentation for -more details. +add or delete text. In general, \cmdname{Shapepar} is better suited +for use as a frame shape than \cmdname{shapepar}. See the +\sty{shapepar} documentation for more details of these commands. \end{description} To restore a \gls*{frame} to its default rectangular setting use @@ -1744,7 +1746,7 @@ whilst retaining the shape. \end{staticcontents*} -The syntax for \cmdname{shapepar} is more complicated, see +The syntax for \cmdname{shapepar} and \cmdname{Shapepar} is more complicated, see the \sty{shapepar} documentation for more details. In general:\\[10pt] \cmdname{shapepar}\{\meta{shape specs}\}\\[10pt] The \sty{shapepar} package has four predefined shapes: Files old/doc/latex/flowfram/flowfram.pdf and new/doc/latex/flowfram/flowfram.pdf differ Files old/doc/latex/flowfram/samples/sample-article.pdf and new/doc/latex/flowfram/samples/sample-article.pdf differ Files old/doc/latex/flowfram/samples/sample-brochure.pdf and new/doc/latex/flowfram/samples/sample-brochure.pdf differ Files old/doc/latex/flowfram/samples/sample-news.pdf and new/doc/latex/flowfram/samples/sample-news.pdf differ Files old/doc/latex/flowfram/samples/sample-news2.pdf and new/doc/latex/flowfram/samples/sample-news2.pdf differ Files old/doc/latex/flowfram/samples/sample-pages.pdf and new/doc/latex/flowfram/samples/sample-pages.pdf differ Files old/doc/latex/flowfram/samples/sample-poster.pdf and new/doc/latex/flowfram/samples/sample-poster.pdf differ Files old/doc/latex/flowfram/samples/sample-rot.pdf and new/doc/latex/flowfram/samples/sample-rot.pdf differ Files old/doc/latex/flowfram/samples/sample.pdf and new/doc/latex/flowfram/samples/sample.pdf differ Files old/doc/latex/flowfram/samples/sample1.pdf and new/doc/latex/flowfram/samples/sample1.pdf differ Files old/doc/latex/flowfram/samples/sample2.pdf and new/doc/latex/flowfram/samples/sample2.pdf differ Files old/doc/latex/flowfram/samples/sample3.pdf and new/doc/latex/flowfram/samples/sample3.pdf differ Files old/doc/latex/flowfram/samples/sampleRL.pdf and new/doc/latex/flowfram/samples/sampleRL.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/flowfram.doc.tlpobj new/tlpkg/tlpobj/flowfram.doc.tlpobj --- old/tlpkg/tlpobj/flowfram.doc.tlpobj 2012-11-13 04:36:39.000000000 +0100 +++ new/tlpkg/tlpobj/flowfram.doc.tlpobj 2014-05-16 03:23:32.000000000 +0200 @@ -1,9 +1,9 @@ name flowfram.doc category Package -revision 28238 +revision 34048 shortdesc doc files of flowfram relocated 1 -docfiles size=549 +docfiles size=550 RELOC/doc/latex/flowfram/CHANGES RELOC/doc/latex/flowfram/README RELOC/doc/latex/flowfram/ffuserguide.pdf ++++++ flowfram.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/flowfram/flowfram.sty new/tex/latex/flowfram/flowfram.sty --- old/tex/latex/flowfram/flowfram.sty 2012-11-13 01:16:56.000000000 +0100 +++ new/tex/latex/flowfram/flowfram.sty 2014-05-16 01:15:16.000000000 +0200 @@ -7,7 +7,7 @@ %% flowfram.dtx (with options: `flowfram.sty,package') %% %% flowfram.dtx -%% Copyright 2012 Nicola Talbot +%% Copyright 2014 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{flowfram}[2012/11/10 v1.14 (NLCT)] +\ProvidesPackage{flowfram}[2014/05/15 v1.15 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval} \RequirePackage{graphics} @@ -1423,12 +1423,18 @@ \def\ff@shape{2}% }% {% - \ifx#1\relax - \def\ff@shape{0}% - \else - \PackageError{flowfram}{Unknown shape \string#1}{}% - \def\ff@shape{2}% - \fi + \ifdefequal{#1}{\Shapepar}% + {% + \def\ff@shape{2}% + }% + {% + \ifx#1\relax + \def\ff@shape{0}% + \else + \PackageError{flowfram}{Unknown shape \string#1}{}% + \def\ff@shape{2}% + \fi + }% }% }% } @@ -3352,7 +3358,10 @@ \expandafter\vsize\csname colheight\romannumeral#1\endcsname \global\@colht\vsize \global\@colroom\@colht - \global\linewidth\columnwidth + \ifnum\linewidth>\columnwidth + \global\linewidth\columnwidth + \fi + \global\textwidth\columnwidth \setmargin \fi \stepcounter{displayedframe}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/flowfram.tlpobj new/tlpkg/tlpobj/flowfram.tlpobj --- old/tlpkg/tlpobj/flowfram.tlpobj 2012-11-13 04:36:40.000000000 +0100 +++ new/tlpkg/tlpobj/flowfram.tlpobj 2014-05-16 03:23:34.000000000 +0200 @@ -1,6 +1,6 @@ name flowfram category Package -revision 28238 +revision 34048 shortdesc Create text frames for posters, brochures or magazines. relocated 1 longdesc The flowfram package enables you to create frames in a document @@ -13,6 +13,6 @@ RELOC/scripts/flowfram/flowfram.perl RELOC/tex/latex/flowfram/flowfram.sty catalogue-ctan /macros/latex/contrib/flowfram -catalogue-date 2012-11-11 10:25:17 +0100 +catalogue-date 2014-05-15 17:30:42 +0200 catalogue-license lppl -catalogue-version 1.14 +catalogue-version 1.15 ++++++ fmtcount.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/CHANGES new/doc/latex/fmtcount/CHANGES --- old/doc/latex/fmtcount/CHANGES 2012-10-25 01:27:48.000000000 +0200 +++ new/doc/latex/fmtcount/CHANGES 2013-08-18 00:59:41.000000000 +0200 @@ -1,5 +1,15 @@ fmtcount package versions: +Version 2.03: + + * Renamed \@fc@loadifbabelldf to \@fc@loadifbabelorpolyglossialdf + and added check for polyglossia language. + + * Fixed multilingual issues where provided languages weren't + detected. + + * Removed spurious spaces. + Version 2.02: * Improved check for multilingual options diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/README new/doc/latex/fmtcount/README --- old/doc/latex/fmtcount/README 2012-10-25 01:27:48.000000000 +0200 +++ new/doc/latex/fmtcount/README 2013-08-18 00:59:41.000000000 +0200 @@ -1,6 +1,6 @@ -LaTeX Package : fmtcount v2.02 +LaTeX Package : fmtcount v2.03 -Last Modified : 2012-10-24 +Last Modified : 2013-08-17 Author : Nicola Talbot and Vincent Belaïche diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/fc-samp.tex new/doc/latex/fmtcount/fc-samp.tex --- old/doc/latex/fmtcount/fc-samp.tex 2012-09-26 00:58:08.000000000 +0200 +++ new/doc/latex/fmtcount/fc-samp.tex 2013-08-18 00:59:41.000000000 +0200 @@ -6,12 +6,12 @@ \padzeroes[5] \newcommand{\printrow}[1]{% -\newline -\setcounter{N}{#1} -\makebox[0.75in][r]{\decimal{N}\quad} -\makebox[0.75in][r]{\hexadecimal{N}\quad} -\makebox[0.75in][r]{\ordinal{N}\quad} -\makebox[2in][l]{\numberstring{N}} + \newline + \setcounter{N}{#1} + \makebox[0.75in][r]{\decimal{N}\quad} + \makebox[0.75in][r]{\hexadecimal{N}\quad} + \makebox[0.75in][r]{\ordinal{N}\quad} + \makebox[2in][l]{\numberstring{N}} } \renewcommand{\thesection}{\ordinal{section}} Files old/doc/latex/fmtcount/fmtcount.pdf and new/doc/latex/fmtcount/fmtcount.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fmtcount.doc.tlpobj new/tlpkg/tlpobj/fmtcount.doc.tlpobj --- old/tlpkg/tlpobj/fmtcount.doc.tlpobj 2012-10-25 04:30:21.000000000 +0200 +++ new/tlpkg/tlpobj/fmtcount.doc.tlpobj 2013-08-18 03:19:29.000000000 +0200 @@ -1,6 +1,6 @@ name fmtcount.doc category Package -revision 28068 +revision 31456 shortdesc doc files of fmtcount relocated 1 docfiles size=139 ++++++ fmtcount.tar.xz ++++++ ++++ 3667 lines of diff (skipped) ++++++ fnpct.doc.tar.xz ++++++ ++++ 2614 lines of diff (skipped) ++++++ fnpct.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fnpct/fnpct.sty new/tex/latex/fnpct/fnpct.sty --- old/tex/latex/fnpct/fnpct.sty 2013-04-09 18:54:11.000000000 +0200 +++ new/tex/latex/fnpct/fnpct.sty 2014-03-10 21:54:52.000000000 +0100 @@ -8,7 +8,7 @@ % Web: https://bitbucket.org/cgnieder/fnpct/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012-2013 Clemens Niederberger +% Copyright 2012-2014 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -31,17 +31,31 @@ \RequirePackage { xparse , l3keys2e , scrlfile } \ProvidesExplPackage {fnpct} - {2013/04/07} - {0.2k} + {2014/01/10} + {0.4b} {footnote kerning} % -------------------------------------------------------------------------- +% check expl3 version: +\@ifpackagelater { expl3 } { 2012/11/21 } + { } + { + \PackageError { fnpct } { Support~package~expl3~too~old } + { + You~need~to~update~your~installation~of~the~bundles~'l3kernel'~and~ + 'l3packages'.\MessageBreak + Loading~fnpct~will~abort! + } + \tex_endinput:D + } + +% -------------------------------------------------------------------------- % SETTING THINGS UP: % this is plain's \nobreak: \cs_new:Npn \fnpct_no_break: { \tex_penalty:D \c_ten_thousand } % messages: -\cs_new:Npn \fnpct_dont_mess_around: +\cs_new_protected:Npn \fnpct_dont_mess_around: { \iow_log:n { ................................................. } \iow_log:n { . ~ fnpct~info: } @@ -58,127 +72,144 @@ I~will~do~nothing~instead. } -\bool_new:N \l_fnpct_strict_bool +\bool_new:N \l__fnpct_strict_bool -\cs_new:Npn \fnpct_message:nx #1#2 +\cs_new_protected:Npn \fnpct_message:nx #1#2 { - \bool_if:NTF \l_fnpct_strict_bool + \bool_if:NTF \l__fnpct_strict_bool { \msg_error:nnx { fnpct } { #1 } } { \msg_warning:nnx { fnpct } { #1 } } { #2 } } % scratch variables: -\tl_new:N \l_fnpct_tmpa_tl -\tl_new:N \l_fnpct_tmpb_tl -\dim_new:N \l_fnpct_tmpa_dim -\dim_new:N \l_fnpct_tmpb_dim -\int_new:N \l_fnpct_tmpa_int +\tl_new:N \l__fnpct_tmpa_tl +\tl_new:N \l__fnpct_tmpb_tl +\dim_new:N \l__fnpct_tmpa_dim +\dim_new:N \l__fnpct_tmpb_dim +\int_new:N \l__fnpct_tmpa_int % rigid lengths: -\dim_new:N \l_fnpct_after_comma_dim -\dim_set:Nn \l_fnpct_after_comma_dim { -.06em } -\dim_new:N \l_fnpct_after_dot_dim -\dim_set:Nn \l_fnpct_after_dot_dim { -.06em } -\dim_new:N \l_fnpct_before_comma_dim -\dim_set:Nn \l_fnpct_before_comma_dim { -.16em } -\dim_new:N \l_fnpct_before_dot_dim -\dim_set:Nn \l_fnpct_before_dot_dim { -.16em } -\dim_new:N \l_fnpct_before_footnote_dim -\dim_set:Nn \l_fnpct_before_footnote_dim { .06em } -\dim_new:N \l_fnpct_normal_mark_width_dim -\dim_set:Nn \l_fnpct_normal_mark_width_dim { 1em } -\dim_new:N \l_fnpct_normal_indent_dim -\dim_set:Nn \l_fnpct_normal_indent_dim { 1.5em } -\dim_new:N \l_fnpct_normal_parindent_dim -\dim_set:Nn \l_fnpct_normal_parindent_dim { 1em } +\dim_new:N \l__fnpct_after_comma_dim +\dim_set:Nn \l__fnpct_after_comma_dim { -.06em } +\dim_new:N \l__fnpct_after_dot_dim +\dim_set:Nn \l__fnpct_after_dot_dim { -.06em } +\dim_new:N \l__fnpct_before_comma_dim +\dim_set:Nn \l__fnpct_before_comma_dim { -.16em } +\dim_new:N \l__fnpct_before_dot_dim +\dim_set:Nn \l__fnpct_before_dot_dim { -.16em } +\dim_new:N \l__fnpct_before_footnote_dim +\dim_set:Nn \l__fnpct_before_footnote_dim { .06em } +\dim_new:N \l__fnpct_normal_mark_width_dim +\dim_set:Nn \l__fnpct_normal_mark_width_dim { 1em } +\dim_new:N \l__fnpct_normal_indent_dim +\dim_set:Nn \l__fnpct_normal_indent_dim { 1.5em } +\dim_new:N \l__fnpct_normal_parindent_dim +\dim_set:Nn \l__fnpct_normal_parindent_dim { 1em } +\dim_new:N \l__fnpct_french_before_footnote_space_dim +\dim_set:Nn \l__fnpct_french_before_footnote_space_dim { .16667em } % multiple footnote input and output variables: -\tl_new:N \l_fnpct_multiple_footnotes_delimiter_tl -\tl_set:Nn \l_fnpct_multiple_footnotes_delimiter_tl { ; } -\tl_new:N \l_fnpct_multiple_footnote_separator_tl +\tl_new:N \l__fnpct_multiple_footnotes_delimiter_tl +\tl_set:Nn \l__fnpct_multiple_footnotes_delimiter_tl { ; } +\tl_new:N \l__fnpct_multiple_footnote_separator_tl % check for KOMA-Script's \multfootsep: \cs_if_exist:NTF \KOMAClassName - { \tl_set:Nn \l_fnpct_multiple_footnote_separator_tl { \multfootsep } } - { \tl_set:Nn \l_fnpct_multiple_footnote_separator_tl { , } } + { \tl_set:Nn \l__fnpct_multiple_footnote_separator_tl { \multfootsep } } + { \tl_set:Nn \l__fnpct_multiple_footnote_separator_tl { , } } % basic booleans for punctuation order switch and multiple footnotes -\bool_new:N \l_fnpct_punct_after_bool -\bool_new:N \l_fnpct_dont_mess_around_bool -\bool_new:N \l_fnpct_multiple_default_bool -\bool_new:N \l_fnpct_multiple_footnotes_bool -\bool_new:N \l_fnpct_reverse_switch_bool -\bool_new:N \l_fnpct_bigfoot_default_top_bool -\bool_new:N \l_fnpct_normal_marks_bool +\bool_new:N \l__fnpct_punct_after_bool +\bool_new:N \l__fnpct_dont_mess_around_bool +\bool_new:N \l__fnpct_multiple_default_bool +\bool_new:N \l__fnpct_multiple_footnotes_bool +\bool_new:N \l__fnpct_reverse_switch_bool +\bool_new:N \l__fnpct_bigfoot_default_top_bool +\bool_new:N \l__fnpct_normal_marks_bool + +\bool_new:N \g__fnpct_after_punctuation_bool % default punctuation marks for switching: -\tl_new:N \l_fnpct_punctuation_marks_tl -\tl_set:Nn \l_fnpct_punctuation_marks_tl { ., } -\prop_new:N \l_fnpct_punctuation_marks_after_prop -\prop_new:N \l_fnpct_punctuation_marks_before_prop -\prop_put:Nnn \l_fnpct_punctuation_marks_after_prop { . } { \l_fnpct_after_dot_dim } -\prop_put:Nnn \l_fnpct_punctuation_marks_after_prop { , } { \l_fnpct_after_comma_dim } -\prop_put:Nnn \l_fnpct_punctuation_marks_before_prop { . } { \l_fnpct_before_dot_dim } -\prop_put:Nnn \l_fnpct_punctuation_marks_before_prop { , } { \l_fnpct_before_comma_dim } - -\cs_new:Npn \fnpct_rm_punctuation:n #1 - { - \tl_remove_all:Nn \l_fnpct_punctuation_marks_tl { #1 } - \prop_del:Nn \l_fnpct_punctuation_marks_after_prop { #1 } - \prop_del:Nn \l_fnpct_punctuation_marks_before_prop { #1 } +\tl_new:N \l__fnpct_punctuation_marks_tl +\tl_set:Nn \l__fnpct_punctuation_marks_tl { ., } +\prop_new:N \l__fnpct_punctuation_marks_after_prop +\prop_new:N \l__fnpct_punctuation_marks_before_prop + +% #1: before/after +% #2: punctuation mark +% #3: dimension +\cs_new_protected:Npn \fnpct_set_punctuation_dim:nnn #1#2#3 + { + \prop_put:cnx { l__fnpct_punctuation_marks_#1_prop } + { #2 } + { \dim_eval:n { #3 } } + } +\cs_generate_variant:Nn \fnpct_set_punctuation_dim:nnn { nV } + +\fnpct_set_punctuation_dim:nnn { after } { . } { \l__fnpct_after_dot_dim } +\fnpct_set_punctuation_dim:nnn { after } { , } { \l__fnpct_after_comma_dim } +\fnpct_set_punctuation_dim:nnn { before } { . } { \l__fnpct_before_dot_dim } +\fnpct_set_punctuation_dim:nnn { before } { , } { \l__fnpct_before_comma_dim } + +\cs_new_protected:Npn \fnpct_rm_punctuation:n #1 + { + \tl_remove_all:Nn \l__fnpct_punctuation_marks_tl { #1 } + \prop_del:Nn \l__fnpct_punctuation_marks_after_prop { #1 } + \prop_del:Nn \l__fnpct_punctuation_marks_before_prop { #1 } } -\tl_new:N \l_fnpct_last_punct_mark_tl +\tl_new:N \l__fnpct_last_punct_mark_tl -\cs_new:Npn \fnpct_add_punctuation:n #1 - { \fnpct_add_punctuation_aux:w #1 [ \q_no_value ] \q_no_value \q_stop } +\cs_new_protected:Npn \fnpct_add_punctuation:n #1 + { \__fnpct_add_punctuation:w #1 [ \q_no_value ] \q_no_value \q_stop } \cs_generate_variant:Nn \fnpct_add_punctuation:n { V } -\cs_new:Npn \fnpct_add_punctuation_aux:w #1[#2]#3 \q_stop +\cs_new_protected:Npn \__fnpct_add_punctuation:w #1[#2]#3 \q_stop { \quark_if_no_value:nTF { #2 } { % there is no option at all \tl_map_inline:nn { #1 } { - \tl_put_right:Nn \l_fnpct_punctuation_marks_tl { ##1 } - \prop_put:Nnn \l_fnpct_punctuation_marks_after_prop { ##1 } { 0pt } - \prop_put:Nnn \l_fnpct_punctuation_marks_before_prop { ##1 } { 0pt } - \tl_set:No \l_fnpct_last_punct_mark_tl { ##1 } + \tl_put_right:Nn \l__fnpct_punctuation_marks_tl { ##1 } + \fnpct_set_punctuation_dim:nnn { after } { ##1 } { 0pt } + \fnpct_set_punctuation_dim:nnn { before } { ##1 } { 0pt } + \tl_set:No \l__fnpct_last_punct_mark_tl { ##1 } } } { \tl_if_blank:nTF { #1 } { % #2 is a second option (= before space) - \prop_put:NVn \l_fnpct_punctuation_marks_before_prop - \l_fnpct_last_punct_mark_tl { #2 } + \fnpct_set_punctuation_dim:nVn { before } + \l__fnpct_last_punct_mark_tl + { #2 } } { % #2 is a first option (= after space), #1 might be more than one token: \tl_if_single_token:nTF { #1 } { - \tl_put_right:Nn \l_fnpct_punctuation_marks_tl { #1 } - \prop_put:Nnn \l_fnpct_punctuation_marks_after_prop { #1 } { #2 } - \prop_put:Nnn \l_fnpct_punctuation_marks_before_prop { #1 } { 0pt } - \tl_set:No \l_fnpct_last_punct_mark_tl { #1 } + \tl_put_right:Nn \l__fnpct_punctuation_marks_tl { #1 } + \fnpct_set_punctuation_dim:nnn { after } { #1 } { #2 } + \fnpct_set_punctuation_dim:nnn { before } { #1 } { 0pt } + \tl_set:No \l__fnpct_last_punct_mark_tl { #1 } } { - \int_zero:N \l_fnpct_tmpa_int + \int_zero:N \l__fnpct_tmpa_int \tl_map_inline:nn { #1 } { - \tl_put_right:Nn \l_fnpct_punctuation_marks_tl { ##1 } - \int_compare:nTF { \l_fnpct_tmpa_int < ( \tl_count:n { #1 } - 1 ) } + \tl_put_right:Nn \l__fnpct_punctuation_marks_tl { ##1 } + \int_compare:nTF { \l__fnpct_tmpa_int < ( \tl_count:n { #1 } - 1 ) } { - \prop_put:Nnn \l_fnpct_punctuation_marks_after_prop { ##1 } { 0pt } - \prop_put:Nnn \l_fnpct_punctuation_marks_before_prop { ##1 } { 0pt } + \fnpct_set_punctuation_dim:nnn { after } { ##1 } { 0pt} + \fnpct_set_punctuation_dim:nnn { before } { ##1 } { 0pt } } { - \prop_put:Nnn \l_fnpct_punctuation_marks_after_prop { ##1 } { #2 } - \prop_put:Nnn \l_fnpct_punctuation_marks_before_prop { ##1 } { 0pt } + \fnpct_set_punctuation_dim:nnn { after } { ##1 } { #2 } + \fnpct_set_punctuation_dim:nnn { before } { ##1 } { 0pt } } - \tl_set:No \l_fnpct_last_punct_mark_tl { ##1 } - \int_incr:N \l_fnpct_tmpa_int + \tl_set:No \l__fnpct_last_punct_mark_tl { ##1 } + \int_incr:N \l__fnpct_tmpa_int } } } @@ -188,9 +219,9 @@ { \quark_if_no_value:nF { #3 } { - \tl_set:Nn \l_fnpct_tmpa_tl { #3 } - \tl_remove_all:Nn \l_fnpct_tmpa_tl { [\q_no_value]\q_no_value } - \fnpct_add_punctuation:V \l_fnpct_tmpa_tl + \tl_set:Nn \l__fnpct_tmpa_tl { #3 } + \tl_remove_all:Nn \l__fnpct_tmpa_tl { [\q_no_value]\q_no_value } + \fnpct_add_punctuation:V \l__fnpct_tmpa_tl } } } @@ -198,46 +229,48 @@ % options: \keys_define:nn { fnpct } { - strict .bool_set:N = \l_fnpct_strict_bool , + strict .bool_set:N = \l__fnpct_strict_bool , strict .default:n = true , after-comma-space .code:n = - \prop_put:Nnn \l_fnpct_punctuation_marks_after_prop { , } { #1 } , + \fnpct_set_punctuation_dim:nnn { after } { , } { #1 } , after-dot-space .code:n = - \prop_put:Nnn \l_fnpct_punctuation_marks_after_prop { . } { #1 } , + \fnpct_set_punctuation_dim:nnn { after } { . } { #1 } , before-comma-space .code:n = - \prop_put:Nnn \l_fnpct_punctuation_marks_before_prop { , } { #1 } , + \fnpct_set_punctuation_dim:nnn { before } { , } { #1 } , before-dot-space .code:n = - \prop_put:Nnn \l_fnpct_punctuation_marks_before_prop { , } { #1 } , + \fnpct_set_punctuation_dim:nnn { before } { , } { #1 } , after-punct-space .code:n = - \prop_map_inline:Nn \l_fnpct_punctuation_marks_after_prop - { \prop_put:Nnn \l_fnpct_punctuation_marks_after_prop { ##1 } { #1 } } , + \prop_map_inline:Nn \l__fnpct_punctuation_marks_after_prop + { \fnpct_set_punctuation_dim:nnn { after } { ##1 } { #1 } } , before-punct-space .code:n = - \prop_map_inline:Nn \l_fnpct_punctuation_marks_before_prop - { \prop_put:Nnn \l_fnpct_punctuation_marks_before_prop { ##1 } { #1 } } , - before-footnote-space .dim_set:N = \l_fnpct_before_footnote_dim , - punct-after .bool_set:N = \l_fnpct_punct_after_bool , + \prop_map_inline:Nn \l__fnpct_punctuation_marks_before_prop + { \fnpct_set_punctuation_dim:nnn { before } { ##1 } { #1 } } , + before-footnote-space .dim_set:N = \l__fnpct_before_footnote_dim , + french-before-footnote-space .dim_set:N = + \l__fnpct_french_before_footnote_space_dim , + punct-after .bool_set:N = \l__fnpct_punct_after_bool , punct-after .default:n = true , dont-mess-around .code:n = - \prop_map_inline:Nn \l_fnpct_punctuation_marks_after_prop - { \prop_put:Nnn \l_fnpct_punctuation_marks_after_prop { ##1 } { 0pt } } - \prop_map_inline:Nn \l_fnpct_punctuation_marks_before_prop - { \prop_put:Nnn \l_fnpct_punctuation_marks_before_prop { ##1 } { 0pt } } - \dim_zero:N \l_fnpct_before_footnote_dim - \bool_set_true:N \l_fnpct_punct_after_bool - \bool_set_true:N \l_fnpct_dont_mess_around_bool + \prop_map_inline:Nn \l__fnpct_punctuation_marks_after_prop + { \fnpct_set_punctuation_dim:nnn { after } { ##1 } { 0pt } } + \prop_map_inline:Nn \l__fnpct_punctuation_marks_before_prop + { \fnpct_set_punctuation_dim:nnn { before } { ##1 } { 0pt } } + \dim_zero:N \l__fnpct_before_footnote_dim + \bool_set_true:N \l__fnpct_punct_after_bool + \bool_set_true:N \l__fnpct_dont_mess_around_bool \fnpct_dont_mess_around: , - mult-fn-delim .tl_set:N = \l_fnpct_multiple_footnotes_delimiter_tl , - mult-fn-sep .tl_set:N = \l_fnpct_multiple_footnote_separator_tl , - multiple .bool_set:N = \l_fnpct_multiple_default_bool , + mult-fn-delim .tl_set:N = \l__fnpct_multiple_footnotes_delimiter_tl , + mult-fn-sep .tl_set:N = \l__fnpct_multiple_footnote_separator_tl , + multiple .bool_set:N = \l__fnpct_multiple_default_bool , multiple .default:n = true , - bigfoot-default-top .bool_set:N = \l_fnpct_bigfoot_default_top_bool , + bigfoot-default-top .bool_set:N = \l__fnpct_bigfoot_default_top_bool , bigfoot-default-top .default:n = true , - normal-marks .bool_set:N = \l_fnpct_normal_marks_bool , + normal-marks .bool_set:N = \l__fnpct_normal_marks_bool , normal-marks .default:n = true , - normal-mark-width .dim_set:N = \l_fnpct_normal_mark_width_dim , - normal-indent .dim_set:N = \l_fnpct_normal_indent_dim , - normal-parindent .dim_set:N = \l_fnpct_normal_parindent_dim , - verb-format .tl_set:N = \l_fnpct_verbatim_format_tl , + normal-mark-width .dim_set:N = \l__fnpct_normal_mark_width_dim , + normal-indent .dim_set:N = \l__fnpct_normal_indent_dim , + normal-parindent .dim_set:N = \l__fnpct_normal_parindent_dim , + verb-format .tl_set:N = \l__fnpct_verbatim_format_tl , add-punct-marks .code:n = \fnpct_add_punctuation:n { #1 } , remove-punct-marks .code:n = \tl_map_function:nN { #1 } \fnpct_rm_punctuation:n @@ -248,7 +281,7 @@ % -------------------------------------------------------------------------- % MAIN INTERNAL FOOTNOTE FUNCTION: % write the notes: -\cs_new:Npn \fnpct_no_value_or_quark_no_value:nTF #1#2#3 +\cs_new:Npn \__fnpct_no_value_or_quark_no_value:nTF #1#2#3 { \IfNoValueTF { #1 } { #2 } { \quark_if_no_value:nTF { #1 } { #2 } { #3 } } @@ -256,149 +289,146 @@ \cs_new:Npn \fnpct_write_note:Nnnn #1#2#3#4 { - \fnpct_no_value_or_quark_no_value:nTF { #2 } + \__fnpct_no_value_or_quark_no_value:nTF { #2 } { #1 { #4 } } { - \fnpct_no_value_or_quark_no_value:nTF { #3 } + \__fnpct_no_value_or_quark_no_value:nTF { #3 } { #1 [ #2 ] { #4 } } { #1 [ #2 ] [ #3 ] { #4 } } } } % check for punctuation: -\cs_new:Npn \fnpct_check_punctuation:TF #1#2 - { \fnpct_check_punctuation_auxi:nTF { 0 } { #1 } { #2 } } +\cs_new_protected:Npn \fnpct_check_punctuation:TF #1#2 + { \__fnpct_check_punctuation:nTF { 0 } { #1 } { #2 } } -\cs_new:Npn \fnpct_check_punctuation_auxi:nTF #1#2#3 +\cs_new_protected:Npn \__fnpct_check_punctuation:nTF #1#2#3 { - \fnpct_get_head:NN - \l_fnpct_current_punct_mark_tl - \l_fnpct_punctuation_marks_tl - \peek_meaning_remove:VTF \l_fnpct_current_punct_mark_tl + \__fnpct_get_head:NN + \l__fnpct_current_punct_mark_tl + \l__fnpct_punctuation_marks_tl + \peek_meaning_remove:VTF \l__fnpct_current_punct_mark_tl { #2 } { - \fnpct_check_punctuation_auxii:nnn { #1 } - { \fnpct_check_punctuation_auxi:VTF \l_fnpct_tmpa_int { #2 } { #3 } } + \__fnpct_check_punctuation_aux:nnn { #1 } + { \__fnpct_check_punctuation:VTF \l__fnpct_tmpa_int { #2 } { #3 } } { #3 } } } -\cs_new:Npn \fnpct_check_punctuation_auxii:nnn #1#2#3 +\cs_new_protected:Npn \__fnpct_check_punctuation_aux:nnn #1#2#3 { - \int_set:Nn \l_fnpct_tmpa_int { #1 } - \int_incr:N \l_fnpct_tmpa_int - \tl_set:Nx \l_fnpct_tmpb_tl { \int_to_arabic:n { \l_fnpct_tmpa_int } } - \tl_remove_all:NV \l_fnpct_punctuation_marks_tl - \l_fnpct_current_punct_mark_tl - \tl_put_right:NV \l_fnpct_punctuation_marks_tl - \l_fnpct_current_punct_mark_tl - \int_compare:nTF { \l_fnpct_tmpa_int < \tl_count:V \l_fnpct_punctuation_marks_tl } + \int_set:Nn \l__fnpct_tmpa_int { #1 } + \int_incr:N \l__fnpct_tmpa_int + \tl_set:Nx \l__fnpct_tmpb_tl { \int_to_arabic:n { \l__fnpct_tmpa_int } } + \tl_remove_all:NV \l__fnpct_punctuation_marks_tl + \l__fnpct_current_punct_mark_tl + \tl_put_right:NV \l__fnpct_punctuation_marks_tl + \l__fnpct_current_punct_mark_tl + \int_compare:nTF { \l__fnpct_tmpa_int < \tl_count:V \l__fnpct_punctuation_marks_tl } { #2 } { #3 } } -\cs_generate_variant:Nn \fnpct_check_punctuation_auxi:nTF { V } +\cs_generate_variant:Nn \__fnpct_check_punctuation:nTF { V } \cs_generate_variant:Nn \peek_meaning_remove:NTF { V } \cs_generate_variant:Nn \tl_remove_all:Nn { NV } \cs_generate_variant:Nn \tl_put_right:Nn { NV } -\cs_new:Npn \fnpct_get_head:NN #1#2 - { - \tl_if_blank:VTF #2 - { \tl_set:Nn #1 { #2 } } - { \exp_after:wN \fnpct_get_head_aux:Nw \exp_after:wN #1#2 \q_stop } - } -\cs_new:Npn \fnpct_get_head_aux:Nw #1#2#3 \q_stop - { \tl_set:Nn #1 { #2 } } +\cs_new_protected:Npn \__fnpct_get_head:NN #1#2 + { \tl_set:Nx #1 { \tl_head:V #2 } } % check for multiple notes: -\tl_new:N \l_fnpct_multiple_true_tl -\tl_new:N \l_fnpct_multiple_false_tl +\tl_new:N \l__fnpct_multiple_true_tl +\tl_new:N \l__fnpct_multiple_false_tl -\cs_new:Npn \fnpct_check_multiple:TF #1#2 +\cs_new_protected:Npn \fnpct_check_multiple:TF #1#2 { - \tl_set:Nn \l_fnpct_multiple_true_tl { #1 } - \tl_set:Nn \l_fnpct_multiple_false_tl { #2 } - \peek_after:Nw \fnpct_check_multiple_aux: + \tl_set:Nn \l__fnpct_multiple_true_tl { #1 } + \tl_set:Nn \l__fnpct_multiple_false_tl { #2 } + \peek_after:Nw \__fnpct_check_multiple: } -\cs_new:Npn \fnpct_check_multiple_aux: +\cs_new_protected:Npn \__fnpct_check_multiple: { - \prop_map_inline:Nn \g_fnpct_adapted_notes_prop + \prop_map_inline:Nn \g__fnpct_adapted_notes_prop { - \prop_get:NnN \g_fnpct_adapted_notes_prop { ##1 } \l_fnpct_tmpb_tl + \prop_get:NnN \g__fnpct_adapted_notes_prop { ##1 } \l__fnpct_tmpb_tl \exp_after:wN - \token_if_eq_meaning:NNTF \l_fnpct_tmpb_tl \l_peek_token + \token_if_eq_meaning:NNTF \l__fnpct_tmpb_tl \l_peek_token { - \bool_set_true:N \l_fnpct_multiple_footnotes_bool + \bool_set_true:N \l__fnpct_multiple_footnotes_bool \prop_map_break: } - { \bool_set_false:N \l_fnpct_multiple_footnotes_bool } + { \bool_set_false:N \l__fnpct_multiple_footnotes_bool } } - \bool_if:NTF \l_fnpct_multiple_footnotes_bool - { \tl_use:N \l_fnpct_multiple_true_tl } - { \tl_use:N \l_fnpct_multiple_false_tl } + \bool_if:NTF \l__fnpct_multiple_footnotes_bool + { \tl_use:N \l__fnpct_multiple_true_tl } + { \tl_use:N \l__fnpct_multiple_false_tl } } % check which mode is active: -\cs_new:Npn \fnpct_punct_if_after:TF #1#2 +\prg_new_conditional:Npnn \fnpct_punct_if_after: { T, TF } { \bool_if:nTF { \bool_xor_p:nn - { \l_fnpct_punct_after_bool } - { \l_fnpct_reverse_switch_bool } + { \l__fnpct_punct_after_bool } + { \l__fnpct_reverse_switch_bool } } - { #1 } - { #2 } + { \prg_return_true: } + { \prg_return_false: } } -\cs_new:Npn \fnpct_punct_if_after:T #1 - { \fnpct_punct_if_after:TF { #1 } {} } - % this is where the magic happens: -% #1: original command -% #2: optional argument of original command -% #3: second optional argument of original command -% #4: mandatory argument of original command -% #5: boolean flag for starred version -\cs_new_protected:Npn \fnpct_handle_note:Nnnnn #1#2#3#4#5 +\cs_new_protected:Npn \fnpct_handle_punctuation:n #1 { - % if a punctuation mark follows remove it, insert dot, skip back - % and then insert footnote - \fnpct_no_break: - \bool_if:NF \l_fnpct_dont_mess_around_bool - { \IfBooleanT { #5 } { \bool_set_true:N \l_fnpct_reverse_switch_bool } } \fnpct_check_punctuation:TF { + % this is need as some commands like biblatex's \autocite may in turn + % call \footnote. It then must not insert the pre-footnote-space: + \bool_gset_true:N \g__fnpct_after_punctuation_bool % A: after=1 && reverse=0 % after=0 && reverse=1 % B: after=1 && reverse=1 % after=0 && reverse=0 \fnpct_punct_if_after:TF - { \fnpct_no_break: \skip_horizontal:N \l_fnpct_before_footnote_dim } { - \tl_use:N \l_fnpct_current_punct_mark_tl \fnpct_no_break: - \prop_get:NVNT - \l_fnpct_punctuation_marks_after_prop - \l_fnpct_current_punct_mark_tl - \l_fnpct_tmpa_dim - { \skip_horizontal:N \l_fnpct_tmpa_dim } + \skip_horizontal:N \l__fnpct_before_footnote_dim } - \fnpct_write_note:Nnnn #1 { #2 } { #3 } { #4 } - \fnpct_write_inner:N #1 + { + \tl_use:N \l__fnpct_current_punct_mark_tl + \prop_get:NVNT \l__fnpct_punctuation_marks_after_prop + \l__fnpct_current_punct_mark_tl + \l__fnpct_tmpa_tl + { + \dim_set:Nn \l__fnpct_tmpa_dim { \l__fnpct_tmpa_tl } + \fnpct_no_break: + \skip_horizontal:N \l__fnpct_tmpa_dim + \fnpct_no_break: + \skip_horizontal:N \c_zero_skip + \fnpct_no_break: + } + } + #1 + \bool_gset_false:N \g__fnpct_after_punctuation_bool \fnpct_punct_if_after:T { \fnpct_no_break: - \prop_get:NVNT - \l_fnpct_punctuation_marks_before_prop - \l_fnpct_current_punct_mark_tl - \l_fnpct_tmpa_dim - { \skip_horizontal:N \l_fnpct_tmpa_dim } - \fnpct_no_break: - \tl_use:N \l_fnpct_current_punct_mark_tl + \prop_get:NVNT \l__fnpct_punctuation_marks_before_prop + \l__fnpct_current_punct_mark_tl + \l__fnpct_tmpa_tl + { + \dim_set:Nn \l__fnpct_tmpa_dim { \l__fnpct_tmpa_tl } + \fnpct_no_break: + \skip_horizontal:N \l__fnpct_tmpa_dim + \fnpct_no_break: + \skip_horizontal:N \c_zero_skip + \fnpct_no_break: + } + \tl_use:N \l__fnpct_current_punct_mark_tl } - \bool_set_false:N \l_fnpct_reverse_switch_bool + \bool_set_false:N \l__fnpct_reverse_switch_bool } { % what about multiple footnotes? (their usage is discouraged with @@ -406,98 +436,89 @@ % this check should probably/maybe be removed (?!) \fnpct_check_multiple:TF { - \bool_set_true:N \l_fnpct_multiple_footnotes_bool + \bool_set_true:N \l__fnpct_multiple_footnotes_bool % else insert space and then note - \fnpct_no_break: \skip_horizontal:N \l_fnpct_before_footnote_dim - \fnpct_write_note:Nnnn #1 { #2 } { #3 } { #4 } - \fnpct_write_inner:N #1 \fnpct_no_break: - \textsuperscript { \l_fnpct_multiple_footnote_separator_tl } - % \bool_set_false:N \l_fnpct_reverse_switch_bool + \bool_if:NF \g__fnpct_after_punctuation_bool + { \skip_horizontal:N \l__fnpct_before_footnote_dim } + #1 + \fnpct_no_break: + \textsuperscript { \l__fnpct_multiple_footnote_separator_tl } } { % else insert space and then note - \bool_if:NTF \l_fnpct_multiple_footnotes_bool - { \bool_set_false:N \l_fnpct_multiple_footnotes_bool } - { \fnpct_no_break: \skip_horizontal:N \l_fnpct_before_footnote_dim } - \fnpct_write_note:Nnnn #1 { #2 } { #3 } { #4 } - \fnpct_write_inner:N #1 - \bool_set_false:N \l_fnpct_reverse_switch_bool + \bool_if:NTF \l__fnpct_multiple_footnotes_bool + { \bool_set_false:N \l__fnpct_multiple_footnotes_bool } + { + \fnpct_no_break: + \bool_if:NF \g__fnpct_after_punctuation_bool + { \skip_horizontal:N \l__fnpct_before_footnote_dim } + } + #1 + \bool_set_false:N \l__fnpct_reverse_switch_bool } + \bool_gset_false:N \g__fnpct_after_punctuation_bool + } + } + + +% #1: original command +% #2: optional argument of original command +% #3: second optional argument of original command +% #4: mandatory argument of original command +% #5: boolean flag for starred version +\cs_new_protected:Npn \fnpct_handle_note:Nnnnn #1#2#3#4#5 + { + % if a punctuation mark follows remove it, insert dot, skip back + % and then insert footnote + \bool_if:NF \l__fnpct_dont_mess_around_bool + { + \IfBooleanT { #5 } + { \bool_set_true:N \l__fnpct_reverse_switch_bool } + } + \fnpct_handle_punctuation:n + { + \fnpct_write_note:Nnnn #1 { #2 } { #3 } { #4 } + \fnpct_write_inner:N #1 } } \cs_generate_variant:Nn \fnpct_handle_note:Nnnnn { cnnnn } % -------------------------------------------------------------------------- % MULTIPLE FOOTNOTES -\seq_new:N \l_fnpct_multiple_footnotes_seq +\seq_new:N \l__fnpct_multiple_footnotes_seq \cs_generate_variant:Nn \seq_set_split:Nnn { NVn } % #1: original note command % #2: star -% #3: multiple notes separated by \l_fnpct_multiple_footnotes_delimiter_tl +% #3: multiple notes separated by \l__fnpct_multiple_footnotes_delimiter_tl \cs_new_protected:Npn \fnpct_mult_note:Nnn #1#2#3 { - \bool_if:NF \l_fnpct_dont_mess_around_bool - { \IfBooleanT { #2 } { \bool_set_true:N \l_fnpct_reverse_switch_bool } } - % split input: - \seq_set_split:NVn \l_fnpct_multiple_footnotes_seq - \l_fnpct_multiple_footnotes_delimiter_tl - { #3 } - \fnpct_no_break: - % look for punctuation mark and do magic: - \fnpct_check_punctuation:TF - { - \fnpct_punct_if_after:TF - { \fnpct_no_break: \skip_horizontal:N \l_fnpct_before_footnote_dim } - { - \tl_use:N \l_fnpct_current_punct_mark_tl - \fnpct_no_break: - \prop_get:NVNT \l_fnpct_punctuation_marks_after_prop - \l_fnpct_current_punct_mark_tl \l_fnpct_tmpa_dim - { \skip_horizontal:N \l_fnpct_tmpa_dim } - } - \fnpct_write_notes:N #1 - \fnpct_punct_if_after:T - { - \prop_get:NVNT \l_fnpct_punctuation_marks_before_prop - \l_fnpct_current_punct_mark_tl \l_fnpct_tmpa_dim - { \skip_horizontal:N \l_fnpct_tmpa_dim } - \fnpct_no_break: - \tl_use:N \l_fnpct_current_punct_mark_tl - } - \bool_set_false:N \l_fnpct_reverse_switch_bool - } + \bool_if:NF \l__fnpct_dont_mess_around_bool { - % else insert space and notes: - \fnpct_check_multiple:TF - { - \bool_set_true:N \l_fnpct_multiple_footnotes_bool - \fnpct_no_break: \skip_horizontal:N \l_fnpct_before_footnote_dim - \fnpct_write_notes:N #1 - \bool_set_false:N \l_fnpct_reverse_switch_bool - \textsuperscript { \l_fnpct_multiple_footnote_separator_tl } - } - { - \bool_if:NTF \l_fnpct_multiple_footnotes_bool - { \bool_set_false:N \l_fnpct_multiple_footnotes_bool } - { \fnpct_no_break: \skip_horizontal:N \l_fnpct_before_footnote_dim } - \fnpct_write_notes:N #1 - \bool_set_false:N \l_fnpct_reverse_switch_bool - } + \IfBooleanT { #2 } + { \bool_set_true:N \l__fnpct_reverse_switch_bool } } + % split input: + \seq_set_split:NVn \l__fnpct_multiple_footnotes_seq + \l__fnpct_multiple_footnotes_delimiter_tl + { #3 } + \fnpct_handle_punctuation:n + { \fnpct_write_notes:NN #1 \l__fnpct_multiple_footnotes_seq } + } \cs_generate_variant:Nn \fnpct_mult_note:Nnn { cnn } -\int_new:N \l_fnpct_multiple_notes_int +\int_new:N \l__fnpct_multiple_notes_int % #1: original note command -\cs_new_protected:Npn \fnpct_write_notes:N #1 +% #2: sequence variable holding the note arguments +\cs_new_protected:Npn \fnpct_write_notes:NN #1#2 { - \int_zero:N \l_fnpct_multiple_notes_int - \seq_map_inline:Nn \l_fnpct_multiple_footnotes_seq + \int_zero:N \l__fnpct_multiple_notes_int + \seq_map_inline:Nn #2 { - \fnpct_read_note_with_option:w ##1 \q_stop { #1 } - \int_incr:N \l_fnpct_multiple_notes_int + \__fnpct_read_note_with_option:w ##1 \q_stop { #1 } + \int_incr:N \l__fnpct_multiple_notes_int } } @@ -508,30 +529,30 @@ % #3: second optional argument to original note command % #4: mandatory argument to original note command % #5: original note command -\bool_new:N \g_fnpct_only_text_bool -\NewDocumentCommand \fnpct_read_note_with_option:w { soo+u{\q_stop}m } +\bool_new:N \g__fnpct_only_text_bool +\NewDocumentCommand \__fnpct_read_note_with_option:w { soo+u{\q_stop}m } { \bool_if:nT { - \int_compare_p:n { \l_fnpct_multiple_notes_int > 0 } + \int_compare_p:n { \l__fnpct_multiple_notes_int > 0 } && \int_compare_p:n { - \l_fnpct_multiple_notes_int + \l__fnpct_multiple_notes_int < - \seq_count:N \l_fnpct_multiple_footnotes_seq + \seq_count:N \l__fnpct_multiple_footnotes_seq } } { \IfBooleanTF { #1 } { \tex_unskip:D } - { \textsuperscript { \l_fnpct_multiple_footnote_separator_tl } } + { \textsuperscript { \l__fnpct_multiple_footnote_separator_tl } } } \IfBooleanTF { #1 } { % TODO: maybe provide option to change \footnotetext? Or do it % automatically? - \bool_gset_true:N \g_fnpct_only_text_bool + \bool_gset_true:N \g__fnpct_only_text_bool \IfNoValueTF { #2 } { \footnotetext { #4 } } { \footnotetext [ #2 ] { #4 } } @@ -543,8 +564,8 @@ % -------------------------------------------------------------------------- % NESTED FOOTNOTES: % 1 layer of nesting... -\prop_new:N \g_fnpct_inner_footnote_prop -\prop_new:N \g_fnpct_inner_footnote_hyperref_prop +\prop_new:N \g__fnpct_inner_footnote_prop +\prop_new:N \g__fnpct_inner_footnote_hyperref_prop \cs_generate_variant:Nn \prop_gput:Nnn { Nxn , Nxo } % this shouldn't be a document command! But for the time being I'll stick to @@ -556,19 +577,19 @@ % TODO: maybe detect what type of note we're in and use the appropriate mark? % Or provide a user interface to choose the appropriate mark? \fnpct_orig_footnotemark:w - \prop_gput:Nxn \g_fnpct_inner_footnote_prop { \thefootnote } { #2 } - \bool_if:NT \l_fnpct_hyperref_bool + \prop_gput:Nxn \g__fnpct_inner_footnote_prop { \thefootnote } { #2 } + \bool_if:NT \l__fnpct_hyperref_bool { - \prop_gput:Nxo \g_fnpct_inner_footnote_hyperref_prop + \prop_gput:Nxo \g__fnpct_inner_footnote_hyperref_prop { \thefootnote } { \Hy@footnote@currentHref } } } { \fnpct_orig_footnotemark:w [ #1 ] - \prop_gput:Nnn \g_fnpct_inner_footnote_prop { #1 } { #2 } - \bool_if:NT \l_fnpct_hyperref_bool + \prop_gput:Nnn \g__fnpct_inner_footnote_prop { #1 } { #2 } + \bool_if:NT \l__fnpct_hyperref_bool { - \prop_gput:Nno \g_fnpct_inner_footnote_hyperref_prop + \prop_gput:Nno \g__fnpct_inner_footnote_hyperref_prop { #1 } { \Hy@footnote@currentHref } } } @@ -578,69 +599,73 @@ { \token_if_eq_meaning:NNF #1 \fnpct_inner_footnote:w { - \prop_map_inline:Nn \g_fnpct_inner_footnote_prop + \prop_map_inline:Nn \g__fnpct_inner_footnote_prop { \footnotetext [ ##1 ] { - \bool_if:NT \l_fnpct_hyperref_bool + \bool_if:NT \l__fnpct_hyperref_bool { - \prop_get:NnN \g_fnpct_inner_footnote_hyperref_prop - { ##1 } \l_fnpct_tmpa_tl + \prop_get:NnN \g__fnpct_inner_footnote_hyperref_prop + { ##1 } \l__fnpct_tmpa_tl \Hy@raisedlink - { \exp_args:No \hyper@@anchor { \l_fnpct_tmpa_tl } } + { \exp_args:NV \hyper@@anchor \l__fnpct_tmpa_tl } } ##2 } } - \prop_gclear:N \g_fnpct_inner_footnote_prop + \prop_gclear:N \g__fnpct_inner_footnote_prop } } -\cs_new:Npn \writeinnernotes +\NewDocumentCommand \writeinnernotes {} { \fnpct_write_inner:N X } % -------------------------------------------------------------------------- % MANUAL KERNING: -% TODO: add nobreak and ensure that \l_fnpct_after_comma_dim et.al match the current +% TODO: add nobreak and ensure that \l__fnpct_after_comma_dim et.al match the current % definition -\cs_new:Npn \kfp +\cs_new_protected:Npn \fnpct_kfp: { \fnpct_no_break: - \prop_get:NnN \l_fnpct_punctuation_marks_before_prop { . } \l_fnpct_tmpa_dim - \prop_get:NnN \l_fnpct_punctuation_marks_after_prop { . } \l_fnpct_tmpb_dim - \bool_if:NTF \l_fnpct_punct_after_bool - { \skip_horizontal:N \l_fnpct_tmpa_dim } - { \skip_horizontal:N \l_fnpct_tmpb_dim } + \prop_get:NnN \l__fnpct_punctuation_marks_before_prop { . } \l__fnpct_tmpa_dim + \prop_get:NnN \l__fnpct_punctuation_marks_after_prop { . } \l__fnpct_tmpb_dim + \bool_if:NTF \l__fnpct_punct_after_bool + { \skip_horizontal:N \l__fnpct_tmpa_dim } + { \skip_horizontal:N \l__fnpct_tmpb_dim } } -\cs_new:Npn \kfc + +\cs_new_protected:Npn \fnpct_kfc: { \fnpct_no_break: - \prop_get:NnN \l_fnpct_punctuation_marks_before_prop { , } \l_fnpct_tmpa_dim - \prop_get:NnN \l_fnpct_punctuation_marks_after_prop { , } \l_fnpct_tmpb_dim - \bool_if:NTF \l_fnpct_punct_after_bool - { \skip_horizontal:N \l_fnpct_tmpa_dim } - { \skip_horizontal:N \l_fnpct_tmpb_dim } + \prop_get:NnN \l__fnpct_punctuation_marks_before_prop { , } \l__fnpct_tmpa_dim + \prop_get:NnN \l__fnpct_punctuation_marks_after_prop { , } \l__fnpct_tmpb_dim + \bool_if:NTF \l__fnpct_punct_after_bool + { \skip_horizontal:N \l__fnpct_tmpa_dim } + { \skip_horizontal:N \l__fnpct_tmpb_dim } } +\NewDocumentCommand \kfp {} { \fnpct_kfp: } +\NewDocumentCommand \kfc {} { \fnpct_kfc: } + % -------------------------------------------------------------------------- % NORMAL MARKS: \AtBeginDocument { - \bool_if:NT \l_fnpct_normal_marks_bool + \bool_if:NT \l__fnpct_normal_marks_bool { \cs_if_exist:NF \KOMAoption { \RequirePackage { scrextend } } \deffootnote - [ \l_fnpct_normal_mark_width_dim ] - { \l_fnpct_normal_indent_dim } - { \l_fnpct_normal_parindent_dim } + [ \l__fnpct_normal_mark_width_dim ] + { \l__fnpct_normal_indent_dim } + { \l__fnpct_normal_parindent_dim } { \thefootnotemark . \enskip } } } % -------------------------------------------------------------------------- % LET'S MAKE IT EASIER TO ADAPT EXISTIUNG FUNCTIONS: -\prop_new:N \g_fnpct_adapted_notes_prop +\prop_new:N \g__fnpct_adapted_notes_prop \cs_generate_variant:Nn \prop_put:Nnn { Nxn } % COPY, RENEW AND CREATE MULT @@ -650,12 +675,12 @@ % #3: mult-variant % % \footnote[<mark>]{<text>} like: -\cs_new:Npn \fnpct_renew_and_mult:NNN #1#2#3 +\cs_new_protected:Npn \fnpct_renew_and_mult:NNN #1#2#3 { - \prop_gput:Nxn \g_fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } + \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } \cs_new_eq:NN #2 #1 \fnpct_create_mult_variant:NN #3 #2 - \bool_if:NTF \l_fnpct_multiple_default_bool + \bool_if:NTF \l__fnpct_multiple_default_bool { \cs_set_eq:NN #1 #3 } { \RenewDocumentCommand #1 { so+m } @@ -664,12 +689,12 @@ } \cs_generate_variant:Nn \fnpct_renew_and_mult:NNN { ccc , NcN } -\cs_new:Npn \fnpct_renew_and_mult_no_opt:NNN #1#2#3 +\cs_new_protected:Npn \fnpct_renew_and_mult_no_opt:NNN #1#2#3 { - \prop_gput:Nxn \g_fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } + \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } \cs_new_eq:NN #2 #1 \fnpct_create_mult_variant:NN #3 #2 - \bool_if:NTF \l_fnpct_multiple_default_bool + \bool_if:NTF \l__fnpct_multiple_default_bool { \cs_set_eq:NN #1 #3 } { \RenewDocumentCommand #1 { s+m } @@ -679,12 +704,12 @@ } } } -\cs_generate_variant:Nn \fnpct_renew_and_mult_no_opt:NNN { ccc } +\cs_generate_variant:Nn \fnpct_renew_and_mult_no_opt:NNN { Nc, ccc } % renew but don't create mult-variant: -\cs_new:Npn \fnpct_renew:NN #1#2 +\cs_new_protected:Npn \fnpct_renew:NN #1#2 { - \prop_gput:Nxn \g_fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } + \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } \cs_new_eq:NN #2 #1 \RenewDocumentCommand #1 { so+m } { \fnpct_handle_note:Nnnnn #2 { ##2 } { \q_no_value } { ##3 } { ##1 } } @@ -692,21 +717,21 @@ \cs_generate_variant:Nn \fnpct_renew:NN { cc ,Nc } % new -\cs_new:Npn \fnpct_new:NN #1#2 +\cs_new_protected:Npn \fnpct_new:NN #1#2 { - \prop_gput:Nxn \g_fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } + \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } \NewDocumentCommand #1 { so+m } { \fnpct_handle_note:Nnnnn #2 { ##2 } { \q_no_value } { ##3 } { ##1 } } } \cs_generate_variant:Nn \fnpct_new:NN { cc , Nc } % \note[<mark>][<oarg>]{<text>} like: -\cs_new:Npn \fnpct_renew_and_mult_opt:NNN #1#2#3 +\cs_new_protected:Npn \fnpct_renew_and_mult_opt:NNN #1#2#3 { - \prop_gput:Nxn \g_fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } + \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } \cs_new_eq:NN #2 #1 \fnpct_create_mult_variant:NN #3 #2 - \bool_if:NTF \l_fnpct_multiple_default_bool + \bool_if:NTF \l__fnpct_multiple_default_bool { \cs_set_eq:NN #1 #3 } { \RenewDocumentCommand #1 { soo+m } @@ -715,9 +740,9 @@ } \cs_generate_variant:Nn \fnpct_renew_and_mult_opt:NNN { ccc , NcN } -\cs_new:Npn \fnpct_renew_opt:NN #1#2 +\cs_new_protected:Npn \fnpct_renew_opt:NN #1#2 { - \prop_gput:Nxn \g_fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } + \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } \cs_new_eq:NN #2 #1 \RenewDocumentCommand #1 { soo+m } { \fnpct_handle_note:Nnnnn #2 { ##2 } { ##3 } { ##4 } { ##1 } } @@ -725,9 +750,9 @@ \cs_generate_variant:Nn \fnpct_renew_opt:NN { cc , Nc } % \note{<arg>} like -\cs_new:Npn \fnpct_renew_no_opt:NN #1#2 +\cs_new_protected:Npn \fnpct_renew_no_opt:NN #1#2 { - \prop_gput:Nxn \g_fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } + \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } \cs_new_eq:NN #2 #1 \RenewDocumentCommand #1 { s+m } { \fnpct_handle_note:Nnnnn #2 { \q_no_value } { \q_no_value } { ##2 } { ##1 } } @@ -735,9 +760,9 @@ \cs_generate_variant:Nn \fnpct_renew_no_opt:NN { cc ,Nc } % \note like -\cs_new:Npn \fnpct_renew_no_arg:NN #1#2 +\cs_new_protected:Npn \fnpct_renew_no_arg:NN #1#2 { - \prop_gput:Nxn \g_fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } + \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } \cs_new_eq:NN #2 #1 \RenewDocumentCommand #1 { s } { \fnpct_handle_note:Nnnnn #2 { \q_no_value } { \q_no_value } { } { ##1 } } @@ -745,16 +770,16 @@ \cs_generate_variant:Nn \fnpct_renew_no_arg:NN { cc } % create mult-variant -\cs_new:Npn \fnpct_create_mult_variant:NN #1#2 +\cs_new_protected:Npn \fnpct_create_mult_variant:NN #1#2 { \NewDocumentCommand #1 { s+m } { \fnpct_mult_note:Nnn #2 { ##1 } { ##2 } } } % \footnotemark[<mark>] like commands: -\cs_new:Npn \fnpct_renew_mark:NN #1#2 +\cs_new_protected:Npn \fnpct_renew_mark:NN #1#2 { - \prop_gput:Nxn \g_fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } + \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 } \cs_new_eq:NN #2 #1 \RenewDocumentCommand #1 { so } { \fnpct_handle_note:Nnnnn #2 { ##2 } { \q_no_value } { } { ##1 } } @@ -790,6 +815,20 @@ { \fnpct_renew_opt:Nc #1 { fnpct_orig_ \cs_to_str:N #1 :w } } } +\NewDocumentCommand \AdaptNoteNoOpt { mm } + { + \cs_if_exist:cTF { fnpct_orig_ \cs_to_str:N #1 :w } + { \fnpct_message:nx { already-adapted } { #1 } } + { \fnpct_renew_and_mult_no_opt:NcN #1 { fnpct_orig_ \cs_to_str:N #1 :w } #2 } + } + +\NewDocumentCommand \AdaptNoteNoOptNoMult { m } + { + \cs_if_exist:cTF { fnpct_orig_ \cs_to_str:N #1:w } + { \fnpct_message:nx { already-adapted } { #1 } } + { \fnpct_renew_no_opt:Nc #1 { fnpct_orig_ \cs_to_str:N #1:w } } + } + \NewDocumentCommand \AdaptNoteMark { m } { \cs_if_exist:cTF { fnpct_orig_ \cs_to_str:N #1 :w } @@ -810,7 +849,7 @@ \AtBeginDocument { \@ifpackageloaded { hyperref } - { \bool_set_true:N \l_fnpct_hyperref_bool } + { \bool_set_true:N \l__fnpct_hyperref_bool } { \cs_if_exist:NF \AfterBeginDocument { \cs_new:Npn \AfterBeginDocument #1 { #1 } } @@ -819,6 +858,8 @@ { \AdaptNote \footnote \multfootnote \AdaptNoteMark \footnotemark + \cs_if_exist:NT \footref + { \AdaptNoteNoOptNoMult \footref } \fnpct_new:NN \innernote \fnpct_inner_footnote:w %% the `endnotes' package: \fnpct_treatment:nn { endnotes } @@ -840,7 +881,6 @@ { \AdaptNoteOpt \sidenote \multsidenote \AdaptNoteMark \sidenotemark -% \AdaptNoteOpt \sidecite \multsidecite } %% the `parnotes' package: \fnpct_treatment:nn { parnotes } @@ -848,25 +888,22 @@ %% the `pagenote' package: \fnpct_treatment:nn { pagenote } { - \bool_if:NT \l_fnpct_makepagenote_bool + \bool_if:NT \l__fnpct_makepagenote_bool { \AdaptNote \pagenote \multpagenote } } %% the `tablefootnote' package: \fnpct_treatment:nn { tablefootnote } - { - \fnpct_renew_and_mult_no_opt:NNN \tablefootnote - \fnpct_orig_tablefootnote:w \multtablefootnote - } + { \AdaptNote \tablefootnote \multtablefootnote } %% the `bigfoot' package: \fnpct_treatment:nn { bigfoot } { - \prop_map_inline:Nn \l_fnpct_footnote_class_prop + \prop_map_inline:Nn \l__fnpct_footnote_class_prop { \fnpct_renew_and_mult:ccc { footnote#2 } { fnpct_orig_footnote#2:w } { multfootnote#2 } \fnpct_renew_mark:cc { footnotemark#2 } { fnpct_orig_footnotemark#2:w } } - \prop_if_in:NnT \l_fnpct_footnote_class_prop { default } + \prop_if_in:NnT \l__fnpct_footnote_class_prop { default } { % re-set basics: \cs_set_eq:NN \footnote \footnotedefault @@ -877,19 +914,19 @@ %% the `fixfoot' package: \fnpct_treatment:nn { fixfoot } { - \prop_map_inline:Nn \l_fnpct_footnote_fixfoot_prop + \prop_map_inline:Nn \l__fnpct_footnote_fixfoot_prop { \fnpct_renew_no_arg:cc { #2 } { fnpct_orig_fix_#2:w } } } %% the `sepfootnotes' package: \fnpct_treatment:nn { sepfootnotes } { - \prop_map_inline:Nn \l_fnpct_sepfootnote_foot_classes_prop + \prop_map_inline:Nn \l__fnpct_sepfootnote_foot_classes_prop { \fnpct_renew_and_mult_no_opt:ccc { #2note } { fnpct_orig_sep_#2:w } { #2multnote } \fnpct_renew_no_opt:cc { #2notemark } { fnpct_orig_sep_#2_mark:w } } - \prop_map_inline:Nn \l_fnpct_sepfootnote_end_classes_prop + \prop_map_inline:Nn \l__fnpct_sepfootnote_end_classes_prop { \fnpct_renew_and_mult_no_opt:ccc { #2note } { fnpct_orig_sep_#2:w } { #2multnote } @@ -900,7 +937,8 @@ } % the `bigfoot' package neads special treatment: -\prop_new:N \l_fnpct_footnote_class_prop +\prop_new:N \l__fnpct_footnote_class_prop + \fnpct_special_treatment:nn { bigfoot } { % hook into \DeclareNewFootnote so we can redefine all footnote @@ -908,7 +946,7 @@ \cs_new_eq:NN \fnpct_new_footnote:w \DeclareNewFootnote \RenewDocumentCommand \DeclareNewFootnote { omo } { - \prop_put:Nnn \l_fnpct_footnote_class_prop { #2 } { #2 } + \prop_put:Nnn \l__fnpct_footnote_class_prop { #2 } { #2 } \IfNoValueTF { #1 } { \IfNoValueTF { #3 } @@ -921,12 +959,13 @@ { \fnpct_new_footnote:w [ #1 ] { #2 } [ #3 ] } } } - \bool_if:NT \l_fnpct_bigfoot_default_top_bool + \bool_if:NT \l__fnpct_bigfoot_default_top_bool { \DeclareNewFootnote { default } } } % as does the `fixfoot' package -\prop_new:N \l_fnpct_footnote_fixfoot_prop +\prop_new:N \l__fnpct_footnote_fixfoot_prop + \fnpct_special_treatment:nn { fixfoot } { % hook into \DeclareFixedFootnote so we can redefine all footnote @@ -934,7 +973,7 @@ \cs_new_eq:NN \fnpct_new_fixnote:w \DeclareFixedFootnote \RenewDocumentCommand \DeclareFixedFootnote { smm } { - \prop_put:Nnx \l_fnpct_footnote_fixfoot_prop { #2 } + \prop_put:Nnx \l__fnpct_footnote_fixfoot_prop { #2 } { \cs_to_str:N #2 } \IfBooleanTF { #1 } { \fnpct_new_fixnote:w * { #2 } { #3 } } @@ -943,17 +982,19 @@ } % and the `pagenote' package: -\bool_new:N \l_fnpct_makepagenote_bool +\bool_new:N \l__fnpct_makepagenote_bool + \fnpct_special_treatment:nn { pagenote } { \tl_put_left:Nn \makepagenote - { \bool_set_true:N \l_fnpct_makepagenote_bool } + { \bool_set_true:N \l__fnpct_makepagenote_bool } } % aaand... the `sepfootnotes' package: -\prop_new:N \l_fnpct_sepfootnote_foot_classes_prop -\prop_new:N \l_fnpct_sepfootnote_end_classes_prop -\prop_new:N \l_fnpct_sepfootnote_symbol_classes_prop +\prop_new:N \l__fnpct_sepfootnote_foot_classes_prop +\prop_new:N \l__fnpct_sepfootnote_end_classes_prop +\prop_new:N \l__fnpct_sepfootnote_symbol_classes_prop + \fnpct_special_treatment:nn { sepfootnotes } { \cs_new_eq:NN \fnpct_orig_new_footnotes:w \newfootnotes @@ -961,19 +1002,19 @@ \cs_new_eq:NN \fnpct_orig_new_symbolnotes:w \newsymbolfootnotes \RenewDocumentCommand \newfootnotes { sm } { - \prop_put:Nnn \l_fnpct_sepfootnote_foot_classes_prop { #2 } { #2 } + \prop_put:Nnn \l__fnpct_sepfootnote_foot_classes_prop { #2 } { #2 } \IfBooleanTF { #1 } { \fnpct_orig_new_footnotes:w * { #2 } } { \fnpct_orig_new_footnotes:w { #2 } } } \RenewDocumentCommand \newendnotes { m } { - \prop_put:Nnn \l_fnpct_sepfootnote_end_classes_prop { #1 } { #1 } + \prop_put:Nnn \l__fnpct_sepfootnote_end_classes_prop { #1 } { #1 } \fnpct_orig_new_endnotes:n { #1 } } \RenewDocumentCommand \newsymbolfootnotes { om } { - \prop_put:Nnn \l_fnpct_sepfootnote_symbol_classes_prop { #2 } { #2 } + \prop_put:Nnn \l__fnpct_sepfootnote_symbol_classes_prop { #2 } { #2 } \IfNoValueTF { #1 } { \fnpct_orig_new_symbolnotes:w { #2 } } { \fnpct_orig_new_symbolnotes:w [ #1 ] { #2 } } @@ -981,6 +1022,21 @@ } % -------------------------------------------------------------------------- +\RequirePackage{translations}[2014/01/10] +\AtBeginDocument{ + \ifcurrentbaselanguage{French} + { + \AfterBeginDocument{ + \let\@footnotemark\@footnotemarkORI + \setfnpct{ + before-footnote-space = + \l__fnpct_french_before_footnote_space_dim + } + } + }{} +} + +% -------------------------------------------------------------------------- % SETUP COMMAND: \NewDocumentCommand \setfnpct { m } { \keys_set:nn { fnpct } { #1 } } @@ -1020,12 +1076,12 @@ breaks any more 2012/06/28 v0.2c - bugfix: works now flawless together with `bigfoot' 2012/07/07 v0.2d - check for all sorts of following footnotes to insert - \l_fnpct_multiple_footnote_separator_tl + \l__fnpct_multiple_footnote_separator_tl 2012/07/24 v0.2e - improved scanning ahead for punctuation marks, adapted to deprecated functions in l3kernel and l3packages 2012/08/27 v0.2f - switched to internal scratch variables 2012/11/14 v0.2g - adapt changes in `sidenotes' package -2013/01/18 v0.2h - bug fixed: \l_fnpct_multiple_footnote_separator_tl +2013/01/18 v0.2h - bug fixed: \l__fnpct_multiple_footnote_separator_tl should be { , } when `memoir' is loaded 2013/01/21 v0.2i - adapted to changes of sepfootnotes, bug fix in reading of multiple notes @@ -1033,6 +1089,22 @@ 2013/04/07 v0.2k - bug fix: suppress possible break point between footnote mark and punctuation mark if `punct-after=true' has been set +2013/04/16 v0.3 - adapt \footref if it exists + - new: \AdaptNoteNoOpt, \AdaptNoteNoOptNoMult +2013/06/14 v0.3a - various internal commands needed to be defined + protected +2013/12/22 v0.4 - when biblatex's \autocite is adapted a fix was needed: + it calls \footnote eventually which inserted + `before-footnote-space' when it shouldn't + - adapt to French language settings + - clearer distinction between internal commands and + document commands +2013/12/23 v0.4a - fix bug introcuded in v0.4 due to a typo +2014/03/10 v0.4b - adapt to version 1.2 of package `translations' + - adapt to update to `tablefootnote' + - bug fix: add missing penalty that caused a footnote + marker to be placed on the following line in some + instances % -------------------------------------------------------------------------- % NOTES: @@ -1041,5 +1113,10 @@ % -------------------------------------------------------------------------- % TODO: +- localization: should there be different defaults for different languages? + And who might provide enough information about conventions in other + languages? - solve incompatibility with the `footnote' package -- get this working (??) => http://tex.stackexchange.com/questions/54288/nested-endnotes \ No newline at end of file +- get this working (??) => http://tex.stackexchange.com/questions/54288/nested-endnotes +- the `bigfoot' package provides \footnote+ and \footnote- -- let's see if we + can add those functionalities again diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fnpct.tlpobj new/tlpkg/tlpobj/fnpct.tlpobj --- old/tlpkg/tlpobj/fnpct.tlpobj 2013-04-10 21:02:23.000000000 +0200 +++ new/tlpkg/tlpobj/fnpct.tlpobj 2014-03-11 03:24:21.000000000 +0100 @@ -1,15 +1,15 @@ name fnpct category Package -revision 29795 +revision 33144 shortdesc Manage footnote marks' interaction with punctuation. relocated 1 longdesc The package moves footnote marks after following punctuation longdesc (comma or full stop), and adjusts kerning as appropriate. As a longdesc side effect, a change to the handling of multiple footnotes is longdesc provided. -runfiles size=10 +runfiles size=11 RELOC/tex/latex/fnpct/fnpct.sty catalogue-ctan /macros/latex/contrib/fnpct -catalogue-date 2013-04-08 10:17:07 +0200 +catalogue-date 2014-03-10 13:15:59 +0100 catalogue-license lppl1.3 -catalogue-version 0.2k +catalogue-version 0.4b ++++++ fontawesome.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fontawesome/README new/doc/latex/fontawesome/README --- old/doc/latex/fontawesome/README 2013-03-24 00:00:00.000000000 +0100 +++ new/doc/latex/fontawesome/README 2013-06-29 00:26:37.000000000 +0200 @@ -1,10 +1,9 @@ fontawesome -- high quality web icons -The "fontawesome" package grants access to 249 web-related icons provided by the +The "fontawesome" package grants access to 302 web-related icons provided by the included "Font Awesome" free font, designed by Dave Gandy and released under the open SIL Open Font License (available at http://scripts.sil.org/OFL). -See http://fortawesome.github.com/Font-Awesome for more details about the font -itself. +See http://www.fontawesome.io for more details about the font itself. This package requires the "fontspec" package and either the Xe(La)TeX or Lua(La)TeX engine to load the included otf font. @@ -17,7 +16,7 @@ Font Awesome font Author: Dave Gandy -Licence: SIL Open Font License +Licence: SIL Open Font License, version 1.1 fontawesome package Author: Xavier Danaux <xdanaux@gmail.com> Files old/doc/latex/fontawesome/fontawesome.pdf and new/doc/latex/fontawesome/fontawesome.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fontawesome/fontawesome.tex new/doc/latex/fontawesome/fontawesome.tex --- old/doc/latex/fontawesome/fontawesome.tex 2013-03-26 00:28:22.000000000 +0100 +++ new/doc/latex/fontawesome/fontawesome.tex 2013-06-29 00:26:37.000000000 +0200 @@ -7,8 +7,8 @@ \documentclass{ltxdoc} %\GetFileInfo{\jobname.sty} -\def\fileversion{3.0.2-1} -\def\filedate{March 23, 2013} +\def\fileversion{3.1.1} +\def\filedate{May 10, 2013} \usepackage{lmodern} \usepackage[numbered]{hypdoc} \usepackage{hologo} @@ -16,6 +16,8 @@ \definecolor{myblue}{rgb}{0.22,0.45,0.70}% light blue \hypersetup{colorlinks=true, linkcolor=myblue, urlcolor=myblue, hyperindex} \usepackage{longtable, booktabs} +\usepackage{tikz} +\usepackage{xparse, ifthen} \usepackage{\jobname} \EnableCrossrefs \CodelineIndex @@ -30,12 +32,14 @@ \maketitle \begin{abstract} -The \textsf{\jobname} package grants access to 249 web-related icons provided by the included \emph{Font Awesome} free font, designed by Dave Gandy and released\footnote{See \url{http://fortawesome.github.com/Font-Awesome} for more details about the font itself} under the open SIL Open Font License\footnote{Available at \url{http://scripts.sil.org/OFL}.}. +The \textsf{\jobname} package grants access to 302 web-related icons provided by the included \emph{Font Awesome} free font, designed by Dave Gandy and released\footnote{See \url{http://fortawesome.github.com/Font-Awesome} for more details about the font itself} under the open SIL Open Font License\footnote{Available at \url{http://scripts.sil.org/OFL}.}. This package requires the \textsf{fontspec} package and either the \hologo{Xe}\hologo{(La)TeX} or Lua\hologo{(La)TeX} engine to load the included otf font. \end{abstract} -\changes{v3.0.2}{2013/03/21}{First public release (version number set to match the included FontAwesome.otf font version).} +\changes{v3.1.1} {2013/05/10}{Update to match Font Awesome version 3.1.1, with 53 new icons.} +\changes{v3.0.2-1}{2013/03/23}{Bigfix release: corrected the swap of the \cs{text-height} and \cs{text-width} icons.} +\changes{v3.0.2} {2013/03/21}{First public release (version number set to match the included FontAwesome.otf font version).} \makeatletter \let\PrintMacroName@original\PrintMacroName %\let\PrintDescribeMacro\@gobble @@ -43,10 +47,10 @@ \let\PrintMacroName\@gobble %\let\PrintEnvName\@gobble \begin{macro}{\faTextHeight} -\changes{v3.0.2-1}{2013/03/23}{Corrected the bindings icons of \cs{text-height} and \cs{text-width}, which were inverted.} +\changes{v3.0.2-1}{2013/03/23}{Corrected binding.} \end{macro} \begin{macro}{\faTextWidth} -\changes{v3.0.2-1}{2013/03/23}{Corrected the bindings icons of \cs{text-height} and \cs{text-width}, which were inverted.} +\changes{v3.0.2-1}{2013/03/23}{Corrected binding.} \end{macro} \let\PrintMacroName\PrintMacroName@original \makeatother @@ -71,23 +75,37 @@ \DescribeMacro{\faicon} Once the \textsf{\jobname} package loaded, icons can be accessed through the general \cs{faicon}, which takes as mandatory argument the \meta{name} of the desired icon, or through a direct command specific to each icon. The full list of icon designs, names and direct commands are showcased next. -\newenvironment{showcase} +\newenvironment{showcase}% {% -% \begin{longtable}{ccp{2.8cm}p{3.5cm}}% debug: shows icons with both generic and specific commands - \begin{longtable}{cp{2.8cm}p{3.5cm}} - \toprule -% \bfseries Icon& \bfseries Icon& \bfseries Name& \bfseries Direct command\\% debug - \bfseries Icon& \bfseries Name& \bfseries Direct command\\ - \midrule\endhead} - {\bottomrule +% \begin{longtable}{ccp{3cm}p{3.5cm}p{1cm}}% debug: shows icons with both generic and specific commands + \begin{longtable}{cp{3cm}p{3.5cm}p{1cm}} + \cmidrule[\heavyrulewidth]{1-3}% \toprule +% \bfseries Icon& \bfseries Icon& \bfseries Name& \bfseries Direct command& \\% debug + \bfseries Icon& \bfseries Name& \bfseries Direct command& \\ + \cmidrule{1-3}\endhead} + {\cmidrule[\heavyrulewidth]{1-3}% \bottomrule \end{longtable}} -\newcommand*{\showcaseicon}[2]{% -% \faicon{#1}& \csname#2\endcsname& \itshape #1& \ttfamily \textbackslash #2\index{\ttfamily \textbackslash #2}\\}% debug - \faicon{#1}& \itshape #1& \ttfamily \textbackslash #2\index{\ttfamily \textbackslash #2}\\} +\NewDocumentCommand{\showcaseicon}{mmg}{% +% \faicon{#1}& \csname#2\endcsname& \itshape #1& \ttfamily \textbackslash #2\index{\ttfamily \textbackslash #2}& \IfNoValueTF{#3}{}{\tag{#3}}\\}% debug + \faicon{#1}& \itshape #1& \ttfamily \textbackslash #2\index{\ttfamily \textbackslash #2}& \IfNoValueTF{#3}{}{\tag{#3}}\\} +\newcommand{\tag}[1]{{% + \small\sffamily% + \ifthenelse{\equal{#1}{new}}{% + \tikz[baseline={(TAG.base)}]{ + \node[white, fill=myblue, rounded corners=3pt, inner sep=1.5pt] (TAG) {new!\vphantom{Ay!}}; + }}{}% + \ifthenelse{\equal{#1}{gone}}{% + \tikz[baseline={(TAG.base)}]{ + \node[black!50, fill=black!25, rounded corners=3pt, inner sep=1.5pt] (TAG) {gone (?)\vphantom{Ay!}}; + }}{}% + \ifthenelse{\equal{#1}{alias}}{% + \textcolor{black!50}{(alias)}}{}% + }} \subsection{Web application icons\label{section:web_application}} \begin{showcase} \showcaseicon{adjust}{faAdjust} + \showcaseicon{anchor}{faAnchor}{new} \showcaseicon{asterisk}{faAsterisk} \showcaseicon{ban-circle}{faBanCircle} \showcaseicon{bar-chart}{faBarChart} @@ -102,35 +120,49 @@ \showcaseicon{bookmark-empty}{faBookmarkEmpty} \showcaseicon{briefcase}{faBriefcase} \showcaseicon{bullhorn}{faBullhorn} + \showcaseicon{bullseye}{faBullseye}{new} \showcaseicon{calendar}{faCalendar} + \showcaseicon{calendar-empty}{faCalendarEmpty}{new} \showcaseicon{camera}{faCamera} \showcaseicon{camera-retro}{faCameraRetro} \showcaseicon{certificate}{faCertificate} \showcaseicon{check}{faCheck} \showcaseicon{check-empty}{faCheckEmpty} + \showcaseicon{check-minus}{faCheckMinus}{new} + \showcaseicon{check-sign}{faCheckSign}{new} \showcaseicon{circle}{faCircle} \showcaseicon{circle-blank}{faCircleBlank} \showcaseicon{cloud}{faCloud} \showcaseicon{cloud-download}{faCloudDownload} \showcaseicon{cloud-upload}{faCloudUpload} + \showcaseicon{code}{faCode}{new} + \showcaseicon{code-fork}{faCodeFork}{new} \showcaseicon{coffee}{faCoffee} \showcaseicon{cog}{faCog} \showcaseicon{cogs}{faCogs} + \showcaseicon{collapse-alt}{faCollapseAlt}{new} \showcaseicon{comment}{faComment} \showcaseicon{comment-alt}{faCommentAlt} \showcaseicon{comments}{faComments} \showcaseicon{comments-alt}{faCommentsAlt} \showcaseicon{credit-card}{faCreditCard} + \showcaseicon{crop}{faCrop}{new} \showcaseicon{dashboard}{faDashboard} \showcaseicon{desktop}{faDesktop} \showcaseicon{download}{faDownload} \showcaseicon{download-alt}{faDownloadAlt} \showcaseicon{edit}{faEdit} + \showcaseicon{edit-sign}{faEditSign}{new} + \showcaseicon{ellipsis-horizontal}{faEllipsisHorizontal}{new} + \showcaseicon{ellipsis-vertical}{faEllipsisVertical}{new} \showcaseicon{envelope}{faEnvelope} \showcaseicon{envelope-alt}{faEnvelopeAlt} \showcaseicon{exchange}{faExchange} + \showcaseicon{exclamation}{faExclamation}{new} \showcaseicon{exclamation-sign}{faExclamationSign} + \showcaseicon{expand-alt}{faExpandAlt}{new} \showcaseicon{external-link}{faExternalLink} + \showcaseicon{external-link-sign}{faExternalLinkSign}{new} \showcaseicon{eye-close}{faEyeClose} \showcaseicon{eye-open}{faEyeOpen} \showcaseicon{facetime-video}{faFacetimeVideo} @@ -138,12 +170,17 @@ \showcaseicon{film}{faFilm} \showcaseicon{filter}{faFilter} \showcaseicon{fire}{faFire} + \showcaseicon{fire-extinguisher}{faFireExtinguisher}{new} \showcaseicon{flag}{faFlag} + \showcaseicon{flag-alt}{faFlagAlt}{new} + \showcaseicon{flag-checkered}{faFlagCheckered}{new} \showcaseicon{folder-open}{faFolderOpen} \showcaseicon{folder-close}{faFolderClose} \showcaseicon{folder-open-alt}{faFolderOpenAlt} \showcaseicon{folder-close-alt}{faFolderCloseAlt} \showcaseicon{food}{faFood} + \showcaseicon{frown}{faFrown}{new} + \showcaseicon{gamepad}{faGamepad}{new} \showcaseicon{gift}{faGift} \showcaseicon{glass}{faGlass} \showcaseicon{globe}{faGlobe} @@ -154,20 +191,33 @@ \showcaseicon{heart-empty}{faHeartEmpty} \showcaseicon{home}{faHome} \showcaseicon{inbox}{faInbox} + \showcaseicon{info}{faInfo}{new} \showcaseicon{info-sign}{faInfoSign} \showcaseicon{key}{faKey} + \showcaseicon{keyboard}{faKeyboard}{new} \showcaseicon{laptop}{faLaptop} \showcaseicon{leaf}{faLeaf} \showcaseicon{legal}{faLegal} \showcaseicon{lemon}{faLemon} + \showcaseicon{level-up}{faLevelUp}{new} + \showcaseicon{level-down}{faLevelDown}{new} \showcaseicon{lightbulb}{faLightbulb} + \showcaseicon{location-arrow}{faLocationArrow}{new} \showcaseicon{lock}{faLock} \showcaseicon{unlock}{faUnlock} + \showcaseicon{unlock-alt}{faUnlockAlt}{new} \showcaseicon{magic}{faMagic} \showcaseicon{magnet}{faMagnet} + \showcaseicon{mail-forward}{faMailForward}{alias} + \showcaseicon{mail-reply}{faMailReply}{alias} + \showcaseicon{mail-reply-all}{faMailReplyAll}{alias} \showcaseicon{map-marker}{faMapMarker} + \showcaseicon{meh}{faMeh}{new} + \showcaseicon{microphone}{faMicrophone}{new} + \showcaseicon{microphone-off}{faMicrophoneOff}{new} \showcaseicon{minus}{faMinus} \showcaseicon{minus-sign}{faMinusSign} + \showcaseicon{minus-sign-alt}{faMinusSignAlt}{new} \showcaseicon{mobile-phone}{faMobilePhone} \showcaseicon{money}{faMoney} \showcaseicon{move}{faMove} @@ -177,13 +227,17 @@ \showcaseicon{ok-circle}{faOkCircle} \showcaseicon{ok-sign}{faOkSign} \showcaseicon{pencil}{faPencil} + \showcaseicon{phone}{faPhone} + \showcaseicon{phone-sign}{faPhoneSign} \showcaseicon{picture}{faPicture} \showcaseicon{plane}{faPlane} \showcaseicon{plus}{faPlus} \showcaseicon{plus-sign}{faPlusSign} \showcaseicon{print}{faPrint} \showcaseicon{pushpin}{faPushpin} + \showcaseicon{puzzle-piece}{faPuzzlePiece}{new} \showcaseicon{qrcode}{faQRcode} + \showcaseicon{question}{faQuestion}{new} \showcaseicon{question-sign}{faQuestionSign} \showcaseicon{quote-left}{faQuoteLeft} \showcaseicon{quote-right}{faQuoteRight} @@ -194,20 +248,28 @@ \showcaseicon{remove-sign}{faRemoveSign} \showcaseicon{reorder}{faReorder} \showcaseicon{reply}{faReply} + \showcaseicon{reply-all}{faReplyAll}{new} \showcaseicon{resize-horizontal}{faResizeHorizontal} \showcaseicon{resize-vertical}{faResizeVertical} \showcaseicon{retweet}{faRetweet} \showcaseicon{road}{faRoad} + \showcaseicon{rocket}{faRocket}{new} + \showcaseicon{rotate-left}{faRotateLeft}{alias} + \showcaseicon{rotate-right}{faRotateRight}{alias} \showcaseicon{rss}{faRSS} + \showcaseicon{rss-sign}{faRSSSign}{new} \showcaseicon{screenshot}{faScreenshot} \showcaseicon{search}{faSearch} \showcaseicon{share}{faShare} \showcaseicon{share-alt}{faShareAlt} + \showcaseicon{share-sign}{faShareSign}{new} + \showcaseicon{shield}{faShield}{new} \showcaseicon{shopping-cart}{faShoppingCart} \showcaseicon{signal}{faSignal} \showcaseicon{signin}{faSignin} \showcaseicon{signout}{faSignout} \showcaseicon{sitemap}{faSitemap} + \showcaseicon{smile}{faSmile}{new} \showcaseicon{sort}{faSort} \showcaseicon{sort-down}{faSortDown} \showcaseicon{sort-up}{faSortUp} @@ -215,12 +277,16 @@ \showcaseicon{star}{faStar} \showcaseicon{star-empty}{faStarEmpty} \showcaseicon{star-half}{faStarHalf} + \showcaseicon{star-half-empty}{faStarHalfEmpty}{new} + \showcaseicon{star-half-full}{faStarHalfFull}{alias} \showcaseicon{tablet}{faTablet} \showcaseicon{tag}{faTag} \showcaseicon{tags}{faTags} \showcaseicon{tasks}{faTasks} + \showcaseicon{terminal}{faTerminal}{new} \showcaseicon{thumbs-down}{faThumbsDown} \showcaseicon{thumbs-up}{faThumbsUp} + \showcaseicon{ticket}{faTicket}{new} \showcaseicon{time}{faTime} \showcaseicon{tint}{faTint} \showcaseicon{trash}{faTrash} @@ -263,8 +329,12 @@ \showcaseicon{italic}{faItalic} \showcaseicon{strikethrough}{faStrikethrough} \showcaseicon{underline}{faUnderline} + \showcaseicon{subscript}{faSubscript}{new} + \showcaseicon{superscript}{faSuperscript}{new} \showcaseicon{link}{faLink} + \showcaseicon{unlink}{faUnlink}{new} \showcaseicon{paper-clip}{faPaperClip} + \showcaseicon{eraser}{faEraser}{new} \showcaseicon{columns}{faColumns} \showcaseicon{table}{faTable} \showcaseicon{thumbnails-large}{faThumbnailsLarge} @@ -294,6 +364,10 @@ \showcaseicon{chevron-right}{faChevronRight} \showcaseicon{chevron-up}{faChevronUp} \showcaseicon{chevron-down}{faChevronDown} + \showcaseicon{chevron-sign-left}{faChevronSignLeft}{new} + \showcaseicon{chevron-sign-right}{faChevronSignRight}{new} + \showcaseicon{chevron-sign-up}{faChevronSignUp}{new} + \showcaseicon{chevron-sign-down}{faChevronSignDown}{new} \showcaseicon{circle-arrow-left}{faCircleArrowLeft} \showcaseicon{circle-arrow-right}{faCircleArrowRight} \showcaseicon{circle-arrow-up}{faCircleArrowUp} @@ -312,8 +386,9 @@ \subsection{Video player icons\label{section:video_player}} \begin{showcase} - \showcaseicon{play-circle}{faPlayCircle} \showcaseicon{play}{faPlay} + \showcaseicon{play-circle}{faPlayCircle} + \showcaseicon{play-sign}{faPlaySign}{new} \showcaseicon{pause}{faPause} \showcaseicon{stop}{faStop} \showcaseicon{step-backward}{faStepBackward} @@ -330,17 +405,18 @@ \subsection{Social icons\label{section:social}} \begin{showcase} - \showcaseicon{phone}{faPhone} - \showcaseicon{phone-sign}{faPhoneSign} + \showcaseicon{css3}{faCSSthree}{new} \showcaseicon{facebook}{faFacebook} \showcaseicon{facebook-sign}{faFacebookSign} \showcaseicon{twitter}{faTwitter} \showcaseicon{twitter-sign}{faTwitterSign} \showcaseicon{github}{faGithub} - \showcaseicon{github-alt}{faGithubAlt} + \showcaseicon{github-alt}{faGithubAlt}{gone} \showcaseicon{github-sign}{faGithubSign} + \showcaseicon{html5}{faHTMLfive}{new} \showcaseicon{linkedin}{faLinkedin} \showcaseicon{linkedin-sign}{faLinkedinSign} + \showcaseicon{maxcdn}{faMaxCDN}{new} \showcaseicon{pinterest}{faPinterest} \showcaseicon{pinterest-sign}{faPinterestSign} \showcaseicon{google-plus}{faGooglePlus} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontawesome.doc.tlpobj new/tlpkg/tlpobj/fontawesome.doc.tlpobj --- old/tlpkg/tlpobj/fontawesome.doc.tlpobj 2013-03-26 04:38:20.000000000 +0100 +++ new/tlpkg/tlpobj/fontawesome.doc.tlpobj 2013-06-29 03:21:59.000000000 +0200 @@ -1,9 +1,9 @@ name fontawesome.doc category Package -revision 29498 +revision 31020 shortdesc doc files of fontawesome relocated 1 -docfiles size=39 +docfiles size=43 RELOC/doc/latex/fontawesome/README RELOC/doc/latex/fontawesome/fontawesome.pdf RELOC/doc/latex/fontawesome/fontawesome.tex ++++++ fontawesome.tar.xz ++++++ Files old/fonts/opentype/public/fontawesome/FontAwesome.otf and new/fonts/opentype/public/fontawesome/FontAwesome.otf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fontawesome/fontawesome.sty new/tex/latex/fontawesome/fontawesome.sty --- old/tex/latex/fontawesome/fontawesome.sty 2013-03-26 00:28:22.000000000 +0100 +++ new/tex/latex/fontawesome/fontawesome.sty 2013-06-29 00:26:37.000000000 +0200 @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fontawesome}[2013/03/23 v3.0.2-1 font awesome icons] +\ProvidesPackage{fontawesome}[2013/05/10 v3.1.1 font awesome icons] %------------------------------------------------------------------------------- @@ -31,273 +31,336 @@ {\FA\csname faicon@#1\endcsname}} % icon-specific commands -\expandafter\def\csname faicon@glass\endcsname {\symbol{"F000}} \def\faGlass {{\FA\csname faicon@glass\endcsname}} -\expandafter\def\csname faicon@music\endcsname {\symbol{"F001}} \def\faMusic {{\FA\csname faicon@music\endcsname}} -\expandafter\def\csname faicon@search\endcsname {\symbol{"F002}} \def\faSearch {{\FA\csname faicon@search\endcsname}} -\expandafter\def\csname faicon@envelope\endcsname {\symbol{"F003}} \def\faEnvelope {{\FA\csname faicon@envelope\endcsname}} -\expandafter\def\csname faicon@heart\endcsname {\symbol{"F004}} \def\faHeart {{\FA\csname faicon@heart\endcsname}} -\expandafter\def\csname faicon@star\endcsname {\symbol{"F005}} \def\faStar {{\FA\csname faicon@star\endcsname}} -\expandafter\def\csname faicon@star-empty\endcsname {\symbol{"F006}} \def\faStarEmpty {{\FA\csname faicon@star-empty\endcsname}} -\expandafter\def\csname faicon@user\endcsname {\symbol{"F007}} \def\faUser {{\FA\csname faicon@user\endcsname}} -\expandafter\def\csname faicon@film\endcsname {\symbol{"F008}} \def\faFilm {{\FA\csname faicon@film\endcsname}} -\expandafter\def\csname faicon@thumbnails-large\endcsname {\symbol{"F009}} \def\faThumbnailsLarge {{\FA\csname faicon@thumbnails-large\endcsname}} -\expandafter\def\csname faicon@thumbnails\endcsname {\symbol{"F00A}} \def\faThumbnails {{\FA\csname faicon@thumbnails\endcsname}} -\expandafter\def\csname faicon@thumbnails-list\endcsname {\symbol{"F00B}} \def\faThumbnailsList {{\FA\csname faicon@thumbnails-list\endcsname}} -\expandafter\def\csname faicon@ok\endcsname {\symbol{"F00C}} \def\faOk {{\FA\csname faicon@ok\endcsname}} -\expandafter\def\csname faicon@remove\endcsname {\symbol{"F00D}} \def\faRemove {{\FA\csname faicon@remove\endcsname}} -\expandafter\def\csname faicon@zoom-in\endcsname {\symbol{"F00E}} \def\faZoomIn {{\FA\csname faicon@zoom-in\endcsname}} - -\expandafter\def\csname faicon@zoom-out\endcsname {\symbol{"F010}} \def\faZoomOut {{\FA\csname faicon@zoom-out\endcsname}} -\expandafter\def\csname faicon@off\endcsname {\symbol{"F011}} \def\faOff {{\FA\csname faicon@off\endcsname}} -\expandafter\def\csname faicon@signal\endcsname {\symbol{"F012}} \def\faSignal {{\FA\csname faicon@signal\endcsname}} -\expandafter\def\csname faicon@cog\endcsname {\symbol{"F013}} \def\faCog {{\FA\csname faicon@cog\endcsname}} -\expandafter\def\csname faicon@trash\endcsname {\symbol{"F014}} \def\faTrash {{\FA\csname faicon@trash\endcsname}} -\expandafter\def\csname faicon@home\endcsname {\symbol{"F015}} \def\faHome {{\FA\csname faicon@home\endcsname}} -\expandafter\def\csname faicon@file\endcsname {\symbol{"F016}} \def\faFile {{\FA\csname faicon@file\endcsname}} -\expandafter\def\csname faicon@time\endcsname {\symbol{"F017}} \def\faTime {{\FA\csname faicon@time\endcsname}} -\expandafter\def\csname faicon@road\endcsname {\symbol{"F018}} \def\faRoad {{\FA\csname faicon@road\endcsname}} -\expandafter\def\csname faicon@download-alt\endcsname {\symbol{"F019}} \def\faDownloadAlt {{\FA\csname faicon@download-alt\endcsname}} -\expandafter\def\csname faicon@download\endcsname {\symbol{"F01A}} \def\faDownload {{\FA\csname faicon@download\endcsname}} -\expandafter\def\csname faicon@upload\endcsname {\symbol{"F01B}} \def\faUpload {{\FA\csname faicon@upload\endcsname}} -\expandafter\def\csname faicon@inbox\endcsname {\symbol{"F01C}} \def\faInbox {{\FA\csname faicon@inbox\endcsname}} -\expandafter\def\csname faicon@play-circle\endcsname {\symbol{"F01D}} \def\faPlayCircle {{\FA\csname faicon@play-circle\endcsname}} -\expandafter\def\csname faicon@repeat\endcsname {\symbol{"F01E}} \def\faRepeat {{\FA\csname faicon@repeat\endcsname}} - -\expandafter\def\csname faicon@refresh\endcsname {\symbol{"F021}} \def\faRefresh {{\FA\csname faicon@refresh\endcsname}} -\expandafter\def\csname faicon@list-alt\endcsname {\symbol{"F022}} \def\faListAlt {{\FA\csname faicon@list-alt\endcsname}} -\expandafter\def\csname faicon@lock\endcsname {\symbol{"F023}} \def\faLock {{\FA\csname faicon@lock\endcsname}} -\expandafter\def\csname faicon@flag\endcsname {\symbol{"F024}} \def\faFlag {{\FA\csname faicon@flag\endcsname}} -\expandafter\def\csname faicon@headphones\endcsname {\symbol{"F025}} \def\faHeadphones {{\FA\csname faicon@headphones\endcsname}} -\expandafter\def\csname faicon@volume-off\endcsname {\symbol{"F026}} \def\faVolumeOff {{\FA\csname faicon@volume-off\endcsname}} -\expandafter\def\csname faicon@volume-down\endcsname {\symbol{"F027}} \def\faVolumeDown {{\FA\csname faicon@volume-down\endcsname}} -\expandafter\def\csname faicon@volume-up\endcsname {\symbol{"F028}} \def\faVolumeUp {{\FA\csname faicon@volume-up\endcsname}} -\expandafter\def\csname faicon@qrcode\endcsname {\symbol{"F029}} \def\faQRcode {{\FA\csname faicon@qrcode\endcsname}} -\expandafter\def\csname faicon@barcode\endcsname {\symbol{"F02A}} \def\faBarcode {{\FA\csname faicon@barcode\endcsname}} -\expandafter\def\csname faicon@tag\endcsname {\symbol{"F02B}} \def\faTag {{\FA\csname faicon@tag\endcsname}} -\expandafter\def\csname faicon@tags\endcsname {\symbol{"F02C}} \def\faTags {{\FA\csname faicon@tags\endcsname}} -\expandafter\def\csname faicon@book\endcsname {\symbol{"F02D}} \def\faBook {{\FA\csname faicon@book\endcsname}} -\expandafter\def\csname faicon@bookmark\endcsname {\symbol{"F02E}} \def\faBookmark {{\FA\csname faicon@bookmark\endcsname}} -\expandafter\def\csname faicon@print\endcsname {\symbol{"F02F}} \def\faPrint {{\FA\csname faicon@print\endcsname}} - -\expandafter\def\csname faicon@camera\endcsname {\symbol{"F030}} \def\faCamera {{\FA\csname faicon@camera\endcsname}} -\expandafter\def\csname faicon@font\endcsname {\symbol{"F031}} \def\faFont {{\FA\csname faicon@font\endcsname}} -\expandafter\def\csname faicon@bold\endcsname {\symbol{"F032}} \def\faBold {{\FA\csname faicon@bold\endcsname}} -\expandafter\def\csname faicon@italic\endcsname {\symbol{"F033}} \def\faItalic {{\FA\csname faicon@italic\endcsname}} -\expandafter\def\csname faicon@text-height\endcsname {\symbol{"F034}} \def\faTextHeight {{\FA\csname faicon@text-height\endcsname}} -\expandafter\def\csname faicon@text-width\endcsname {\symbol{"F035}} \def\faTextWidth {{\FA\csname faicon@text-width\endcsname}} -\expandafter\def\csname faicon@align-left\endcsname {\symbol{"F036}} \def\faAlignLeft {{\FA\csname faicon@align-left\endcsname}} -\expandafter\def\csname faicon@align-center\endcsname {\symbol{"F037}} \def\faAlignCenter {{\FA\csname faicon@align-center\endcsname}} -\expandafter\def\csname faicon@align-right\endcsname {\symbol{"F038}} \def\faAlignRight {{\FA\csname faicon@align-right\endcsname}} -\expandafter\def\csname faicon@align-justify\endcsname {\symbol{"F039}} \def\faAlignJustify {{\FA\csname faicon@align-justify\endcsname}} -\expandafter\def\csname faicon@list\endcsname {\symbol{"F03A}} \def\faList {{\FA\csname faicon@list\endcsname}} -\expandafter\def\csname faicon@indent-left\endcsname {\symbol{"F03B}} \def\faIndentLeft {{\FA\csname faicon@indent-left\endcsname}} -\expandafter\def\csname faicon@indent-right\endcsname {\symbol{"F03C}} \def\faIndentRight {{\FA\csname faicon@indent-right\endcsname}} -\expandafter\def\csname faicon@facetime-video\endcsname {\symbol{"F03D}} \def\faFacetimeVideo {{\FA\csname faicon@facetime-video\endcsname}} -\expandafter\def\csname faicon@picture\endcsname {\symbol{"F03E}} \def\faPicture {{\FA\csname faicon@picture\endcsname}} - -\expandafter\def\csname faicon@pencil\endcsname {\symbol{"F040}} \def\faPencil {{\FA\csname faicon@pencil\endcsname}} -\expandafter\def\csname faicon@map-marker\endcsname {\symbol{"F041}} \def\faMapMarker {{\FA\csname faicon@map-marker\endcsname}} -\expandafter\def\csname faicon@adjust\endcsname {\symbol{"F042}} \def\faAdjust {{\FA\csname faicon@adjust\endcsname}} -\expandafter\def\csname faicon@tint\endcsname {\symbol{"F043}} \def\faTint {{\FA\csname faicon@tint\endcsname}} -\expandafter\def\csname faicon@edit\endcsname {\symbol{"F044}} \def\faEdit {{\FA\csname faicon@edit\endcsname}} -\expandafter\def\csname faicon@share\endcsname {\symbol{"F045}} \def\faShare {{\FA\csname faicon@share\endcsname}} -\expandafter\def\csname faicon@check\endcsname {\symbol{"F046}} \def\faCheck {{\FA\csname faicon@check\endcsname}} -\expandafter\def\csname faicon@move\endcsname {\symbol{"F047}} \def\faMove {{\FA\csname faicon@move\endcsname}} -\expandafter\def\csname faicon@step-backward\endcsname {\symbol{"F048}} \def\faStepBackward {{\FA\csname faicon@step-backward\endcsname}} -\expandafter\def\csname faicon@fast-backward\endcsname {\symbol{"F049}} \def\faFastBackward {{\FA\csname faicon@fast-backward\endcsname}} -\expandafter\def\csname faicon@backward\endcsname {\symbol{"F04A}} \def\faBackward {{\FA\csname faicon@backward\endcsname}} -\expandafter\def\csname faicon@play\endcsname {\symbol{"F04B}} \def\faPlay {{\FA\csname faicon@play\endcsname}} -\expandafter\def\csname faicon@pause\endcsname {\symbol{"F04C}} \def\faPause {{\FA\csname faicon@pause\endcsname}} -\expandafter\def\csname faicon@stop\endcsname {\symbol{"F04D}} \def\faStop {{\FA\csname faicon@stop\endcsname}} -\expandafter\def\csname faicon@forward\endcsname {\symbol{"F04E}} \def\faForward {{\FA\csname faicon@forward\endcsname}} - -\expandafter\def\csname faicon@fast-forward\endcsname {\symbol{"F050}} \def\faFastForward {{\FA\csname faicon@fast-forward\endcsname}} -\expandafter\def\csname faicon@step-forward\endcsname {\symbol{"F051}} \def\faStepForward {{\FA\csname faicon@step-forward\endcsname}} -\expandafter\def\csname faicon@eject\endcsname {\symbol{"F052}} \def\faEject {{\FA\csname faicon@eject\endcsname}} -\expandafter\def\csname faicon@chevron-left\endcsname {\symbol{"F053}} \def\faChevronLeft {{\FA\csname faicon@chevron-left\endcsname}} -\expandafter\def\csname faicon@chevron-right\endcsname {\symbol{"F054}} \def\faChevronRight {{\FA\csname faicon@chevron-right\endcsname}} -\expandafter\def\csname faicon@plus-sign\endcsname {\symbol{"F055}} \def\faPlusSign {{\FA\csname faicon@plus-sign\endcsname}} -\expandafter\def\csname faicon@minus-sign\endcsname {\symbol{"F056}} \def\faMinusSign {{\FA\csname faicon@minus-sign\endcsname}} -\expandafter\def\csname faicon@remove-sign\endcsname {\symbol{"F057}} \def\faRemoveSign {{\FA\csname faicon@remove-sign\endcsname}} -\expandafter\def\csname faicon@ok-sign\endcsname {\symbol{"F058}} \def\faOkSign {{\FA\csname faicon@ok-sign\endcsname}} -\expandafter\def\csname faicon@question-sign\endcsname {\symbol{"F059}} \def\faQuestionSign {{\FA\csname faicon@question-sign\endcsname}} -\expandafter\def\csname faicon@info-sign\endcsname {\symbol{"F05A}} \def\faInfoSign {{\FA\csname faicon@info-sign\endcsname}} -\expandafter\def\csname faicon@screenshot\endcsname {\symbol{"F05B}} \def\faScreenshot {{\FA\csname faicon@screenshot\endcsname}} -\expandafter\def\csname faicon@remove-circle\endcsname {\symbol{"F05C}} \def\faRemoveCircle {{\FA\csname faicon@remove-circle\endcsname}} -\expandafter\def\csname faicon@ok-circle\endcsname {\symbol{"F05D}} \def\faOkCircle {{\FA\csname faicon@ok-circle\endcsname}} -\expandafter\def\csname faicon@ban-circle\endcsname {\symbol{"F05E}} \def\faBanCircle {{\FA\csname faicon@ban-circle\endcsname}} - -\expandafter\def\csname faicon@arrow-left\endcsname {\symbol{"F060}} \def\faArrowLeft {{\FA\csname faicon@arrow-left\endcsname}} -\expandafter\def\csname faicon@arrow-right\endcsname {\symbol{"F061}} \def\faArrowRight {{\FA\csname faicon@arrow-right\endcsname}} -\expandafter\def\csname faicon@arrow-up\endcsname {\symbol{"F062}} \def\faArrowUp {{\FA\csname faicon@arrow-up\endcsname}} -\expandafter\def\csname faicon@arrow-down\endcsname {\symbol{"F063}} \def\faArrowDown {{\FA\csname faicon@arrow-down\endcsname}} -\expandafter\def\csname faicon@share-alt\endcsname {\symbol{"F064}} \def\faShareAlt {{\FA\csname faicon@share-alt\endcsname}} -\expandafter\def\csname faicon@resize-full\endcsname {\symbol{"F065}} \def\faResizeFull {{\FA\csname faicon@resize-full\endcsname}} -\expandafter\def\csname faicon@resize-small\endcsname {\symbol{"F066}} \def\faResizeSmall {{\FA\csname faicon@resize-small\endcsname}} -\expandafter\def\csname faicon@plus\endcsname {\symbol{"F067}} \def\faPlus {{\FA\csname faicon@plus\endcsname}} -\expandafter\def\csname faicon@minus\endcsname {\symbol{"F068}} \def\faMinus {{\FA\csname faicon@minus\endcsname}} -\expandafter\def\csname faicon@asterisk\endcsname {\symbol{"F069}} \def\faAsterisk {{\FA\csname faicon@asterisk\endcsname}} -\expandafter\def\csname faicon@exclamation-sign\endcsname {\symbol{"F06A}} \def\faExclamationSign {{\FA\csname faicon@exclamation-sign\endcsname}} -\expandafter\def\csname faicon@gift\endcsname {\symbol{"F06B}} \def\faGift {{\FA\csname faicon@gift\endcsname}} -\expandafter\def\csname faicon@leaf\endcsname {\symbol{"F06C}} \def\faLeaf {{\FA\csname faicon@leaf\endcsname}} -\expandafter\def\csname faicon@fire\endcsname {\symbol{"F06D}} \def\faFire {{\FA\csname faicon@fire\endcsname}} -\expandafter\def\csname faicon@eye-open\endcsname {\symbol{"F06E}} \def\faEyeOpen {{\FA\csname faicon@eye-open\endcsname}} - -\expandafter\def\csname faicon@eye-close\endcsname {\symbol{"F070}} \def\faEyeClose {{\FA\csname faicon@eye-close\endcsname}} -\expandafter\def\csname faicon@warning-sign\endcsname {\symbol{"F071}} \def\faWarningSign {{\FA\csname faicon@warning-sign\endcsname}} -\expandafter\def\csname faicon@plane\endcsname {\symbol{"F072}} \def\faPlane {{\FA\csname faicon@plane\endcsname}} -\expandafter\def\csname faicon@calendar\endcsname {\symbol{"F073}} \def\faCalendar {{\FA\csname faicon@calendar\endcsname}} -\expandafter\def\csname faicon@random\endcsname {\symbol{"F074}} \def\faRandom {{\FA\csname faicon@random\endcsname}} -\expandafter\def\csname faicon@comment\endcsname {\symbol{"F075}} \def\faComment {{\FA\csname faicon@comment\endcsname}} -\expandafter\def\csname faicon@magnet\endcsname {\symbol{"F076}} \def\faMagnet {{\FA\csname faicon@magnet\endcsname}} -\expandafter\def\csname faicon@chevron-up\endcsname {\symbol{"F077}} \def\faChevronUp {{\FA\csname faicon@chevron-up\endcsname}} -\expandafter\def\csname faicon@chevron-down\endcsname {\symbol{"F078}} \def\faChevronDown {{\FA\csname faicon@chevron-down\endcsname}} -\expandafter\def\csname faicon@retweet\endcsname {\symbol{"F079}} \def\faRetweet {{\FA\csname faicon@retweet\endcsname}} -\expandafter\def\csname faicon@shopping-cart\endcsname {\symbol{"F07A}} \def\faShoppingCart {{\FA\csname faicon@shopping-cart\endcsname}} -\expandafter\def\csname faicon@folder-close\endcsname {\symbol{"F07B}} \def\faFolderClose {{\FA\csname faicon@folder-close\endcsname}} -\expandafter\def\csname faicon@folder-open\endcsname {\symbol{"F07C}} \def\faFolderOpen {{\FA\csname faicon@folder-open\endcsname}} -\expandafter\def\csname faicon@resize-vertical\endcsname {\symbol{"F07D}} \def\faResizeVertical {{\FA\csname faicon@resize-vertical\endcsname}} -\expandafter\def\csname faicon@resize-horizontal\endcsname {\symbol{"F07E}} \def\faResizeHorizontal{{\FA\csname faicon@resize-horizontal\endcsname}} - -\expandafter\def\csname faicon@bar-chart\endcsname {\symbol{"F080}} \def\faBarChart {{\FA\csname faicon@bar-chart\endcsname}} -\expandafter\def\csname faicon@twitter-sign\endcsname {\symbol{"F081}} \def\faTwitterSign {{\FA\csname faicon@twitter-sign\endcsname}} -\expandafter\def\csname faicon@facebook-sign\endcsname {\symbol{"F082}} \def\faFacebookSign {{\FA\csname faicon@facebook-sign\endcsname}} -\expandafter\def\csname faicon@camera-retro\endcsname {\symbol{"F083}} \def\faCameraRetro {{\FA\csname faicon@camera-retro\endcsname}} -\expandafter\def\csname faicon@key\endcsname {\symbol{"F084}} \def\faKey {{\FA\csname faicon@key\endcsname}} -\expandafter\def\csname faicon@cogs\endcsname {\symbol{"F085}} \def\faCogs {{\FA\csname faicon@cogs\endcsname}} -\expandafter\def\csname faicon@comments\endcsname {\symbol{"F086}} \def\faComments {{\FA\csname faicon@comments\endcsname}} -\expandafter\def\csname faicon@thumbs-up\endcsname {\symbol{"F087}} \def\faThumbsUp {{\FA\csname faicon@thumbs-up\endcsname}} -\expandafter\def\csname faicon@thumbs-down\endcsname {\symbol{"F088}} \def\faThumbsDown {{\FA\csname faicon@thumbs-down\endcsname}} -\expandafter\def\csname faicon@star-half\endcsname {\symbol{"F089}} \def\faStarHalf {{\FA\csname faicon@star-half\endcsname}} -\expandafter\def\csname faicon@heart-empty\endcsname {\symbol{"F08A}} \def\faHeartEmpty {{\FA\csname faicon@heart-empty\endcsname}} -\expandafter\def\csname faicon@signout\endcsname {\symbol{"F08B}} \def\faSignout {{\FA\csname faicon@signout\endcsname}} -\expandafter\def\csname faicon@linkedin-sign\endcsname {\symbol{"F08C}} \def\faLinkedinSign {{\FA\csname faicon@linkedin-sign\endcsname}} -\expandafter\def\csname faicon@pushpin\endcsname {\symbol{"F08D}} \def\faPushpin {{\FA\csname faicon@pushpin\endcsname}} -\expandafter\def\csname faicon@external-link\endcsname {\symbol{"F08E}} \def\faExternalLink {{\FA\csname faicon@external-link\endcsname}} - -\expandafter\def\csname faicon@signin\endcsname {\symbol{"F090}} \def\faSignin {{\FA\csname faicon@signin\endcsname}} -\expandafter\def\csname faicon@trophy\endcsname {\symbol{"F091}} \def\faTrophy {{\FA\csname faicon@trophy\endcsname}} -\expandafter\def\csname faicon@github-sign\endcsname {\symbol{"F092}} \def\faGithubSign {{\FA\csname faicon@github-sign\endcsname}} -\expandafter\def\csname faicon@upload-alt\endcsname {\symbol{"F093}} \def\faUploadAlt {{\FA\csname faicon@upload-alt\endcsname}} -\expandafter\def\csname faicon@lemon\endcsname {\symbol{"F094}} \def\faLemon {{\FA\csname faicon@lemon\endcsname}} -\expandafter\def\csname faicon@phone\endcsname {\symbol{"F095}} \def\faPhone {{\FA\csname faicon@phone\endcsname}} -\expandafter\def\csname faicon@check-empty\endcsname {\symbol{"F096}} \def\faCheckEmpty {{\FA\csname faicon@check-empty\endcsname}} -\expandafter\def\csname faicon@bookmark-empty\endcsname {\symbol{"F097}} \def\faBookmarkEmpty {{\FA\csname faicon@bookmark-empty\endcsname}} -\expandafter\def\csname faicon@phone-sign\endcsname {\symbol{"F098}} \def\faPhoneSign {{\FA\csname faicon@phone-sign\endcsname}} -\expandafter\def\csname faicon@twitter\endcsname {\symbol{"F099}} \def\faTwitter {{\FA\csname faicon@twitter\endcsname}} -\expandafter\def\csname faicon@facebook\endcsname {\symbol{"F09A}} \def\faFacebook {{\FA\csname faicon@facebook\endcsname}} -\expandafter\def\csname faicon@github\endcsname {\symbol{"F09B}} \def\faGithub {{\FA\csname faicon@github\endcsname}} -\expandafter\def\csname faicon@unlock\endcsname {\symbol{"F09C}} \def\faUnlock {{\FA\csname faicon@unlock\endcsname}} -\expandafter\def\csname faicon@credit-card\endcsname {\symbol{"F09D}} \def\faCreditCard {{\FA\csname faicon@credit-card\endcsname}} -\expandafter\def\csname faicon@rss\endcsname {\symbol{"F09E}} \def\faRSS {{\FA\csname faicon@rss\endcsname}} - -\expandafter\def\csname faicon@hdd\endcsname {\symbol{"F0A0}} \def\faHDD {{\FA\csname faicon@hdd\endcsname}} -\expandafter\def\csname faicon@bullhorn\endcsname {\symbol{"F0A1}} \def\faBullhorn {{\FA\csname faicon@bullhorn\endcsname}} -\expandafter\def\csname faicon@bell\endcsname {\symbol{"F0A2}} \def\faBell {{\FA\csname faicon@bell\endcsname}} -\expandafter\def\csname faicon@certificate\endcsname {\symbol{"F0A3}} \def\faCertificate {{\FA\csname faicon@certificate\endcsname}} -\expandafter\def\csname faicon@hand-left\endcsname {\symbol{"F0A4}} \def\faHandLeft {{\FA\csname faicon@hand-left\endcsname}} -\expandafter\def\csname faicon@hand-right\endcsname {\symbol{"F0A5}} \def\faHandRight {{\FA\csname faicon@hand-right\endcsname}} -\expandafter\def\csname faicon@hand-up\endcsname {\symbol{"F0A6}} \def\faHandUp {{\FA\csname faicon@hand-up\endcsname}} -\expandafter\def\csname faicon@hand-down\endcsname {\symbol{"F0A7}} \def\faHandDown {{\FA\csname faicon@hand-down\endcsname}} -\expandafter\def\csname faicon@circle-arrow-left\endcsname {\symbol{"F0A8}} \def\faCircleArrowLeft {{\FA\csname faicon@circle-arrow-left\endcsname}} -\expandafter\def\csname faicon@circle-arrow-right\endcsname{\symbol{"F0A9}} \def\faCircleArrowRight{{\FA\csname faicon@circle-arrow-right\endcsname}} -\expandafter\def\csname faicon@circle-arrow-up\endcsname {\symbol{"F0AA}} \def\faCircleArrowUp {{\FA\csname faicon@circle-arrow-up\endcsname}} -\expandafter\def\csname faicon@circle-arrow-down\endcsname {\symbol{"F0AB}} \def\faCircleArrowDown {{\FA\csname faicon@circle-arrow-down\endcsname}} -\expandafter\def\csname faicon@globe\endcsname {\symbol{"F0AC}} \def\faGlobe {{\FA\csname faicon@globe\endcsname}} -\expandafter\def\csname faicon@wrench\endcsname {\symbol{"F0AD}} \def\faWrench {{\FA\csname faicon@wrench\endcsname}} -\expandafter\def\csname faicon@tasks\endcsname {\symbol{"F0AE}} \def\faTasks {{\FA\csname faicon@tasks\endcsname}} - -\expandafter\def\csname faicon@filter\endcsname {\symbol{"F0B0}} \def\faFilter {{\FA\csname faicon@filter\endcsname}} -\expandafter\def\csname faicon@briefcase\endcsname {\symbol{"F0B1}} \def\faBriefcase {{\FA\csname faicon@briefcase\endcsname}} -\expandafter\def\csname faicon@fullscreen\endcsname {\symbol{"F0B2}} \def\faFullscreen {{\FA\csname faicon@fullscreen\endcsname}} - -\expandafter\def\csname faicon@group\endcsname {\symbol{"F0C0}} \def\faGroup {{\FA\csname faicon@group\endcsname}} -\expandafter\def\csname faicon@link\endcsname {\symbol{"F0C1}} \def\faLink {{\FA\csname faicon@link\endcsname}} -\expandafter\def\csname faicon@cloud\endcsname {\symbol{"F0C2}} \def\faCloud {{\FA\csname faicon@cloud\endcsname}} -\expandafter\def\csname faicon@beaker\endcsname {\symbol{"F0C3}} \def\faBeaker {{\FA\csname faicon@beaker\endcsname}} -\expandafter\def\csname faicon@cut\endcsname {\symbol{"F0C4}} \def\faCut {{\FA\csname faicon@cut\endcsname}} -\expandafter\def\csname faicon@copy\endcsname {\symbol{"F0C5}} \def\faCopy {{\FA\csname faicon@copy\endcsname}} -\expandafter\def\csname faicon@paper-clip\endcsname {\symbol{"F0C6}} \def\faPaperClip {{\FA\csname faicon@paper-clip\endcsname}} -\expandafter\def\csname faicon@save\endcsname {\symbol{"F0C7}} \def\faSave {{\FA\csname faicon@save\endcsname}} -\expandafter\def\csname faicon@sign-blank\endcsname {\symbol{"F0C8}} \def\faSignBlank {{\FA\csname faicon@sign-blank\endcsname}} -\expandafter\def\csname faicon@reorder\endcsname {\symbol{"F0C9}} \def\faReorder {{\FA\csname faicon@reorder\endcsname}} -\expandafter\def\csname faicon@list-ul\endcsname {\symbol{"F0CA}} \def\faListUL {{\FA\csname faicon@list-ul\endcsname}} -\expandafter\def\csname faicon@list-ol\endcsname {\symbol{"F0CB}} \def\faListOL {{\FA\csname faicon@list-ol\endcsname}} -\expandafter\def\csname faicon@strikethrough\endcsname {\symbol{"F0CC}} \def\faStrikethrough {{\FA\csname faicon@strikethrough\endcsname}} -\expandafter\def\csname faicon@underline\endcsname {\symbol{"F0CD}} \def\faUnderline {{\FA\csname faicon@underline\endcsname}} -\expandafter\def\csname faicon@table\endcsname {\symbol{"F0CE}} \def\faTable {{\FA\csname faicon@table\endcsname}} - -\expandafter\def\csname faicon@magic\endcsname {\symbol{"F0D0}} \def\faMagic {{\FA\csname faicon@magic\endcsname}} -\expandafter\def\csname faicon@truck\endcsname {\symbol{"F0D1}} \def\faTruck {{\FA\csname faicon@truck\endcsname}} -\expandafter\def\csname faicon@pinterest\endcsname {\symbol{"F0D2}} \def\faPinterest {{\FA\csname faicon@pinterest\endcsname}} -\expandafter\def\csname faicon@pinterest-sign\endcsname {\symbol{"F0D3}} \def\faPinterestSign {{\FA\csname faicon@pinterest-sign\endcsname}} -\expandafter\def\csname faicon@google-plus-sign\endcsname {\symbol{"F0D4}} \def\faGooglePlusSign {{\FA\csname faicon@google-plus-sign\endcsname}} -\expandafter\def\csname faicon@google-plus\endcsname {\symbol{"F0D5}} \def\faGooglePlus {{\FA\csname faicon@google-plus\endcsname}} -\expandafter\def\csname faicon@money\endcsname {\symbol{"F0D6}} \def\faMoney {{\FA\csname faicon@money\endcsname}} -\expandafter\def\csname faicon@caret-down\endcsname {\symbol{"F0D7}} \def\faCaretDown {{\FA\csname faicon@caret-down\endcsname}} -\expandafter\def\csname faicon@caret-up\endcsname {\symbol{"F0D8}} \def\faCaretUp {{\FA\csname faicon@caret-up\endcsname}} -\expandafter\def\csname faicon@caret-left\endcsname {\symbol{"F0D9}} \def\faCaretLeft {{\FA\csname faicon@caret-left\endcsname}} -\expandafter\def\csname faicon@caret-right\endcsname {\symbol{"F0DA}} \def\faCaretRight {{\FA\csname faicon@caret-right\endcsname}} -\expandafter\def\csname faicon@columns\endcsname {\symbol{"F0DB}} \def\faColumns {{\FA\csname faicon@columns\endcsname}} -\expandafter\def\csname faicon@sort\endcsname {\symbol{"F0DC}} \def\faSort {{\FA\csname faicon@sort\endcsname}} -\expandafter\def\csname faicon@sort-down\endcsname {\symbol{"F0DD}} \def\faSortDown {{\FA\csname faicon@sort-down\endcsname}} -\expandafter\def\csname faicon@sort-up\endcsname {\symbol{"F0DE}} \def\faSortUp {{\FA\csname faicon@sort-up\endcsname}} - -\expandafter\def\csname faicon@envelope-alt\endcsname {\symbol{"F0E0}} \def\faEnvelopeAlt {{\FA\csname faicon@envelope-alt\endcsname}} -\expandafter\def\csname faicon@linkedin\endcsname {\symbol{"F0E1}} \def\faLinkedin {{\FA\csname faicon@linkedin\endcsname}} -\expandafter\def\csname faicon@undo\endcsname {\symbol{"F0E2}} \def\faUndo {{\FA\csname faicon@undo\endcsname}} -\expandafter\def\csname faicon@legal\endcsname {\symbol{"F0E3}} \def\faLegal {{\FA\csname faicon@legal\endcsname}} -\expandafter\def\csname faicon@dashboard\endcsname {\symbol{"F0E4}} \def\faDashboard {{\FA\csname faicon@dashboard\endcsname}} -\expandafter\def\csname faicon@comment-alt\endcsname {\symbol{"F0E5}} \def\faCommentAlt {{\FA\csname faicon@comment-alt\endcsname}} -\expandafter\def\csname faicon@comments-alt\endcsname {\symbol{"F0E6}} \def\faCommentsAlt {{\FA\csname faicon@comments-alt\endcsname}} -\expandafter\def\csname faicon@bolt\endcsname {\symbol{"F0E7}} \def\faBolt {{\FA\csname faicon@bolt\endcsname}} -\expandafter\def\csname faicon@sitemap\endcsname {\symbol{"F0E8}} \def\faSitemap {{\FA\csname faicon@sitemap\endcsname}} -\expandafter\def\csname faicon@umbrella\endcsname {\symbol{"F0E9}} \def\faUmbrella {{\FA\csname faicon@umbrella\endcsname}} -\expandafter\def\csname faicon@paste\endcsname {\symbol{"F0EA}} \def\faPaste {{\FA\csname faicon@paste\endcsname}} -\expandafter\def\csname faicon@lightbulb\endcsname {\symbol{"F0EB}} \def\faLightbulb {{\FA\csname faicon@lightbulb\endcsname}} -\expandafter\def\csname faicon@exchange\endcsname {\symbol{"F0EC}} \def\faExchange {{\FA\csname faicon@exchange\endcsname}} -\expandafter\def\csname faicon@cloud-download\endcsname {\symbol{"F0ED}} \def\faCloudDownload {{\FA\csname faicon@cloud-download\endcsname}} -\expandafter\def\csname faicon@cloud-upload\endcsname {\symbol{"F0EE}} \def\faCloudUpload {{\FA\csname faicon@cloud-upload\endcsname}} - -\expandafter\def\csname faicon@user-md\endcsname {\symbol{"F0F0}} \def\faUserMD {{\FA\csname faicon@user-md\endcsname}} -\expandafter\def\csname faicon@stethoscope\endcsname {\symbol{"F0F1}} \def\faStethoscope {{\FA\csname faicon@stethoscope\endcsname}} -\expandafter\def\csname faicon@suitcase\endcsname {\symbol{"F0F2}} \def\faSuitcase {{\FA\csname faicon@suitcase\endcsname}} -\expandafter\def\csname faicon@bell-alt\endcsname {\symbol{"F0F3}} \def\faBellAlt {{\FA\csname faicon@bell-alt\endcsname}} -\expandafter\def\csname faicon@coffee\endcsname {\symbol{"F0F4}} \def\faCoffee {{\FA\csname faicon@coffee\endcsname}} -\expandafter\def\csname faicon@food\endcsname {\symbol{"F0F5}} \def\faFood {{\FA\csname faicon@food\endcsname}} -\expandafter\def\csname faicon@file-alt\endcsname {\symbol{"F0F6}} \def\faFileAlt {{\FA\csname faicon@file-alt\endcsname}} -\expandafter\def\csname faicon@building\endcsname {\symbol{"F0F7}} \def\faBuilding {{\FA\csname faicon@building\endcsname}} -\expandafter\def\csname faicon@hospital\endcsname {\symbol{"F0F8}} \def\faHospital {{\FA\csname faicon@hospital\endcsname}} -\expandafter\def\csname faicon@ambulance\endcsname {\symbol{"F0F9}} \def\faAmbulance {{\FA\csname faicon@ambulance\endcsname}} -\expandafter\def\csname faicon@medical-kit\endcsname {\symbol{"F0FA}} \def\faMedicalKit {{\FA\csname faicon@medical-kit\endcsname}} -\expandafter\def\csname faicon@fighter-jet\endcsname {\symbol{"F0FB}} \def\faFighterJet {{\FA\csname faicon@fighter-jet\endcsname}} -\expandafter\def\csname faicon@beer\endcsname {\symbol{"F0FC}} \def\faBeer {{\FA\csname faicon@beer\endcsname}} -\expandafter\def\csname faicon@hospital-sign\endcsname {\symbol{"F0FD}} \def\faHospitalSign {{\FA\csname faicon@hospital-sign\endcsname}} -\expandafter\def\csname faicon@medical-sign\endcsname {\symbol{"F0FE}} \def\faMedicalSign {{\FA\csname faicon@medical-sign\endcsname}}% referred to as plus-sign-alt in Font Awesome documentation - -\expandafter\def\csname faicon@double-angle-left\endcsname {\symbol{"F100}} \def\faDoubleAngleLeft {{\FA\csname faicon@double-angle-left\endcsname}} -\expandafter\def\csname faicon@double-angle-right\endcsname{\symbol{"F101}} \def\faDoubleAngleRight{{\FA\csname faicon@double-angle-right\endcsname}} -\expandafter\def\csname faicon@double-angle-up\endcsname {\symbol{"F102}} \def\faDoubleAngleUp {{\FA\csname faicon@double-angle-up\endcsname}} -\expandafter\def\csname faicon@double-angle-down\endcsname {\symbol{"F103}} \def\faDoubleAngleDown {{\FA\csname faicon@double-angle-down\endcsname}} -\expandafter\def\csname faicon@angle-left\endcsname {\symbol{"F104}} \def\faAngleLeft {{\FA\csname faicon@angle-left\endcsname}} -\expandafter\def\csname faicon@angle-right\endcsname {\symbol{"F105}} \def\faAngleRight {{\FA\csname faicon@angle-right\endcsname}} -\expandafter\def\csname faicon@angle-up\endcsname {\symbol{"F106}} \def\faAngleUp {{\FA\csname faicon@angle-up\endcsname}} -\expandafter\def\csname faicon@angle-down\endcsname {\symbol{"F107}} \def\faAngleDown {{\FA\csname faicon@angle-down\endcsname}} -\expandafter\def\csname faicon@desktop\endcsname {\symbol{"F108}} \def\faDesktop {{\FA\csname faicon@desktop\endcsname}} -\expandafter\def\csname faicon@laptop\endcsname {\symbol{"F109}} \def\faLaptop {{\FA\csname faicon@laptop\endcsname}} -\expandafter\def\csname faicon@tablet\endcsname {\symbol{"F10A}} \def\faTablet {{\FA\csname faicon@tablet\endcsname}} -\expandafter\def\csname faicon@mobile-phone\endcsname {\symbol{"F10B}} \def\faMobilePhone {{\FA\csname faicon@mobile-phone\endcsname}} -\expandafter\def\csname faicon@circle-blank\endcsname {\symbol{"F10C}} \def\faCircleBlank {{\FA\csname faicon@circle-blank\endcsname}} -\expandafter\def\csname faicon@quote-left\endcsname {\symbol{"F10D}} \def\faQuoteLeft {{\FA\csname faicon@quote-left\endcsname}} -\expandafter\def\csname faicon@quote-right\endcsname {\symbol{"F10E}} \def\faQuoteRight {{\FA\csname faicon@quote-right\endcsname}} - -\expandafter\def\csname faicon@spinner\endcsname {\symbol{"F110}} \def\faSpinner {{\FA\csname faicon@spinner\endcsname}} -\expandafter\def\csname faicon@circle\endcsname {\symbol{"F111}} \def\faCircle {{\FA\csname faicon@circle\endcsname}} -\expandafter\def\csname faicon@reply\endcsname {\symbol{"F112}} \def\faReply {{\FA\csname faicon@reply\endcsname}} -\expandafter\def\csname faicon@github-alt\endcsname {\symbol{"F113}} \def\faGithubAlt {{\FA\csname faicon@github-alt\endcsname}} -\expandafter\def\csname faicon@folder-open-alt\endcsname {\symbol{"F114}} \def\faFolderOpenAlt {{\FA\csname faicon@folder-open-alt\endcsname}} -\expandafter\def\csname faicon@folder-close-alt\endcsname {\symbol{"F115}} \def\faFolderCloseAlt {{\FA\csname faicon@folder-close-alt\endcsname}} - +\expandafter\def\csname faicon@glass\endcsname {\symbol{"F000}} \def\faGlass {{\FA\csname faicon@glass\endcsname}} +\expandafter\def\csname faicon@music\endcsname {\symbol{"F001}} \def\faMusic {{\FA\csname faicon@music\endcsname}} +\expandafter\def\csname faicon@search\endcsname {\symbol{"F002}} \def\faSearch {{\FA\csname faicon@search\endcsname}} +\expandafter\def\csname faicon@envelope\endcsname {\symbol{"F003}} \def\faEnvelope {{\FA\csname faicon@envelope\endcsname}} +\expandafter\def\csname faicon@heart\endcsname {\symbol{"F004}} \def\faHeart {{\FA\csname faicon@heart\endcsname}} +\expandafter\def\csname faicon@star\endcsname {\symbol{"F005}} \def\faStar {{\FA\csname faicon@star\endcsname}} +\expandafter\def\csname faicon@star-empty\endcsname {\symbol{"F006}} \def\faStarEmpty {{\FA\csname faicon@star-empty\endcsname}} +\expandafter\def\csname faicon@user\endcsname {\symbol{"F007}} \def\faUser {{\FA\csname faicon@user\endcsname}} +\expandafter\def\csname faicon@film\endcsname {\symbol{"F008}} \def\faFilm {{\FA\csname faicon@film\endcsname}} +\expandafter\def\csname faicon@thumbnails-large\endcsname {\symbol{"F009}} \def\faThumbnailsLarge {{\FA\csname faicon@thumbnails-large\endcsname}} +\expandafter\def\csname faicon@thumbnails\endcsname {\symbol{"F00A}} \def\faThumbnails {{\FA\csname faicon@thumbnails\endcsname}} +\expandafter\def\csname faicon@thumbnails-list\endcsname {\symbol{"F00B}} \def\faThumbnailsList {{\FA\csname faicon@thumbnails-list\endcsname}} +\expandafter\def\csname faicon@ok\endcsname {\symbol{"F00C}} \def\faOk {{\FA\csname faicon@ok\endcsname}} +\expandafter\def\csname faicon@remove\endcsname {\symbol{"F00D}} \def\faRemove {{\FA\csname faicon@remove\endcsname}} +\expandafter\def\csname faicon@zoom-in\endcsname {\symbol{"F00E}} \def\faZoomIn {{\FA\csname faicon@zoom-in\endcsname}} + +\expandafter\def\csname faicon@zoom-out\endcsname {\symbol{"F010}} \def\faZoomOut {{\FA\csname faicon@zoom-out\endcsname}} +\expandafter\def\csname faicon@off\endcsname {\symbol{"F011}} \def\faOff {{\FA\csname faicon@off\endcsname}} +\expandafter\def\csname faicon@signal\endcsname {\symbol{"F012}} \def\faSignal {{\FA\csname faicon@signal\endcsname}} +\expandafter\def\csname faicon@cog\endcsname {\symbol{"F013}} \def\faCog {{\FA\csname faicon@cog\endcsname}} +\expandafter\def\csname faicon@trash\endcsname {\symbol{"F014}} \def\faTrash {{\FA\csname faicon@trash\endcsname}} +\expandafter\def\csname faicon@home\endcsname {\symbol{"F015}} \def\faHome {{\FA\csname faicon@home\endcsname}} +\expandafter\def\csname faicon@file\endcsname {\symbol{"F016}} \def\faFile {{\FA\csname faicon@file\endcsname}} +\expandafter\def\csname faicon@time\endcsname {\symbol{"F017}} \def\faTime {{\FA\csname faicon@time\endcsname}} +\expandafter\def\csname faicon@road\endcsname {\symbol{"F018}} \def\faRoad {{\FA\csname faicon@road\endcsname}} +\expandafter\def\csname faicon@download-alt\endcsname {\symbol{"F019}} \def\faDownloadAlt {{\FA\csname faicon@download-alt\endcsname}} +\expandafter\def\csname faicon@download\endcsname {\symbol{"F01A}} \def\faDownload {{\FA\csname faicon@download\endcsname}} +\expandafter\def\csname faicon@upload\endcsname {\symbol{"F01B}} \def\faUpload {{\FA\csname faicon@upload\endcsname}} +\expandafter\def\csname faicon@inbox\endcsname {\symbol{"F01C}} \def\faInbox {{\FA\csname faicon@inbox\endcsname}} +\expandafter\def\csname faicon@play-circle\endcsname {\symbol{"F01D}} \def\faPlayCircle {{\FA\csname faicon@play-circle\endcsname}} +\expandafter\def\csname faicon@repeat\endcsname {\symbol{"F01E}} \def\faRepeat {{\FA\csname faicon@repeat\endcsname}} + +\expandafter\def\csname faicon@refresh\endcsname {\symbol{"F021}} \def\faRefresh {{\FA\csname faicon@refresh\endcsname}} +\expandafter\def\csname faicon@list-alt\endcsname {\symbol{"F022}} \def\faListAlt {{\FA\csname faicon@list-alt\endcsname}} +\expandafter\def\csname faicon@lock\endcsname {\symbol{"F023}} \def\faLock {{\FA\csname faicon@lock\endcsname}} +\expandafter\def\csname faicon@flag\endcsname {\symbol{"F024}} \def\faFlag {{\FA\csname faicon@flag\endcsname}} +\expandafter\def\csname faicon@headphones\endcsname {\symbol{"F025}} \def\faHeadphones {{\FA\csname faicon@headphones\endcsname}} +\expandafter\def\csname faicon@volume-off\endcsname {\symbol{"F026}} \def\faVolumeOff {{\FA\csname faicon@volume-off\endcsname}} +\expandafter\def\csname faicon@volume-down\endcsname {\symbol{"F027}} \def\faVolumeDown {{\FA\csname faicon@volume-down\endcsname}} +\expandafter\def\csname faicon@volume-up\endcsname {\symbol{"F028}} \def\faVolumeUp {{\FA\csname faicon@volume-up\endcsname}} +\expandafter\def\csname faicon@qrcode\endcsname {\symbol{"F029}} \def\faQRcode {{\FA\csname faicon@qrcode\endcsname}} +\expandafter\def\csname faicon@barcode\endcsname {\symbol{"F02A}} \def\faBarcode {{\FA\csname faicon@barcode\endcsname}} +\expandafter\def\csname faicon@tag\endcsname {\symbol{"F02B}} \def\faTag {{\FA\csname faicon@tag\endcsname}} +\expandafter\def\csname faicon@tags\endcsname {\symbol{"F02C}} \def\faTags {{\FA\csname faicon@tags\endcsname}} +\expandafter\def\csname faicon@book\endcsname {\symbol{"F02D}} \def\faBook {{\FA\csname faicon@book\endcsname}} +\expandafter\def\csname faicon@bookmark\endcsname {\symbol{"F02E}} \def\faBookmark {{\FA\csname faicon@bookmark\endcsname}} +\expandafter\def\csname faicon@print\endcsname {\symbol{"F02F}} \def\faPrint {{\FA\csname faicon@print\endcsname}} + +\expandafter\def\csname faicon@camera\endcsname {\symbol{"F030}} \def\faCamera {{\FA\csname faicon@camera\endcsname}} +\expandafter\def\csname faicon@font\endcsname {\symbol{"F031}} \def\faFont {{\FA\csname faicon@font\endcsname}} +\expandafter\def\csname faicon@bold\endcsname {\symbol{"F032}} \def\faBold {{\FA\csname faicon@bold\endcsname}} +\expandafter\def\csname faicon@italic\endcsname {\symbol{"F033}} \def\faItalic {{\FA\csname faicon@italic\endcsname}} +\expandafter\def\csname faicon@text-height\endcsname {\symbol{"F034}} \def\faTextHeight {{\FA\csname faicon@text-height\endcsname}} +\expandafter\def\csname faicon@text-width\endcsname {\symbol{"F035}} \def\faTextWidth {{\FA\csname faicon@text-width\endcsname}} +\expandafter\def\csname faicon@align-left\endcsname {\symbol{"F036}} \def\faAlignLeft {{\FA\csname faicon@align-left\endcsname}} +\expandafter\def\csname faicon@align-center\endcsname {\symbol{"F037}} \def\faAlignCenter {{\FA\csname faicon@align-center\endcsname}} +\expandafter\def\csname faicon@align-right\endcsname {\symbol{"F038}} \def\faAlignRight {{\FA\csname faicon@align-right\endcsname}} +\expandafter\def\csname faicon@align-justify\endcsname {\symbol{"F039}} \def\faAlignJustify {{\FA\csname faicon@align-justify\endcsname}} +\expandafter\def\csname faicon@list\endcsname {\symbol{"F03A}} \def\faList {{\FA\csname faicon@list\endcsname}} +\expandafter\def\csname faicon@indent-left\endcsname {\symbol{"F03B}} \def\faIndentLeft {{\FA\csname faicon@indent-left\endcsname}} +\expandafter\def\csname faicon@indent-right\endcsname {\symbol{"F03C}} \def\faIndentRight {{\FA\csname faicon@indent-right\endcsname}} +\expandafter\def\csname faicon@facetime-video\endcsname {\symbol{"F03D}} \def\faFacetimeVideo {{\FA\csname faicon@facetime-video\endcsname}} +\expandafter\def\csname faicon@picture\endcsname {\symbol{"F03E}} \def\faPicture {{\FA\csname faicon@picture\endcsname}} + +\expandafter\def\csname faicon@pencil\endcsname {\symbol{"F040}} \def\faPencil {{\FA\csname faicon@pencil\endcsname}} +\expandafter\def\csname faicon@map-marker\endcsname {\symbol{"F041}} \def\faMapMarker {{\FA\csname faicon@map-marker\endcsname}} +\expandafter\def\csname faicon@adjust\endcsname {\symbol{"F042}} \def\faAdjust {{\FA\csname faicon@adjust\endcsname}} +\expandafter\def\csname faicon@tint\endcsname {\symbol{"F043}} \def\faTint {{\FA\csname faicon@tint\endcsname}} +\expandafter\def\csname faicon@edit\endcsname {\symbol{"F044}} \def\faEdit {{\FA\csname faicon@edit\endcsname}} +\expandafter\def\csname faicon@share\endcsname {\symbol{"F045}} \def\faShare {{\FA\csname faicon@share\endcsname}} +\expandafter\def\csname faicon@check\endcsname {\symbol{"F046}} \def\faCheck {{\FA\csname faicon@check\endcsname}} +\expandafter\def\csname faicon@move\endcsname {\symbol{"F047}} \def\faMove {{\FA\csname faicon@move\endcsname}} +\expandafter\def\csname faicon@step-backward\endcsname {\symbol{"F048}} \def\faStepBackward {{\FA\csname faicon@step-backward\endcsname}} +\expandafter\def\csname faicon@fast-backward\endcsname {\symbol{"F049}} \def\faFastBackward {{\FA\csname faicon@fast-backward\endcsname}} +\expandafter\def\csname faicon@backward\endcsname {\symbol{"F04A}} \def\faBackward {{\FA\csname faicon@backward\endcsname}} +\expandafter\def\csname faicon@play\endcsname {\symbol{"F04B}} \def\faPlay {{\FA\csname faicon@play\endcsname}} +\expandafter\def\csname faicon@pause\endcsname {\symbol{"F04C}} \def\faPause {{\FA\csname faicon@pause\endcsname}} +\expandafter\def\csname faicon@stop\endcsname {\symbol{"F04D}} \def\faStop {{\FA\csname faicon@stop\endcsname}} +\expandafter\def\csname faicon@forward\endcsname {\symbol{"F04E}} \def\faForward {{\FA\csname faicon@forward\endcsname}} + +\expandafter\def\csname faicon@fast-forward\endcsname {\symbol{"F050}} \def\faFastForward {{\FA\csname faicon@fast-forward\endcsname}} +\expandafter\def\csname faicon@step-forward\endcsname {\symbol{"F051}} \def\faStepForward {{\FA\csname faicon@step-forward\endcsname}} +\expandafter\def\csname faicon@eject\endcsname {\symbol{"F052}} \def\faEject {{\FA\csname faicon@eject\endcsname}} +\expandafter\def\csname faicon@chevron-left\endcsname {\symbol{"F053}} \def\faChevronLeft {{\FA\csname faicon@chevron-left\endcsname}} +\expandafter\def\csname faicon@chevron-right\endcsname {\symbol{"F054}} \def\faChevronRight {{\FA\csname faicon@chevron-right\endcsname}} +\expandafter\def\csname faicon@plus-sign\endcsname {\symbol{"F055}} \def\faPlusSign {{\FA\csname faicon@plus-sign\endcsname}} +\expandafter\def\csname faicon@minus-sign\endcsname {\symbol{"F056}} \def\faMinusSign {{\FA\csname faicon@minus-sign\endcsname}} +\expandafter\def\csname faicon@remove-sign\endcsname {\symbol{"F057}} \def\faRemoveSign {{\FA\csname faicon@remove-sign\endcsname}} +\expandafter\def\csname faicon@ok-sign\endcsname {\symbol{"F058}} \def\faOkSign {{\FA\csname faicon@ok-sign\endcsname}} +\expandafter\def\csname faicon@question-sign\endcsname {\symbol{"F059}} \def\faQuestionSign {{\FA\csname faicon@question-sign\endcsname}} +\expandafter\def\csname faicon@info-sign\endcsname {\symbol{"F05A}} \def\faInfoSign {{\FA\csname faicon@info-sign\endcsname}} +\expandafter\def\csname faicon@screenshot\endcsname {\symbol{"F05B}} \def\faScreenshot {{\FA\csname faicon@screenshot\endcsname}} +\expandafter\def\csname faicon@remove-circle\endcsname {\symbol{"F05C}} \def\faRemoveCircle {{\FA\csname faicon@remove-circle\endcsname}} +\expandafter\def\csname faicon@ok-circle\endcsname {\symbol{"F05D}} \def\faOkCircle {{\FA\csname faicon@ok-circle\endcsname}} +\expandafter\def\csname faicon@ban-circle\endcsname {\symbol{"F05E}} \def\faBanCircle {{\FA\csname faicon@ban-circle\endcsname}} + +\expandafter\def\csname faicon@arrow-left\endcsname {\symbol{"F060}} \def\faArrowLeft {{\FA\csname faicon@arrow-left\endcsname}} +\expandafter\def\csname faicon@arrow-right\endcsname {\symbol{"F061}} \def\faArrowRight {{\FA\csname faicon@arrow-right\endcsname}} +\expandafter\def\csname faicon@arrow-up\endcsname {\symbol{"F062}} \def\faArrowUp {{\FA\csname faicon@arrow-up\endcsname}} +\expandafter\def\csname faicon@arrow-down\endcsname {\symbol{"F063}} \def\faArrowDown {{\FA\csname faicon@arrow-down\endcsname}} +\expandafter\def\csname faicon@share-alt\endcsname {\symbol{"F064}} \def\faShareAlt {{\FA\csname faicon@share-alt\endcsname}} +\expandafter\def\csname faicon@resize-full\endcsname {\symbol{"F065}} \def\faResizeFull {{\FA\csname faicon@resize-full\endcsname}} +\expandafter\def\csname faicon@resize-small\endcsname {\symbol{"F066}} \def\faResizeSmall {{\FA\csname faicon@resize-small\endcsname}} +\expandafter\def\csname faicon@plus\endcsname {\symbol{"F067}} \def\faPlus {{\FA\csname faicon@plus\endcsname}} +\expandafter\def\csname faicon@minus\endcsname {\symbol{"F068}} \def\faMinus {{\FA\csname faicon@minus\endcsname}} +\expandafter\def\csname faicon@asterisk\endcsname {\symbol{"F069}} \def\faAsterisk {{\FA\csname faicon@asterisk\endcsname}} +\expandafter\def\csname faicon@exclamation-sign\endcsname {\symbol{"F06A}} \def\faExclamationSign {{\FA\csname faicon@exclamation-sign\endcsname}} +\expandafter\def\csname faicon@gift\endcsname {\symbol{"F06B}} \def\faGift {{\FA\csname faicon@gift\endcsname}} +\expandafter\def\csname faicon@leaf\endcsname {\symbol{"F06C}} \def\faLeaf {{\FA\csname faicon@leaf\endcsname}} +\expandafter\def\csname faicon@fire\endcsname {\symbol{"F06D}} \def\faFire {{\FA\csname faicon@fire\endcsname}} +\expandafter\def\csname faicon@eye-open\endcsname {\symbol{"F06E}} \def\faEyeOpen {{\FA\csname faicon@eye-open\endcsname}} + +\expandafter\def\csname faicon@eye-close\endcsname {\symbol{"F070}} \def\faEyeClose {{\FA\csname faicon@eye-close\endcsname}} +\expandafter\def\csname faicon@warning-sign\endcsname {\symbol{"F071}} \def\faWarningSign {{\FA\csname faicon@warning-sign\endcsname}} +\expandafter\def\csname faicon@plane\endcsname {\symbol{"F072}} \def\faPlane {{\FA\csname faicon@plane\endcsname}} +\expandafter\def\csname faicon@calendar\endcsname {\symbol{"F073}} \def\faCalendar {{\FA\csname faicon@calendar\endcsname}} +\expandafter\def\csname faicon@random\endcsname {\symbol{"F074}} \def\faRandom {{\FA\csname faicon@random\endcsname}} +\expandafter\def\csname faicon@comment\endcsname {\symbol{"F075}} \def\faComment {{\FA\csname faicon@comment\endcsname}} +\expandafter\def\csname faicon@magnet\endcsname {\symbol{"F076}} \def\faMagnet {{\FA\csname faicon@magnet\endcsname}} +\expandafter\def\csname faicon@chevron-up\endcsname {\symbol{"F077}} \def\faChevronUp {{\FA\csname faicon@chevron-up\endcsname}} +\expandafter\def\csname faicon@chevron-down\endcsname {\symbol{"F078}} \def\faChevronDown {{\FA\csname faicon@chevron-down\endcsname}} +\expandafter\def\csname faicon@retweet\endcsname {\symbol{"F079}} \def\faRetweet {{\FA\csname faicon@retweet\endcsname}} +\expandafter\def\csname faicon@shopping-cart\endcsname {\symbol{"F07A}} \def\faShoppingCart {{\FA\csname faicon@shopping-cart\endcsname}} +\expandafter\def\csname faicon@folder-close\endcsname {\symbol{"F07B}} \def\faFolderClose {{\FA\csname faicon@folder-close\endcsname}} +\expandafter\def\csname faicon@folder-open\endcsname {\symbol{"F07C}} \def\faFolderOpen {{\FA\csname faicon@folder-open\endcsname}} +\expandafter\def\csname faicon@resize-vertical\endcsname {\symbol{"F07D}} \def\faResizeVertical {{\FA\csname faicon@resize-vertical\endcsname}} +\expandafter\def\csname faicon@resize-horizontal\endcsname {\symbol{"F07E}} \def\faResizeHorizontal {{\FA\csname faicon@resize-horizontal\endcsname}} + +\expandafter\def\csname faicon@bar-chart\endcsname {\symbol{"F080}} \def\faBarChart {{\FA\csname faicon@bar-chart\endcsname}} +\expandafter\def\csname faicon@twitter-sign\endcsname {\symbol{"F081}} \def\faTwitterSign {{\FA\csname faicon@twitter-sign\endcsname}} +\expandafter\def\csname faicon@facebook-sign\endcsname {\symbol{"F082}} \def\faFacebookSign {{\FA\csname faicon@facebook-sign\endcsname}} +\expandafter\def\csname faicon@camera-retro\endcsname {\symbol{"F083}} \def\faCameraRetro {{\FA\csname faicon@camera-retro\endcsname}} +\expandafter\def\csname faicon@key\endcsname {\symbol{"F084}} \def\faKey {{\FA\csname faicon@key\endcsname}} +\expandafter\def\csname faicon@cogs\endcsname {\symbol{"F085}} \def\faCogs {{\FA\csname faicon@cogs\endcsname}} +\expandafter\def\csname faicon@comments\endcsname {\symbol{"F086}} \def\faComments {{\FA\csname faicon@comments\endcsname}} +\expandafter\def\csname faicon@thumbs-up\endcsname {\symbol{"F087}} \def\faThumbsUp {{\FA\csname faicon@thumbs-up\endcsname}} +\expandafter\def\csname faicon@thumbs-down\endcsname {\symbol{"F088}} \def\faThumbsDown {{\FA\csname faicon@thumbs-down\endcsname}} +\expandafter\def\csname faicon@star-half\endcsname {\symbol{"F089}} \def\faStarHalf {{\FA\csname faicon@star-half\endcsname}} +\expandafter\def\csname faicon@heart-empty\endcsname {\symbol{"F08A}} \def\faHeartEmpty {{\FA\csname faicon@heart-empty\endcsname}} +\expandafter\def\csname faicon@signout\endcsname {\symbol{"F08B}} \def\faSignout {{\FA\csname faicon@signout\endcsname}} +\expandafter\def\csname faicon@linkedin-sign\endcsname {\symbol{"F08C}} \def\faLinkedinSign {{\FA\csname faicon@linkedin-sign\endcsname}} +\expandafter\def\csname faicon@pushpin\endcsname {\symbol{"F08D}} \def\faPushpin {{\FA\csname faicon@pushpin\endcsname}} +\expandafter\def\csname faicon@external-link\endcsname {\symbol{"F08E}} \def\faExternalLink {{\FA\csname faicon@external-link\endcsname}} + +\expandafter\def\csname faicon@signin\endcsname {\symbol{"F090}} \def\faSignin {{\FA\csname faicon@signin\endcsname}} +\expandafter\def\csname faicon@trophy\endcsname {\symbol{"F091}} \def\faTrophy {{\FA\csname faicon@trophy\endcsname}} +\expandafter\def\csname faicon@github-sign\endcsname {\symbol{"F092}} \def\faGithubSign {{\FA\csname faicon@github-sign\endcsname}} +\expandafter\def\csname faicon@upload-alt\endcsname {\symbol{"F093}} \def\faUploadAlt {{\FA\csname faicon@upload-alt\endcsname}} +\expandafter\def\csname faicon@lemon\endcsname {\symbol{"F094}} \def\faLemon {{\FA\csname faicon@lemon\endcsname}} +\expandafter\def\csname faicon@phone\endcsname {\symbol{"F095}} \def\faPhone {{\FA\csname faicon@phone\endcsname}} +\expandafter\def\csname faicon@check-empty\endcsname {\symbol{"F096}} \def\faCheckEmpty {{\FA\csname faicon@check-empty\endcsname}} +\expandafter\def\csname faicon@bookmark-empty\endcsname {\symbol{"F097}} \def\faBookmarkEmpty {{\FA\csname faicon@bookmark-empty\endcsname}} +\expandafter\def\csname faicon@phone-sign\endcsname {\symbol{"F098}} \def\faPhoneSign {{\FA\csname faicon@phone-sign\endcsname}} +\expandafter\def\csname faicon@twitter\endcsname {\symbol{"F099}} \def\faTwitter {{\FA\csname faicon@twitter\endcsname}} +\expandafter\def\csname faicon@facebook\endcsname {\symbol{"F09A}} \def\faFacebook {{\FA\csname faicon@facebook\endcsname}} +\expandafter\def\csname faicon@github\endcsname {\symbol{"F09B}} \def\faGithub {{\FA\csname faicon@github\endcsname}} +\expandafter\def\csname faicon@unlock\endcsname {\symbol{"F09C}} \def\faUnlock {{\FA\csname faicon@unlock\endcsname}} +\expandafter\def\csname faicon@credit-card\endcsname {\symbol{"F09D}} \def\faCreditCard {{\FA\csname faicon@credit-card\endcsname}} +\expandafter\def\csname faicon@rss\endcsname {\symbol{"F09E}} \def\faRSS {{\FA\csname faicon@rss\endcsname}} + +\expandafter\def\csname faicon@hdd\endcsname {\symbol{"F0A0}} \def\faHDD {{\FA\csname faicon@hdd\endcsname}} +\expandafter\def\csname faicon@bullhorn\endcsname {\symbol{"F0A1}} \def\faBullhorn {{\FA\csname faicon@bullhorn\endcsname}} +\expandafter\def\csname faicon@bell\endcsname {\symbol{"F0A2}} \def\faBell {{\FA\csname faicon@bell\endcsname}} +\expandafter\def\csname faicon@certificate\endcsname {\symbol{"F0A3}} \def\faCertificate {{\FA\csname faicon@certificate\endcsname}} +\expandafter\def\csname faicon@hand-left\endcsname {\symbol{"F0A4}} \def\faHandLeft {{\FA\csname faicon@hand-left\endcsname}} +\expandafter\def\csname faicon@hand-right\endcsname {\symbol{"F0A5}} \def\faHandRight {{\FA\csname faicon@hand-right\endcsname}} +\expandafter\def\csname faicon@hand-up\endcsname {\symbol{"F0A6}} \def\faHandUp {{\FA\csname faicon@hand-up\endcsname}} +\expandafter\def\csname faicon@hand-down\endcsname {\symbol{"F0A7}} \def\faHandDown {{\FA\csname faicon@hand-down\endcsname}} +\expandafter\def\csname faicon@circle-arrow-left\endcsname {\symbol{"F0A8}} \def\faCircleArrowLeft {{\FA\csname faicon@circle-arrow-left\endcsname}} +\expandafter\def\csname faicon@circle-arrow-right\endcsname {\symbol{"F0A9}} \def\faCircleArrowRight {{\FA\csname faicon@circle-arrow-right\endcsname}} +\expandafter\def\csname faicon@circle-arrow-up\endcsname {\symbol{"F0AA}} \def\faCircleArrowUp {{\FA\csname faicon@circle-arrow-up\endcsname}} +\expandafter\def\csname faicon@circle-arrow-down\endcsname {\symbol{"F0AB}} \def\faCircleArrowDown {{\FA\csname faicon@circle-arrow-down\endcsname}} +\expandafter\def\csname faicon@globe\endcsname {\symbol{"F0AC}} \def\faGlobe {{\FA\csname faicon@globe\endcsname}} +\expandafter\def\csname faicon@wrench\endcsname {\symbol{"F0AD}} \def\faWrench {{\FA\csname faicon@wrench\endcsname}} +\expandafter\def\csname faicon@tasks\endcsname {\symbol{"F0AE}} \def\faTasks {{\FA\csname faicon@tasks\endcsname}} + +\expandafter\def\csname faicon@filter\endcsname {\symbol{"F0B0}} \def\faFilter {{\FA\csname faicon@filter\endcsname}} +\expandafter\def\csname faicon@briefcase\endcsname {\symbol{"F0B1}} \def\faBriefcase {{\FA\csname faicon@briefcase\endcsname}} +\expandafter\def\csname faicon@fullscreen\endcsname {\symbol{"F0B2}} \def\faFullscreen {{\FA\csname faicon@fullscreen\endcsname}} + +\expandafter\def\csname faicon@group\endcsname {\symbol{"F0C0}} \def\faGroup {{\FA\csname faicon@group\endcsname}} +\expandafter\def\csname faicon@link\endcsname {\symbol{"F0C1}} \def\faLink {{\FA\csname faicon@link\endcsname}} +\expandafter\def\csname faicon@cloud\endcsname {\symbol{"F0C2}} \def\faCloud {{\FA\csname faicon@cloud\endcsname}} +\expandafter\def\csname faicon@beaker\endcsname {\symbol{"F0C3}} \def\faBeaker {{\FA\csname faicon@beaker\endcsname}} +\expandafter\def\csname faicon@cut\endcsname {\symbol{"F0C4}} \def\faCut {{\FA\csname faicon@cut\endcsname}} +\expandafter\def\csname faicon@copy\endcsname {\symbol{"F0C5}} \def\faCopy {{\FA\csname faicon@copy\endcsname}} +\expandafter\def\csname faicon@paper-clip\endcsname {\symbol{"F0C6}} \def\faPaperClip {{\FA\csname faicon@paper-clip\endcsname}} +\expandafter\def\csname faicon@save\endcsname {\symbol{"F0C7}} \def\faSave {{\FA\csname faicon@save\endcsname}} +\expandafter\def\csname faicon@sign-blank\endcsname {\symbol{"F0C8}} \def\faSignBlank {{\FA\csname faicon@sign-blank\endcsname}} +\expandafter\def\csname faicon@reorder\endcsname {\symbol{"F0C9}} \def\faReorder {{\FA\csname faicon@reorder\endcsname}} +\expandafter\def\csname faicon@list-ul\endcsname {\symbol{"F0CA}} \def\faListUL {{\FA\csname faicon@list-ul\endcsname}} +\expandafter\def\csname faicon@list-ol\endcsname {\symbol{"F0CB}} \def\faListOL {{\FA\csname faicon@list-ol\endcsname}} +\expandafter\def\csname faicon@strikethrough\endcsname {\symbol{"F0CC}} \def\faStrikethrough {{\FA\csname faicon@strikethrough\endcsname}} +\expandafter\def\csname faicon@underline\endcsname {\symbol{"F0CD}} \def\faUnderline {{\FA\csname faicon@underline\endcsname}} +\expandafter\def\csname faicon@table\endcsname {\symbol{"F0CE}} \def\faTable {{\FA\csname faicon@table\endcsname}} + +\expandafter\def\csname faicon@magic\endcsname {\symbol{"F0D0}} \def\faMagic {{\FA\csname faicon@magic\endcsname}} +\expandafter\def\csname faicon@truck\endcsname {\symbol{"F0D1}} \def\faTruck {{\FA\csname faicon@truck\endcsname}} +\expandafter\def\csname faicon@pinterest\endcsname {\symbol{"F0D2}} \def\faPinterest {{\FA\csname faicon@pinterest\endcsname}} +\expandafter\def\csname faicon@pinterest-sign\endcsname {\symbol{"F0D3}} \def\faPinterestSign {{\FA\csname faicon@pinterest-sign\endcsname}} +\expandafter\def\csname faicon@google-plus-sign\endcsname {\symbol{"F0D4}} \def\faGooglePlusSign {{\FA\csname faicon@google-plus-sign\endcsname}} +\expandafter\def\csname faicon@google-plus\endcsname {\symbol{"F0D5}} \def\faGooglePlus {{\FA\csname faicon@google-plus\endcsname}} +\expandafter\def\csname faicon@money\endcsname {\symbol{"F0D6}} \def\faMoney {{\FA\csname faicon@money\endcsname}} +\expandafter\def\csname faicon@caret-down\endcsname {\symbol{"F0D7}} \def\faCaretDown {{\FA\csname faicon@caret-down\endcsname}} +\expandafter\def\csname faicon@caret-up\endcsname {\symbol{"F0D8}} \def\faCaretUp {{\FA\csname faicon@caret-up\endcsname}} +\expandafter\def\csname faicon@caret-left\endcsname {\symbol{"F0D9}} \def\faCaretLeft {{\FA\csname faicon@caret-left\endcsname}} +\expandafter\def\csname faicon@caret-right\endcsname {\symbol{"F0DA}} \def\faCaretRight {{\FA\csname faicon@caret-right\endcsname}} +\expandafter\def\csname faicon@columns\endcsname {\symbol{"F0DB}} \def\faColumns {{\FA\csname faicon@columns\endcsname}} +\expandafter\def\csname faicon@sort\endcsname {\symbol{"F0DC}} \def\faSort {{\FA\csname faicon@sort\endcsname}} +\expandafter\def\csname faicon@sort-down\endcsname {\symbol{"F0DD}} \def\faSortDown {{\FA\csname faicon@sort-down\endcsname}} +\expandafter\def\csname faicon@sort-up\endcsname {\symbol{"F0DE}} \def\faSortUp {{\FA\csname faicon@sort-up\endcsname}} + +\expandafter\def\csname faicon@envelope-alt\endcsname {\symbol{"F0E0}} \def\faEnvelopeAlt {{\FA\csname faicon@envelope-alt\endcsname}} +\expandafter\def\csname faicon@linkedin\endcsname {\symbol{"F0E1}} \def\faLinkedin {{\FA\csname faicon@linkedin\endcsname}} +\expandafter\def\csname faicon@undo\endcsname {\symbol{"F0E2}} \def\faUndo {{\FA\csname faicon@undo\endcsname}} +\expandafter\def\csname faicon@legal\endcsname {\symbol{"F0E3}} \def\faLegal {{\FA\csname faicon@legal\endcsname}} +\expandafter\def\csname faicon@dashboard\endcsname {\symbol{"F0E4}} \def\faDashboard {{\FA\csname faicon@dashboard\endcsname}} +\expandafter\def\csname faicon@comment-alt\endcsname {\symbol{"F0E5}} \def\faCommentAlt {{\FA\csname faicon@comment-alt\endcsname}} +\expandafter\def\csname faicon@comments-alt\endcsname {\symbol{"F0E6}} \def\faCommentsAlt {{\FA\csname faicon@comments-alt\endcsname}} +\expandafter\def\csname faicon@bolt\endcsname {\symbol{"F0E7}} \def\faBolt {{\FA\csname faicon@bolt\endcsname}} +\expandafter\def\csname faicon@sitemap\endcsname {\symbol{"F0E8}} \def\faSitemap {{\FA\csname faicon@sitemap\endcsname}} +\expandafter\def\csname faicon@umbrella\endcsname {\symbol{"F0E9}} \def\faUmbrella {{\FA\csname faicon@umbrella\endcsname}} +\expandafter\def\csname faicon@paste\endcsname {\symbol{"F0EA}} \def\faPaste {{\FA\csname faicon@paste\endcsname}} +\expandafter\def\csname faicon@lightbulb\endcsname {\symbol{"F0EB}} \def\faLightbulb {{\FA\csname faicon@lightbulb\endcsname}} +\expandafter\def\csname faicon@exchange\endcsname {\symbol{"F0EC}} \def\faExchange {{\FA\csname faicon@exchange\endcsname}} +\expandafter\def\csname faicon@cloud-download\endcsname {\symbol{"F0ED}} \def\faCloudDownload {{\FA\csname faicon@cloud-download\endcsname}} +\expandafter\def\csname faicon@cloud-upload\endcsname {\symbol{"F0EE}} \def\faCloudUpload {{\FA\csname faicon@cloud-upload\endcsname}} + +\expandafter\def\csname faicon@user-md\endcsname {\symbol{"F0F0}} \def\faUserMD {{\FA\csname faicon@user-md\endcsname}} +\expandafter\def\csname faicon@stethoscope\endcsname {\symbol{"F0F1}} \def\faStethoscope {{\FA\csname faicon@stethoscope\endcsname}} +\expandafter\def\csname faicon@suitcase\endcsname {\symbol{"F0F2}} \def\faSuitcase {{\FA\csname faicon@suitcase\endcsname}} +\expandafter\def\csname faicon@bell-alt\endcsname {\symbol{"F0F3}} \def\faBellAlt {{\FA\csname faicon@bell-alt\endcsname}} +\expandafter\def\csname faicon@coffee\endcsname {\symbol{"F0F4}} \def\faCoffee {{\FA\csname faicon@coffee\endcsname}} +\expandafter\def\csname faicon@food\endcsname {\symbol{"F0F5}} \def\faFood {{\FA\csname faicon@food\endcsname}} +\expandafter\def\csname faicon@file-alt\endcsname {\symbol{"F0F6}} \def\faFileAlt {{\FA\csname faicon@file-alt\endcsname}} +\expandafter\def\csname faicon@building\endcsname {\symbol{"F0F7}} \def\faBuilding {{\FA\csname faicon@building\endcsname}} +\expandafter\def\csname faicon@hospital\endcsname {\symbol{"F0F8}} \def\faHospital {{\FA\csname faicon@hospital\endcsname}} +\expandafter\def\csname faicon@ambulance\endcsname {\symbol{"F0F9}} \def\faAmbulance {{\FA\csname faicon@ambulance\endcsname}} +\expandafter\def\csname faicon@medical-kit\endcsname {\symbol{"F0FA}} \def\faMedicalKit {{\FA\csname faicon@medical-kit\endcsname}} +\expandafter\def\csname faicon@fighter-jet\endcsname {\symbol{"F0FB}} \def\faFighterJet {{\FA\csname faicon@fighter-jet\endcsname}} +\expandafter\def\csname faicon@beer\endcsname {\symbol{"F0FC}} \def\faBeer {{\FA\csname faicon@beer\endcsname}} +\expandafter\def\csname faicon@hospital-sign\endcsname {\symbol{"F0FD}} \def\faHospitalSign {{\FA\csname faicon@hospital-sign\endcsname}} +\expandafter\def\csname faicon@medical-sign\endcsname {\symbol{"F0FE}} \def\faMedicalSign {{\FA\csname faicon@medical-sign\endcsname}}% referred to as plus-sign-alt in Font Awesome documentation + +\expandafter\def\csname faicon@double-angle-left\endcsname {\symbol{"F100}} \def\faDoubleAngleLeft {{\FA\csname faicon@double-angle-left\endcsname}} +\expandafter\def\csname faicon@double-angle-right\endcsname {\symbol{"F101}} \def\faDoubleAngleRight {{\FA\csname faicon@double-angle-right\endcsname}} +\expandafter\def\csname faicon@double-angle-up\endcsname {\symbol{"F102}} \def\faDoubleAngleUp {{\FA\csname faicon@double-angle-up\endcsname}} +\expandafter\def\csname faicon@double-angle-down\endcsname {\symbol{"F103}} \def\faDoubleAngleDown {{\FA\csname faicon@double-angle-down\endcsname}} +\expandafter\def\csname faicon@angle-left\endcsname {\symbol{"F104}} \def\faAngleLeft {{\FA\csname faicon@angle-left\endcsname}} +\expandafter\def\csname faicon@angle-right\endcsname {\symbol{"F105}} \def\faAngleRight {{\FA\csname faicon@angle-right\endcsname}} +\expandafter\def\csname faicon@angle-up\endcsname {\symbol{"F106}} \def\faAngleUp {{\FA\csname faicon@angle-up\endcsname}} +\expandafter\def\csname faicon@angle-down\endcsname {\symbol{"F107}} \def\faAngleDown {{\FA\csname faicon@angle-down\endcsname}} +\expandafter\def\csname faicon@desktop\endcsname {\symbol{"F108}} \def\faDesktop {{\FA\csname faicon@desktop\endcsname}} +\expandafter\def\csname faicon@laptop\endcsname {\symbol{"F109}} \def\faLaptop {{\FA\csname faicon@laptop\endcsname}} +\expandafter\def\csname faicon@tablet\endcsname {\symbol{"F10A}} \def\faTablet {{\FA\csname faicon@tablet\endcsname}} +\expandafter\def\csname faicon@mobile-phone\endcsname {\symbol{"F10B}} \def\faMobilePhone {{\FA\csname faicon@mobile-phone\endcsname}} +\expandafter\def\csname faicon@circle-blank\endcsname {\symbol{"F10C}} \def\faCircleBlank {{\FA\csname faicon@circle-blank\endcsname}} +\expandafter\def\csname faicon@quote-left\endcsname {\symbol{"F10D}} \def\faQuoteLeft {{\FA\csname faicon@quote-left\endcsname}} +\expandafter\def\csname faicon@quote-right\endcsname {\symbol{"F10E}} \def\faQuoteRight {{\FA\csname faicon@quote-right\endcsname}} + +\expandafter\def\csname faicon@spinner\endcsname {\symbol{"F110}} \def\faSpinner {{\FA\csname faicon@spinner\endcsname}} +\expandafter\def\csname faicon@circle\endcsname {\symbol{"F111}} \def\faCircle {{\FA\csname faicon@circle\endcsname}} +\expandafter\def\csname faicon@reply\endcsname {\symbol{"F112}} \def\faReply {{\FA\csname faicon@reply\endcsname}} +\expandafter\def\csname faicon@github-alt\endcsname {\symbol{"F113}} \def\faGithubAlt {{\FA\csname faicon@github-alt\endcsname}} +\expandafter\def\csname faicon@folder-open-alt\endcsname {\symbol{"F114}} \def\faFolderOpenAlt {{\FA\csname faicon@folder-open-alt\endcsname}} +\expandafter\def\csname faicon@folder-close-alt\endcsname {\symbol{"F115}} \def\faFolderCloseAlt {{\FA\csname faicon@folder-close-alt\endcsname}} +\expandafter\def\csname faicon@expand-alt\endcsname {\symbol{"F116}} \def\faExpandAlt {{\FA\csname faicon@expand-alt\endcsname}} +\expandafter\def\csname faicon@collapse-alt\endcsname {\symbol{"F117}} \def\faCollapseAlt {{\FA\csname faicon@collapse-alt\endcsname}} +\expandafter\def\csname faicon@smile\endcsname {\symbol{"F118}} \def\faSmile {{\FA\csname faicon@smile\endcsname}} +\expandafter\def\csname faicon@frown\endcsname {\symbol{"F119}} \def\faFrown {{\FA\csname faicon@frown\endcsname}} +\expandafter\def\csname faicon@meh\endcsname {\symbol{"F11A}} \def\faMeh {{\FA\csname faicon@meh\endcsname}} +\expandafter\def\csname faicon@gamepad\endcsname {\symbol{"F11B}} \def\faGamepad {{\FA\csname faicon@gamepad\endcsname}} +\expandafter\def\csname faicon@keyboard\endcsname {\symbol{"F11C}} \def\faKeyboard {{\FA\csname faicon@keyboard\endcsname}} +\expandafter\def\csname faicon@flag-alt\endcsname {\symbol{"F11D}} \def\faFlagAlt {{\FA\csname faicon@flag-alt\endcsname}} +\expandafter\def\csname faicon@flag-checkered\endcsname {\symbol{"F11E}} \def\faFlagCheckered {{\FA\csname faicon@flag-checkered\endcsname}} + +\expandafter\def\csname faicon@terminal\endcsname {\symbol{"F120}} \def\faTerminal {{\FA\csname faicon@terminal\endcsname}} +\expandafter\def\csname faicon@code\endcsname {\symbol{"F121}} \def\faCode {{\FA\csname faicon@code\endcsname}} +\expandafter\def\csname faicon@reply-all\endcsname {\symbol{"F122}} \def\faReplyAll {{\FA\csname faicon@reply-all\endcsname}} +\expandafter\def\csname faicon@star-half-empty\endcsname {\symbol{"F123}} \def\faStarHalfEmpty {{\FA\csname faicon@star-half-empty\endcsname}} +\expandafter\def\csname faicon@location-arrow\endcsname {\symbol{"F124}} \def\faLocationArrow {{\FA\csname faicon@location-arrow\endcsname}} +\expandafter\def\csname faicon@crop\endcsname {\symbol{"F125}} \def\faCrop {{\FA\csname faicon@crop\endcsname}} +\expandafter\def\csname faicon@code-fork\endcsname {\symbol{"F126}} \def\faCodeFork {{\FA\csname faicon@code-fork\endcsname}} +\expandafter\def\csname faicon@unlink\endcsname {\symbol{"F127}} \def\faUnlink {{\FA\csname faicon@unlink\endcsname}} +\expandafter\def\csname faicon@question\endcsname {\symbol{"F128}} \def\faQuestion {{\FA\csname faicon@question\endcsname}} +\expandafter\def\csname faicon@info\endcsname {\symbol{"F129}} \def\faInfo {{\FA\csname faicon@info\endcsname}} +\expandafter\def\csname faicon@exclamation\endcsname {\symbol{"F12A}} \def\faExclamation {{\FA\csname faicon@exclamation\endcsname}} +\expandafter\def\csname faicon@superscript\endcsname {\symbol{"F12B}} \def\faSuperscript {{\FA\csname faicon@superscript\endcsname}} +\expandafter\def\csname faicon@subscript\endcsname {\symbol{"F12C}} \def\faSubscript {{\FA\csname faicon@subscript\endcsname}} +\expandafter\def\csname faicon@eraser\endcsname {\symbol{"F12D}} \def\faEraser {{\FA\csname faicon@eraser\endcsname}} +\expandafter\def\csname faicon@puzzle-piece\endcsname {\symbol{"F12E}} \def\faPuzzlePiece {{\FA\csname faicon@puzzle-piece\endcsname}} + +\expandafter\def\csname faicon@microphone\endcsname {\symbol{"F130}} \def\faMicrophone {{\FA\csname faicon@microphone\endcsname}} +\expandafter\def\csname faicon@microphone-off\endcsname {\symbol{"F131}} \def\faMicrophoneOff {{\FA\csname faicon@microphone-off\endcsname}} +\expandafter\def\csname faicon@shield\endcsname {\symbol{"F132}} \def\faShield {{\FA\csname faicon@shield\endcsname}} +\expandafter\def\csname faicon@calendar-empty\endcsname {\symbol{"F133}} \def\faCalendarEmpty {{\FA\csname faicon@calendar-empty\endcsname}} +\expandafter\def\csname faicon@fire-extinguisher\endcsname {\symbol{"F134}} \def\faFireExtinguisher {{\FA\csname faicon@fire-extinguisher\endcsname}} +\expandafter\def\csname faicon@rocket\endcsname {\symbol{"F135}} \def\faRocket {{\FA\csname faicon@rocket\endcsname}} +\expandafter\def\csname faicon@maxcdn\endcsname {\symbol{"F136}} \def\faMaxCDN {{\FA\csname faicon@maxcdn\endcsname}} +\expandafter\def\csname faicon@chevron-sign-left\endcsname {\symbol{"F137}} \def\faChevronSignLeft {{\FA\csname faicon@chevron-sign-left\endcsname}} +\expandafter\def\csname faicon@chevron-sign-right\endcsname {\symbol{"F138}} \def\faChevronSignRight {{\FA\csname faicon@chevron-sign-right\endcsname}} +\expandafter\def\csname faicon@chevron-sign-up\endcsname {\symbol{"F139}} \def\faChevronSignUp {{\FA\csname faicon@chevron-sign-up\endcsname}} +\expandafter\def\csname faicon@chevron-sign-down\endcsname {\symbol{"F13A}} \def\faChevronSignDown {{\FA\csname faicon@chevron-sign-down\endcsname}} +\expandafter\def\csname faicon@html5\endcsname {\symbol{"F13B}} \def\faHTMLfive {{\FA\csname faicon@html5\endcsname}} +\expandafter\def\csname faicon@css3\endcsname {\symbol{"F13C}} \def\faCSSthree {{\FA\csname faicon@css3\endcsname}} +\expandafter\def\csname faicon@anchor\endcsname {\symbol{"F13D}} \def\faAnchor {{\FA\csname faicon@anchor\endcsname}} +\expandafter\def\csname faicon@unlock-alt\endcsname {\symbol{"F13E}} \def\faUnlockAlt {{\FA\csname faicon@unlock-alt\endcsname}} + +\expandafter\def\csname faicon@bullseye\endcsname {\symbol{"F140}} \def\faBullseye {{\FA\csname faicon@bullseye\endcsname}} +\expandafter\def\csname faicon@ellipsis-horizontal\endcsname{\symbol{"F141}} \def\faEllipsisHorizontal{{\FA\csname faicon@ellipsis-horizontal\endcsname}} +\expandafter\def\csname faicon@ellipsis-vertical\endcsname {\symbol{"F142}} \def\faEllipsisVertical {{\FA\csname faicon@ellipsis-vertical\endcsname}} +\expandafter\def\csname faicon@rss-sign\endcsname {\symbol{"F143}} \def\faRSSSign {{\FA\csname faicon@rss-sign\endcsname}} +\expandafter\def\csname faicon@play-sign\endcsname {\symbol{"F144}} \def\faPlaySign {{\FA\csname faicon@play-sign\endcsname}} +\expandafter\def\csname faicon@ticket\endcsname {\symbol{"F145}} \def\faTicket {{\FA\csname faicon@ticket\endcsname}} +\expandafter\def\csname faicon@minus-sign-alt\endcsname {\symbol{"F146}} \def\faMinusSignAlt {{\FA\csname faicon@minus-sign-alt\endcsname}} +\expandafter\def\csname faicon@check-minus\endcsname {\symbol{"F147}} \def\faCheckMinus {{\FA\csname faicon@check-minus\endcsname}} +\expandafter\def\csname faicon@level-up\endcsname {\symbol{"F148}} \def\faLevelUp {{\FA\csname faicon@level-up\endcsname}} +\expandafter\def\csname faicon@level-down\endcsname {\symbol{"F149}} \def\faLevelDown {{\FA\csname faicon@level-down\endcsname}} +\expandafter\def\csname faicon@check-sign\endcsname {\symbol{"F14A}} \def\faCheckSign {{\FA\csname faicon@check-sign\endcsname}} +\expandafter\def\csname faicon@edit-sign\endcsname {\symbol{"F14B}} \def\faEditSign {{\FA\csname faicon@edit-sign\endcsname}} +\expandafter\def\csname faicon@external-link-sign\endcsname {\symbol{"F14C}} \def\faExternalLinkSign {{\FA\csname faicon@external-link-sign\endcsname}} +\expandafter\def\csname faicon@share-sign\endcsname {\symbol{"F14D}} \def\faShareSign {{\FA\csname faicon@share-sign\endcsname}} + +% aliases +\expandafter\def\csname faicon@mail-forward\endcsname {\faShareAlt} \def\faMailForward {\faShareAlt} +\expandafter\def\csname faicon@mail-reply\endcsname {\faReply} \def\faMailReply {\faReply} +\expandafter\def\csname faicon@mail-reply-all\endcsname {\faReplyAll} \def\faMailReplyAll {\faReplyAll} +\expandafter\def\csname faicon@star-half-full\endcsname {\faStarHalfEmpty}\def\faStarHalfFull {\faStarHalfEmpty} +\expandafter\def\csname faicon@rotate-left\endcsname {\faUndo} \def\faRotateLeft {\faUndo} +\expandafter\def\csname faicon@rotate-right\endcsname {\faRepeat} \def\faRotateRight {\faRepeat} \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontawesome.tlpobj new/tlpkg/tlpobj/fontawesome.tlpobj --- old/tlpkg/tlpobj/fontawesome.tlpobj 2013-03-26 04:38:20.000000000 +0100 +++ new/tlpkg/tlpobj/fontawesome.tlpobj 2013-06-29 03:21:59.000000000 +0200 @@ -1,15 +1,15 @@ name fontawesome category Package -revision 29498 +revision 31020 shortdesc Font containing web-related icons. relocated 1 longdesc The package offers access to the large number of web-related longdesc icons provided by the included font. The package requires the longdesc package, fontspec, running under XeTeX or LuaTeX. -runfiles size=21 +runfiles size=25 RELOC/fonts/opentype/public/fontawesome/FontAwesome.otf RELOC/tex/latex/fontawesome/fontawesome.sty catalogue-ctan /fonts/fontawesome -catalogue-date 2013-03-24 11:01:10 +0100 +catalogue-date 2013-06-12 15:49:49 +0200 catalogue-license other-free -catalogue-version 3.0.2-1 +catalogue-version 3.1.1 ++++++ fontaxes.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fontaxes/README new/doc/latex/fontaxes/README --- old/doc/latex/fontaxes/README 2011-09-20 01:46:08.000000000 +0200 +++ new/doc/latex/fontaxes/README 2014-03-23 23:12:52.000000000 +0100 @@ -38,7 +38,7 @@ ------- Copyright (c) 2007 by Andreas Buehmann -Copyright (c) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de> +Copyright (c) 2014 by Michael Ummels <michael.ummels@rwth-aachen.de> This work may be distributed and modified under the terms and conditions of the LaTeX Project Public License, version 1.3c or greater (your choice). Files old/doc/latex/fontaxes/fontaxes.pdf and new/doc/latex/fontaxes/fontaxes.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fontaxes/test-fontaxes.tex new/doc/latex/fontaxes/test-fontaxes.tex --- old/doc/latex/fontaxes/test-fontaxes.tex 2011-09-20 01:46:08.000000000 +0200 +++ new/doc/latex/fontaxes/test-fontaxes.tex 2014-03-23 23:12:52.000000000 +0100 @@ -7,7 +7,7 @@ %% fontaxes.dtx (with options: `test') %% %% Copyright (c) 2007 by Andreas Buehmann -%% Copyright (c) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de> +%% Copyright (c) 2014 by Michael Ummels <michael.ummels@rwth-aachen.de> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontaxes.doc.tlpobj new/tlpkg/tlpobj/fontaxes.doc.tlpobj --- old/tlpkg/tlpobj/fontaxes.doc.tlpobj 2011-12-20 04:29:20.000000000 +0100 +++ new/tlpkg/tlpobj/fontaxes.doc.tlpobj 2014-03-25 03:22:37.000000000 +0100 @@ -1,9 +1,9 @@ name fontaxes.doc category Package -revision 24880 +revision 33276 shortdesc doc files of fontaxes relocated 1 -docfiles size=32 +docfiles size=33 RELOC/doc/latex/fontaxes/README RELOC/doc/latex/fontaxes/fontaxes.pdf RELOC/doc/latex/fontaxes/test-fontaxes.tex ++++++ fontaxes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fontaxes/fontaxes.sty new/tex/latex/fontaxes/fontaxes.sty --- old/tex/latex/fontaxes/fontaxes.sty 2011-12-20 02:22:59.000000000 +0100 +++ new/tex/latex/fontaxes/fontaxes.sty 2014-03-24 21:41:35.000000000 +0100 @@ -7,7 +7,7 @@ %% fontaxes.dtx (with options: `package') %% %% Copyright (c) 2007 by Andreas Buehmann -%% Copyright (c) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de> +%% Copyright (c) 2014 by Michael Ummels <michael.ummels@rwth-aachen.de> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -25,7 +25,7 @@ %% the derived files fontaxes.sty, test-fontaxes.tex and fontaxes.pdf. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fontaxes}[2011/12/16 v1.0c Font selection axes] +\ProvidesPackage{fontaxes}[2014/03/23 v1.0d Font selection axes] \DeclareRobustCommand\upshape{\not@math@alphabet\upshape\relax \fontprimaryshape\updefault\selectfont} \DeclareRobustCommand\itshape{\not@math@alphabet\itshape\mathit @@ -111,6 +111,8 @@ \AtBeginDocument{ \@ifpackageloaded{hyperref}{% \pdfstringdefDisableCommands{% + \let\fontprimaryshape\@gobble + \let\fontsecondaryshape\@gobble \let\fontfigurestyle\@gobble \let\fontfigurealignment\@gobble \let\fontbasefamily\@gobble @@ -305,10 +307,6 @@ \newcommand*\fontaxes@save[1]{% \expandafter\let\csname fontaxes@last@\string#1\endcsname#1% } -\AtBeginDocument{% - \fontaxes@provide@mv@copy{tabular}{normal}% - \fontaxes@provide@mv@copy{boldtabular}{bold}% -} \newcommand*\fontaxes@provide@mv@copy[2]{% \@ifundefined{mv@#1}{% \DeclareMathVersion{#1}% @@ -316,6 +314,10 @@ \csname mv@#2\endcsname }{}% } +\AtBeginDocument{% + \fontaxes@provide@mv@copy{tabular}{normal}% + \fontaxes@provide@mv@copy{boldtabular}{bold}% +} \newif\iffontaxes@exists \newcommand*\fontaxes@check@family[1]{% \begingroup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontaxes.tlpobj new/tlpkg/tlpobj/fontaxes.tlpobj --- old/tlpkg/tlpobj/fontaxes.tlpobj 2011-12-20 04:29:20.000000000 +0100 +++ new/tlpkg/tlpobj/fontaxes.tlpobj 2014-03-25 03:22:37.000000000 +0100 @@ -1,6 +1,6 @@ name fontaxes category Package -revision 24880 +revision 33276 shortdesc Additional font axes for LaTeX. relocated 1 longdesc The package adds several new font axes on top of LaTeX's New @@ -11,6 +11,6 @@ runfiles size=4 RELOC/tex/latex/fontaxes/fontaxes.sty catalogue-ctan /macros/latex/contrib/fontaxes -catalogue-date 2011-12-19 11:01:35 +0100 +catalogue-date 2014-03-23 16:44:03 +0100 catalogue-license lppl1.3 -catalogue-version 1.0c +catalogue-version 1.0d ++++++ fontinst.doc.tar.xz ++++++ Files old/texmf-dist/doc/man/man1/fontinst.man1.pdf and new/texmf-dist/doc/man/man1/fontinst.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontinst.doc.tlpobj new/tlpkg/tlpobj/fontinst.doc.tlpobj --- old/tlpkg/tlpobj/fontinst.doc.tlpobj 2013-04-09 03:40:14.000000000 +0200 +++ new/tlpkg/tlpobj/fontinst.doc.tlpobj 2014-04-29 03:29:48.000000000 +0200 @@ -1,6 +1,6 @@ name fontinst.doc category Package -revision 29764 +revision 33736 shortdesc doc files of fontinst docfiles size=460 texmf-dist/doc/fonts/fontinst/README ++++++ fontinst.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontinst.tlpobj new/tlpkg/tlpobj/fontinst.tlpobj --- old/tlpkg/tlpobj/fontinst.tlpobj 2013-04-09 03:40:16.000000000 +0200 +++ new/tlpkg/tlpobj/fontinst.tlpobj 2014-04-29 03:29:50.000000000 +0200 @@ -1,6 +1,6 @@ name fontinst category Package -revision 29764 +revision 33736 shortdesc Help with installing fonts for TeX and LaTeX. longdesc TeX macros for converting Adobe Font Metric files to TeX metric longdesc and virtual font format. Fontinst helps mainly with the number ++++++ fontools.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/afm2afm.1 new/texmf-dist/doc/man/man1/afm2afm.1 --- old/texmf-dist/doc/man/man1/afm2afm.1 2013-01-04 00:28:41.000000000 +0100 +++ new/texmf-dist/doc/man/man1/afm2afm.1 2013-10-01 23:32:52.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.20) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "AFM2AFM 1" -.TH AFM2AFM 1 "2012-03-06" "fontools" "Marc Penninga" +.TH AFM2AFM 1 "2013-08-07" "fontools" "Marc Penninga" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -137,6 +146,7 @@ .IX Item "afm2afm" [\fB\-help\fR] [\fB\-encoding\fR \fIencodingfile\fR] +[\fB\-kpx\fR \fIkpxfile\fR] [\fB\-output\fR \fIoutputfile\fR] \&\fBafmfile\fR .SH "DESCRIPTION" @@ -145,10 +155,12 @@ .PP Metrics (including kerning data) for characters not present in the chosen encoding are excluded from the output, which resuls in -much smaller files. +(potentially much) smaller files. .PP -Note that if you don't specify an encoding file, the \fIafm\fR file -isn't re-encoded, but the unused data is still pruned. +Additional kerning pairs can be added to the output file. +If you don't specify an encoding file, +the \fIafm\fR file isn't re-encoded; +however, all unused (unencoded) data is still pruned. .PP The program also generates an entry for a \fIdvips\fR\-style map file, but only if the \fIafm\fR file has been re-encoded and @@ -162,6 +174,20 @@ .IP "\fB\-encoding\fR \fIencodingfile\fR" 4 .IX Item "-encoding encodingfile" Re-encode to the enconding in \fIencodingfile\fR +.IP "\fB\-kpx\fR \fIkpxfile\fR" 4 +.IX Item "-kpx kpxfile" +Read additional kerning pairs from \fIkpxfile\fR and add these to the output. +This option cannot be used to override values from the input \fIafm\fR file, +since \fBafm2afm\fR will write both old and new values to the output! +.Sp +The \fIkpxfile\fR should contain kerning data in standard \fIafm\fR format, +i.e. for each kerning pair there should be a line +.Sp +.Vb 1 +\& KPX <left_glyph> <right_glyph> <amount> +.Ve +.Sp +All other lines in the \fIkpxfile\fR are ignored. .IP "\fB\-output\fR \fIoutputfile\fR" 4 .IX Item "-output outputfile" Write the result to \fIoutputfile\fR instead of \f(CW\*(C`stdout\*(C'\fR. @@ -169,30 +195,36 @@ .IX Item "afmfile" The \fIafm\fR file to be re-encoded. .PP -Option names may be shortened to a unique prefix. +You may use either one or two dashes before options, +and option names may be shortened to a unique prefix. .SH "AUTHOR" .IX Header "AUTHOR" Marc Penninga <marcpenninga@gmail.com> .SH "COPYRIGHT" .IX Header "COPYRIGHT" -Copyright (C) 2005\-2012 Marc Penninga. +Copyright (C) 2005\-2013 Marc Penninga. .SH "LICENSE" .IX Header "LICENSE" This program is free software; you can redistribute it and/or modify it under the terms of the \s-1GNU\s0 General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. -A copy of the \s-1GNU\s0 General Public License is included with \fBautoinst\fR; +A copy of the \s-1GNU\s0 General Public License is included with \fBafm2afm\fR; see the file \fIGPLv2.txt\fR. .SH "DISCLAIMER" .IX Header "DISCLAIMER" This program is distributed in the hope that it will be useful, -but \s-1WITHOUT\s0 \s-1ANY\s0 \s-1WARRANTY\s0; without even the implied warranty of -\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0. +but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of +\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0 See the \s-1GNU\s0 General Public License for more details. .SH "RECENT CHANGES" .IX Header "RECENT CHANGES" (See the source code for the rest of the story.) +.IP "\fI2013\-08\-07\fR" 12 +.IX Item "2013-08-07" +Added the \fI\-kpx\fR command-line option. +Replaced all \f(CW\*(C`given/when\*(C'\fR constructions in the source code by \f(CW\*(C`if\*(C'\fR's, +to avoid warnings about experimental features in Perl 5.18 and later. .IP "\fI2012\-02\-01\fR" 12 .IX Item "2012-02-01" Refactored the code; added the \*(L"no re-encoding, only pruning\*(R" Files old/texmf-dist/doc/man/man1/afm2afm.man1.pdf and new/texmf-dist/doc/man/man1/afm2afm.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/autoinst.1 new/texmf-dist/doc/man/man1/autoinst.1 --- old/texmf-dist/doc/man/man1/autoinst.1 2013-02-07 23:51:16.000000000 +0100 +++ new/texmf-dist/doc/man/man1/autoinst.1 2014-04-06 00:21:21.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.20) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "AUTOINST 1" -.TH AUTOINST 1 "2013-02-06" "fontools" "Marc Penninga" +.TH AUTOINST 1 "2014-04-04" "fontools" "Marc Penninga" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -134,18 +143,18 @@ for installing OpenType fonts in LaTeX. .SH "SYNOPSIS" .IX Header "SYNOPSIS" -\&\fBautoinst\fR [\fIoptions\fR] \fBfont(s)\fR +\&\fBautoinst\fR [\fIoptions\fR] \fBfontfile(s)\fR .SH "DESCRIPTION" .IX Header "DESCRIPTION" -Eddie Kohler's \fITypeTools\fR, especially \fIotftotfm\fR, are superb tools -for installing OpenType fonts in LaTeX, but their use -(even in automatic mode) is complicated: they need many long -command lines and don't generate the \fIfd\fR and \fIsty\fR files LaTeX needs. -\&\fBautoinst\fR simplifies the font installation process with \fIotftotfm\fR -by generating and executing all command lines -and by creating and installing all \fIfd\fR and \fIsty\fR files. +Eddie Kohler's \fI\s-1LCDF\s0 TypeTools\fR are superb tools for installing +OpenType fonts in LaTeX, but they can be hard to use: +they need many, often long, command lines +and don't generate the \fIfd\fR and \fIsty\fR files LaTeX needs. +\&\fBautoinst\fR simplifies the use of the \fITypeTools\fR for font installation +by generating and executing all commands for \fIotftotfm\fR +and by creating and installing all necessary \fIfd\fR and \fIsty\fR files. .PP -Given a family of font files (in either \fIotf\fR or \fIttf\fR format), +Given a family of font files (in \fIotf\fR or \fIttf\fR format), \&\fBautoinst\fR will create several LaTeX font families: .RS 2 .IP "\-" 3 @@ -153,35 +162,34 @@ and proportional variants), each with the following shapes: .RS 3 .RS 2 -.IP "\fIn\fR" 6 +.IP "\fIn\fR" 8 .IX Item "n" Roman text -.IP "\fIsc\fR" 6 +.IP "\fIit\fR, \fIsl\fR" 8 +.IX Item "it, sl" +Italic and slanted (sometimes called oblique) text +.IP "\fIsc\fR" 8 .IX Item "sc" Small caps -.IP "\fInw\fR" 6 -.IX Item "nw" -\&\*(L"Upright swash\*(R"; usually normal text with some extra \*(L"oldstyle\*(R" ligatures, -such as ct, sp and st. -.IP "\fItl\fR" 6 +.IP "\fIsw\fR" 8 +.IX Item "sw" +Swash +.IP "\fItl\fR" 8 .IX Item "tl" Titling shape. Meant for all-caps text only (even though it sometimes contains lowercase glyphs as well), where letterspacing and the positioning of punctuation characters have been adjusted to suit all-caps text. -This shape is generated only for the families with lining digits, -since old-style digits make no sense with all-caps text. -.IP "\fIit\fR" 6 -.IX Item "it" -Italic (or oblique) text -.IP "\fIscit\fR" 6 -.IX Item "scit" -Italic small caps -.IP "\fIsw\fR" 6 -.IX Item "sw" -Swash -.IP "\fItlit\fR" 6 -.IX Item "tlit" -Italic titling +(This shape is only generated for the families with lining digits, +since old-style digits make no sense with all-caps text.) +.IP "\fIscit\fR, \fIscsl\fR" 8 +.IX Item "scit, scsl" +Italic and slanted small caps +.IP "\fInw\fR" 8 +.IX Item "nw" +\&\*(L"Upright swash\*(R"; usually normal text with \*(L"oldstyle\*(R" ligatures such as ct, sp and st. +.IP "\fItlit\fR, \fItlsl\fR" 8 +.IX Item "tlit, tlsl" +Italic and slanted titling text .RE .RS 2 .RE @@ -190,23 +198,23 @@ .RE .IP "\-" 3 For each text family: a family of TS1\-encoded symbol fonts, -in roman and italic shapes. +in roman, italic and slanted shapes. .IP "\-" 3 Four families with superiors, inferiors, numerators and denominators, -in roman and italic shapes. +in roman, italic and slanted shapes. .IP "\-" 3 -An ornament family, in roman and italic shapes. +An ornament family, in roman, italic and slanted shapes. .RE .RS 2 .RE .PP -Of course, if the fonts don't contain oldstyle digits, small caps etc., -the corresponding shapes and families are not created. +Of course, if the fonts don't contain italics, oldstyle digits, small caps +etc., the corresponding shapes and families are not created. Furthermore, the creation of most families and shapes can be controlled by -command-line options (see \*(L"COMMAND-LINE \s-1OPTIONS\s0\*(R" below). +command-line options (see \*(L"COMMAND-LINE \s-1OPTIONS\*(R"\s0 below). .PP -The generated font families are named \fI<FontFamily>\-<Suffix>\fR, -where \fI<Suffix>\fR is one of +These families use the \fIFontPro\fR project's naming scheme: +\&\fI<FontFamily>\-<Suffix>\fR, where \fI<Suffix>\fR is: .IP "\fI\s-1LF\s0\fR" 8 .IX Item "LF" proportional (i.e., figures have varying widths) lining figures @@ -223,11 +231,11 @@ .IX Item "Sup" superior characters (many fonts have only an incomplete set of superior characters: digits, some punctuation and the letters \fIabdeilmnorst\fR; -normal forms will then be used for the other characters) +normal forms are used for other characters) .IP "\fIInf\fR" 8 .IX Item "Inf" -inferior characters; usually only digits and punctuation, -normal forms for the other characters +inferior characters; usually only digits and some punctuation, +normal forms for other characters .IP "\fIOrn\fR" 8 .IX Item "Orn" ornaments @@ -242,50 +250,54 @@ where \fI<suffix>\fR is the same as above (but in lowercase), \&\fI<shape>\fR is either empty, \*(L"sc\*(R", \*(L"swash\*(R" or \*(L"titling\*(R", and \fI<enc>\fR is the encoding. -A typical name in this scheme would be \*(L"MinionPro\-Regular\-osf\-sc\-ly1\*(R". +A typical name in this scheme is \*(L"LinLibertineO\-osf\-sc\-ly1\*(R". .SS "On the choice of text encoding" .IX Subsection "On the choice of text encoding" -By default, \fBautoinst\fR generates text fonts with \s-1OT1\s0, T1 and \s-1LY1\s0 +By default, \fBautoinst\fR generates text fonts with \s-1OT1, T1\s0 and \s-1LY1\s0 encodings, and the generated style files use \s-1LY1\s0 as the default text encoding. \&\s-1LY1\s0 has been chosen over T1 because it has some empty slots to accomodate -the additional ligatures and alternate glyphs provided by many OpenType fonts. -Different encodings can be selected using the \fI\-encoding\fR -command-line option (see \*(L"COMMAND-LINE \s-1OPTIONS\s0\*(R" below). +the additional ligatures provided by many OpenType fonts. +Different encodings can be chosen using the \fI\-encoding\fR command-line option +(see \*(L"COMMAND-LINE \s-1OPTIONS\*(R"\s0 below). .SS "Using the fonts in your LaTeX documents" .IX Subsection "Using the fonts in your LaTeX documents" \&\fBautoinst\fR generates a style file for using the font in LaTeX documents, named \fI<FontFamily>.sty\fR. This style file also takes care of loading the -\&\fIfontenc\fR and \fItextcomp\fR packages, if necessary. +\&\fIfontenc\fR and \fItextcomp\fR packages. To use the font, simply put \f(CW\*(C`\eusepackage{\f(CI<FontFamily>\f(CW}\*(C'\fR in the preamble of your document. .PP This style file defines a number of options: -.IP "\fIlining, oldstyle, tabular, proportional\fR" 4 +.ie n .IP """lining"", ""oldstyle"", ""tabular"", ""proportional""" 4 +.el .IP "\f(CWlining\fR, \f(CWoldstyle\fR, \f(CWtabular\fR, \f(CWproportional\fR" 4 .IX Item "lining, oldstyle, tabular, proportional" -Choose which digits will be used for the text fonts. +Choose which figure style to use. The defaults are \*(L"oldstyle\*(R" and \*(L"proportional\*(R" (if available). -.IP "\fIultrablack, ultrabold, heavy, extrablack, black, extrabold, demibold, semibold, bold\fR" 4 +.ie n .IP """scale=\f(CI<number>\f(CW""" 4 +.el .IP "\f(CWscale=\f(CI<number>\f(CW\fR" 4 +.IX Item "scale=<number>" +Scale the font by a factor of \fI<number>\fR. +For example: to increase the size of the font by 5%, use +\&\f(CW\*(C`\eusepackage[scale=1.05]{\f(CI<FontFamily>\f(CW}\*(C'\fR. +May also be spelled \f(CW\*(C`scaled\*(C'\fR. +.Sp +This option is only available when you have the \fIxkeyval\fR package installed. +.ie n .IP """ultrablack"", ""ultrabold"", ""heavy"", ""extrablack"", ""black"", ""extrabold"", ""demibold"", ""semibold"", ""bold""" 4 +.el .IP "\f(CWultrablack\fR, \f(CWultrabold\fR, \f(CWheavy\fR, \f(CWextrablack\fR, \f(CWblack\fR, \f(CWextrabold\fR, \f(CWdemibold\fR, \f(CWsemibold\fR, \f(CWbold\fR" 4 .IX Item "ultrablack, ultrabold, heavy, extrablack, black, extrabold, demibold, semibold, bold" -Choose the weight that LaTeX will use for the \*(L"bold\*(R" weight -(i.e., the value of \f(CW\*(C`\ebfdefault\*(C'\fR). -.IP "\fIlight, medium, regular\fR" 4 +Choose the weight that LaTeX will use for the \*(L"bold\*(R" weight. +.ie n .IP """light"", ""medium"", ""regular""" 4 +.el .IP "\f(CWlight\fR, \f(CWmedium\fR, \f(CWregular\fR" 4 .IX Item "light, medium, regular" -Choose the weight that LaTeX will use for the \*(L"regular\*(R" weight -(i.e., the value of \f(CW\*(C`\emddefault\*(C'\fR). -.IP "\fIscaled=<scale>\fR" 4 -.IX Item "scaled=<scale>" -Scale the font by a factor of \fI<scale>\fR. -For example: to increase the size of the font by 5%, use the command -\&\f(CW\*(C`\eusepackage[scaled=1.05]{\f(CI<FontFamily>\f(CW}\*(C'\fR. -.Sp -This option is only available when the \fIxkeyval\fR package is found -in your TeX installation. +Choose the weight that LaTeX will use for the \*(L"regular\*(R" weight. +.PP +These last two groups of options will only work if +you have the \fImweights\fR package installed. .PP -The style file will also try to load the \fIfontaxes\fR package, +The style file will also try to load the \fIfontaxes\fR package +(available on \s-1CTAN\s0), which gives easy access to various font shapes and styles. -It is available from \s-1CTAN\s0 -(\fIhttp://www.ctan.org/tex\-archive/macros/latex/contrib/fontaxes\fR). -Using the machinery set up by \fIfontaxes\fR, the generated style file also +Using the machinery set up by \fIfontaxes\fR, the generated style file defines a number of commands (which take the text to be typeset as argument) and declarations (which don't take arguments, but affect all text up to the end of the current group) of its own: @@ -320,19 +332,21 @@ This is a deliberate feature that allows you to provide your own encoding vector, e.g. if your fonts use non-standard glyph names for ornaments. .PP -These commands are only generated for shapes and number styles -that actually exist; no commands are generated for shapes and styles -that don't exist, or whose generation has been turned off -using command-line options (see below). -Please also note that these commands are built on top of \fIfontaxes\fR; +These commands are only generated for existing shapes and number styles; +no commands are generated for shapes and styles that don't exist, +or whose generation has been turned off using command-line options. +Also: these commands are built on top of \fIfontaxes\fR; if that package cannot be found, you're limited to using the -lower-level commands from standard \s-1NFSS\s0 (\f(CW\*(C`\efontfamily\*(C'\fR, \f(CW\*(C`\efontseries\*(C'\fR, +lower-level commands from standard \s-1NFSS \s0(\f(CW\*(C`\efontfamily\*(C'\fR, \f(CW\*(C`\efontseries\*(C'\fR, \&\f(CW\*(C`\efontshape\*(C'\fR etc.). .SS "Using multiple font families in one document" .IX Subsection "Using multiple font families in one document" -If you want to use more than one font family in a document, be aware -that style files generated by versions of \fBautoinst\fR older dan 2009 -are incompatible with those generated by newer versions. +Style files generated by versions of \fBautoinst\fR older dan 2013\-07\-25 +redefined \f(CW\*(C`\emddefault\*(C'\fR and \f(CW\*(C`\ebfdefault\*(C'\fR, whereas newer style files +use the \fImweights\fR package instead. +If you use multiple \fBautoinst\fR\-generated font familes in the same document, +it is best if all style files are generated by the same version of +\&\fBautoinst\fR; re-generate the older families if necessary. .SS "\s-1NFSS\s0 codes" .IX Subsection "NFSS codes" \&\s-1NFSS\s0 identifies fonts by a combination of family, series (weight plus width), @@ -340,33 +354,33 @@ \&\fBautoinst\fR parses the output of \f(CW\*(C`otfinfo \-\-info\*(C'\fR to determine these parameters. When this fails (e.g., because the font family contains uncommon widths or weights), -\&\fBautoinst\fR would end up with different fonts having the \fIsame\fR values -for these font parameters, which means that these fonts cannot be used in \s-1NFSS\s0. -In this case, \fBautoinst\fR will split the font family into multiple subfamilies +\&\fBautoinst\fR ends up with different fonts having the \fIsame\fR values +for these font parameters, which means that these fonts cannot be used in \s-1NFSS.\s0 +In that case, \fBautoinst\fR will split the font family into multiple subfamilies (based on each font file's \*(L"Subfamily\*(R" value) and try again. (Since many font vendors misunderstand the \*(L"Subfamily\*(R" concept and make each font file its own separate subfamily, this strategy is only used as a last resort.) .PP If such a proliferation of font families is unwanted, -either run \fBautoinst\fR on a smaller set of fonts (omitting the ones that -failed to parse correctly) -or else add the missing widths, weights and shapes to the tables \f(CW%FD_WIDTH\fR, -\&\f(CW%FD_WEIGHT\fR and \f(CW%FD_SHAPE\fR, near the top of the source code. +either run \fBautoinst\fR on a smaller set of fonts or +add the missing widths, weights and shapes to the tables \f(CW%FD_WIDTH\fR, +\&\f(CW%FD_WEIGHT\fR and \f(CW%FD_SHAPE\fR, at the top of the source code. Please also send a bug report (see \s-1AUTHOR\s0 below). .PP \&\fBautoinst\fR maps widths, weights and shapes to \s-1NFSS\s0 codes using -the following tables. These are based both on the standard \fIFontname\fR scheme -and on the tables in Philipp Lehman's \fIFont Installation Guide\fR, -but some changes had to be made to avoid name clashes in font families -with many different widths and weights. +the following tables. These are based as much as possible +on the standard \fIFontname\fR scheme and Philipp Lehman's +\&\fIFont Installation Guide\fR, +but some changes were made to avoid name clashes in font families +with many widths and weights. .PP .Vb 1 \& WEIGHT WIDTH \& \& Thin t Ultra Compressed up \& Ultra Light ul Extra Compressed ep -\& Extra Light el Compressed, Compact p +\& Extra Light el Compressed p \& Light l Compact p \& Book [1] Ultra Condensed uc \& Regular [1] Extra Condensed ec @@ -385,8 +399,9 @@ \& Roman, Upright n [2] \& Italic it \& Cursive, Kursiv it -\& Oblique, Slanted it [3] -\& Incline(d) it [3] +\& Oblique sl [3] +\& Slanted sl [3] +\& Incline(d) sl [3] .Ve .PP \fINotes:\fR @@ -400,11 +415,7 @@ the first of these is mapped to \*(L"n\*(R", the second one to \*(L"it\*(R". .IP "[3]" 4 .IX Item "[3]" -Mapping the \*(L"Slanted\*(R", \*(L"Oblique\*(R" or \*(L"Inclined\*(R" shape to \*(L"it\*(R" instead of \*(L"sl\*(R" -simplifies \fBautoinst\fR. Since font families with both italic and slanted -shapes do \- to the best of my knowledge \- not exist -(apart from Computer Modern, of course), -this shouldn't cause problems in real life. +New in release 2014\-01\-21; before that, slanted fonts were mapped to \*(L"it\*(R". .SS "A note for MiKTeX users" .IX Subsection "A note for MiKTeX users" Automatically installing the fonts into a suitable \s-1TEXMF\s0 tree @@ -415,134 +426,145 @@ into subdirectories of the current directory. If you use such a TeX distribution, you should either move these files to their correct destinations by hand, or use the \fI\-target\fR option -(see \*(L"COMMAND-LINE \s-1OPTIONS\s0\*(R" below) to specify a \s-1TEXMF\s0 tree. +(see \*(L"COMMAND-LINE \s-1OPTIONS\*(R"\s0 below) to specify a \s-1TEXMF\s0 tree. .PP -Also, some OpenType fonts lead to \fIpl\fR and \fIvpl\fR files that +Also, some OpenType fonts may lead to \fIpl\fR and \fIvpl\fR files that are too big for MiKTeX's \fIpltotf\fR and \fIvptovf\fR; the versions that come with W32TeX (\fIhttp://www.w32tex.org\fR) and TeXLive (\fIhttp://tug.org/texlive\fR) don't have this problem. .SH "COMMAND-LINE OPTIONS" .IX Header "COMMAND-LINE OPTIONS" +\&\fBautoinst\fR tries hard to do The Right Thing (\s-1TM\s0) by default, +so in many cases you won't need these options; +but most aspects of its operation can be changed if you want to. +.PP You may use either one or two dashes before options, and option names may be shortened to a unique prefix (e.g., \fB\-encoding\fR may be abbreviated to \fB\-enc\fR or even \fB\-en\fR, but \fB\-e\fR is ambiguous (\fB\-encoding\fR, \fB\-extra\fR). +.IP "\fB\-dryrun\fR" 4 +.IX Item "-dryrun" +Don't actually generate any fonts and files, only create a logfile +showing which fonts would be generated. +By default, this information is written to \fIautoinst.log\fR; +use the \fB\-logfile\fR option to specify a different filename. .IP "\fB\-encoding\fR=\fIencoding[,encoding]\fR" 4 .IX Item "-encoding=encoding[,encoding]" -Use the specified encodings for the text fonts. The default is \*(L"\s-1OT1\s0,T1,LY1\*(R". -For each encoding, a file \fI<encoding>.enc\fR (in all \fIlowercase\fR) +Generate the specified encoding(s) for the text fonts. The default is \*(L"\s-1OT1,T1,LY1\*(R".\s0 +For each encoding, a file \fI<encoding>.enc\fR (\fIlowercase\fR) should be somewhere where \fIotftotfm\fR can find it. Suitable encoding files -for \s-1OT1\s0, T1/TS1 and \s-1LY1\s0 come with \fBautoinst\fR. (Note that these files are +for \s-1OT1, T1/TS1\s0 and \s-1LY1\s0 come with \fBautoinst\fR. (These files are called \fIfontools_ot1.enc\fR etc. to avoid name clashes with other packages; -the \*(L"fontools_\*(R" prefix doesn't need to be specified.) +the \*(L"fontools_\*(R" prefix may be omitted.) .Sp Multiple text encodings can be specified as a comma-separated list: \&\f(CW\*(C`\-encoding=OT1,T1\*(C'\fR. The encodings are passed to \fIfontenc\fR in the order specified, so the last one will be the default text encoding. +.IP "\fB\-ts1\fR / \fB\-nots1\fR" 4 +.IX Item "-ts1 / -nots1" +Control the creation of TS1\-encoded fonts. The default is \fB\-ts1\fR +if the text encodings (see \fI\-encoding\fR above) include T1, +\&\fB\-nots1\fR otherwise. .IP "\fB\-sanserif\fR" 4 .IX Item "-sanserif" Install the font as a sanserif font, accessed via \f(CW\*(C`\esffamily\*(C'\fR and \f(CW\*(C`\etextsf\*(C'\fR. -Note that the generated style file redefines \f(CW\*(C`\efamilydefault\*(C'\fR, +The generated style file redefines \f(CW\*(C`\efamilydefault\*(C'\fR, so including it will still make this font the default text font. .IP "\fB\-typewriter\fR" 4 .IX Item "-typewriter" Install the font as a typewriter font, accessed via \f(CW\*(C`\ettfamily\*(C'\fR and \&\f(CW\*(C`\etexttt\*(C'\fR. -Note that the generated style file redefines \f(CW\*(C`\efamilydefault\*(C'\fR, +The generated style file redefines \f(CW\*(C`\efamilydefault\*(C'\fR, so including it will still make this font the default text font. -.IP "\fB\-ts1\fR" 4 -.IX Item "-ts1" -.PD 0 -.IP "\fB\-nots1\fR" 4 -.IX Item "-nots1" -.PD -Turn the creation of TS1\-encoded fonts on or off. The default is \fB\-ts1\fR -if the text encodings (see \fI\-encoding\fR above) include T1, -\&\fB\-nots1\fR otherwise. -.IP "\fB\-smallcaps\fR" 4 -.IX Item "-smallcaps" -.PD 0 -.IP "\fB\-nosmallcaps\fR" 4 -.IX Item "-nosmallcaps" -.PD -Turn the creation of small caps fonts on or off. The default is +.IP "\fB\-lining\fR / \fB\-nolining\fR" 4 +.IX Item "-lining / -nolining" +Control the creation of fonts with lining figures. The default is +\&\fB\-lining\fR. +.IP "\fB\-oldstyle\fR / \fB\-nooldstyle\fR" 4 +.IX Item "-oldstyle / -nooldstyle" +Control the creation of fonts with oldstyle figures. The default is +\&\fB\-oldstyle\fR. +.IP "\fB\-proportional\fR / \fB\-noproportional\fR" 4 +.IX Item "-proportional / -noproportional" +Control the creation of fonts with proportional figures. The default is +\&\fB\-proportional\fR. +.IP "\fB\-tabular\fR / \fB\-notabular\fR" 4 +.IX Item "-tabular / -notabular" +Control the creation of fonts with tabular figures. The default is +\&\fB\-tabular\fR. +.IP "\fB\-smallcaps\fR / \fB\-nosmallcaps\fR" 4 +.IX Item "-smallcaps / -nosmallcaps" +Control the creation of small caps fonts. The default is \&\fB\-smallcaps\fR. -.IP "\fB\-swash\fR" 4 -.IX Item "-swash" -.PD 0 -.IP "\fB\-noswash\fR" 4 -.IX Item "-noswash" -.PD -Turn the creation of swash fonts on or off. The default is \fB\-swash\fR. -.IP "\fB\-titling\fR" 4 -.IX Item "-titling" -.PD 0 -.IP "\fB\-notitling\fR" 4 -.IX Item "-notitling" -.PD -Turn the creation of titling fonts on or off. The default is \fB\-titling\fR. -.IP "\fB\-superiors\fR" 4 -.IX Item "-superiors" -.PD 0 -.IP "\fB\-nosuperiors\fR" 4 -.IX Item "-nosuperiors" -.PD -Turn the creation of fonts with superior characters on or off. +.IP "\fB\-swash\fR / \fB\-noswash\fR" 4 +.IX Item "-swash / -noswash" +Control the creation of swash fonts. The default is \fB\-swash\fR. +.IP "\fB\-titling\fR / \fB\-notitling\fR" 4 +.IX Item "-titling / -notitling" +Control the creation of titling fonts. The default is \fB\-titling\fR. +.IP "\fB\-superiors\fR / \fB\-nosuperiors\fR" 4 +.IX Item "-superiors / -nosuperiors" +Control the creation of fonts with superior characters. The default is \fB\-superiors\fR. -.IP "\fB\-inferiors\fR" 4 -.IX Item "-inferiors" -.PD 0 -.IP "\fB\-noinferiors\fR" 4 -.IX Item "-noinferiors" -.PD -Turn the creation of fonts with inferior digits on or off. +.IP "\fB\-inferiors\fR / \fB\-noinferiors\fR" 4 +.IX Item "-inferiors / -noinferiors" +Control the creation of fonts with inferior digits. The default is \fB\-noinferiors\fR. -.IP "\fB\-fractions\fR" 4 -.IX Item "-fractions" -.PD 0 -.IP "\fB\-nofractions\fR" 4 -.IX Item "-nofractions" -.PD -Turn the creation of fonts with numerators and denominators on or off. +.IP "\fB\-fractions\fR / \fB\-nofractions\fR" 4 +.IX Item "-fractions / -nofractions" +Control the creation of fonts with numerators and denominators. The default is \fB\-nofractions\fR. -.IP "\fB\-ornaments\fR" 4 -.IX Item "-ornaments" -.PD 0 -.IP "\fB\-noornaments\fR" 4 -.IX Item "-noornaments" -.PD -Turn the creation of ornament fonts on or off. The default is \fB\-ornaments\fR. +.IP "\fB\-ornaments\fR / \fB\-noornaments\fR" 4 +.IX Item "-ornaments / -noornaments" +Control the creation of ornament fonts. The default is \fB\-ornaments\fR. .IP "\fB\-verbose\fR" 4 .IX Item "-verbose" -Verbose mode; print detailed info about what \fBautoinst\fR thinks it's doing. -.IP "\fB\-extra\fR=\fItext\fR" 4 -.IX Item "-extra=text" -Pass \fItext\fR as options to \fIotftotfm\fR. To prevent \fItext\fR from accidentily -being interpreted as options to \fBautoinst\fR, it should be properly quoted. -.IP "\fB\-figurekern\fR" 4 -.IX Item "-figurekern" +Verbose mode; print detailed information about which fonts \fBautoinst\fR +is generating. By default, this information is written to \fIautoinst.log\fR; +a different filename can be specified using the \fB\-logfile\fR option. +Repeat this option for even more detailed information. +.IP "\fB\-logfile\fR=\fI\s-1LOGFILE\s0\fR" 4 +.IX Item "-logfile=LOGFILE" +Write the logging information to \fI\s-1LOGFILE\s0\fR instead of \fIautoinst.log\fR. +.IP "\fB\-defaultlining\fR / \fB\-defaultoldstyle\fR" 4 +.IX Item "-defaultlining / -defaultoldstyle" .PD 0 -.IP "\fB\-nofigurekern\fR" 4 -.IX Item "-nofigurekern" +.IP "\fB\-defaulttabular\fR / \fB\-defaultproportional\fR" 4 +.IX Item "-defaulttabular / -defaultproportional" .PD +Tell \fBautoinst\fR which figure style is the current font family's default +(i.e., which figures you get when you don't specify any OpenType features). +.Sp +\&\fIDon't use these options unless you are certain you need them! +They are only needed for fonts that don't provide OpenType features +for their default figure style; and even in that case, +the default values (\f(BI\-defaultlining\fI and \f(BI\-defaulttabular\fI) +are usually correct.\fR +.IP "\fB\-figurekern\fR / \fB\-nofigurekern\fR" 4 +.IX Item "-figurekern / -nofigurekern" Some fonts provide kerning pairs for tabular figures. This is very probably not what you want (e.g., numbers in tables won't line up exactly). The option \fB\-nofigurekern\fR adds extra \fI \-\-ligkern\fR options -to the command lines for \fIotftotfm\fR to suppress such kerns -(but of course only for the \*(L"\s-1TLF\s0\*(R" and \*(L"TOsF\*(R" families). -Since this leads to very long command lines (it adds one hundred such options) +to the commands for \fIotftotfm\fR to suppress such kerns +(but of course only for the families with tabular figures). +Since this leads to very long commands (one hundred such options in total!) and the problem only occurs in very few fonts, the default is \fB\-figurekern\fR. +.IP "\fB\-extra\fR=\fItext\fR" 4 +.IX Item "-extra=text" +Add \fItext\fR to the command line to \fIotftotfm\fR. To prevent \fItext\fR from +accidentily being interpreted as options to \fBautoinst\fR, it should be +properly quoted. .IP "\fB\-manual\fR" 4 .IX Item "-manual" Manual mode. By default, \fBautoinst\fR executes all \fIotftotfm\fR -command lines it generates; with the \fB\-manual\fR option, these commands are +commands it generates; with the \fB\-manual\fR option, these commands are instead written to a file \fIautoinst.bat\fR. -Also, the generated \fIotftotfm\fR command lines specify the \fI \-\-pl\fR option -(which tells \fIotftotfm\fR to generate readable/editable \fIpl\fR and \fIvpl\fR files -instead of the default \fItfm\fR and \fIvf\fR files) -and leave out the \fI \-\-automatic\fR option (which tells \fIotftotfm\fR to +Also, the generated \fIotftotfm\fR commands specify the \fI \-\-pl\fR option +(which tells \fIotftotfm\fR to generate human readable/editable \fIpl\fR +and \fIvpl\fR files instead of the default \fItfm\fR and \fIvf\fR files) +and omit the \fI \-\-automatic\fR option (which causes \fIotftotfm\fR to leave all generated files in the current directory, rather than install them into your \s-1TEXMF\s0 tree). .Sp @@ -571,35 +593,31 @@ subdirectories in the \s-1TEXMF\s0 tree where generated files will be stored. The default values are \*(L"lcdftools\*(R" and the font's FontFamily name. .Sp -Please note that these options change \fIonly\fR directory names, +Note that these options change \fIonly\fR directory names, not the names of any generated files. -.IP "\fB\-updmap\fR" 4 -.IX Item "-updmap" -.PD 0 -.IP "\fB\-noupdmap\fR" 4 -.IX Item "-noupdmap" -.PD +.IP "\fB\-updmap\fR / \fB\-noupdmap\fR" 4 +.IX Item "-updmap / -noupdmap" Control whether or not \fIupdmap\fR is called after the last call to \fIotftotfm\fR. The default is \fB\-updmap\fR. .SH "SEE ALSO" .IX Header "SEE ALSO" -Eddie Kohler's TypeTools (\fIhttp://www.lcdf.org/type\fR). +Eddie Kohler's \fBTypeTools\fR (\fIhttp://www.lcdf.org/type\fR). .PP -Perl is pre-installed on most Linux and Unix systems; -on Windows, try ActiveState's ActivePerl -(available from \fIhttp://www.activestate.com\fR) +\&\fBPerl\fR can be downloaded from \fIhttp://www.perl.org\fR; it is +pre-installed on many Linux distributions. +For Windows, try ActivePerl (\fIhttp://www.activestate.com\fR) or Strawberry Perl (\fIhttp://strawberryperl.com\fR). .PP -XeTeX (\fIhttp://www.tug.org/xetex\fR) and LuaTeX (\fIhttp://www.luatex.org\fR) -are TeX extensions that can use many types of font -(including both flavours of OpenType) without TeX-specific support files. +The \fBFontPro\fR project (\fIhttps://github.com/sebschub/FontPro\fR) +offers very complete LaTeX support for Adobe's Minion Pro and Myriad Pro +(including math), and is currently working on Cronos Pro. .PP -The FontPro project (\fIhttps://github.com/sebschub/FontPro\fR) -offers very complete support for Adobe's Minion Pro and Myriad Pro -(including math), and is currently working on Cronos Pro as well. +\&\fBXeTeX\fR (\fIhttp://www.tug.org/xetex\fR) and \fBLuaTeX\fR (\fIhttp://www.luatex.org\fR) +are TeX engines that can use fonts in many formats +(including both flavours of OpenType) without TeX-specific support files. .PP -John Owens' \fIotfinst\fR (available from \s-1CTAN\s0) is another wrapper -around \fIotftotfm\fR, and may work for you when \fBautoinst\fR doesn't. +John Owens' \fBotfinst\fR (available from \s-1CTAN\s0) is another wrapper +around \fIotftotfm\fR. .SH "AUTHOR" .IX Header "AUTHOR" Marc Penninga <marcpenninga@gmail.com> @@ -607,10 +625,10 @@ When sending a bug report, please give as much relevant information as possible; this includes at least (but may not be limited to) the output from running \fBautoinst\fR with the \fI\-verbose\fR option. -Please make sure that this output includes all (if any) error messages. +Please include all (if any) error messages as well. .SH "COPYRIGHT" .IX Header "COPYRIGHT" -Copyright (C) 2005\-2013 Marc Penninga. +Copyright (C) 2005\-2014 Marc Penninga. .SH "LICENSE" .IX Header "LICENSE" This program is free software; you can redistribute it and/or modify @@ -622,48 +640,36 @@ .SH "DISCLAIMER" .IX Header "DISCLAIMER" This program is distributed in the hope that it will be useful, -but \s-1WITHOUT\s0 \s-1ANY\s0 \s-1WARRANTY\s0; without even the implied warranty of -\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0. See the +but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of +\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0 See the \&\s-1GNU\s0 General Public License for more details. .SH "RECENT CHANGES" .IX Header "RECENT CHANGES" (See the source code for the rest of the story.) -.IP "\fI2013\-02\-06\fR" 12 -.IX Item "2013-02-06" -Bugfix: the directory names for map and encoding files contained -the \*(L"vendor\*(R" instead of the \*(L"typeface\*(R". -.IP "\fI2013\-01\-03\fR" 12 -.IX Item "2013-01-03" -Added extra \*(L"ssub\*(R" rules to the \fIfd\fR files that substitute \*(L"b\*(R" for \*(L"bx\*(R". -Verbose mode now also prints all generated commands before they're executed. -.IP "\fI2012\-10\-25\fR" 12 -.IX Item "2012-10-25" -Added extra \*(L"ssub\*(R" rules to the \fIfd\fR files that substitute italic -shapes for slanted ones. -.IP "\fI2012\-09\-25\fR" 12 -.IX Item "2012-09-25" -Added the \fI\-vendor\fR, \fI\-typeface\fR and \fI\-(no)updmap\fR command line options. -.IP "\fI2012\-07\-06\fR" 12 -.IX Item "2012-07-06" -Documentation update. -.IP "\fI2012\-03\-06\fR" 12 -.IX Item "2012-03-06" -Implemented the \*(L"splitting the font family into multiple subfamilies\*(R" -emergency strategy when font info parsing fails. -Added recognition for a number of unusual widths, weights and shapes. -.IP "\fI2012\-02\-29\fR" 12 -.IX Item "2012-02-29" -Fixed a bug in the font parsing code, -where possible widths, weights and shapes where tested in the wrong order; -this led to \*(L"ExtraLight\*(R" fonts being recognised as \*(L"Light\*(R". -Added recognition for \*(L"Narrow\*(R" and \*(L"Wide\*(R" widths. -Also added the \fI\-(no)figurekern\fR command-line option. -.IP "\fI2012\-02\-01\fR" 12 -.IX Item "2012-02-01" -Reorganised the code, and fixed some bugs in the process. -Added the \fI\-target\fR command-line option. -Made \fBautoinst\fR install the \fIfd\fR and \fIsty\fR files in -the same \s-1TEXMF\s0 tree as the other generated files. -Generate \s-1OT1\s0, T1 and \s-1LY1\s0 encoded text fonts by default. -Made \fI\-titling\fR a default option (instead of \fI\-notitling\fR). -Updated the documentation. +.IP "\fI2014\-04\-04\fR" 12 +.IX Item "2014-04-04" +Fixed a bug in the font info parsing code. +.IP "\fI2014\-01\-21\fR" 12 +.IX Item "2014-01-21" +\&\*(L"Oblique\*(R" or \*(L"slanted\*(R" fonts are now mapped to \s-1NFSS\s0 code \*(L"sl\*(R" instead +of \*(L"it\*(R"; added \*(L"ssub\*(R" rules to the <fd> files to substitute slanted fonts +for italic ones if the latter are missing. Fixed a few bugs. +.IP "\fI2014\-01\-03\fR" 12 +.IX Item "2014-01-03" +Added the \fI\-dryrun\fR and \fI\-logfile\fR options; changed which info is logged. +Added the \fI\-lining\fR, \fI\-oldstyle\fR, \fI\-tabular\fR and \fI\-proportional\fR +options; the old options with those names have been renamed to +\&\fI\-defaultlining\fR, \fI\-defaultoldstyle\fR etc. +.IP "\fI2013\-10\-31\fR" 12 +.IX Item "2013-10-31" +The previous change required Perl v5.14 or newer; +now it also works with older versions. +.IP "\fI2013\-10\-01\fR" 12 +.IX Item "2013-10-01" +Added the \fI\-lining\fR, \fI\-oldstyle\fR, \fI\-tabular\fR and \fI\-proportional\fR +command line options. +.IP "\fI2013\-07\-25\fR" 12 +.IX Item "2013-07-25" +The generated \fIsty\fR files now use the \fImweights\fR package instead of +redefining \f(CW\*(C`\emddefault\*(C'\fR and \f(CW\*(C`\ebfdefault\*(C'\fR. +Added \f(CW\*(C`scale\*(C'\fR as an alias for the package option \f(CW\*(C`scaled\*(C'\fR. Files old/texmf-dist/doc/man/man1/autoinst.man1.pdf and new/texmf-dist/doc/man/man1/autoinst.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ot2kpx.1 new/texmf-dist/doc/man/man1/ot2kpx.1 --- old/texmf-dist/doc/man/man1/ot2kpx.1 2013-01-04 00:28:41.000000000 +0100 +++ new/texmf-dist/doc/man/man1/ot2kpx.1 2013-10-01 23:32:52.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.20) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "OT2KPX 1" -.TH OT2KPX 1 "2012-03-06" "fontools" "Marc Penninga" +.TH OT2KPX 1 "2013-08-07" "fontools" "Marc Penninga" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -155,12 +164,12 @@ \&\*(L"kern\*(R" tables with format other than 0 and ValueRecords with other types of data than just XAdvance data. .Sp -Most of these limitations don't really matter, since the missing features +Most of these limitations won't matter, since the missing features are rare (the only fonts I know of that use them are the non-western fonts -that come with Adobe Reader). Furthermore, some of these features concern -(according to the OpenType specification) \fI\*(L"define subtle, device-dependent -adjustments at specific font sizes or device resolutions\*(R"\fR. -Since there's no way to express such adjustments in \fIafm\fR format, +that come with Adobe Reader). Furthermore, many of these features define +(according to the OpenType specification) \fI\*(L"subtle, device-dependent +adjustments at specific font sizes or device resolutions\*(R"\fR; +since there's no way to express such adjustments in \fIafm\fR format, ignoring them seems to be the only option anyway. .IP "\fB\-\fR" 4 .IX Item "-" @@ -171,8 +180,8 @@ .RS 4 .IP "\-" 4 The OpenType specification says that fonts in \fIotf\fR format shouldn't -use the \*(L"kern\*(R" table at all, just the lookups from the \*(L"\s-1GPOS\s0\*(R" table. -Many such fonts do, however, contain a \*(L"kern\*(R" table, but no \*(L"\s-1GPOS\s0\*(R" table; +use the \*(L"kern\*(R" table at all, just the lookups from the \*(L"\s-1GPOS\*(R"\s0 table. +Many such fonts do, however, contain a \*(L"kern\*(R" table, but no \*(L"\s-1GPOS\*(R"\s0 table; so we use the \*(L"kern\*(R" table anyway. .IP "\-" 4 Instead of reading all LookupTables, it might be better to let the user @@ -189,24 +198,28 @@ Marc Penninga <marcpenninga@gmail.com> .SH "COPYRIGHT" .IX Header "COPYRIGHT" -Copyright (C) 2005\-2012 Marc Penninga. +Copyright (C) 2005\-2013 Marc Penninga. .SH "LICENSE" .IX Header "LICENSE" This program is free software; you can redistribute it and/or modify it under the terms of the \s-1GNU\s0 General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. -A copy of the \s-1GNU\s0 General Public License is included with \fBautoinst\fR; +A copy of the \s-1GNU\s0 General Public License is included with \fBot2kpx\fR; see the file \fIGPLv2.txt\fR. .SH "DISCLAIMER" .IX Header "DISCLAIMER" This program is distributed in the hope that it will be useful, -but \s-1WITHOUT\s0 \s-1ANY\s0 \s-1WARRANTY\s0; without even the implied warranty of -\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0. +but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of +\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0 See the \s-1GNU\s0 General Public License for more details. .SH "RECENT CHANGES" .IX Header "RECENT CHANGES" (See the source code for the rest of the story.) +.IP "\fI2013\-08\-07\fR" 12 +.IX Item "2013-08-07" +Replaced all \f(CW\*(C`given/when\*(C'\fR constructions in the source code by \f(CW\*(C`if\*(C'\fR's, +to avoid warnings about experimental features in Perl 5.18 and later. .IP "\fI2012\-02\-01\fR" 12 .IX Item "2012-02-01" Refactored the code, and fixed a number of bugs in the process. Files old/texmf-dist/doc/man/man1/ot2kpx.man1.pdf and new/texmf-dist/doc/man/man1/ot2kpx.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/fontools/README new/texmf-dist/doc/support/fontools/README --- old/texmf-dist/doc/support/fontools/README 2013-02-07 23:51:16.000000000 +0100 +++ new/texmf-dist/doc/support/fontools/README 2014-04-06 00:21:21.000000000 +0200 @@ -22,14 +22,14 @@ Perl - The Fontools are written in Perl; any recent version should work. + The Fontools are written in Perl; any version since v5.10.1 should work. Perl is usually installed on Linux and Unix systems; for Windows, try ActivePerl (http://www.activestate.com) or Strawberry Perl (http://strawberryperl.com). LCDF TypeTools Of course, Autoinst needs the LCDF TypeTools; - their installation directory should be in the PATH environment variable. + they should be installed in a directory on your PATH. Kpathsea Automatically installing the fonts into a suitable TEXMF tree @@ -38,6 +38,7 @@ own directory searching (such as MiKTeX), Autoinst will complain that it cannot find the kpsewhich program and install all generated files into subdirectories of the current directory. + If you use such a TeX distribution, either move these files to their destinations by hand, or use the -target command line option (please see the manual for more information). @@ -47,12 +48,21 @@ somewhere where otftotfm can find them. -LICENSE -------- +DISCLAIMER +---------- -This software is copyright (C) 2005-2013 Marc Penninga. It is released under -the terms of the GNU General Public Licence. See the file GPLv2.txt for +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. + + +LICENSE & COPYRIGHT +------------------- + +This software is copyright (C) 2005-2014 Marc Penninga. It is released under +the terms of the GNU General Public Licence; see the file GPLv2.txt for the license conditions. - Marc Penninga, 2013/02/06 + Marc Penninga, 2014/04/04 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontools.doc.tlpobj new/tlpkg/tlpobj/fontools.doc.tlpobj --- old/tlpkg/tlpobj/fontools.doc.tlpobj 2013-04-08 21:25:48.000000000 +0200 +++ new/tlpkg/tlpobj/fontools.doc.tlpobj 2014-04-06 03:25:43.000000000 +0200 @@ -1,8 +1,8 @@ name fontools.doc category Package -revision 29725 +revision 33380 shortdesc doc files of fontools -docfiles size=29 +docfiles size=30 texmf-dist/doc/man/man1/afm2afm.1 texmf-dist/doc/man/man1/afm2afm.man1.pdf texmf-dist/doc/man/man1/autoinst.1 ++++++ fontools.tar.xz ++++++ ++++ 2182 lines of diff (skipped) ++++++ fonts-tlwg.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fonts-tlwg/examples/teststd.tex new/doc/fonts/fonts-tlwg/examples/teststd.tex --- old/doc/fonts/fonts-tlwg/examples/teststd.tex 2012-02-18 00:36:57.000000000 +0100 +++ new/doc/fonts/fonts-tlwg/examples/teststd.tex 2014-03-17 23:55:08.000000000 +0100 @@ -40,6 +40,9 @@ ที่ ท่า ทิ้ง ท้า กิ๊ง ก๊ง ตี๋ ต๋า บ่น ป่น, บ้น ป้น, บ๊น ป๊น, บ๋น ป๋น บิน ปิน บีน ปีน บิ่น ปิ่น บัน ปั่น บั่น ก็ ป็ ปู่ ญ ญุ ญู ญฺ ฐ ฐุ ฐู ฐฺ กุ ฎุ ฎู ฎฺ ฏุ ฏู ฏฺ บำ บ่ำ ปำ ป่ำ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} + ปะเฺติ็ลฺ โฺญฺ็จฺ ปั็วฮฺ ทฺ็อง เปฺิ็ว มูํย + แต็่ง เจฺํอ เปรฺิ่ห์ โจ๊่ เปฺี่ย โฺทร ม็่อง เติ็ง อาื ยาึ ปิํปี็ป็่ป๊่ปฺ่ + จือรฺุ การฺู - -- --- `` '' \dag{} \ddag{} \S{} \P{} \${} \ae{} \AE{} \oe{} \OE{} \aa{} \AA{} \ss{} \copyright{} \textregistered{} \texttrademark{} \textbackslash{} \textasciicircum{} \textasciitilde{} \textbar{} \textbraceleft{} @@ -548,28 +551,40 @@ \subsection{ตัวอย่างประโยคภาษาไทย} +\testthaipoem{umpush}{l}{n} + \testthaipoem{umpush}{m}{n} \testthaipoem{umpush}{b}{n} +\testthaipoem{umpush}{l}{it} + \testthaipoem{umpush}{m}{it} \testthaipoem{umpush}{b}{it} \subsection{ตัวอย่างภาษาอังกฤษ} +\testenglish{umpush}{l}{n} + \testenglish{umpush}{m}{n} \testenglish{umpush}{b}{n} +\testenglish{umpush}{l}{it} + \testenglish{umpush}{m}{it} \testenglish{umpush}{b}{it} +\testEnglish{umpush}{l}{n} + \testEnglish{umpush}{m}{n} \testEnglish{umpush}{b}{n} +\testEnglish{umpush}{l}{it} + \testEnglish{umpush}{m}{it} \testEnglish{umpush}{b}{it} @@ -577,10 +592,14 @@ \subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ} +\testligkern{umpush}{l}{n} + \testligkern{umpush}{m}{n} \testligkern{umpush}{b}{n} +\testligkern{umpush}{l}{it} + \testligkern{umpush}{m}{it} \testligkern{umpush}{b}{it} @@ -588,10 +607,14 @@ \subsection{ภาษาบาลี-สันสกฤต} +\testpali{umpush}{l}{n} + \testpali{umpush}{m}{n} \testpali{umpush}{b}{n} +\testpali{umpush}{l}{it} + \testpali{umpush}{m}{it} \testpali{umpush}{b}{it} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fonts-tlwg.doc.tlpobj new/tlpkg/tlpobj/fonts-tlwg.doc.tlpobj --- old/tlpkg/tlpobj/fonts-tlwg.doc.tlpobj 2013-05-15 03:42:25.000000000 +0200 +++ new/tlpkg/tlpobj/fonts-tlwg.doc.tlpobj 2014-03-18 03:27:42.000000000 +0100 @@ -1,6 +1,6 @@ name fonts-tlwg.doc category Package -revision 30477 +revision 33209 shortdesc doc files of fonts-tlwg relocated 1 docfiles size=4 ++++++ fonts-tlwg.tar.xz ++++++ ++++ 3985 lines of diff (skipped) ++++++ fontspec.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontspec.doc.tlpobj new/tlpkg/tlpobj/fontspec.doc.tlpobj --- old/tlpkg/tlpobj/fontspec.doc.tlpobj 2013-05-22 03:51:30.000000000 +0200 +++ new/tlpkg/tlpobj/fontspec.doc.tlpobj 2013-12-15 03:21:19.000000000 +0100 @@ -1,6 +1,6 @@ name fontspec.doc category Package -revision 30618 +revision 32416 shortdesc doc files of fontspec relocated 1 docfiles size=755 ++++++ fontspec.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontspec.tlpobj new/tlpkg/tlpobj/fontspec.tlpobj --- old/tlpkg/tlpobj/fontspec.tlpobj 2013-05-22 03:51:31.000000000 +0200 +++ new/tlpkg/tlpobj/fontspec.tlpobj 2013-12-15 03:21:21.000000000 +0100 @@ -1,6 +1,6 @@ name fontspec category Package -revision 30618 +revision 32416 shortdesc Advanced font selection in XeLaTeX and LuaLaTeX. relocated 1 longdesc Fontspec is a package for XeLaTeX and LuaLaTeX. It provides an @@ -8,6 +8,7 @@ longdesc OpenType fonts through the NFSS in LaTeX running on XeTeX or longdesc LuaTeX engines. The package requires the l3kernel and xparse longdesc bundles from the LaTeX 3 development team. +depend iftex depend kastrup depend l3kernel depend l3packages @@ -20,6 +21,6 @@ RELOC/tex/latex/fontspec/fontspec.lua RELOC/tex/latex/fontspec/fontspec.sty catalogue-ctan /macros/latex/contrib/fontspec -catalogue-date 2013-03-17 00:29:52 +0100 +catalogue-date 2013-05-26 19:01:07 +0200 catalogue-license lppl1.3 -catalogue-version v2.3a +catalogue-version v2.3c ++++++ fontware.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pltotf.1 new/texmf-dist/doc/man/man1/pltotf.1 --- old/texmf-dist/doc/man/man1/pltotf.1 2013-04-08 23:16:34.000000000 +0200 +++ new/texmf-dist/doc/man/man1/pltotf.1 2014-04-29 00:59:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH PLTOTF 1 "27 December 1992" "Web2C 2013" +.TH PLTOTF 1 "27 December 1992" "Web2C 2014" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF M\s-2ETAFONT\s0 Files old/texmf-dist/doc/man/man1/pltotf.man1.pdf and new/texmf-dist/doc/man/man1/pltotf.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/tftopl.1 new/texmf-dist/doc/man/man1/tftopl.1 --- old/texmf-dist/doc/man/man1/tftopl.1 2013-04-08 23:16:34.000000000 +0200 +++ new/texmf-dist/doc/man/man1/tftopl.1 2014-04-29 00:59:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH TFTOPL 1 "17 December 1994" "Web2C 2013" +.TH TFTOPL 1 "17 December 1994" "Web2C 2014" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF M\s-2ETAFONT\s0 Files old/texmf-dist/doc/man/man1/tftopl.man1.pdf and new/texmf-dist/doc/man/man1/tftopl.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/vftovp.1 new/texmf-dist/doc/man/man1/vftovp.1 --- old/texmf-dist/doc/man/man1/vftovp.1 2013-04-08 23:16:34.000000000 +0200 +++ new/texmf-dist/doc/man/man1/vftovp.1 2014-04-29 00:59:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH VFTOVP 1 "19 December 1994" "Web2C 2013" +.TH VFTOVP 1 "19 December 1994" "Web2C 2014" .\"===================================================================== .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP .if n .ds TX TeX Files old/texmf-dist/doc/man/man1/vftovp.man1.pdf and new/texmf-dist/doc/man/man1/vftovp.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/vptovf.1 new/texmf-dist/doc/man/man1/vptovf.1 --- old/texmf-dist/doc/man/man1/vptovf.1 2013-04-08 23:16:34.000000000 +0200 +++ new/texmf-dist/doc/man/man1/vptovf.1 2014-04-29 00:59:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH VPTOVF 1 "16 December 1994" "Web2C 2013" +.TH VPTOVF 1 "16 December 1994" "Web2C 2014" .\"===================================================================== .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP .if n .ds TX TeX Files old/texmf-dist/doc/man/man1/vptovf.man1.pdf and new/texmf-dist/doc/man/man1/vptovf.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontware.doc.tlpobj new/tlpkg/tlpobj/fontware.doc.tlpobj --- old/tlpkg/tlpobj/fontware.doc.tlpobj 2013-04-09 03:40:16.000000000 +0200 +++ new/tlpkg/tlpobj/fontware.doc.tlpobj 2014-04-29 03:29:51.000000000 +0200 @@ -1,6 +1,6 @@ name fontware.doc category TLCore -revision 29764 +revision 33736 shortdesc doc files of fontware docfiles size=12 texmf-dist/doc/man/man1/pltotf.1 ++++++ forest.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/forest/README new/doc/latex/forest/README --- old/doc/latex/forest/README 2013-01-30 00:20:36.000000000 +0100 +++ new/doc/latex/forest/README 2014-03-08 01:34:19.000000000 +0100 @@ -1,6 +1,6 @@ -LaTeX package: forest [2013/01/28 v1.03 Drawing (linguistic) trees] +LaTeX package: forest [2014/03/07 v1.05 Drawing (linguistic) trees] -Copyright (c) 2012 Saso Zivanovic +Copyright (c) 2014 Saso Zivanovic (Sa\v{s}o \v{Z}ivanovi\'{c}) saso.zivanovic@guest.arnes.si Files old/doc/latex/forest/forest.pdf and new/doc/latex/forest/forest.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/forest.doc.tlpobj new/tlpkg/tlpobj/forest.doc.tlpobj --- old/tlpkg/tlpobj/forest.doc.tlpobj 2013-01-30 04:37:05.000000000 +0100 +++ new/tlpkg/tlpobj/forest.doc.tlpobj 2014-03-08 03:22:04.000000000 +0100 @@ -1,8 +1,8 @@ name forest.doc category Package -revision 28979 +revision 33116 shortdesc doc files of forest relocated 1 -docfiles size=218 +docfiles size=219 RELOC/doc/latex/forest/README RELOC/doc/latex/forest/forest.pdf ++++++ forest.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/forest/forest.sty new/tex/latex/forest/forest.sty --- old/tex/latex/forest/forest.sty 2013-01-30 00:20:36.000000000 +0100 +++ new/tex/latex/forest/forest.sty 2014-03-08 01:34:19.000000000 +0100 @@ -8,7 +8,7 @@ %% %% `forest' is a `pgf/tikz'-based package for drawing (linguistic) trees. %% -%% Copyright (c) 2012 Saso Zivanovic +%% Copyright (c) 2013 Saso Zivanovic %% (Sa\v{s}o \v{Z}ivanovi\'{c}) %% saso.zivanovic@guest.arnes.si %% @@ -29,7 +29,7 @@ %% This work consists of the files forest.dtx and forest.ins %% and the derived file forest.sty. %% -\ProvidesPackage{forest}[2013/01/28 v1.03 Drawing (linguistic) trees] +\ProvidesPackage{forest}[2014/03/07 v1.05 Drawing (linguistic) trees] \RequirePackage{tikz}[2010/10/13] \usetikzlibrary{shapes} @@ -3427,7 +3427,17 @@ \forest@mt{north east}% \forest@lt{south west}% }% -\cslet{forest@compute@node@boundary@rounded rectangle}\forest@compute@node@boundary@rectangle +\csdef{forest@compute@node@boundary@rounded rectangle}{% + \forest@mt{east}% + \forest@lt{north east}% + \forest@lt{north}% + \forest@lt{north west}% + \forest@lt{west}% + \forest@lt{south west}% + \forest@lt{south}% + \forest@lt{south east}% + \forest@lt{east}% +}% \csdef{forest@compute@node@boundary@chamfered rectangle}{% \forest@mt{before south west}% \forest@mt{after south west}% @@ -3506,11 +3516,15 @@ \let\forest@original@tikz@parse@node\tikz@parse@node \let\tikz@parse@node\forest@tikz@parse@node \fi - \forest@drawtree@beginbox - \pgfkeysalso{/forest/begin draw}% - \forest@node@drawtree@ - \pgfkeysalso{/forest/end draw}% - \forest@drawtree@endbox + \pgfkeysgetvalue{/forest/begin draw/.@cmd}\forest@temp@begindraw + \pgfkeysgetvalue{/forest/end draw/.@cmd}\forest@temp@enddraw + \edef\forest@marshal{% + \noexpand\forest@drawtree@beginbox + \expandonce{\forest@temp@begindraw\pgfkeysnovalue\pgfeov}% + \noexpand\forest@node@drawtree@ + \expandonce{\forest@temp@enddraw\pgfkeysnovalue\pgfeov}% + \noexpand\forest@drawtree@endbox + }\forest@marshal \ifforesttikzcshack \let\tikz@parse@node\forest@original@tikz@parse@node \fi @@ -4465,7 +4479,7 @@ \edef\forest@marshal{% \noexpand\pgfutil@in@ {\expandafter\detokenize\expandafter{\forest@temp}.} - {\expandafter\detokenize\expandafter{\jobname}.}% + {\expandafter\detokenize\expandafter{\pgfactualjobname}.}% }\forest@marshal \ifpgfutil@in@ \else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/forest.tlpobj new/tlpkg/tlpobj/forest.tlpobj --- old/tlpkg/tlpobj/forest.tlpobj 2013-01-30 04:37:05.000000000 +0100 +++ new/tlpkg/tlpobj/forest.tlpobj 2014-03-08 03:22:05.000000000 +0100 @@ -1,21 +1,21 @@ name forest category Package -revision 28979 +revision 33116 shortdesc Drawing (linguistic) trees. relocated 1 longdesc The package is provides a PGF/TikZ-based mechanism for drawing -longdesc linguistic (and other kinds of) trees. Its main features are: - -longdesc a packing algorithm which can produce very compact trees; - a -longdesc user-friendly interface consisting of the familiar bracket -longdesc encoding of trees plus the key-value interface to option- -longdesc setting; - many tree-formatting options, with control over -longdesc option values of individual nodes and mechanisms for their -longdesc manipulation; - the possibility to decorate the tree using the -longdesc full power of PGF/TikZ; and - an externalization mechanism -longdesc sensitive to code-changes. +longdesc linguistic (and other kinds of) trees. Its main features are: a +longdesc packing algorithm which can produce very compact trees; a user- +longdesc friendly interface consisting of the familiar bracket encoding +longdesc of trees plus the key-value interface to option-setting; many +longdesc tree-formatting options, with control over option values of +longdesc individual nodes and mechanisms for their manipulation; the +longdesc possibility to decorate the tree using the full power of +longdesc PGF/TikZ; and an externalization mechanism sensitive to code- +longdesc changes. runfiles size=41 RELOC/tex/latex/forest/forest.sty catalogue-ctan /graphics/pgf/contrib/forest -catalogue-date 2013-01-29 10:13:54 +0100 +catalogue-date 2014-03-07 15:12:26 +0100 catalogue-license lppl1.3 -catalogue-version 1.03 +catalogue-version 1.05 ++++++ formlett.doc.tar.xz ++++++ ++++++ formlett.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/formlett.tlpobj new/tlpkg/tlpobj/formlett.tlpobj --- old/tlpkg/tlpobj/formlett.tlpobj 2011-02-20 04:15:28.000000000 +0100 +++ new/tlpkg/tlpobj/formlett.tlpobj 2014-04-18 02:56:20.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=17 RELOC/tex/generic/formlett/formlett.sty catalogue-ctan /macros/generic/formlett -catalogue-date 2010-12-21 20:58:16 +0100 -catalogue-license noinfo +catalogue-date 2011-09-13 15:32:00 +0200 +catalogue-license gpl catalogue-version 2.3 ++++++ fouridx.doc.tar.xz ++++++ Files old/doc/latex/fouridx/fouridx.pdf and new/doc/latex/fouridx/fouridx.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fouridx.doc.tlpobj new/tlpkg/tlpobj/fouridx.doc.tlpobj --- old/tlpkg/tlpobj/fouridx.doc.tlpobj 2010-06-10 18:28:04.000000000 +0200 +++ new/tlpkg/tlpobj/fouridx.doc.tlpobj 2013-11-23 03:21:05.000000000 +0100 @@ -1,8 +1,8 @@ name fouridx.doc category Package -revision 15878 +revision 32214 shortdesc doc files of fouridx relocated 1 -docfiles size=29 +docfiles size=53 RELOC/doc/latex/fouridx/README RELOC/doc/latex/fouridx/fouridx.pdf ++++++ fouridx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fouridx/fouridx.sty new/tex/latex/fouridx/fouridx.sty --- old/tex/latex/fouridx/fouridx.sty 2008-04-09 20:35:23.000000000 +0200 +++ new/tex/latex/fouridx/fouridx.sty 2013-11-23 00:06:07.000000000 +0100 @@ -8,7 +8,7 @@ %% %% fouridx package %% -%% Copyright 2008 Stefan Karrmann +%% Copyright 2008, 2013 Stefan Karrmann %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -17,17 +17,40 @@ %% %% S.Karrmann at web.de %% -\def\fileversion{1.00} -\def\filedate{2008/03/27} +\def\fileversion{2.00} +\def\filedate{2013/11/21} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{fouridx}[\filedate\space v\fileversion\space Four indices] \newcommand{\fourIdx}[5]{% - \setbox1=\hbox{\ensuremath{^{#1}}}% - \setbox2=\hbox{\ensuremath{_{#2}}}% - \setbox5=\hbox{\ensuremath{#5}}% - \hspace{\ifnum\wd1>\wd2\wd1\else\wd2\fi}% - \ensuremath{\copy5^{\hspace{-\wd1}\hspace{-\wd5}#1\hspace{\wd5}#3}% - _{\hspace{-\wd2}\hspace{-\wd5}#2\hspace{\wd5}#4}% + \ensuremath{\mathchoice% + {{\setbox1=\hbox{$\scriptstyle{#1}$}% + \setbox2=\hbox{$\scriptstyle{#2}$}% + \setbox5=\hbox{$\displaystyle{#5}$}% + \hspace*{\ifnum\wd1>\wd2\wd1\else\wd2\fi}% + \copy5^{\scriptstyle\hspace{-\wd1}\hspace{-\wd5}#1\hspace{\wd5}#3}% + _{\scriptstyle\hspace{-\wd2}\hspace{-\wd5}#2\hspace{\wd5}#4}% + }}% display + {{\setbox1=\hbox{$\scriptstyle{#1}$}% + \setbox2=\hbox{$\scriptstyle{#2}$}% + \setbox5=\hbox{$\textstyle{#5}$}% + \hspace*{\ifnum\wd1>\wd2\wd1\else\wd2\fi}% + \copy5^{\scriptstyle\hspace{-\wd1}\hspace{-\wd5}#1\hspace{\wd5}#3}% + _{\scriptstyle\hspace{-\wd2}\hspace{-\wd5}#2\hspace{\wd5}#4}% + }}% text + {{\setbox1=\hbox{$\scriptscriptstyle{#1}$}% + \setbox2=\hbox{$\scriptscriptstyle{#2}$}% + \setbox5=\hbox{$\scriptstyle{#5}$}% + \hspace*{\ifnum\wd1>\wd2\wd1\else\wd2\fi}% + \copy5^{\scriptscriptstyle\hspace{-\wd1}\hspace{-\wd5}#1\hspace{\wd5}#3}% + _{\scriptscriptstyle\hspace{-\wd2}\hspace{-\wd5}#2\hspace{\wd5}#4}% + }}% script + {{\setbox1=\hbox{$\scriptscriptstyle{#1}$}% + \setbox2=\hbox{$\scriptscriptstyle{#2}$}% + \setbox5=\hbox{$\scriptscriptstyle{#5}$}% + \hspace*{\ifnum\wd1>\wd2\wd1\else\wd2\fi}% + \copy5^{\scriptscriptstyle\hspace{-\wd1}\hspace{-\wd5}#1\hspace{\wd5}#3}% + _{\scriptscriptstyle\hspace{-\wd2}\hspace{-\wd5}#2\hspace{\wd5}#4}% + }}% scriptscript }} \endinput %% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fouridx.tlpobj new/tlpkg/tlpobj/fouridx.tlpobj --- old/tlpkg/tlpobj/fouridx.tlpobj 2010-06-10 18:28:04.000000000 +0200 +++ new/tlpkg/tlpobj/fouridx.tlpobj 2013-11-23 03:21:05.000000000 +0100 @@ -1,6 +1,6 @@ name fouridx category Package -revision 15878 +revision 32214 shortdesc Left sub- and superscripts in maths mode. relocated 1 longdesc The package enables left subscripts and superscripts in maths @@ -12,6 +12,6 @@ runfiles size=1 RELOC/tex/latex/fouridx/fouridx.sty catalogue-ctan /macros/latex/contrib/fouridx -catalogue-date 2008-08-19 20:38:14 +0200 +catalogue-date 2013-11-21 22:41:55 +0100 catalogue-license lppl -catalogue-version 1.00 +catalogue-version 2.00 ++++++ texlive-specs-i-rpmlintrc ++++++ addFilter(".*dangling-symlink.*/fonts/.*") addFilter(".*dangling-symlink.*/zypper\.py.*") addFilter(".*description-shorter-than-summary.*") addFilter(".*devel-file-in-non-devel-package.*/doc/.*") addFilter(".*files-duplicate.*") addFilter(".*E:.*files-duplicated-waste.*") addFilter(".*spelling-error.*") addFilter(".*zero-length.*") addFilter(".*E:.*summary-too-long.*") addFilter(".*incorrect-fsf-address.*") addFilter(".*hidden-file-or-dir.*/\.tex.*") addFilter(".*wrong-script-end-of-line-encoding.*") addFilter(".*script-without-shebang.*/doc/.*") addFilter(".*wrong-script-interpreter.*/doc/.*") addFilter(".*non-executable-script.*/doc/.*")