context-simplefonts (25feb13)

git-svn-id: svn://tug.org/texlive/trunk@29229 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 8 insertions, 4 deletions

diff --git a/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.mkiv b/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.mkiv
index 9e7bf9ad0fd..e2e9a339b6c 100644
--- a/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.mkiv
+++ b/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.mkiv
@@ -480,8 +480,8 @@
             \doglobal\increment\simplefonts!handwritingfont
             \simplefonts@scripttypescript{\simplefontparameter\c!style}{\v!handwritingfont :\simplefonts!handwritingfont}
         \else\ifx\currentsimplefont\v!calligraphicfont
-            \simplefonts@scripttypescript{\simplefontparameter\c!style}{\v!calligraphicfont:\simplefonts!handwritingfont}
             \doglobal\increment\simplefonts!calligraphicfont
+            \simplefonts@scripttypescript{\simplefontparameter\c!style}{\v!calligraphicfont:\simplefonts!calligraphicfont}
         \fi\fi
 
         % don't create a typeface and set bodyfont when the module is loaded
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 1126fae7a86..7915be5339b 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -128,7 +128,7 @@ my @TLP_working = qw(
     ctanify ctanupload ctable ctex ctex-faq
     cursolatex cuisine
     currfile currvita curve curve2e curves
-    custom-bib cutwin cv cweb-latex cyklop cyrillic
+    custom-bib cutwin cv cweb-latex cyklop cyrillic cyrplain
   dancers dashbox dashrule dashundergaps datatool
     dateiliste datenumber datetime
     dblfloatfix dcpic de-macro decimal decorule dehyph-exptl dejavu
@@ -523,6 +523,7 @@ my @TLP_no_check = (
   "groff",		# binary
   "gsftopk",		# binary
   "gustlib",		# not on CTAN, requested from GUST
+  "gustprog",		# not on CTAN, GUST
   "guide-to-latex",	# not on CTAN, book examples, ok
   "hyperref-docsrc",	# not on CTAN, awaiting hyperref doc volunteer
   "ifluatex",		# part of oberdiek
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index af90b356ac8..755b2af844f 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -164,6 +164,7 @@ sub find_ctan_dir {
     $ctan_dir = "language/hyphenation/elhyphen" if $me eq "hyphen-greek";
     $ctan_dir = "macros/generic" if $me eq "genmisc";
     $ctan_dir = "macros/latex/contrib/misc" if $me eq "ltxmisc";
+    $ctan_dir = "macros/latex/contrib/t2/cyrplain" if $me eq "cyrplain";
 
     # do last, for sake of subdirs above.
     $ctan_dir = "language/hyphenation"
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index fdf912c76df..7a7f8755a2c 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1162,6 +1162,7 @@ $standarddest = "texmf-dist";
  'chronosys',	'generic',
  'circ',	'latex',
  'cirth',	'generic',
+ 'cyrplain',	'plain',
  'dehyph-exptl','generic',
  'dratex',	'generic',
  'edmac',	'generic',
@@ -1289,6 +1290,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'custom-bib',	'\.mbs|\.tex',
  'cweb-latex',	'cwebbase.tex|' . $standardtex,
  'cyrillic',	'\.tex|\.sty|\.fd$|\.def',
+ 'cyrplain',	'.',
  'dehyph-exptl','de.*-x-.*\.tex|\.pat',
  'dialogl',	'[^c]\.sty|listout\.tex', # not dialogl-doc.sty
  'din1505',     'NULL', # no tex files, only natbib.cfg, would be system-wide
@@ -1872,6 +1874,7 @@ $standardsource='\.(bat|c|drv|dtx|fea|fdd|ins|sfd)$|configure.*|install-sh';
  'chemarrow',		'\.mp|\.vfb',
  'concmath-fonts',	'NULL',
  'crossword',		$standardsource . '|AcrossLite',
+ 'cyrplain',		'NULL',			# all in tex
  'epsf',		'NULL',
  'epslatex-fr',		'NULL',
  'epspdf',		'NULL',  		# leave .install
@@ -4503,8 +4506,7 @@ sub MAKEpst
   eval ($postaction) if $postaction;
 }
 
-sub MAKEfontinst
-{
+sub MAKEfontinst {
   &xchdir ($packagedir);
   &runjob("mkdir -p $DEST/tex/latex/fontinst");
   &runjob("mkdir -p $DEST/tex/fontinst");