From 2354238b2396b322ce12ff4c24d8b823f592005a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 14 Mar 2013 22:31:40 +0000 Subject: lettrine (14mar13) git-svn-id: svn://tug.org/texlive/trunk@29391 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/lettrine/demo-de.pdf | Bin 122261 -> 122256 bytes Master/texmf-dist/doc/latex/lettrine/demo.pdf | Bin 119334 -> 119297 bytes Master/texmf-dist/doc/latex/lettrine/lettrine.pdf | Bin 222974 -> 223342 bytes .../texmf-dist/source/latex/lettrine/lettrine.dtx | 15 +++++++++------ .../texmf-dist/source/latex/lettrine/lettrine.ins | 2 +- Master/texmf-dist/tex/latex/lettrine/lettrine.sty | 10 +++++----- Master/tlpkg/libexec/ctan2tds | 11 +++++++++++ 7 files changed, 26 insertions(+), 12 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf b/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf index 343329bbce9..0f6a25a52ad 100644 Binary files a/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf and b/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf differ diff --git a/Master/texmf-dist/doc/latex/lettrine/demo.pdf b/Master/texmf-dist/doc/latex/lettrine/demo.pdf index 8eff693fc56..47e0512ac84 100644 Binary files a/Master/texmf-dist/doc/latex/lettrine/demo.pdf and b/Master/texmf-dist/doc/latex/lettrine/demo.pdf differ diff --git a/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf b/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf index 06e0e63a333..33e78df9b9f 100644 Binary files a/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf and b/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf differ diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx index c5692a6d68c..5fc747abf78 100644 --- a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx +++ b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx @@ -3,7 +3,7 @@ % % \iffalse meta-comment % -% Copyright (C) 1999-2012 Daniel Flipo. +% Copyright (C) 1999-2013 Daniel Flipo. % % This program can be redistributed and/or modified under the terms % of the LaTeX Project Public License either version 1.3 of this @@ -30,7 +30,7 @@ \ProvidesFile{lettrine.dtx} % %<*!cfg> - [2012/07/20 v1.63 (Daniel Flipo)] + [2013/03/14 v1.64 (Daniel Flipo)] % % % Lettrine package for LaTeX version 2e @@ -665,14 +665,17 @@ \addtolength{\L@next}{-\L@slope}% \advance\@tempcnta\@ne}% \edef\L@parshape{\L@parshape \rightmargin \the\linewidth}% - \noindent\leavevmode - \parshape=\L@parshape + \noindent + \parshape=\L@parshape\relax % \end{macrocode} +% \changes{lettrine-1.64}{2013/03/14}{Remove \$ around \cs{smash} +% and add \cs{relax}. Bug pointed out by David Monniaux. +% Correction by Enrico Gregorio.} % Write the dropped capital into the left margin, and wrap % the rest of paragraph around it. % \begin{macrocode} - $\smash{\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% - \hskip \the\L@Findent}}$% + \smash{\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% + \hskip \the\L@Findent}}% \usebox{\L@tbox}} % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.ins b/Master/texmf-dist/source/latex/lettrine/lettrine.ins index e71866caee3..389367d2075 100644 --- a/Master/texmf-dist/source/latex/lettrine/lettrine.ins +++ b/Master/texmf-dist/source/latex/lettrine/lettrine.ins @@ -1,5 +1,5 @@ %% -%% Copyright (C) 1999-2007 Daniel Flipo. +%% Copyright (C) 1999-2013 Daniel Flipo. %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License either version 1.3 of this diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty index 971c2c33ede..a58b64b84f9 100644 --- a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty +++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{lettrine.sty} - [2012/07/20 v1.63 (Daniel Flipo)] + [2013/03/14 v1.64 (Daniel Flipo)] \NeedsTeXFormat{LaTeX2e}[1999/12/01] \RequirePackage{keyval} \newcounter{DefaultLines} @@ -184,10 +184,10 @@ \addtolength{\L@next}{-\L@slope}% \advance\@tempcnta\@ne}% \edef\L@parshape{\L@parshape \rightmargin \the\linewidth}% - \noindent\leavevmode - \parshape=\L@parshape - $\smash{\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% - \hskip \the\L@Findent}}$% + \noindent + \parshape=\L@parshape\relax + \smash{\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% + \hskip \the\L@Findent}}% \usebox{\L@tbox}} \InputIfFileExists{lettrine.cfg} {\typeout{Loading lettrine.cfg}} diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 681c49baa32..d8ab22a4bbe 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1095,6 +1095,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'biblatex' => '&POSTbiblatex', 'bibtex' => '&POSTbibtex', 'chemmacros' => '&POSTchemmacros', + 'context' => '&POSTcontext', 'context-games' => '&POSTcontext_games', 'coordsys' => '&POSTcoordsys', 'cs' => '&POSTcs', @@ -4888,6 +4889,16 @@ sub POSTchemmacros { &SYSTEM ("$MV language pictures $dstdir/"); } +sub POSTcontext { + print "POST$package - rearrange, remove\n"; + &xchdir ($DEST); + &SYSTEM ("$MV colors tex/context/colors"); + &SYSTEM ("$RM -rf fonts/truetype/hoekwater/lm/"); #lmtypewriter10-regular.ttf + &SYSTEM ("$RM -rf fonts/data/tests/"); #texmfhome.otf + &SYSTEM ("$RM -rf web2c/"); #context*cnf*, texlive2011cnf.lua + &SYSTEM ("find -name koeieletters -o -name jmn | xargs rm -rf"); +} + sub POSTcontext_games { print "POST$package - remove duplicated fonts\n"; &SYSTEM ("$RM -rf fonts"); -- cgit v1.2.3