diff options
author | Karl Berry <karl@freefriends.org> | 2013-10-23 22:34:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-10-23 22:34:57 +0000 |
commit | 6daaa8dbe5802de50efd195ba87e6d57ea94b341 (patch) | |
tree | 75839d792b8434bd1779a01f1122956d741bbc00 | |
parent | 61f231cbcfa0f524d40e07bae990011768108bf3 (diff) |
gfsdidot (23oct13)
git-svn-id: svn://tug.org/texlive/trunk@31978 c570f23f-e606-0410-a88d-b1316a301751
38 files changed, 58 insertions, 477 deletions
diff --git a/Master/texmf-dist/doc/fonts/gfsdidot/README b/Master/texmf-dist/doc/fonts/gfsdidot/README index 74b985162eb..029df32d1a9 100644 --- a/Master/texmf-dist/doc/fonts/gfsdidot/README +++ b/Master/texmf-dist/doc/fonts/gfsdidot/README @@ -1,8 +1,6 @@ + -------- GFS Didot & GFS Olga for LaTeX ------------- -The GFS Didot and Bodoni fonts (created by the Greek Font Society) are -released under the SIL Open Font License, and the LaTeX support files -(created by myself and colleagues) are released under the LPPL. A. Tsolomitis diff --git a/Master/texmf-dist/doc/fonts/gfsdidot/README.TEXLIVE b/Master/texmf-dist/doc/fonts/gfsdidot/README.TEXLIVE index f9d6a536b3c..b514a25ca51 100644 --- a/Master/texmf-dist/doc/fonts/gfsdidot/README.TEXLIVE +++ b/Master/texmf-dist/doc/fonts/gfsdidot/README.TEXLIVE @@ -4,5 +4,6 @@ missing source code. You can find these files on CTAN at http://mirror.ctan.org/fonts/greek/gfs/gfsdidot If questions or concerns, email tex-live@tug.org. - DidotSpecimen.pdf OlgaSpecimen.pdf + GFSDidot-LaTeX-Guide.pdf + DidotSpecimen.pdf diff --git a/Master/texmf-dist/doc/fonts/gfsdidot/gfsdidot.pdf b/Master/texmf-dist/doc/fonts/gfsdidot/gfsdidot.pdf Binary files differdeleted file mode 100644 index 0257e68ac07..00000000000 --- a/Master/texmf-dist/doc/fonts/gfsdidot/gfsdidot.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/fonts/gfsdidot/gfsdidot.tex b/Master/texmf-dist/doc/fonts/gfsdidot/gfsdidot.tex deleted file mode 100644 index 170c6bf454f..00000000000 --- a/Master/texmf-dist/doc/fonts/gfsdidot/gfsdidot.tex +++ /dev/null @@ -1,400 +0,0 @@ -%% (c) copyright 2006, 2007 -%% Antonis Tsolomitis -%% Department of Mathematics, University of the Aegean -%% -%% This document can be redistributed and/or modified under the terms -%% of the LaTeX Project Public License Distributed from CTAN -%% archives in directory macros/latex/base/lppl.txt; either -%% version 1 of the License, or any later version. - -\documentclass{article} -\usepackage[polutonikogreek,english]{babel} -\usepackage[iso-8859-7]{inputenc} -\usepackage{gfsdidot} - -%\renewcommand{\ttdefault}{hlst} - -%%%%% Theorems and friends -\newtheorem{theorem}{Θεώρημα}[section] -\newtheorem{lemma}[theorem]{Λήμμα} -\newtheorem{proposition}[theorem]{Πρόταση} -\newtheorem{corollary}[theorem]{Πόρισμα} -\newtheorem{definition}[theorem]{Ορισμός} -\newtheorem{remark}[theorem]{Παρατήρηση} -\newtheorem{axiom}[theorem]{Αξίωμα} -\newtheorem{exercise}[theorem]{Άσκηση} - - -%%%%% Environment ``proof'' -\newenvironment{proof}[1]{{\textit{Απόδειξη:}}}{\ \hfill$\Box$} -\newenvironment{hint}[1]{{\textit{Υπόδειξη:}}}{\ \hfill$\Box$} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - - - -\title{The \textsc{gfsdidot} font family} -\author{Antonis Tsolomitis\\ -Laboratory of Digital Typography\\ and Mathematical Software\\ -Department of Mathematics\\ -University of the Aegean} -\date {\textsc{28} January \textsc{2006}} - - -\begin{document} -\maketitle - -\section{Introduction} -The Didot family of the Greek Font Society was made available for free -in autumn 2005. This font existed with a commercial license for many -years before. Support for LaTeX and the babel package was prepared -several years ago by the author and I.\ Vasilogiorgakis. With the -free availability of the fonts I have modified the original package -so that it reflects the changes occured in the latest releases by \textsc{gfs}. - -The package supports three encodings: OT1, T1 and LGR to the extend -that the font themselves cover these. OT1 and LGR should be -fairly complete. The greek part is to be used with the greek option of -the Babel package. - -The fonts are loaded with - -\verb|\usepackage{gfsdidot}|. - -The fonts as released contain an italic version, but its greek part is -just the roman in slanted form. To overcome this problem for the greek -part, we use for italic another font by \textsc{gfs} called Olga. -As far as the latin part is concerned the italic characters are taken -from Didot-Italic (Olga contains no latin characters). -The package provides also a matching small caps shape for both latin -and greek including old style numbers. - -Finally, the math symbols are taken from the pxfonts package except -of course the characters that are already provided by Didot and Olga. -The choice of pxfonts was made on the basis that the latin part of -Didot is based on Palatino. Moreover, all Didot characters are scaled -in the \verb|.fd| files by a factor of 1.04 in order to match the -x-height of pxfonts. - -\section{Installation} - -Copy the contents of the subdirectory afm in -texmf/fonts/afm/GFS/Didot/ - -\medskip - -\noindent Copy the contents of the subdirectory doc in -texmf/doc/latex/GFS/Didot/ - -\medskip - -\noindent Copy the contents of the subdirectory enc in -texmf/fonts/enc/dvips/GFS/Didot/ - -\medskip - -\noindent Copy the contents of the subdirectory map in -texmf/fonts/map/dvips/GFS/Didot/ - -\medskip - -\noindent Copy the contents of the subdirectory tex in -texmf/tex/latex/GFS/Didot/ - -\medskip - -\noindent Copy the contents of the subdirectory tfm in -texmf/fonts/tfm/GFS/Didot/ - -\medskip - -\noindent Copy the contents of the subdirectory type1 in -texmf/fonts/type1/GFS/Didot/ - -\medskip - -\noindent Copy the contents of the subdirectory vf in -texmf/fonts/vf/GFS/Didot/ - -\medskip - -\noindent In your installations updmap.cfg file add the line - -\medskip - -\noindent Map gfsdidot.map - -\medskip - -Refresh your filename database and the map file database (for example, on Unix systems -run mktexlsr and then run the updmap script as root). - -You are now ready to use the fonts provided that you have a relatively -modern installation that includes pxfonts. - -\section{Usage} - -As said in the introduction the package covers both english and -greek. Greek covers polytonic too through babel (read the -documentation -of the babel package and its greek option). - -For example, the preample - -\begin{verbatim} -\documentclass{article} -\usepackage[english,greek]{babel} -\usepackage[iso-8859-7]{inputenc} -\usepackage{gfsdidot} -\end{verbatim} - -will be the correct setup for articles in Greek. - -\bigskip - -\subsection{Transformations by \texttt{dvips}} - -Other than the shapes provided by the fonts themselves, this package -provides an upright italic shape and a slanted small caps shape -using the standard mechanism provided by dvips. Upright italics -are called with \verb|\uishape| and slanted small caps with \verb|\scslshape|. -For example, the code -\begin{verbatim} -{\itshape italics {\uishape upright italics} {\itshape italics again} -\textgreek{{\itshape >'αβγδζξφψ`ω| {\uishape >'αβγδζξφψ`ω|} {\itshape >'αβγδζξφψ`ω|}}}} - -\textsc{small caps \textgreek{πεζοκεφαλαία} 0123456789} {\scslshape - \textgreek{πεζοκεφαλαία 0123456789}} -\end{verbatim} -will give - -{\itshape italics {\uishape upright italics} {\itshape italics again} -\textgreek{{\itshape >'αβγδζξφψ`ω| {\uishape >'αβγδζξφψ`ω|} {\itshape - >'αβγδζξφψ`ω|}}}} - -\textsc{small caps \textgreek{πεζοκεφαλαία} 0123456789} {\scslshape - \textgreek{πεζοκεφαλαία 0123456789}} - -\noindent The commands \verb|\textui{}| and \verb|\textscsl{}| are also provided. - - - - -\subsection{Tabular numbers} - -Tabular numbers (of fixed width) are accessed with the command -\verb|\tabnums{}|. Compare - -\begin{tabular}{ll} -\verb+|0|1|2|3|4|5|6|7|8|9|+ & |0|1|2|3|4|5|6|7|8|9|\\ -\verb+\tabnums{|0|1|2|3|4|5|6|7|8|9|}+ & \tabnums{|0|1|2|3|4|5|6|7|8|9|} -\end{tabular} - - -\subsection{Text fractions} - -Text fractions are composed using the lower and upper numerals -provided by the fonts, and are -accessed with the command \verb|\textfrac{}{}|. -For example, \verb|\textfrac{-22}{7}| gives \textfrac{-22}{7}. - -Precomposed fractions are provided too by \verb|\onehalf|, -\verb|\onethird|, etc. - - -\subsection{Additional characters} - -\begin{center} -\begin{tabular}{|c|c|}\hline -\verb|\textbullet| &\textbullet \\ \hline -\verb|\textparagraph| &\textparagraph \\ \hline -\verb|\textparagraphalt| & \textparagraphalt\\ \hline -\verb|\careof| & \careof\\ \hline -\verb|\numero| & \numero\\ \hline -\verb|\estimated| & \estimated\\ \hline -\verb|\whitebullet| & \whitebullet\\ \hline -\verb|\textlozenge| & \textlozenge\\ \hline -\verb|\eurocurrency| & \eurocurrency\\ \hline -\verb|\interrobang| & \interrobang\\ \hline -\verb|\textdagger| & \textdagger\\ \hline -\verb|\textdaggerdbl| & \textdaggerdbl\\ \hline -\verb|\yencurrency| & \yencurrency\\ \hline -\end{tabular} -\end{center} - -Euro is also available in LGR enconding. \verb|\textgreek{\euro}| -gives \textgreek{\euro}. - -\subsection{Alternate characters} - -In the greek encoding the initial theta is chosen -automatically. Compare: \textgreek{θάλασσα} but \textgreek{Αθηνά}. -Other alternate characters are not chosen automatically. - -Olga provides a double lambda: \lambdadbl. This can be accessed with the -command \verb|\lambdadbl| in textmode. - -For example, in LGR encoding - -\medskip - -\verb|\textit{a\lambdadbl'a kat'allhlos metasjhmatism;oc}| - -\smallskip - -gives - -\smallskip - -\textgreek{\textit{a\lambdadbl'a kat'allhlos metasqhmatism'oc}}. - - -\section{Problems} - - - The -accents of the capital letters should hang in the left margin when such a letter starts a -line. \TeX\ and \LaTeX\ do not provide the tools for such a -feature. However, this seems to be possible with -\textlatin{pdf\TeX} -As this is work in progress, please be patient\ldots - - - - -\section{Samples} - -The next two pages provide samples in english and greek with math. - - -\newpage - -Adding up these inequalities with respect to $i$, we get -\begin{equation} \sum c_i d_i \leq \frac1{p} +\frac1{q} =1\label{10}\end{equation} -since $\sum c_i^p =\sum d_i^q =1$.\hfill$\Box$ - -In the case $p=q=2$ -the above inequality is also called the -\textit{Cauchy-Schwartz inequality}. - -Notice, also, that by formally defining $\left( \sum |b_k|^q\right)^{1/q}$ to be -$\sup |b_k|$ for $q=\infty$, we give sense to (9) for all -$1\leq p\leq\infty$. - - -A similar inequality is true for functions instead of sequences with the sums -being substituted by integrals. - -\medskip - -\textbf{Theorem} {\itshape Let $1<p<\infty$ and let $q$ be such that $1/p +1/q =1$. Then, -for all functions $f,g$ on an interval $[a,b]$ -such that the integrals $\int_a^b |f(t)|^p\,dt$, $\int_a^b |g(t)|^q\,dt$ and -$\int_a^b |f(t)g(t)|\,dt$ exist \textup{(}as Riemann integrals\textup{)}, -we have -\begin{equation} -\int_a^b |f(t)g(t)|\,dt\leq -\biggl(\int_a^b |f(t)|^p\,dt\biggr)^{1/p} -\biggl(\int_a^b |g(t)|^q\,dt\biggr)^{1/q} . -\end{equation} -} - -Notice that if the Riemann integral $\int_a^b f(t)g(t)\,dt$ also exists, then -from the inequality $\left|\int_a^b f(t)g(t)\,dt\right|\leq -\int_a^b |f(t)g(t)|\,dt$ follows that -\begin{equation} -\left|\int_a^b f(t)g(t)\,dt\right|\leq -\biggl(\int_a^b |f(t)|^p\,dt\biggr)^{1/p} -\biggl(\int_a^b |g(t)|^q\,dt\biggr)^{1/q} . -\end{equation} - - - -\textit{Proof:} Consider a partition of the interval $[a,b]$ in $n$ equal -subintervals with endpoints -$a=x_0<x_1<\cdots<x_n=b$. Let $\Delta x=(b-a)/n$. -We have -\begin{eqnarray} -\sum_{i=1}^n |f(x_i)g(x_i)|\Delta x &\leq& -\sum_{i=1}^n |f(x_i)g(x_i)|(\Delta x)^{\frac1{p}+\frac1{q}}\nonumber\\ -&=&\sum_{i=1}^n \left(|f(x_i)|^p \Delta x\right)^{1/p} \left(|g(x_i)|^q -\Delta x\right)^{1/q}.\label{functionalHolder1}\\ \nonumber -\end{eqnarray} - -\newpage\greektext - - -% $\bullet$ Μήκος τόξου καμπύλης - -% \begin{proposition}\label{chap2:sec1:prop 23} -% Έστω $\gamma$ καμπύλη με παραμετρική εξίσωση $x=g(t)$, $y=f(t)$, -% $t\in [a,\,b]$ αν $g'$, $f'$ συνεχείς στο $[a,\,b]$ τότε η -% $\gamma$ έχει μήκος $S=L(\gamma)=\int_a^b \sqrt{g'(t)^2+f'(t)^2} -% dt$. -% \end{proposition} - -\textbullet\ Εμβαδόν επιφάνειας από περιστροφή\\ - -\begin{proposition}\label{chap2:sec1:prop23-2} -Έστω $\gamma$ καμπύλη με παραμετρική εξίσωση $x=g(t)$, $y=f(t)$, -$t\in [a,\,b]$ αν $g'$, $f'$ συνεχείς στο $[a,\,b]$ τότε το -εμβαδόν από περιστροφή της $\gamma$ γύρω από τον $xx'$ δίνεται \\ -$Β=2\pi\int_a^b |f(t)| \sqrt{g'(t)^2+f^{\prime}(t^2)} dt$. \\ Αν η -$\gamma$ δίνεται από την $y=f(x)$, $x\in [a,\,b]$ τότε -$Β=2\pi\int_a^b |f(t)| \sqrt{1+f'(x)^2} dx$ -\end{proposition} - -\textbullet\ Όγκος στερεών από περιστροφή\\ Έστω $f : -[a,\,b]\rightarrow \mathbb{R}$ συνεχής και $R=\{f, Ox,x=a,x=b\}$ -είναι ο όγκος από περιστροφή του γραφήματος της $f$ γύρω από τον -$Ox$ μεταξύ των ευθειών $x=a$, και $x=b$, τότε $V=\pi\int_a^b f -(x)^2 dx$ - -\textbullet\ Αν $f,g : [a,\,b]\rightarrow \mathbb{R}$ και $0\leq -g(x)\leq f(x)$ τότε ο όγκος στερεού που παράγεται από περιστροφή -των γραφημάτων των $f$ και $g$, $R=\{f,g, Ox,x=a,x=b\}$ είναι \\ -$V=\pi\int_a^b\{ f (x)^2-g(x)^2\} dx$. - -\textbullet\ Αν $x=g(t)$, $y=f(t)$, $t=[t_1,\,t_2]$ τότε -$V=\pi\int_{t_1}^{t_2}\{ f (t)^2 g'(t)\} dt$ για $g(t_1)=a$, -$g(t_2)=b$. - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\section{Ασκήσεις}\label{chap2:sec2} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\begin{exercise}\label{chap2:ex1} -Να εκφραστεί το παρακάτω όριο ως ολοκλήρωμα $Riemann$ κατάλ\-ληλης -συνάρτησης\\ -$$\lim_{n\rightarrow\infty} \frac{1}{n}\sum_{k=1}^{n}\sqrt[n]{e^k} $$ -\end{exercise} -%%%%%%%%% -\textit{Υπόδειξη:} -Πρέπει να σκεφτούμε μια συνάρτηση της οποίας γνωρίζουμε ότι υπάρχει το ολοκλήρωμα. - Τότε παίρνουμε μια διαμέριση $P_n$ και δείχνουμε π.χ. ότι το $U(f,P_n)$ είναι η ζητούμενη σειρά. - -\bigskip - -%%%%%%%%%%%%%% -\textit{Λύση:} -Πρέπει να σκεφτούμε μια συνάρτηση της οποίας γνωρίζουμε ότι υπάρχει το ολοκλήρωμα. -Τότε παίρνουμε μια διαμέριση $P_n$ και δείχνουμε π.χ. ότι το $U(f,P_n)$ είναι η ζητούμενη σειρά.\\ -Έχουμε ότι -\begin{eqnarray}\frac{1}{n}\sum_{k=1}^{n}\sqrt[n]{e^k} = -\frac{1}{n}\sqrt[n]{e}+\frac{1}{n}\sqrt[n]{e^2}+\cdots + -\frac{1}{n}\sqrt[n]{e^n}\nonumber\\ -=\frac{1}{n}e^{\frac{1}{n}}+\frac{1}{n}e^{\frac{2}{n}}+\cdots+\frac{1}{n}e^{\frac{n}{n}}\nonumber -\end{eqnarray} - - - - -\end{document} - -%%% Local Variables: -%%% mode: latex -%%% TeX-master: t -%%% End: diff --git a/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot-Bold.afm b/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot-Bold.afm index 3d54c84b773..f887a1a5720 100644 --- a/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot-Bold.afm +++ b/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot-Bold.afm @@ -1,11 +1,11 @@ StartFontMetrics 2.0 Comment Generated by pfaedit -Comment Creation Date: Mon Oct 22 11:10:07 PDT 2007 +Comment Creation Date: Sun Feb 12 13:05:58 2006 FontName GFSDidot-Bold FullName GFS Didot Bold FamilyName GFS Didot Weight Bold -Notice (Copyright 2007 Greek Font Society. This Font Software is licensed under the SIL Open Font License, Version 1.1, with Reserved Font Name 'GFS Didot'.) +Notice (Copyright (c) , Greek Font Society 2001. All rights reserved.) ItalicAngle 0 IsFixedPitch false UnderlinePosition -363 diff --git a/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot-BoldItalic.afm b/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot-BoldItalic.afm index 55eda6c3e75..8248c01f2ad 100644 --- a/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot-BoldItalic.afm +++ b/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot-BoldItalic.afm @@ -1,11 +1,11 @@ StartFontMetrics 2.0 Comment Generated by pfaedit -Comment Creation Date: Mon Oct 22 11:10:07 PDT 2007 +Comment Creation Date: Sun Feb 12 13:27:39 2006 FontName GFSDidot-BoldItalic FullName GFS Didot BoldItalic FamilyName GFS Didot Weight Bold -Notice (Copyright 2007 Greek Font Society. This Font Software is licensed under the SIL Open Font License, Version 1.1, with Reserved Font Name 'GFS Didot'.) +Notice (Copyright (c) Designed by Takis Katsoulidis and George D. Matthiopoulos., 2001. All rights reserved.) ItalicAngle -11 IsFixedPitch false UnderlinePosition -133 diff --git a/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot-Italic.afm b/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot-Italic.afm index 5862e815e81..b9c1c98e4ce 100644 --- a/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot-Italic.afm +++ b/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot-Italic.afm @@ -1,11 +1,11 @@ StartFontMetrics 2.0 Comment Generated by pfaedit -Comment Creation Date: Mon Oct 22 11:10:07 PDT 2007 +Comment Creation Date: Sun Feb 12 14:25:52 2006 FontName GFSDidot-Italic FullName GFS Didot Italic FamilyName GFS Didot Weight Normal -Notice (Copyright 2007 Greek Font Society. This Font Software is licensed under the SIL Open Font License, Version 1.1, with Reserved Font Name 'GFS Didot'.) +Notice (Copyright (c) George Matthiopoulos and Takis Katsoulidis, 2001. All rights reserved.) ItalicAngle -11 IsFixedPitch false UnderlinePosition -290 diff --git a/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot.afm b/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot.afm index 9a00eacd20f..703cc44740d 100644 --- a/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot.afm +++ b/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSDidot.afm @@ -1,11 +1,11 @@ StartFontMetrics 2.0 Comment Generated by pfaedit -Comment Creation Date: Mon Oct 22 11:10:07 PDT 2007 +Comment Creation Date: Wed Mar 1 18:29:36 2006 FontName GFSDidot FullName GFS Didot FamilyName GFS Didot Weight Normal -Notice (Copyright 2007 Greek Font Society. This Font Software is licensed under the SIL Open Font License, Version 1.1, with Reserved Font Name 'GFS Didot'.) +Notice (Copyright (c) Greek Font Society, 2001. All rights reserved.) ItalicAngle 0 IsFixedPitch false UnderlinePosition -290 diff --git a/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSOlga.afm b/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSOlga.afm index 330680194b5..2e0eb419f98 100644 --- a/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSOlga.afm +++ b/Master/texmf-dist/fonts/afm/public/gfsdidot/GFSOlga.afm @@ -1,11 +1,11 @@ StartFontMetrics 2.0 Comment Generated by pfaedit -Comment Creation Date: Mon Oct 22 11:10:07 PDT 2007 +Comment Creation Date: Sun Feb 12 13:31:18 2006 FontName GFSOlga FullName GFS Olga FamilyName GFS Olga Weight Regular -Notice (Copyright 2007 Greek Font Society. This Font Software is licensed under the SIL Open Font License, Version 1.1, with Reserved Font Name 'GFS Olga'.) +Notice (Copyright (c) GREEK FONT SOCIETY, 1995. All rights reserved.) ItalicAngle -11 IsFixedPitch false UnderlinePosition -334 diff --git a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didot.enc b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didot.enc index c953153f019..6dd9d18f742 100644 --- a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didot.enc +++ b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didot.enc @@ -1,6 +1,5 @@ % @@psencodingfile@{ % author = "A. Tsolomitis", -% license = "public domain", % version = "1.0", % date = "October 2001", % filename = "didot.enc", diff --git a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotdenomnums.enc b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotdenomnums.enc index fb6e91fa41b..48c9d32385a 100644 --- a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotdenomnums.enc +++ b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotdenomnums.enc @@ -1,6 +1,5 @@ % @@psencodingfile@{ % author = "A. Tsolomitis", -% license = "public domain", % version = "1.0", % date = "July 2003", % filename = "didotdenomnums.enc", @@ -86,4 +85,4 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def -%% LIGKERN f j =: fj ; f f =: ff ; f i =: fi ; f l =: fl ; +%% LIGKERN f j =: fj ; f f =: ff ; f i =: fi ; f l =: fl ;
\ No newline at end of file diff --git a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotec.enc b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotec.enc index 05e11cb1e16..28d20b09e4d 100644 --- a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotec.enc +++ b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotec.enc @@ -1,7 +1,6 @@ % % This is the EC encoding for the didot font family. -% Public domain. -% A. Tsolomitis +% (C) A. Tsolomitis % % % LIGKERN space l =: lslash ; space L =: Lslash ; diff --git a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotnumnums.enc b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotnumnums.enc index f08f3cca464..c9d88ebe1bd 100644 --- a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotnumnums.enc +++ b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotnumnums.enc @@ -1,6 +1,5 @@ % @@psencodingfile@{ % author = "A. Tsolomitis", -% license = "public domain", % version = "1.0", % date = "July 2003", % filename = "didotnumnums.enc", @@ -87,4 +86,4 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def -%% LIGKERN f j =: fj ; f f =: ff ; f i =: fi ; f l =: fl ; +%% LIGKERN f j =: fj ; f f =: ff ; f i =: fi ; f l =: fl ;
\ No newline at end of file diff --git a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didottabnums.enc b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didottabnums.enc index 00dc7eeafc0..71225819e37 100644 --- a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didottabnums.enc +++ b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didottabnums.enc @@ -1,6 +1,5 @@ % @@psencodingfile@{ % author = "A. Tsolomitis", -% license = "public domain", % version = "1.0", % date = "July 2003", % filename = "didottabnums.enc", @@ -85,4 +84,4 @@ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef ] def -%% LIGKERN exclam exclam =: exclamdbl ; +%% LIGKERN exclam exclam =: exclamdbl ;
\ No newline at end of file diff --git a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotuecsc.enc b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotuecsc.enc index 7167df99236..5ce65c00c59 100644 --- a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotuecsc.enc +++ b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotuecsc.enc @@ -1,7 +1,6 @@ % % This is the EC encoding for the didot font family. -% Public domain. -% A. Tsolomitis +% (C) A. Tsolomitis % % % LIGKERN space L =: Lslash ; diff --git a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotusc.enc b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotusc.enc index 97f23bc05ff..12d56b748cf 100644 --- a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotusc.enc +++ b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/didotusc.enc @@ -1,11 +1,10 @@ % @@psencodingfile@{ % author = "A. Tsolomitis", -% license = "public domain", % version = "1.0", % date = "January 2002", % filename = "didotusc.enc", % email = "atsol@aegean.gr", -% docstring = "Encoding for the small caps of the GFS Didot font family" +% docstring = "Encoding for The SmallCaps of the GFS Didot FontFamily" % @} % /didotusc [ diff --git a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gfsudidotmath.enc b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gfsudidotmath.enc index ab48904268e..9a36b751c1b 100644 --- a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gfsudidotmath.enc +++ b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gfsudidotmath.enc @@ -1,6 +1,6 @@ -% TeX math italic encoding - no ligatures or kerns. -% Public domain. -% A. Tsolomitis +% TeX math italic encoding. +% No ligatures or kerns. +% /gfsudidotmath [ % now 256 chars follow % 0x0 /Gamma diff --git a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpdidot.enc b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpdidot.enc index f91a7f1cc5f..e2893265181 100644 --- a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpdidot.enc +++ b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpdidot.enc @@ -1,11 +1,10 @@ % @@psencodingfile@{ % author = "A. Tsolomitis", -% license = "public domain", % version = "1.0", % date = "October 2001", % filename = "gpdidot.enc", % email = "atsol@aegean.gr", -% docstring = "Encoding for the didot font family" +% docstring = "Encoding for the didot fontfamily" % @} % % diff --git a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpdidoti.enc b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpdidoti.enc index e17aacd5343..bf1677b2a1e 100644 --- a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpdidoti.enc +++ b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpdidoti.enc @@ -1,11 +1,10 @@ % @@psencodingfile@{ % author = "A. Tsolomitis", -% license = "public domain", % version = "1.0", % date = "October 2001", % filename = "gpdidoti.enc", % email = "atsol@aegean.gr", -% docstring = "Encoding for the didot font family (italic)" +% docstring = "Encoding for the didot fontfamily (italic)" % @} % % @@ -14,7 +13,7 @@ /endash /.notdef /Deltanum /Etanum /Chinum /Munum /stigma /uni03DA /cy /uni1FBC /uni1FCC /uni1FFC /uni03D1 /zeta1 /epsilon1 /phi1 % 0x10 - /uni03D0 /omega1 /qoppa /uni03DE /rho1 /.notdef /.notdef /.notdef + /uni03D0 /omega1 /qoppa /uni03DE /rho1 /partialdiff /.notdef /.notdef /Euro /perthousand /.notdef /uni03E0 /quoteleft /quoteright /braxy /macron % 0x20 /uni1FC1 /exclam /dieresis /uni1FEE /uni1FED /percent /middot /uni1FFD diff --git a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpdidotusc.enc b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpdidotusc.enc index 569ce3aa9d3..b7a0dd8a05f 100644 --- a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpdidotusc.enc +++ b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpdidotusc.enc @@ -1,11 +1,10 @@ % @@psencodingfile@{ % author = "A. Tsolomitis", -% license = "public domain", % version = "1.0", % date = "January 2006", % filename = "gpdidotusc.enc", % email = "atsol@aegean.gr", -% docstring = "Encoding for the didot font family" +% docstring = "Encoding for the didot fontfamily" % @} % % diff --git a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpolga.enc b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpolga.enc index c551e94d6d9..897c8c54347 100644 --- a/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpolga.enc +++ b/Master/texmf-dist/fonts/enc/dvips/gfsdidot/gpolga.enc @@ -1,11 +1,10 @@ % @@psencodingfile@{ % author = "A. Tsolomitis", -% license = "public domain", % version = "1.0", % date = "October 2001", % filename = "gpolga.enc", % email = "atsol@aegean.gr", -% docstring = "Encoding for GFS Olga" +% docstring = "Encoding for Olga" % @} % % diff --git a/Master/texmf-dist/fonts/map/dvips/gfsdidot/gfsdidot.map b/Master/texmf-dist/fonts/map/dvips/gfsdidot/gfsdidot.map index ef58b90e9ed..143b54c2b36 100644 --- a/Master/texmf-dist/fonts/map/dvips/gfsdidot/gfsdidot.map +++ b/Master/texmf-dist/fonts/map/dvips/gfsdidot/gfsdidot.map @@ -1,5 +1,4 @@ -### Map file for GFS Didot and GFS Olga ### -### Public domain. +%%%%%%%%%%%%%%%%%%%%%%%%%%% The GFS Didot font family %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% didotrg9r GFSDidot " didotec ReEncodeFont " <didotec.enc <GFSDidot.pfb didotrg8r GFSDidot " didot ReEncodeFont " <didot.enc <GFSDidot.pfb didotb9r GFSDidot-Bold " didotec ReEncodeFont " <didotec.enc <GFSDidot-Bold.pfb @@ -24,14 +23,17 @@ gdidotrg6r GFSDidot " gpdidot ReEncodeFont " <gpdidot.enc gdidotb6r GFSDidot-Bold " gpdidot ReEncodeFont " <gpdidot.enc <GFSDidot-Bold.pfb gdidotbi6r GFSDidot-BoldItalic " gpdidot ReEncodeFont " <gpdidot.enc <GFSDidot-BoldItalic.pfb gdidoti6r GFSDidot-Italic " gpdidoti ReEncodeFont " <gpdidoti.enc <GFSDidot-Italic.pfb - -didottabnums8r GFSDidot " didottabnums ReEncodeFont " <didottabnums.enc <GFSDidot.pfb -didotnumnums8r GFSDidot " didotnumnums ReEncodeFont " <didotnumnums.enc <GFSDidot.pfb -didotdenomnums8r GFSDidot " didotdenomnums ReEncodeFont " <didotdenomnums.enc <GFSDidot.pfb - golgai6r GFSOlga " gpolga ReEncodeFont " <gpolga.enc <GFSOlga.pfb golgaui6r GFSOlga " -0.220 SlantFont gpolga ReEncodeFont " <gpolga.enc <GFSOlga.pfb gdidotsc6r GFSDidot " gpdidotusc ReEncodeFont " <gpdidotusc.enc <GFSDidot.pfb gdidotsco6r GFSDidot " 0.167 SlantFont gpdidotusc ReEncodeFont " <gpdidotusc.enc <GFSDidot.pfb gfsudidotmath8r GFSOlga " gfsudidotmath ReEncodeFont " <gfsudidotmath.enc <GFSOlga.pfb -### +didottabnums8r GFSDidot " didottabnums ReEncodeFont " <didottabnums.enc <GFSDidot.pfb +didotnumnums8r GFSDidot " didotnumnums ReEncodeFont " <didotnumnums.enc <GFSDidot.pfb +didotdenomnums8r GFSDidot " didotdenomnums ReEncodeFont " <didotdenomnums.enc <GFSDidot.pfb +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + + + diff --git a/Master/texmf-dist/fonts/tfm/public/gfsdidot/gdidoti6a.tfm b/Master/texmf-dist/fonts/tfm/public/gfsdidot/gdidoti6a.tfm Binary files differindex 6eca8d9dc95..8894ba7f602 100644 --- a/Master/texmf-dist/fonts/tfm/public/gfsdidot/gdidoti6a.tfm +++ b/Master/texmf-dist/fonts/tfm/public/gfsdidot/gdidoti6a.tfm diff --git a/Master/texmf-dist/fonts/tfm/public/gfsdidot/gdidoti6r.tfm b/Master/texmf-dist/fonts/tfm/public/gfsdidot/gdidoti6r.tfm Binary files differindex 0f1c59b2819..6bf6fcc2dee 100644 --- a/Master/texmf-dist/fonts/tfm/public/gfsdidot/gdidoti6r.tfm +++ b/Master/texmf-dist/fonts/tfm/public/gfsdidot/gdidoti6r.tfm diff --git a/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot-Bold.pfb b/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot-Bold.pfb Binary files differindex 38e75a6173c..45a5fa8dafa 100644 --- a/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot-Bold.pfb +++ b/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot-Bold.pfb diff --git a/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot-BoldItalic.pfb b/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot-BoldItalic.pfb Binary files differindex f6476923de7..7aac6135dcd 100644 --- a/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot-BoldItalic.pfb +++ b/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot-BoldItalic.pfb diff --git a/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot-Italic.pfb b/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot-Italic.pfb Binary files differindex d3b367b08d7..dd1cb381a99 100644 --- a/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot-Italic.pfb +++ b/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot-Italic.pfb diff --git a/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot.pfb b/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot.pfb Binary files differindex a4ea5550403..95ef91c2ca4 100644 --- a/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot.pfb +++ b/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSDidot.pfb diff --git a/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSOlga.pfb b/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSOlga.pfb Binary files differindex 365cd21820e..4fa56187268 100644 --- a/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSOlga.pfb +++ b/Master/texmf-dist/fonts/type1/public/gfsdidot/GFSOlga.pfb diff --git a/Master/texmf-dist/fonts/vf/public/gfsdidot/gdidoti6a.vf b/Master/texmf-dist/fonts/vf/public/gfsdidot/gdidoti6a.vf Binary files differindex 5000f928f71..59622c07d73 100644 --- a/Master/texmf-dist/fonts/vf/public/gfsdidot/gdidoti6a.vf +++ b/Master/texmf-dist/fonts/vf/public/gfsdidot/gdidoti6a.vf diff --git a/Master/texmf-dist/fonts/vf/public/gfsdidot/gfsudidotmath8a.vf b/Master/texmf-dist/fonts/vf/public/gfsdidot/gfsudidotmath8a.vf Binary files differindex 5d88c972fc9..f4f4c56032d 100644 --- a/Master/texmf-dist/fonts/vf/public/gfsdidot/gfsudidotmath8a.vf +++ b/Master/texmf-dist/fonts/vf/public/gfsdidot/gfsudidotmath8a.vf diff --git a/Master/texmf-dist/tex/latex/gfsdidot/gfsdidot.sty b/Master/texmf-dist/tex/latex/gfsdidot/gfsdidot.sty index 734ac5258b9..3e127c681ad 100644 --- a/Master/texmf-dist/tex/latex/gfsdidot/gfsdidot.sty +++ b/Master/texmf-dist/tex/latex/gfsdidot/gfsdidot.sty @@ -1,4 +1,10 @@ -%% This is file `gfsdidot.sty'. +%% +%% This is file `gfsdidot.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% gfsdidot.dtx (with options: `gfsdidot') %% %% (c) copyright 2001 %% Antonis Tsolomitis diff --git a/Master/texmf-dist/tex/latex/gfsdidot/lgrudidot.fd b/Master/texmf-dist/tex/latex/gfsdidot/lgrudidot.fd index 65f8c0f426e..8ce63a4f465 100644 --- a/Master/texmf-dist/tex/latex/gfsdidot/lgrudidot.fd +++ b/Master/texmf-dist/tex/latex/gfsdidot/lgrudidot.fd @@ -1,14 +1,10 @@ -%% This is file 'lgrudidot.fd'. +%% This is file 'lgrudidot.fd', +%% generated with the docstrip utility. %% %% (c) copyright Jan 2002 by -%% Antonis Tsolomitis and Ioannis Vasilogiorgakis. +%% Tsolomitis Antonis and Vasilogiorgakis Ioannis. %% Modified by A. Tsolomitis January 2006. %% -%% This program can be redistributed and/or modified under the terms -%% of the LaTeX Project Public License Distributed from CTAN -%% archives in directory macros/latex/base/lppl.txt; either -%% version 1 of the License, or any later version. -%% %% THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \DeclareFontFamily{LGR}{udidot}{} diff --git a/Master/texmf-dist/tex/latex/gfsdidot/omludidot.fd b/Master/texmf-dist/tex/latex/gfsdidot/omludidot.fd index e7450bfdd4f..cda79f9f8f6 100644 --- a/Master/texmf-dist/tex/latex/gfsdidot/omludidot.fd +++ b/Master/texmf-dist/tex/latex/gfsdidot/omludidot.fd @@ -2,12 +2,7 @@ %% generated with the docstrip utility. %% %% (c) copyright Jan 2002 by -%% Antonis Tsolomitis and Ioannis Vasilogiorgakis. -%% -%% This program can be redistributed and/or modified under the terms -%% of the LaTeX Project Public License Distributed from CTAN -%% archives in directory macros/latex/base/lppl.txt; either -%% version 1 of the License, or any later version. +%% Tsolomitis Antonis and Vasilogiorgakis Ioannis. %% %% THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY diff --git a/Master/texmf-dist/tex/latex/gfsdidot/ot1udidot.fd b/Master/texmf-dist/tex/latex/gfsdidot/ot1udidot.fd index 7d992194af2..50f710b075b 100644 --- a/Master/texmf-dist/tex/latex/gfsdidot/ot1udidot.fd +++ b/Master/texmf-dist/tex/latex/gfsdidot/ot1udidot.fd @@ -1,13 +1,10 @@ -%% This is file 'ot1udidot.fd'. +%% This is file 'ot1udidot.fd', +%% generated with the docstrip utility. %% %% (c) copyright Jan 2002 by -%% Antonis Tsolomitis and Ioannis Vasilogiorgakis. +%% Tsolomitis Antonis and Vasilogiorgakis Ioannis. %% Modified by A. Tsolomitis January 2006. %% -%% This program can be redistributed and/or modified under the terms -%% of the LaTeX Project Public License Distributed from CTAN -%% archives in directory macros/latex/base/lppl.txt; either -%% version 1 of the License, or any later version. %% %% THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY diff --git a/Master/texmf-dist/tex/latex/gfsdidot/t1udidot.fd b/Master/texmf-dist/tex/latex/gfsdidot/t1udidot.fd index 6805151aed1..be83d05e033 100644 --- a/Master/texmf-dist/tex/latex/gfsdidot/t1udidot.fd +++ b/Master/texmf-dist/tex/latex/gfsdidot/t1udidot.fd @@ -1,14 +1,10 @@ -%% This is file 't1udidot.fd'. +%% This is file 't1udidot.fd', +%% generated with the docstrip utility. %% %% (c) copyright Jan 2002 by -%% Antonis Tsolomitis and Ioannis Vasilogiorgakis. +%% Tsolomitis Antonis and Vasilogiorgakis Ioannis. %% Modified by A. Tsolomitis, January 2006. %% -%% This program can be redistributed and/or modified under the terms -%% of the LaTeX Project Public License Distributed from CTAN -%% archives in directory macros/latex/base/lppl.txt; either -%% version 1 of the License, or any later version. -%% %% THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \DeclareFontFamily{T1}{udidot}{} diff --git a/Master/texmf-dist/tex/latex/gfsdidot/uudidotnums.fd b/Master/texmf-dist/tex/latex/gfsdidot/uudidotnums.fd index 6350cd32d2e..379fcae915f 100644 --- a/Master/texmf-dist/tex/latex/gfsdidot/uudidotnums.fd +++ b/Master/texmf-dist/tex/latex/gfsdidot/uudidotnums.fd @@ -1,7 +1,8 @@ -%% This is file 'uudidotnums.fd'. +%% This is file 'uudidotnums.fd', +%% generated with the docstrip utility. %% %% (c) copyright Jan 2002 by -%% Antonis Tsolomitis and Ioannis Vasilogiorgakis. +%% Tsolomitis Antonis and Vasilogiorgakis Ioannis. %% %% THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 0b7b86d4495..a8225388e8a 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2570,7 +2570,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot' 'gfsbaskerville'=> 'B*Specimen.pdf', # no source 'gfsbodoni' => 'B*Specimen.pdf', # no source 'gfscomplutum' => 'C*Specimen.pdf', # no source - 'gfsdidot' => '[DO]*Specimen.pdf', # no source + 'gfsdidot' => '.pdf', # no source 'gfsneohellenic'=> 'N*Specimen.pdf', # no source 'jknapltx' => 'ubbold.fd', # clash bbold's Ubbold.fd; sauter bbold fails 'numericplots' => '.*\.m', # matlab |