summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-02-13 00:14:33 +0000
committerKarl Berry <karl@freefriends.org>2010-02-13 00:14:33 +0000
commitc7836c0ae27eba7243eda1fc90252f96cc591f94 (patch)
treed9dfc989c9c0f1c857c56af932812fb6054d174d
parent4ee49b4b98a7fba128972f784ffee7d8b37b9450 (diff)
ofs update (12feb10)
git-svn-id: svn://tug.org/texlive/trunk@16991 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/ofs/changes.txt4
-rw-r--r--Master/texmf-dist/tex/generic/ofs/ofs.tex4
-rw-r--r--Master/texmf-dist/tex/generic/ofs/pantyk.tex67
3 files changed, 40 insertions, 35 deletions
diff --git a/Master/texmf-dist/doc/generic/ofs/changes.txt b/Master/texmf-dist/doc/generic/ofs/changes.txt
index 45e710ccdb3..0d6104d6bce 100644
--- a/Master/texmf-dist/doc/generic/ofs/changes.txt
+++ b/Master/texmf-dist/doc/generic/ofs/changes.txt
@@ -52,3 +52,7 @@
a117.tex, amsfn.tex, mtfn.tex, txfn.tex, pantyk.tex added
ofsmtdef.tex is only wrapper file to mtfn.tex
2004/05/20 ofs.tex: \catcode`\|=12 set temporary to avoid ConTeXt conflict
+2006/03/30 ofs.tex: \restorefontid: {} -> \begingroup\endgroup because
+ {} makes empty \hbox in math mode.
+2010/02/10 pantyk.tex corrected
+
diff --git a/Master/texmf-dist/tex/generic/ofs/ofs.tex b/Master/texmf-dist/tex/generic/ofs/ofs.tex
index e925feb0f97..89e03f87f4a 100644
--- a/Master/texmf-dist/tex/generic/ofs/ofs.tex
+++ b/Master/texmf-dist/tex/generic/ofs/ofs.tex
@@ -150,9 +150,9 @@ Z
\def\restorefontid #1{\expandafter
\ifx \csname fn:\expandafter\fontname\csname#1\endcsname\endcsname \relax
\else
- {\expandafter \font \csname
+ \begingroup \expandafter \font \csname
\csname fn:\expandafter\fontname\csname#1\endcsname\endcsname
- \endcsname =\fontname\csname#1\endcsname\relax}%
+ \endcsname =\fontname\csname#1\endcsname\relax \endgroup
\fi
}
\def\ofsloadfont #1#2#3#4#5#6{% #1:famname #2:seqname, #3:(variant) file,
diff --git a/Master/texmf-dist/tex/generic/ofs/pantyk.tex b/Master/texmf-dist/tex/generic/ofs/pantyk.tex
index b147801e338..3710a57dc70 100644
--- a/Master/texmf-dist/tex/generic/ofs/pantyk.tex
+++ b/Master/texmf-dist/tex/generic/ofs/pantyk.tex
@@ -4,7 +4,7 @@
% After "\input pantyk", you can use
%
% \showfonts ... to show the loaded fontfamilies on terminal
-% \fontusage ... to show the usage of new TeX macros on terminal
+% \fontusage ... to show the usage of new TeX macros on terminal
\ifx \ofsdeclarefamily\undefined \input ofs \fi
\protectreading pantyk.tex % This is part of OFS package
@@ -23,8 +23,9 @@
\modifyenc 8z:antt;%
\def\TeX{T\kern-.08em\lower.3333ex\hbox{E}\kern-0.09emX}%
}
-\registerenc: 8t \registerenc: 8z \registerenc: 7k \registerenc: 6w
-\registerenc: 8a
+\registerenc: 7t \registerenc: 8t \registerenc: 8q \registerenc: 8z
+\registerenc: 8y \registerenc: 7k
+\registerenc: 6a \registerenc: 6t \registerenc: 6c \registerenc: 8v
\ofsdeclarefamily [AntykwaTorunskaCaps] {% ------- AntykwaTorunskaCaps
\loadtextfam (Regular) \nowackienc-anttrcap;%
@@ -38,8 +39,9 @@
\modifyenc 8z:antt;%
\def\TeX{T\kern-.08em\lower.3333ex\hbox{E}\kern-0.09emX}%
}
-\registerenc: 8t \registerenc: 8z \registerenc: 7k \registerenc: 6w
-\registerenc: 8a
+\registerenc: 7t \registerenc: 8t \registerenc: 8q \registerenc: 8z
+\registerenc: 8y \registerenc: 7k
+\registerenc: 6a \registerenc: 6t \registerenc: 6c \registerenc: 8v
\ofsdeclarefamily [AntykwaTorunskaCond] {% ------- AntykwaTorunskaCond
\loadtextfam (Regular) \nowackienc-anttcr;%
@@ -53,8 +55,9 @@
\modifyenc 8z:antt;%
\def\TeX{T\kern-.08em\lower.3333ex\hbox{E}\kern-0.09emX}%
}
-\registerenc: 8t \registerenc: 8z \registerenc: 7k \registerenc: 6w
-\registerenc: 8a
+\registerenc: 7t \registerenc: 8t \registerenc: 8q \registerenc: 8z
+\registerenc: 8y \registerenc: 7k
+\registerenc: 6a \registerenc: 6t \registerenc: 6c \registerenc: 8v
\ofsdeclarefamily [AntykwaTorunskaCondCaps] {% ---- AntykwaTorunskaCondCaps
\loadtextfam (Regular) \nowackienc-anttcrcap;%
@@ -68,19 +71,28 @@
\modifyenc 8z:antt;%
\def\TeX{T\kern-.08em\lower.3333ex\hbox{E}\kern-0.09emX}%
}
-\registerenc: 8t \registerenc: 8z \registerenc: 7k \registerenc: 6w
-\registerenc: 8a
+\registerenc: 7t \registerenc: 8t \registerenc: 8q \registerenc: 8z
+\registerenc: 8y \registerenc: 7k
+\registerenc: 6a \registerenc: 6t \registerenc: 6c \registerenc: 8v
-% Janusz Nowacki use a non standard tfm names. We need
+
+% Janusz Nowacki uses non standard tfm names. We need
% to define a conversion table:
\def\nowackienc{\csname nowacki:\fotenc\endcsname}
-\expandafter \def \csname nowacki:8t\endcsname {cork}
-\expandafter \def \csname nowacki:8z\endcsname {cs}
-\expandafter \def \csname nowacki:6w\endcsname {1251}
-\expandafter \def \csname nowacki:7k\endcsname {wncyr}
-\expandafter \def \csname nowacki:8a\endcsname {texansi}
-\expandafter \def \csname nowacki:8x\endcsname {exp}
+\def\nowackidef#1 #2 {\expandafter \def \csname nowacki:#1\endcsname{#2}}
+
+\nowackidef 7t rm % CM fonts
+\nowackidef 8t ec % EC fonts
+\nowackidef 8q qx % polish QX
+\nowackidef 8z cs % czech CSfonts
+\nowackidef 8y texansi % Y&Y
+\nowackidef 7k wncy % wncyr fonts
+\nowackidef 6a t2a % cyrillic-t2a
+\nowackidef 6t t2b % cyrillic-t2b
+\nowackidef 6c t2c % cyrillic-t2c
+\nowackidef 8v t5 % vietnamese
+\nowackidef 8x exp % expert
% The expert fonts are the same for Caps and Normal:
@@ -103,24 +115,13 @@
\registertfm exp-anttcmicap - exp-anttcmi
\ofsdeclarefamily [AntykwaPoltawskiego] {% --------------- AntykwaPoltawskiego
- \loadtextfam (Regular) \nowackienc-antpr;%
- (Bold) \nowackienc-antpb;%
- (Italic) \nowackienc-antpri;%
- (BoldItalic) \nowackienc-antpbi;;%
+ \loadtextfam (Regular) antpr;%
+ (Bold) antpb;%
+ (Italic) antpri;%
+ (BoldItalic) antpbi;;%
\def\TeX{T\kern-.08em\lower.3333ex\hbox{E}\kern-0.09emX}%
}
-\registerenc: 8t \registerenc: 8z
-
-\endinput
-
-
-
-
-
-
-
-
-
-
+\registerenc: 8q
+\endinput