asaetr pdf doc, and keep variant cmcscsl10 in doc dir (29apr09)

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

7 files changed, 117 insertions, 5 deletions

diff --git a/Master/texmf-dist/source/latex/asaetr/MANIFEST b/Master/texmf-dist/doc/latex/asaetr/MANIFEST
index 49bdb566a0d..49bdb566a0d 100644
--- a/Master/texmf-dist/source/latex/asaetr/MANIFEST
+++ b/Master/texmf-dist/doc/latex/asaetr/MANIFEST
diff --git a/Master/texmf-dist/bibtex/bib/asaetr/asaetr.bib b/Master/texmf-dist/doc/latex/asaetr/asaetr.bib
index 1ed6d6ef1b9..1ed6d6ef1b9 100644
--- a/Master/texmf-dist/bibtex/bib/asaetr/asaetr.bib
+++ b/Master/texmf-dist/doc/latex/asaetr/asaetr.bib
diff --git a/Master/texmf-dist/doc/latex/asaetr/asaetr.dvi b/Master/texmf-dist/doc/latex/asaetr/asaetr.dvi
deleted file mode 100644
index 6b7fb55288d..00000000000
--- a/Master/texmf-dist/doc/latex/asaetr/asaetr.dvi
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/asaetr/asaetr.pdf b/Master/texmf-dist/doc/latex/asaetr/asaetr.pdf
new file mode 100644
index 00000000000..8fcee0d0ac4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/asaetr/asaetr.pdf
diff --git a/Master/texmf-dist/doc/latex/asaetr/cmcscsl10.mf b/Master/texmf-dist/doc/latex/asaetr/cmcscsl10.mf
new file mode 100644
index 00000000000..7452fb532e4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/asaetr/cmcscsl10.mf
@@ -0,0 +1,111 @@
+%% Save file as: CMCSCSL10.MF                   Source: FILESERV@SHSU.BITNET
+% Computer Modern Roman Caps and Small Caps 10 point
+if unknown cmbase: input cmbase fi
+
+font_identifier:="CMCSC"; font_size 10pt#;
+
+% first come parameters used to set the uppercase letters
+% (including some for lowercase that aren't actually used)
+u#:=21/36pt#;      % unit width
+width_adj#:=0pt#;    % width adjustment for certain characters
+serif_fit#:=0pt#;    % extra sidebar near lowercase serifs
+cap_serif_fit#:=5/36pt#;  % extra sidebar near uppercase serifs
+letter_fit#:=5/36pt#;    % extra space added to all sidebars
+
+body_height#:=270/36pt#;  % height of tallest characters
+asc_height#:=250/36pt#;    % height of lowercase ascenders
+cap_height#:=246/36pt#;    % height of caps
+fig_height#:=232/36pt#;    % height of numerals
+x_height#:=155/36pt#;    % height of lowercase without ascenders
+math_axis#:=90/36pt#;    % axis of symmetry for math symbols
+bar_height#:=87/36pt#;    % height of crossbar in lowercase e
+comma_depth#:=70/36pt#;    % depth of comma below baseline
+desc_depth#:=70/36pt#;    % depth of lowercase descenders
+
+crisp#:=0pt#;      % diameter of serif corners
+tiny#:=8/36pt#;      % diameter of rounded corners
+fine#:=7/36pt#;      % diameter of sharply rounded corners
+thin_join#:=7/36pt#;    % width of extrafine details
+hair#:=9/36pt#;      % lowercase hairline breadth
+stem#:=25/36pt#;    % lowercase stem breadth
+curve#:=30/36pt#;    % lowercase curve breadth
+ess#:=27/36pt#;      % breadth in middle of lowercase s
+flare#:=33/36pt#;    % diameter of bulbs or breadth of terminals
+dot_size#:=38/36pt#;    % diameter of dots
+cap_hair#:=11/36pt#;    % uppercase hairline breadth
+cap_stem#:=32/36pt#;    % uppercase stem breadth
+cap_curve#:=37/36pt#;    % uppercase curve breadth
+cap_ess#:=35/36pt#;    % breadth in middle of uppercase s
+rule_thickness#:=.4pt#;    % thickness of lines in math symbols
+
+dish#:=1/36pt#;      % amount erased at top or bottom of serifs
+bracket#:=20/36pt#;    % vertical distance from serif base to tangent
+jut#:=28/36pt#;      % protrusion of lowercase serifs
+cap_jut#:=37/36pt#;    % protrusion of uppercase serifs
+beak_jut#:=10/36pt#;    % horizontal protrusion of beak serifs
+beak#:=70/36pt#;    % vertical protrusion of beak serifs
+vair#:=8/36pt#;      % vertical diameter of hairlines
+notch_cut#:=10pt#;    % maximum breadth above or below notches
+bar#:=11/36pt#;      % lowercase bar thickness
+slab#:=11/36pt#;    % serif and arm thickness
+cap_bar#:=11/36pt#;    % uppercase bar thickness
+cap_band#:=11/36pt#;    % uppercase thickness above/below lobes
+cap_notch_cut#:=10pt#;    % max breadth above/below uppercase notches
+serif_drop#:=4/36pt#;    % vertical drop of sloped serifs
+stem_corr#:=1/36pt#;    % for small refinements of stem breadth
+vair_corr#:=1/36pt#;    % for small refinements of hairline height
+apex_corr#:=0pt#;    % extra width at diagonal junctions
+
+o#:=8/36pt#;      % amount of overshoot for curves
+apex_o#:=8/36pt#;    % amount of overshoot for diagonal junctions
+
+slant:=1/4;      % tilt ratio $(\Delta x/\Delta y)$
+fudge:=1;      % factor applied to weights of heavy characters
+math_spread:=0;      % extra openness of math symbols
+superness:=1/sqrt2;    % parameter for superellipses
+superpull:=1/6;      % extra openness inside bowls
+beak_darkness:=11/30;    % fraction of triangle inside beak serifs
+ligs:=1;      % level of ligatures to be included
+
+square_dots:=false;    % should dots be square?
+hefty:=false;      % should we try hard not to be overweight?
+serifs:=true;      % should serifs and bulbs be attached?
+monospace:=false;    % should all characters have the same width?
+variant_g:=false;    % should an italic-style g be used?
+low_asterisk:=false;    % should the asterisk be centered at the axis?
+math_fitting:=false;    % should math-mode spacing be used?
+
+% now come replacements used to set the lowercase caps
+
+lower.u#:=16/36pt#;    % unit width
+lower.width_adj#:=0pt#;    % width adjustment for certain characters
+lower.cap_serif_fit#:=4/36pt#;  % extra sidebar near uppercase serifs
+lower.letter_fit#:=2.4/36pt#;  % extra space added to all sidebars
+
+lower.body_height#:=200/36pt#;  % height of tallest characters
+lower.cap_height#:=185/36pt#;  % height of caps
+lower.x_height#:=116/36pt#;  % height of lowercase without ascenders
+lower.bar_height#:=65/36pt#;  % height of crossbar in lowercase e
+lower.comma_depth#:=52/36pt#;  % depth of comma below baseline
+
+lower.flare#:=25/36pt#;    % diameter of bulbs or breadth of terminals
+lower.cap_hair#:=9.1/36pt#;  % uppercase hairline breadth
+lower.stem#:=21/36pt#;    % lowercase stem breadth
+lower.cap_stem#:=26/36pt#;  % uppercase stem breadth
+lower.cap_curve#:=31/36pt#;  % uppercase curve breadth
+lower.cap_ess#:=28/36pt#;  % breadth in middle of uppercase s
+
+lower.cap_jut#:=26/36pt#;  % protrusion of uppercase serifs
+lower.beak_jut#:=7/36pt#;  % horizontal protrusion of beak serifs
+lower.beak#:=52/36pt#;    % vertical protrusion of beak serifs
+lower.slab#:=9.1/36pt#;    % serif and arm thickness
+lower.cap_bar#:=9.1/36pt#;  % uppercase bar thickness
+lower.cap_band#:=9.1/36pt#;  % uppercase thickness above/below lobes
+lower.cap_notch_cut#:=10pt#;  % max breadth above/below uppercase notches
+
+lower.o#:=5/36pt#;    % amount of overshoot for curves
+lower.apex_o#:=4/36pt#;    % amount of overshoot for diagonal junctions
+
+lower.fudge:=1;      % factor applied to weights of heavy characters
+
+generate csc      % switch to the driver file
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 07846c54961..a57e6641e4c 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -31,7 +31,7 @@ my @WorkingTLP = qw(
           apa apacite appendix apl
           arabi arabtex arabxetex archaic arcs arev
           armenian AroBend arphic arrayjob arsclassica
-          arydshln Asana-Math ascii assignment astro
+          arydshln Asana-Math asaetr ascii assignment astro
           attachfile auncial-new aurical authoraftertitle authorindex
           auto-pst-pdf autoarea automata
         babel babelbib bangtex barcodes barr bbcard bbding bbm bbold bclogo
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index fa42d3040cc..da83affb056 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1319,6 +1319,7 @@ $standardbib = 'NULL';  # almost all bib files are for the doc
 # packages which have Metafont sources to run.
 $standardmf='[0-9]\.mf';
 %specialmf= (
+ 'asaetr',	'NULL', # cmcscsl10.mf conflict
  'astro',	'astrosym.mf',
  'backgammon',	'bg\.mf',
  'cherokee',	'cherokee.mf',
@@ -1349,7 +1350,9 @@ $standardmf='[0-9]\.mf';
 );
 
 # additional mf files to be installed but not run.
+$standardmfinstall = '\.mf$';
 %specialmfinstall = (
+ 'asaetr'	=> 'NULL', # cmcscsl10.mf conflict
  'astro'	=> 'astrosym.(cal|cmn|mac|uni|xtr)',
  'cmcyr'	=> '\.mf',	
  'ibygrk'	=> 'ibycus4\.map',	# tex|mf source
@@ -1983,10 +1986,8 @@ sub domf {
   #
   # don't use $mfpatt since that's only the tfm-able mf files; just
   # install all the .mf files.
-  &install ($mfdir, '\.mf$');
-  if (exists $specialmfinstall{$package}) {
-    &install ($mfdir, $specialmfinstall{$package});
-  }
+  my $mf_inst_patt = $specialmfinstall{$package} || '\.mf$';
+  &install ($mfdir, $mf_inst_patt);
 }
 
 sub rundvi {