From f2069d8f20962f39f9058b5b3617fd0f1aa1dee9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 30 Sep 2013 00:09:52 +0000 Subject: sync lhcyr git-svn-id: svn://tug.org/texlive/trunk@31795 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/lhcyr/README | 1 + .../tex/latex/lhcyr/lhcyrkoi/maketfms.sh | 11 +++++++--- Master/tlpkg/bin/tlpkg-ctan-check | 2 +- Master/tlpkg/libexec/ctan2tds | 25 ++++++++++++++++++++++ 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/Master/texmf-dist/source/latex/lhcyr/README b/Master/texmf-dist/source/latex/lhcyr/README index 6e00617b836..c0897e9ac15 100644 --- a/Master/texmf-dist/source/latex/lhcyr/README +++ b/Master/texmf-dist/source/latex/lhcyr/README @@ -1,3 +1,4 @@ + LHCYR 1.0 (c) 1998 V.V.Zhytnikov (vvzhy@td.lpi.ac.ru) The LaTeX 2e styles for Russian typesetting in bilingual environment Available at CTAN:/tex-archive/macros/latex/contrib/supported/lhcyr diff --git a/Master/texmf-dist/tex/latex/lhcyr/lhcyrkoi/maketfms.sh b/Master/texmf-dist/tex/latex/lhcyr/lhcyrkoi/maketfms.sh index cd037e4c7a6..06a6832d32e 100644 --- a/Master/texmf-dist/tex/latex/lhcyr/lhcyrkoi/maketfms.sh +++ b/Master/texmf-dist/tex/latex/lhcyr/lhcyrkoi/maketfms.sh @@ -1,11 +1,16 @@ -if [ mktextfm ]; then +echo To create tfm\'s for lh-fonts in the KOI-8 encoding we have +echo to determine the proper command which depends on the teTeX version. +echo Trying \"mktextfm\" and \"MakeTeXTFM\" ... +if [ `mktextfm cmr10` ]; then MKTFMC=mktextfm -elif [ MakeTeXTFM ]; then +elif [ `MakeTeXTFM cmr10` ]; then MKTFMC=MakeTeXTFM else - echo Cannot determine a command for creating tfm + echo Cannot determine a command for creating tfm! exit 1 fi +echo Using \"$MKTFMC\" ... + $MKTFMC kcb10 $MKTFMC kcbx10 $MKTFMC kcbx12 diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 9a14007a9ed..712ce6ecf5b 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -264,7 +264,7 @@ my @TLP_working = qw( latexdiff latexfileinfo-pkgs latexfileversion latexmk latexmp latexpand lato layaureo layouts lazylist lcd lcg lcyw leading leaflet lecturer ledmac leftidx leipzig lengthconvert - lettre lettrine levy lewis lexikon lfb lgreek lh lhelp + lettre lettrine levy lewis lexikon lfb lgreek lh lhcyr lhelp libertine libgreek librarian librebaskerville librecaslon libris lilyglyphs limap linearA linegoal diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 752a1946f47..7a90c80f2ea 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1160,6 +1160,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'knuth' => '&POSTknuth', 'koma-script' => '&POST_rmsymlink', 'latex2e-help-texinfo' => '&POSTlatex2ehelptexinfo', + 'lhcyr' => '&POSTlhcyr', 'lilyglyphs' => '&POSTlilyglyphs', 'listbib' => '&POSTlistbib', 'lithuanian' => '&POSTlithuanian', @@ -1435,6 +1436,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$'; 'lettre', '\.ins|\.cls', 'levy', 'greekmacros.tex|' . $standardtex, 'lgrx', '\.dfu$|' . $standardtex, + 'lhcyr', 'lhcyr.*', 'librarian', '(t-)?librarian.(tex|sty)', 'listbib', 'listbib.tex|' . $standardtex, 'listings-ext','\.sty', # not .cfg @@ -1995,6 +1997,7 @@ $standardsource='\.(bat|c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh'; 'latex2e-help-texinfo','NULL', # doc package 'latex2man', 'NULL', # leave Makefile 'latexdiff', 'NULL', # leave Makefile + 'lhcyr', 'README', # historical 'lua-alt-getopt', 'NULL', 'lua2dox', 'NULL', # process lua2dox_filter.bat 'mdframed', 'Makefile|' . $standardsource, @@ -5369,6 +5372,28 @@ sub POSTlatex2ehelptexinfo { &SYSTEM ("$RM -rf spanish"); } +sub POSTlhcyr { + print "\t POST$package - move to source, avoid dups\n"; + &xchdir ("$DEST/tex/latex/$package"); + # Sebastian moved tex files to the top level, removed from other dirs. + # We just follow what he did, years ago. + for my $tex (qw(karabas kniga otchet pismo rusfonts statya)) { + &SYSTEM ("$MV lhcyralt/$tex.tex ."); + &SYSTEM ("$RM */$tex.tex"); + } + # + for my $hyph (glob ("*/{hyphen.cfg,rhyphen.tex}")) { + my ($hdir) = $hyph =~ m,^(.*)/,; + (my $hdest = $hyph) =~ s,/(.*)$,/$hdir-$1,; + &SYSTEM ("$MV $hyph $hdest"); + } + # + # mfj's to source dir, ignoring that there are multiple versions. + for my $dir (glob ("lhcyr{alt,win}")) { + &SYSTEM ("$MV $dir/*.mfj $DEST/source/latex/$package/"); + } +} + sub POSTlilyglyphs { print "\t POST$package - move directories around\n"; &rename_with_mkdir ("fonts", "$DEST/fonts/opentype/public/$package"); -- cgit v1.2.3