summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-02-15 00:56:51 +0000
committerKarl Berry <karl@freefriends.org>2010-02-15 00:56:51 +0000
commitadf08a68b3e6d7d88c1953a1f5cb99a80b32b08c (patch)
tree60333c71dd96d3c909c29d0cbb7ba48bc5c9c323
parent4ccbc52dab3e0854855023d871eb57c855e1edad (diff)
euenc update (13feb10)
git-svn-id: svn://tug.org/texlive/trunk@17015 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/euenc/README73
-rw-r--r--Master/texmf-dist/doc/latex/euenc/euenc.pdfbin0 -> 153949 bytes
-rw-r--r--Master/texmf-dist/doc/latex/euenc/test-euxlm.ltx (renamed from Master/texmf-dist/doc/xelatex/euenc/test-eu1lm.ltx)27
-rw-r--r--Master/texmf-dist/doc/xelatex/euenc/README50
-rw-r--r--Master/texmf-dist/doc/xelatex/euenc/euenc.pdfbin63664 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/xelatex/euenc/test-eu1lm.pdfbin157935 -> 0 bytes
-rw-r--r--Master/texmf-dist/source/latex/euenc/Makefile90
-rw-r--r--Master/texmf-dist/source/latex/euenc/euenc.dtx (renamed from Master/texmf-dist/source/xelatex/euenc/euenc.dtx)439
-rw-r--r--Master/texmf-dist/source/xelatex/euenc/euenc.ins66
-rw-r--r--Master/texmf-dist/tex/latex/euenc/eu1enc.def (renamed from Master/texmf-dist/tex/xelatex/euenc/eu1enc.def)10
-rw-r--r--Master/texmf-dist/tex/latex/euenc/eu1lmdh.fd10
-rw-r--r--Master/texmf-dist/tex/latex/euenc/eu1lmr.fd (renamed from Master/texmf-dist/tex/xelatex/euenc/eu1lmr.fd)6
-rw-r--r--Master/texmf-dist/tex/latex/euenc/eu1lmss.fd (renamed from Master/texmf-dist/tex/xelatex/euenc/eu1lmss.fd)22
-rw-r--r--Master/texmf-dist/tex/latex/euenc/eu1lmssq.fd (renamed from Master/texmf-dist/tex/xelatex/euenc/eu1lmssq.fd)12
-rw-r--r--Master/texmf-dist/tex/latex/euenc/eu1lmtt.fd68
-rw-r--r--Master/texmf-dist/tex/latex/euenc/eu1lmvtt.fd (renamed from Master/texmf-dist/tex/xelatex/euenc/eu1lmvtt.fd)19
-rw-r--r--Master/texmf-dist/tex/latex/euenc/eu2enc.def36
-rw-r--r--Master/texmf-dist/tex/latex/euenc/eu2lmdh.fd10
-rw-r--r--Master/texmf-dist/tex/latex/euenc/eu2lmr.fd43
-rw-r--r--Master/texmf-dist/tex/latex/euenc/eu2lmss.fd36
-rw-r--r--Master/texmf-dist/tex/latex/euenc/eu2lmssq.fd22
-rw-r--r--Master/texmf-dist/tex/latex/euenc/eu2lmtt.fd68
-rw-r--r--Master/texmf-dist/tex/latex/euenc/eu2lmvtt.fd45
-rw-r--r--Master/texmf-dist/tex/xelatex/euenc/eu1lmdh.fd12
-rw-r--r--Master/texmf-dist/tex/xelatex/euenc/eu1lmtt.fd40
25 files changed, 752 insertions, 452 deletions
diff --git a/Master/texmf-dist/doc/latex/euenc/README b/Master/texmf-dist/doc/latex/euenc/README
new file mode 100644
index 00000000000..a3ae256d3d0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/euenc/README
@@ -0,0 +1,73 @@
+ The EU encodings
+
+
+This package is the first release of the first step towards offering a
+LaTeX font encoding based on unicode. No macro support is offered (the
+encoding is just a placeholder for now) but the EU1 (for XeTeX) and EU2
+(for LuaTeX) Latin Modern encoding is offered in order to access the
+OpenType versions of those fonts.
+
+This package is developed on <http://github.com/wspr/euenc>.
+
+
+Installation
+------------
+
+Here are the recommended installation methods (preferred first).
+
+1. If you are using TeX Live 2008 or later, use 'tlmgr install euenc'.
+Alternatively, try your (TeX or Linux) distribution's package management system.
+
+2. a. Grab euenc.tds.zip on the CTAN.
+ b. Unzip it at the root of one or your TDS trees.
+ c. You may need to update some filename database after, see your TeX
+distribution's manual for details.
+
+3. a. Grab the sources from CTAN or github.
+ b. Run 'make install TEXMFROOT=/path/to/texmf'.
+ c. See 2c.
+
+4. Try to figure it out by looking at the Makefile and comments in the sources.
+Note that the generation of the files need a shell and doesn't work under
+cygwin.
+
+
+Manifest
+--------
+
+Source files:
+ euenc.dtx single file source & doc for the package
+
+Derived files:
+ euenc.pdf documentation
+ test-euxlm.ltx LaTeX example document
+ convert-lmfd.sh Shell script to generate the eu*.fd files
+ sed-eu2lmr.sed Sed script to generate the eu2*.fr files
+ sed-eu1lmr.sed Sed script to generate the eu1*.fr files
+ eu1lmdh.fd Latin modern font description file
+ eu1lmr.fd .
+ eu1lmss.fd .
+ eu1lmssq.fd .
+ eu1lmtt.fd .
+ eu1lmvtt.fd .
+ eu2lmdh.fd .
+ eu2lmr.fd .
+ eu2lmss.fd .
+ eu2lmssq.fd .
+ eu2lmtt.fd .
+ eu2lmvtt.fd .
+
+
+License
+-------
+
+Copyright 2006-2010 Will Robertson <wspr81@gmail.com>
+Copyright 2009-2010 Elie Roux <elie.roux@telecom-bretagne.eu>
+Copyright 2009-2010 Khaled Hosny <khaledhosny@eglug.org>
+
+Distributable under the LaTeX Project Public License,
+version 1.3c or higher (your choice). The latest version of
+this license is at: http://www.latex-project.org/lppl.txt
+
+This work is "maintained" (as per LPPL maintenance status)
+by Will Robertson.
diff --git a/Master/texmf-dist/doc/latex/euenc/euenc.pdf b/Master/texmf-dist/doc/latex/euenc/euenc.pdf
new file mode 100644
index 00000000000..e312e9fb7c4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/euenc/euenc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/xelatex/euenc/test-eu1lm.ltx b/Master/texmf-dist/doc/latex/euenc/test-euxlm.ltx
index 0b422b6f0f5..6217003f328 100644
--- a/Master/texmf-dist/doc/xelatex/euenc/test-eu1lm.ltx
+++ b/Master/texmf-dist/doc/latex/euenc/test-euxlm.ltx
@@ -1,5 +1,5 @@
%%
-%% This is file `test-eu1lm.ltx',
+%% This is file `test-euxlm.ltx',
%% generated with the docstrip utility.
%%
%% The original source files were:
@@ -7,7 +7,8 @@
%% euenc.dtx (with options: `lmtest')
%%
%% _____________________________________
-%% Copyright ^^c2^^a9 2006-2008 Will Robertson
+%% The EUENC bundle
+%% Will Robertson, Elie Roux, Khaled Hosny
%%
%% License information appended.
%%
@@ -21,11 +22,23 @@
\DefineShortVerb{\|}
\usepackage{slantsc}
-\usepackage[EU1]{fontenc}
+\usepackage{ifluatex}
+\usepackage{ifxetex}
+\ifxetex
+ \def\EU{EU1}
+\else
+ \ifluatex
+ \usepackage{luaotfload}
+ \def\EU{EU2}
+ \else
+ \def\EU{T1}
+ \fi
+\fi
+\usepackage[\EU]{fontenc}
\usepackage{lmodern}
\begin{document}
-\title{Testing the Latin Modern \texttt{EU1} encoding}
+\title{Testing the Latin Modern \texttt{\EU} encoding}
\author{Will Robertson}
\maketitle
\thispagestyle{empty}
@@ -113,7 +126,9 @@
\end{document}
%%
-%% Copyright ^^c2^^a9 2006-2008 by Will Robertson <wspr81@gmail.com>
+%% Copyright 2006-2010 Will Robertson <wspr81@gmail.com>
+%% Copyright 2009-2010 Elie Roux <elie.roux@telecom-bretagne.eu>
+%% Copyright 2009-2010 Khaled Hosny <khaledhosny@eglug.org>
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
@@ -125,4 +140,4 @@
%% This work consists of the file euenc.dtx and various derived files.
%%
%%
-%% End of file `test-eu1lm.ltx'.
+%% End of file `test-euxlm.ltx'.
diff --git a/Master/texmf-dist/doc/xelatex/euenc/README b/Master/texmf-dist/doc/xelatex/euenc/README
deleted file mode 100644
index d0233a21295..00000000000
--- a/Master/texmf-dist/doc/xelatex/euenc/README
+++ /dev/null
@@ -1,50 +0,0 @@
-________________________
-THE EU ENCODING(S) v0.1d
-
-Warning: don't install this package with Latin Modern fonts prior to
-version 1.106, which was released in Feb 2008.
-
-This package is the first release of the first step towards offering a
-LaTeX font encoding based on unicode. XeTeX is the only engine currently
-utilising it to the best of my knowledge. No macro support is offered (the
-encoding is just a placeholder for now) but an EU1 Latin Modern encoding is
-offered in order to access the OpenType versions of those fonts.
-
-N.B. This will only work when xdvipdfmx is used as the output driver for
-XeTeX; xdv2pdf (Mac OS X only) does not support OpenType fonts that aren't
-installed in the system itself. As of XeTeX v0.997, xdv2pdf is no longer
-the default driver in Mac OS X.
-
-Usually you'll just want to use fontspec:
-\documentclass{article}
-\usepackage{fontspec}
-\begin{document}
-...
-\end{document}
-
-Example of use without fontspec:
-\documentclass{article}
-\usepackage[EU1]{fontenc}
-\usepackage{lmodern}
-\begin{document}
-...
-\end{document}
-
-See the accompanying file <test-eu1lm.ltx> for a complete example.
-
-____________
-INSTALLATION
-
-CTAN contains the necessary files to install for this package:
- - eu1enc.def
- - lm/eu1lm*.fd (* is a wild card: six files in all)
-These should be placed in $TEXMF/tex/xelatex/euenc .
-
-To generate these files from the euenc.dtx file, first run `latex eu1enc.ins`.
-This will extract the eu1enc.def file and a slew of shell scripts that
-create the lm/eu1lm*.fd files. These .fd files are generated by executing
-`sh convert-lmfd.sh`.
-
-______________
-Will Robertson
-2007
diff --git a/Master/texmf-dist/doc/xelatex/euenc/euenc.pdf b/Master/texmf-dist/doc/xelatex/euenc/euenc.pdf
deleted file mode 100644
index ddb55065e95..00000000000
--- a/Master/texmf-dist/doc/xelatex/euenc/euenc.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/xelatex/euenc/test-eu1lm.pdf b/Master/texmf-dist/doc/xelatex/euenc/test-eu1lm.pdf
deleted file mode 100644
index 463bdf095bb..00000000000
--- a/Master/texmf-dist/doc/xelatex/euenc/test-eu1lm.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/source/latex/euenc/Makefile b/Master/texmf-dist/source/latex/euenc/Makefile
new file mode 100644
index 00000000000..d0b4f8dfcf8
--- /dev/null
+++ b/Master/texmf-dist/source/latex/euenc/Makefile
@@ -0,0 +1,90 @@
+# Makefile for euenc
+
+NAME = euenc
+DOC = $(NAME).pdf
+DTX = $(NAME).dtx
+
+# Files grouped by generation mode
+FDFILES = eu1lmdh.fd eu1lmr.fd eu1lmss.fd eu1lmssq.fd eu1lmtt.fd eu1lmvtt.fd\
+eu2lmdh.fd eu2lmr.fd eu2lmss.fd eu2lmssq.fd eu2lmtt.fd eu2lmvtt.fd eu1enc.def eu2enc.def
+COMPILED = $(DOC)
+UNPACKED = test-euxlm.ltx
+GENERATED = $(COMPILED) $(UNPACKED) $(FDFILES)
+SOURCE = $(DTX) README Makefile
+
+# Files grouped by installation location
+RUNFILES = $(FDFILES)
+DOCFILES = $(DOC) README $(UNPACKED)
+SRCFILES = $(DTX) Makefile
+
+# The following definitions should be equivalent
+# ALL_FILES = $(RUNFILES) $(DOCFILES) $(SRCFILES)
+ALL_FILES = $(GENERATED) $(SOURCE)
+
+# Installation locations
+FORMAT = latex
+RUNDIR = $(TEXMFROOT)/tex/$(FORMAT)/$(NAME)
+DOCDIR = $(TEXMFROOT)/doc/$(FORMAT)/$(NAME)
+SRCDIR = $(TEXMFROOT)/source/$(FORMAT)/$(NAME)
+TEXMFROOT = ./texmf
+
+CTAN_ZIP = $(NAME).zip
+TDS_ZIP = $(NAME).tds.zip
+ZIPS = $(CTAN_ZIP) $(TDS_ZIP)
+
+DO_PDFLATEX = pdflatex --interaction=batchmode $< >/dev/null
+DO_SED = sh convert-lmfd.sh
+
+all: $(GENERATED)
+doc: $(COMPILED)
+unpack: $(UNPACKED)
+ctan: $(CTAN_ZIP)
+tds: $(TDS_ZIP)
+world: all ctan
+
+$(COMPILED): $(DTX)
+ $(DO_PDFLATEX)
+ $(DO_PDFLATEX)
+ $(DO_SED)
+
+$(UNPACKED): $(COMPILED)
+
+$(FDFILES): $(COMPILED)
+
+$(CTAN_ZIP): $(SOURCE) $(COMPILED) $(TDS_ZIP)
+ @echo "Making $@ for CTAN upload."
+ @$(RM) -- $@
+ @zip -9 $@ $^ >/dev/null
+
+define run-install
+@mkdir -p $(RUNDIR) && cp $(RUNFILES) $(RUNDIR)
+@mkdir -p $(DOCDIR) && cp $(DOCFILES) $(DOCDIR)
+@mkdir -p $(SRCDIR) && cp $(SRCFILES) $(SRCDIR)
+endef
+
+$(TDS_ZIP): TEXMFROOT=./tmp-texmf
+$(TDS_ZIP): $(ALL_FILES)
+ @echo "Making TDS-ready archive $@."
+ @$(RM) -- $@
+ $(run-install)
+ @cd $(TEXMFROOT) && zip -9 ../$@ -r . >/dev/null
+ @$(RM) -r -- $(TEXMFROOT)
+
+.PHONY: install manifest clean mrproper
+
+install: $(ALL_FILES)
+ @echo "Installing in '$(TEXMFROOT)'."
+ $(run-install)
+
+manifest:
+ @echo "Source files:"
+ @for f in $(SOURCE); do echo $$f; done
+ @echo ""
+ @echo "Derived files:"
+ @for f in $(GENERATED); do echo $$f; done
+
+clean:
+ @$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg
+
+mrproper: clean
+ @$(RM) -- $(GENERATED) $(ZIPS)
diff --git a/Master/texmf-dist/source/xelatex/euenc/euenc.dtx b/Master/texmf-dist/source/latex/euenc/euenc.dtx
index 41773590b73..9c2262bcef5 100644
--- a/Master/texmf-dist/source/xelatex/euenc/euenc.dtx
+++ b/Master/texmf-dist/source/latex/euenc/euenc.dtx
@@ -1,11 +1,11 @@
% \iffalse meta-comment
%
-%!TEX encoding = UTF-8 Unicode
-%
-% Copyright 2005 by Will Robertson <wspr81@gmail.com>
+% Copyright 2006-2010 Will Robertson <wspr81@gmail.com>
+% Copyright 2009-2010 Elie Roux <elie.roux@telecom-bretagne.eu>
+% Copyright 2009-2010 Khaled Hosny <khaledhosny@eglug.org>
%
% Distributable under the LaTeX Project Public License,
-% version 1.3b or higher (your choice). The latest version of
+% version 1.3c or higher (your choice). The latest version of
% this license is at: http://www.latex-project.org/lppl.txt
%
% This work is "maintained" (as per LPPL maintenance status)
@@ -14,8 +14,13 @@
% This work consists of the file euenc.dtx and various derived files.
%
%<*dtxinfo>
-\ProvidesFile{euenc.dtx}[2008/05/14 v0.1e Experimental unicode font encodings]
+\ProvidesFile{euenc.dtx}
%</dtxinfo>
+%<eu1>\ProvidesFile{eu1enc.def}
+%<eu2>\ProvidesFile{eu2enc.def}
+%<*eu1|eu2>
+ [2010/01/28 v0.1f Experimental Unicode font encodings]
+%</eu1|eu2>
%
%<*internalbatchfile>
\begingroup
@@ -26,15 +31,17 @@
\preamble
_____________________________________
- Copyright © 2006-2008 Will Robertson
+ The EUENC bundle
+ Will Robertson, Elie Roux, Khaled Hosny
License information appended.
-
\endpreamble
\postamble
-Copyright © 2006-2008 by Will Robertson <wspr81@gmail.com>
+Copyright 2006-2010 Will Robertson <wspr81@gmail.com>
+Copyright 2009-2010 Elie Roux <elie.roux@telecom-bretagne.eu>
+Copyright 2009-2010 Khaled Hosny <khaledhosny@eglug.org>
Distributable under the LaTeX Project Public License,
version 1.3c or higher (your choice). The latest version of
@@ -47,24 +54,19 @@ This work consists of the file \jobname.dtx and various derived files.
\endpostamble
\askforoverwritefalse
-\generate{\file{euenc.ins}{\from{\jobname.dtx}{batchfile}}}
-\generate{\file{euenc-style.sty}{\from{\jobname.dtx}{dtx-style}}}
\generate{\file{eu1enc.def}{\from{\jobname.dtx}{eu1}}}
-\generate{\file{test-eu1lm.ltx}{\from{\jobname.dtx}{lmtest}}}
-\nopreamble\nopostamble
-\generate{\file{README.txt}{\from{\jobname.dtx}{readme}}}
-\generate{\file{convert-lmfd.sh}{\from{\jobname.dtx}{lmscript}}}
-\generate{\file{sed-eu1lmr.sed}{\from{\jobname.dtx}{sedlmr}}}
-\generate{\file{sed-eu1lmdh.sed}{\from{\jobname.dtx}{sedlmdh}}}
-\generate{\file{sed-eu1lmss.sed}{\from{\jobname.dtx}{sedlmss}}}
-\generate{\file{sed-eu1lmssq.sed}{\from{\jobname.dtx}{sedlmssq}}}
-\generate{\file{sed-eu1lmtt.sed}{\from{\jobname.dtx}{sedlmtt}}}
-\generate{\file{sed-eu1lmvtt.sed}{\from{\jobname.dtx}{sedlmvtt}}}
+\generate{\file{eu2enc.def}{\from{\jobname.dtx}{eu2}}}
+\generate{\file{test-euxlm.ltx}{\from{\jobname.dtx}{lmtest}}}
%</batchfile>
%<batchfile>\endbatchfile
%<*internalbatchfile>
+\generate{\file{euenc.ins}{\from{\jobname.dtx}{batchfile}}}
+\generate{\file{euenc-style.sty}{\from{\jobname.dtx}{dtx-style}}}
+\nopreamble\nopostamble
+\generate{\file{convert-lmfd.sh}{\from{\jobname.dtx}{lmscript}}}
+\generate{\file{sed-eu1lm.sed}{\from{\jobname.dtx}{eu1sedlm}}}
+\generate{\file{sed-eu2lm.sed}{\from{\jobname.dtx}{eu2sedlm}}}
\endgroup
-\immediate\write18{sh convert-lmfd.sh}%
%</internalbatchfile>
%
%<*driver>
@@ -85,15 +87,15 @@ This work consists of the file \jobname.dtx and various derived files.
% \errorcontextlines=999 ^^A% Show up all my mistakes
% \GetFileInfo{euenc.dtx}
%
-% \title{The experimental unicode `\EUx' encodings}
-% \author{Will Robertson}
+% \title{The Experimental Unicode `\EUx' Encodings}
+% \author{Will Robertson \and Elie Roux \and Khaled Hosny}
% \date{\filedate \qquad \fileversion}
%
% \maketitle
%
-% \begin{abstract}
-% This file documents some experimental unicode font encodings, initially
-% used for \XeTeX. Includes Latin Modern font definitions for version 1.106 of those fonts.
+% \begin{abstract}\noindent
+% This file documents some experimental Unicode font encodings,
+% used for \XeTeX\ and Lua\TeX. Includes Latin Modern font definitions for version 1.6 and later of those fonts.
% \end{abstract}
%
% \tableofcontents
@@ -105,21 +107,21 @@ This work consists of the file \jobname.dtx and various derived files.
% It is also a sensible system for typesetting multilingual documents
% while remaining within \TeX's restrictions of 8-bit fonts.
%
-% When \XeTeX\ came along, no work had seemingly been done on using
-% this infrastructure for unicode fonts. For one thing, the notion of a well-defined
-% font encoding — which neatly pigeonholes a font into a category of containing
-% a specific set of glyphs — doesn't work so well when designers have
+% When \XeTeX\ came along, no work had been done on using
+% this infrastructure for Unicode fonts. For one thing, the notion of a well-defined
+% font encoding --- which neatly pigeonholes a font into a category of containing
+% a specific set of glyphs --- doesn't work so well when designers have
% an essentially unrestricted selection of glyphs they may add to their fonts.
%
-% Both technical advantages of \LaTeX's font encodings — error checking, and
-% multilingual typesetting — were no longer relevant with \XeTeX, due to
+% Both technical advantages of \LaTeX's font encodings --- error checking, and
+% multilingual typesetting --- were no longer relevant with \XeTeX, due to
% impracticality for the former and redundancy in the latter; \XeTeX's support
-% of OpenType fonts obviates the need for font switching by necessity when changing
-% languages.
+% of OpenType fonts obviates the need for font switching (for glyph coverage only) by necessity when changing
+% languages, although multiple fonts will often be used for stylistic purposes.
%
% Nonetheless, font encodings are tied inextricably into \LaTeX's font selection
% mechanisms. For the first couple of years of \XeTeX's life, defined font families
-% were placed in the |U| encoding; appropriate, given the unicode initial, but
+% were placed in the |U| encoding; appropriate, given the Unicode initial, but
% \emph{inappropriate} within the framework of \LaTeX\ itself. The |U| encoding
% stands for `undefined', to be used for fonts that contain glyphs that are essentially
% arbitrary; for example, a Dingbats font.
@@ -127,36 +129,24 @@ This work consists of the file \jobname.dtx and various derived files.
% Since \XeLaTeX\ documents didn't interact with the `regular' world so much,
% this overloading of the encoding didn't really matter in the long run. But eventually,
% it became apparent that it would be appropriate to use font encodings to represent
-% unicode subsets and/or different methods of font loading (to be addressed later).
-%
-% This document contains the first steps in this direction.
-%
-% \section{The \EUx\ encodings}
-%
-% As with much of my \XeTeX\ work, nothing can be relied upon to last
-% unchanged into the future. This is an unfortunate fact that extensions to \TeX\
-% that deal with unicode (>16 bit fonts) are still many and varied (by this time next
-% year, there will be at least four\footnote{\XeTeX, Lua\TeX, Omega/Aleph, \ExTeX,
-% if I've counted correctly}). \XeTeX\ is the only one with active macro
-% development at the present time to the best of my knowledge. It thus serves
-% as a testbed for new ideas; furthermore, I'm learning all of this stuff too so
-% it's possible that I'll make conceptual mistakes that require changes later on.
+% Unicode subsets and/or different methods of font loading. With the advent of Lua\TeX,
+% this latter use has justified the approach originally taken here.
%
% \section{The \EU1 encoding}
%
% The \EU1 encoding represents the first attempt of providing a
-% standard \LaTeX\ encoding for unicode fonts.
+% standard \LaTeX\ encoding for Unicode fonts.
% At present, it loads and defines nothing in terms of declaring text
-% glyphs and accents. That rôle is played for now by Ross Moore's \pkg{xunicode}
+% glyphs and accents. That r\^{o}le is played for now by Ross Moore's \pkg{xunicode}
% package; in the future I hope some of that package will migrate here.
%
% Because we can assume that all current \TeX\ distributions will
% contain the Latin Modern OpenType fonts (\path{fonts/opentype/public/lm}),
-% this is selected as the default font. More details on this font later.
+% these are selected as the default fonts. More details on this later.
%
% I am now defining the convention that \EU1 encoded fonts have no
-% necessary subsets of unicode. Perhaps in the future this will be restricted
-% to fonts that support unicode accent characters.
+% necessary subsets of Unicode. Perhaps in the future this will be restricted
+% to fonts that support Unicode accent characters.
%
% Furthermore, no restrictions are made on the method used to load the font.
% \XeTeX\ allows fonts of two types: system installed fonts (also accessible
@@ -166,7 +156,6 @@ This work consists of the file \jobname.dtx and various derived files.
%<*eu1>
% \fi
% \begin{macrocode}
-\ProvidesFile{eu1enc.def}[2008/03/08 v0.1d Experimental unicode font encoding]
\DeclareFontEncoding{EU1}{}{}
\DeclareErrorFont{EU1}{lmr}{m}{n}{10}
\DeclareFontSubstitution{EU1}{lmr}{m}{n}
@@ -180,178 +169,136 @@ This work consists of the file \jobname.dtx and various derived files.
%</eu1>
% \fi
%
+% \section{The \EU2 encoding}
+%
+% The \EU2 encoding is to be used with Lua\TeX, it is essentially the same as
+% \EU1, the actual difference is in the font definition files.
+% \iffalse
+%<*eu2>
+% \fi
+% \begin{macrocode}
+\DeclareFontEncoding{EU2}{}{}
+\DeclareErrorFont{EU2}{lmr}{m}{n}{10}
+\DeclareFontSubstitution{EU2}{lmr}{m}{n}
+% \end{macrocode}
+% The |:| character needs to be sanitised in case \pkg{babel} makes it active:
+% \begin{macrocode}
+\g@addto@macro\nfss@catcodes{\@makeother:}
+% \end{macrocode}
+% \iffalse
+%</eu2>
+% \fi
+%
% \section{The Latin Modern OpenType fonts}
%
-% Version 0.1c/d of \pkg{euenc} supports version~1.106 of the LM fonts, released in February 2008.
+% Version 0.2 of \pkg{euenc} supports version~1.6 of the LM fonts, released in October 2009.
%
% \subsection{Conversion scripts}
% The |.fd| files are converted from the \enc{T1} encoding
-% with the following shell script. In order to generate
-% the Latin Modern \EU1 encoding font definitions, execute the following commands:
-% \begin{verbatim}
-% latex euenc.ins
-% sh convert-lmfd.sh
-% \end{verbatim}
-% The sources that allow this generation are shown following.
+% with the following shell script.
+% Only the package maintainers need to be able to run this script and those following.
%
% \subsubsection{Encoding conversion shell script}
-% Make sure the \texttt{lm/} directory exists before running this script.
+%
% \iffalse
%<*lmscript>
% \fi
% \begin{macrocode}
-sed -E -f sed-eu1lmr.sed `kpsewhich t1lmr.fd` > lm/eu1lmr.fd
-sed -E -f sed-eu1lmdh.sed `kpsewhich t1lmdh.fd` > lm/eu1lmdh.fd
-sed -E -f sed-eu1lmss.sed `kpsewhich t1lmss.fd` > lm/eu1lmss.fd
-sed -E -f sed-eu1lmssq.sed `kpsewhich t1lmssq.fd` > lm/eu1lmssq.fd
-sed -E -f sed-eu1lmtt.sed `kpsewhich t1lmtt.fd` > lm/eu1lmtt.fd
-sed -E -f sed-eu1lmvtt.sed `kpsewhich t1lmvtt.fd` > lm/eu1lmvtt.fd
+sed -f sed-eu1lm.sed `kpsewhich t1lmr.fd` > eu1lmr.fd
+sed -f sed-eu1lm.sed `kpsewhich t1lmdh.fd` > eu1lmdh.fd
+sed -f sed-eu1lm.sed `kpsewhich t1lmss.fd` > eu1lmss.fd
+sed -f sed-eu1lm.sed `kpsewhich t1lmssq.fd` > eu1lmssq.fd
+sed -f sed-eu1lm.sed `kpsewhich t1lmvtt.fd` > eu1lmvtt.fd
+
+sed -f sed-eu2lm.sed `kpsewhich t1lmr.fd` > eu2lmr.fd
+sed -f sed-eu2lm.sed `kpsewhich t1lmdh.fd` > eu2lmdh.fd
+sed -f sed-eu2lm.sed `kpsewhich t1lmss.fd` > eu2lmss.fd
+sed -f sed-eu2lm.sed `kpsewhich t1lmssq.fd` > eu2lmssq.fd
+sed -f sed-eu2lm.sed `kpsewhich t1lmvtt.fd` > eu2lmvtt.fd
+
+sed -f sed-eu1lm.sed -e \
+ 's/:mapping=tex-text//g' `kpsewhich t1lmtt.fd` > eu1lmtt.fd
+sed -f sed-eu2lm.sed -e \
+ 's/;.trep;.tlig;//g' `kpsewhich t1lmtt.fd` > eu2lmtt.fd
% \end{macrocode}
% \iffalse
%</lmscript>
% \fi
%
% \subsubsection{Encoding conversion \texttt{sed} scripts}
-% The shell script above clearly requires the following quickly assembled |sed| scripts.
-% No doubt they could be reduced to a single script with enough motivation. For now, they work.
+% The shell script above clearly requires the following |sed| scripts.
%
-% \paragraph{Roman}
+% \paragraph{Sed scripts}
% \iffalse
-%<*sedlmr>
+%<*eu1sedlm,eu2sedlm>
% \fi
% \begin{macrocode}
/^%.*/d
-s/{T1}/{EU1}/g
-s/t1lm/eu1lm/g
-
-s/ec-lmri([0-9]*)/lmroman\1-italic/g
-s/ec-lmro([0-9]*)/lmromanslant\1-regular/g
-s/ec-lmr([0-9]*)/lmroman\1-regular/g
-s/ec-lmcsco([0-9]*)/lmromancaps\1-oblique/g
-s/ec-lmcsc([0-9]*)/lmromancaps\1-regular/g
-
-s/ec-lmbxo([0-9]*)/lmromanslant\1-bold/g
-s/ec-lmbxi([0-9]*)/lmroman\1-bolditalic/g
-s/ec-lmbx([0-9]*)/lmroman\1-bold/g
-s/ec-lmbo([0-9]*)/lmromandemi\1-oblique/g
-s/ec-lmb([0-9]*)/lmromandemi\1-regular/g
-
-s/(>.[ ]*)(lm[a-z0-9\-]*)/\1"[\2]:mapping=tex-text"/g
-% \end{macrocode}
-% \iffalse
-%</sedlmr>
-% \fi
-% \paragraph{Dunhill}
-% \iffalse
-%<*sedlmdh>
-% \fi
-% \begin{macrocode}
-/^%.*/d
-s/{T1}/{EU1}/g
-s/t1lm/eu1lm/g
-
-s/ec-lmdunh([0-9]*)/lmromandunh\1-regular/g
-s/ec-lmduno([0-9]*)/lmromandunh\1-oblique/g
-% \end{macrocode}
-% \changes{v0.1e}{2008/05/14}{Oblique dunh was wrong (?!).}
-% \iffalse
-%</sedlmdh>
-% \fi
-% \paragraph{Sans}
-% \iffalse
-%<*sedlmss>
-% \fi
-% \begin{macrocode}
-/^%.*/d
-s/{T1}/{EU1}/g
-s/t1lm/eu1lm/g
+%<eu1sedlm>s/{T1}/{EU1}/g
+%<eu1sedlm>s/t1lm/eu1lm/g
+%<eu2sedlm>s/{T1}/{EU2}/g
+%<eu2sedlm>s/t1lm/eu2lm/g
-s/ec-lmss([0-9]+)/lmsans\1-regular/g
-s/ec-lmsso([0-9]+)/lmsans\1-oblique/g
+s/ec-lmri\([0-9]*\)/lmroman\1-italic/g
+s/ec-lmro\([0-9]*\)/lmromanslant\1-regular/g
+s/ec-lmr\([0-9]*\)/lmroman\1-regular/g
+s/ec-lmcsco\([0-9]*\)/lmromancaps\1-oblique/g
+s/ec-lmcsc\([0-9]*\)/lmromancaps\1-regular/g
-s/ec-lmssdc([0-9]+)/lmsansdemicond\1-regular/g
-s/ec-lmssdo([0-9]+)/lmsansdemicond\1-oblique/g
+s/ec-lmbxo\([0-9]*\)/lmromanslant\1-bold/g
+s/ec-lmbxi\([0-9]*\)/lmroman\1-bolditalic/g
+s/ec-lmbx\([0-9]*\)/lmroman\1-bold/g
+s/ec-lmbo\([0-9]*\)/lmromandemi\1-oblique/g
+s/ec-lmb\([0-9]*\)/lmromandemi\1-regular/g
-s/ec-lmssbx([0-9]+)/lmsans\1-bold/g
-s/ec-lmssbo([0-9]+)/lmsans\1-boldoblique/g
+s/ec-lmdunh\([0-9]*\)/lmromandunh\1-regular/g
+s/ec-lmduno\([0-9]*\)/lmromandunh\1-oblique/g
-s/(>.[ ]*)(lm[a-z0-9\-]+)/\1"[\2]:mapping=tex-text"/g
-% \end{macrocode}
-% \changes{v0.1}{2007/01/18}{`ssdc' and `ssdo' were switched with the upright for some reason.}
-% \iffalse
-%</sedlmss>
-% \fi
-% \paragraph{Sans Quotation}
-% \iffalse
-%<*sedlmssq>
-% \fi
-% \begin{macrocode}
-/^%.*/d
-s/{T1}/{EU1}/g
-s/t1lm/eu1lm/g
+s/ec-lmss\([0-9]\{1,\}\)/lmsans\1-regular/g
+s/ec-lmsso\([0-9]\{1,\}\)/lmsans\1-oblique/g
-s/ec-lmssq([0-9]+)/lmsansquot\1-regular/g
-s/ec-lmssqo([0-9]+)/lmsansquot\1-oblique/g
-s/ec-lmssqbx([0-9]+)/lmsansquot\1-bold/g
-s/ec-lmssqbo([0-9]+)/lmsansquot\1-boldoblique/g
+s/ec-lmssdc\([0-9]\{1,\}\)/lmsansdemicond\1-regular/g
+s/ec-lmssdo\([0-9]\{1,\}\)/lmsansdemicond\1-oblique/g
-s/(>.[ ]*)(lm[a-z0-9\-]+)/\1"[\2]:mapping=tex-text"/g
-% \end{macrocode}
-% \iffalse
-%</sedlmssq>
-% \fi
-% \paragraph{Typewriter}
-% \iffalse
-%<*sedlmtt>
-% \fi
-% \begin{macrocode}
-/^%.*/d
-s/{T1}/{EU1}/g
-s/t1lm/eu1lm/g
+s/ec-lmssbx\([0-9]\{1,\}\)/lmsans\1-bold/g
+s/ec-lmssbo\([0-9]\{1,\}\)/lmsans\1-boldoblique/g
-s/ec-lmtt([0-9]+)/lmmono\1-regular/g
-s/ec-lmtto([0-9]+)/lmmonoslant\1-regular/g
-s/ec-lmtti([0-9]+)/lmmono\1-italic/g
+s/ec-lmssq\([0-9]\{1,\}\)/lmsansquot\1-regular/g
+s/ec-lmssqo\([0-9]\{1,\}\)/lmsansquot\1-oblique/g
+s/ec-lmssqbx\([0-9]\{1,\}\)/lmsansquot\1-bold/g
+s/ec-lmssqbo\([0-9]\{1,\}\)/lmsansquot\1-boldoblique/g
-s/ec-lmtcsc([0-9]+)/lmmonocaps\1-regular/g
-s/ec-lmtcso([0-9]+)/lmmonocaps\1-oblique/g
+s/ec-lmtt\([0-9]\{1,\}\)/lmmono\1-regular/g
+s/ec-lmtto\([0-9]\{1,\}\)/lmmonoslant\1-regular/g
+s/ec-lmtti\([0-9]\{1,\}\)/lmmono\1-italic/g
-s/ec-lmtl([0-9]+)/lmmonolt\1-regular/g
-s/ec-lmtlo([0-9]+)/lmmonolt\1-oblique/g
-s/ec-lmtk([0-9]+)/lmmonolt\1-bold/g
-s/ec-lmtko([0-9]+)/lmmonolt\1-boldoblique/g
+s/ec-lmtcsc\([0-9]\{1,\}\)/lmmonocaps\1-regular/g
+s/ec-lmtcso\([0-9]\{1,\}\)/lmmonocaps\1-oblique/g
-s/ec-lmtlc([0-9]+)/lmmonoltcond\1-regular/g
-s/ec-lmtlco([0-9]+)/lmmonoltcond\1-oblique/g
+s/ec-lmtl\([0-9]\{1,\}\)/lmmonolt\1-regular/g
+s/ec-lmtlo\([0-9]\{1,\}\)/lmmonolt\1-oblique/g
+s/ec-lmtk\([0-9]\{1,\}\)/lmmonolt\1-bold/g
+s/ec-lmtko\([0-9]\{1,\}\)/lmmonolt\1-boldoblique/g
-s/(>.[ ]*)(lm[a-z0-9\-]+)/\1"[\2]"/g
-% \end{macrocode}
-% \changes{v0.1d}{2008/03/08}{Missed typewriter italic somehow.}
-% \changes{v0.1e}{2008/05/14}{Oblique mono was wrong (?!).}
-% \iffalse
-%</sedlmtt>
-% \fi
-% \paragraph{Variable-width Typewriter}
-% \iffalse
-%<*sedlmvtt>
-% \fi
-% \begin{macrocode}
-/^%.*/d
-s/{T1}/{EU1}/g
-s/t1lm/eu1lm/g
+s/ec-lmtlc\([0-9]\{1,\}\)/lmmonoltcond\1-regular/g
+s/ec-lmtlco\([0-9]\{1,\}\)/lmmonoltcond\1-oblique/g
-s/ec-lmvtt([0-9]+)/lmmonoprop\1-regular/g
-s/ec-lmvtto([0-9]+)/lmmonoprop\1-oblique/g
+s/ec-lmvtt\([0-9]\{1,\}\)/lmmonoprop\1-regular/g
+s/ec-lmvtto\([0-9]\{1,\}\)/lmmonoprop\1-oblique/g
-s/ec-lmvtl([0-9]+)/lmmonoproplt\1-regular/g
-s/ec-lmvtlo([0-9]+)/lmmonoproplt\1-oblique/g
-s/ec-lmvtk([0-9]+)/lmmonoproplt\1-bold/g
-s/ec-lmvtko([0-9]+)/lmmonoproplt\1-boldoblique/g
+s/ec-lmvtl\([0-9]\{1,\}\)/lmmonoproplt\1-regular/g
+s/ec-lmvtlo\([0-9]\{1,\}\)/lmmonoproplt\1-oblique/g
+s/ec-lmvtk\([0-9]\{1,\}\)/lmmonoproplt\1-bold/g
+s/ec-lmvtko\([0-9]\{1,\}\)/lmmonoproplt\1-boldoblique/g
-s/(>.[ ]*)(lm[a-z0-9\-]+)/\1"[\2]:mapping=tex-text"/g
+%<eu1sedlm>s/\(>.[ ]*\)\(lm[a-z0-9\-]\{1,\}\)/\1"[\2]:mapping=tex-text"/g
+%<eu2sedlm>s/\(>.[ ]*\)\(lm[a-z0-9\-]\{1,\}\)/\1file:\2:script=latn;+trep;+tlig;/g
% \end{macrocode}
+% \changes{v0.1}{2007/01/18}{`ssdc' and `ssdo' were switched with the upright for some reason.}
+% \changes{v0.1d}{2008/03/08}{Missed typewriter italic somehow.}
+% \changes{v0.1e}{2008/05/14}{Oblique mono was wrong (?!).}
% \iffalse
-%</sedlmvtt>
+%</eu1sedlm,eu2sedlm>
% \fi
%
% \subsection{Latin Modern test file}
@@ -371,11 +318,23 @@ s/(>.[ ]*)(lm[a-z0-9\-]+)/\1"[\2]:mapping=tex-text"/g
\DefineShortVerb{\|}
\usepackage{slantsc}
-\usepackage[EU1]{fontenc}
+\usepackage{ifluatex}
+\usepackage{ifxetex}
+\ifxetex
+ \def\EU{EU1}
+\else
+ \ifluatex
+ \usepackage{luaotfload}
+ \def\EU{EU2}
+ \else
+ \def\EU{T1}
+ \fi
+\fi
+\usepackage[\EU]{fontenc}
\usepackage{lmodern}
\begin{document}
-\title{Testing the Latin Modern \texttt{EU1} encoding}
+\title{Testing the Latin Modern \texttt{\EU} encoding}
\author{Will Robertson}
\maketitle
\thispagestyle{empty}
@@ -478,61 +437,6 @@ s/(>.[ ]*)(lm[a-z0-9\-]+)/\1"[\2]:mapping=tex-text"/g
%
%\iffalse
%
-%<*readme>
-% \begin{macrocode}
-________________________
-THE EU ENCODING(S) v0.1e
-
-Warning: don't install this package with Latin Modern fonts prior to
-version 1.106, which was released in Feb 2008.
-
-This package is the first release of the first step towards offering a
-LaTeX font encoding based on unicode. XeTeX is the only engine currently
-utilising it to the best of my knowledge. No macro support is offered (the
-encoding is just a placeholder for now) but an EU1 Latin Modern encoding is
-offered in order to access the OpenType versions of those fonts.
-
-N.B. This will only work when xdvipdfmx is used as the output driver for
-XeTeX; xdv2pdf (Mac OS X only) does not support OpenType fonts that aren't
-installed in the system itself. As of XeTeX v0.997, xdv2pdf is no longer
-the default driver in Mac OS X.
-
-Usually you'll just want to use fontspec:
-\documentclass{article}
-\usepackage{fontspec}
-\begin{document}
-...
-\end{document}
-
-Example of use without fontspec:
-\documentclass{article}
-\usepackage[EU1]{fontenc}
-\usepackage{lmodern}
-\begin{document}
-...
-\end{document}
-
-See the accompanying file <test-eu1lm.ltx> for a complete example.
-
-____________
-INSTALLATION
-
-CTAN contains the necessary files to install for this package:
- - eu1enc.def
- - lm/eu1lm*.fd (* is a wild card: six files in all)
-These should be placed in $TEXMF/tex/xelatex/euenc .
-
-To generate these files from the euenc.dtx file, first run `latex eu1enc.ins`.
-This will extract the eu1enc.def file and a slew of shell scripts that
-create the lm/eu1lm*.fd files. These .fd files are generated by executing
-`sh convert-lmfd.sh`.
-
-______________
-Will Robertson
-2007-2008
-% \end{macrocode}
-%</readme>
-%
%<*dtx-style>
% \begin{macrocode}
\ProvidesPackage{euenc-style}
@@ -555,7 +459,20 @@ Will Robertson
{\endlist}
\usepackage{booktabs,calc,color,fancyvrb,graphicx,ifthen,refstyle,url,varioref}
-\usepackage{fontspec,xltxtra}
+\usepackage{metalogo}
+\usepackage{tgpagella,eulervm}
+\usepackage[scaled=1.1]{inconsolata}
+\usepackage[
+ bookmarks=true,
+ colorlinks=true,
+ linkcolor=niceblue,
+ urlcolor=niceblue,
+ citecolor=niceblue,
+ pdftitle={The Experimental Unicode 'EUx' Encodings},
+ pdfsubject={Experimental Unicode font encodings for Unicode TeX engines},
+ pdfauthor={Will Robertson},
+ pdfkeywords={xetex, xelatex, luatex, lualatex, unicode, fontenc}
+ ]{hyperref}
\definecolor{niceblue}{rgb}{0.4,0.6,1.000}
\newenvironment{example}
@@ -610,21 +527,17 @@ Will Robertson
\def\ie{\latin{i.e.}}
\def\etc{\@ifnextchar.{\latin{etc}}{\latin{etc.}\@}}
-%% LOGOS, tuned for Palatino:
-\TeX@logo@spacing{-0.12em}{-0.12em}%
- {0.5ex}{-0.3em}{-0.12em}{-0.1em}
+%% LOGOS, tuned for Pagella:
+\setlogokern{Te}{-0.12em}%
+\setlogokern{eT}{-0.12em}%
+\setlogokern{eX}{-0.12em}%
+\setlogokern{Xe}{-0.12em}%
+\setlogokern{La}{-0.3em}%
+\setlogokern{aT}{-0.12em}%
+\setlogokern{eL}{-0.1em}
\def\MacOSX{Mac~OS~X}
-%% fontspec declarations:
-\setromanfont[Mapping=tex-text]{FPL Neu}
-\defaultfontfeatures{Scale=MatchLowercase}
-\setsansfont[Mapping=tex-text,
- BoldFont={Skia},
- BoldFeatures={Weight=1.7}]{Skia}
-\setmonofont{Osaka-Mono}
-\defaultfontfeatures{Mapping=tex-text}
-
\DeclareRobustCommand\ExTeX{\textrm{\relax
\ensuremath{\textstyle\varepsilon_{\kern-0.15em\mathcal{X}}}\relax
\kern-.15em\TeX}}
@@ -633,10 +546,9 @@ Will Robertson
\def\EUx{\enc{EU$x$}}
%% (La)TeX font-related declarations:
-\linespread{1.05} % FPL Neu needs more space between lines
+\linespread{1.05} % Pagella needs more space between lines
\frenchspacing % Remove ugly extra space after punctuation
-\def\MacOSX{Mac~OS~X}
% \end{macrocode}
%</dtx-style>
%\fi
@@ -645,11 +557,10 @@ Will Robertson
% \typeout{*************************************************************}
% \typeout{*}
% \typeout{* To finish the installation you have to move the following}
-% \typeout{* file into a directory searched by XeTeX:}
+% \typeout{* files into a directory searched by LaTeX:}
% \typeout{*}
-% \typeout{* \space\space\space eu1enc.def}
+% \typeout{* \space\space\space eu1enc.def \space eu2enc.def \space eu*.fd }
% \typeout{*}
% \typeout{*************************************************************}
%
\endinput
- \ No newline at end of file
diff --git a/Master/texmf-dist/source/xelatex/euenc/euenc.ins b/Master/texmf-dist/source/xelatex/euenc/euenc.ins
deleted file mode 100644
index 1aa1823f308..00000000000
--- a/Master/texmf-dist/source/xelatex/euenc/euenc.ins
+++ /dev/null
@@ -1,66 +0,0 @@
-%%
-%% This is file `euenc.ins',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% euenc.dtx (with options: `batchfile')
-%%
-%% _____________________________________
-%% Copyright ^^c2^^a9 2006-2008 Will Robertson
-%%
-%% License information appended.
-%%
-\input docstrip.tex
-\keepsilent
-\preamble
-
- _____________________________________
- Copyright ^^c2^^a9 2006-2008 Will Robertson
-
- License information appended.
-
-\endpreamble
-\postamble
-
-Copyright ^^c2^^a9 2006-2008 by Will Robertson <wspr81@gmail.com>
-
-Distributable under the LaTeX Project Public License,
-version 1.3c or higher (your choice). The latest version of
-this license is at: http://www.latex-project.org/lppl.txt
-
-This work is "maintained" (as per LPPL maintenance status)
-by Will Robertson.
-
-This work consists of the file \jobname.dtx and various derived files.
-
-\endpostamble
-\askforoverwritefalse
-\generate{\file{euenc.ins}{\from{\jobname.dtx}{batchfile}}}
-\generate{\file{euenc-style.sty}{\from{\jobname.dtx}{dtx-style}}}
-\generate{\file{eu1enc.def}{\from{\jobname.dtx}{eu1}}}
-\generate{\file{test-eu1lm.ltx}{\from{\jobname.dtx}{lmtest}}}
-\nopreamble\nopostamble
-\generate{\file{README.txt}{\from{\jobname.dtx}{readme}}}
-\generate{\file{convert-lmfd.sh}{\from{\jobname.dtx}{lmscript}}}
-\generate{\file{sed-eu1lmr.sed}{\from{\jobname.dtx}{sedlmr}}}
-\generate{\file{sed-eu1lmdh.sed}{\from{\jobname.dtx}{sedlmdh}}}
-\generate{\file{sed-eu1lmss.sed}{\from{\jobname.dtx}{sedlmss}}}
-\generate{\file{sed-eu1lmssq.sed}{\from{\jobname.dtx}{sedlmssq}}}
-\generate{\file{sed-eu1lmtt.sed}{\from{\jobname.dtx}{sedlmtt}}}
-\generate{\file{sed-eu1lmvtt.sed}{\from{\jobname.dtx}{sedlmvtt}}}
-\endbatchfile
-%%
-%% Copyright ^^c2^^a9 2006-2008 by Will Robertson <wspr81@gmail.com>
-%%
-%% Distributable under the LaTeX Project Public License,
-%% version 1.3c or higher (your choice). The latest version of
-%% this license is at: http://www.latex-project.org/lppl.txt
-%%
-%% This work is "maintained" (as per LPPL maintenance status)
-%% by Will Robertson.
-%%
-%% This work consists of the file euenc.dtx and various derived files.
-%%
-%%
-%% End of file `euenc.ins'.
diff --git a/Master/texmf-dist/tex/xelatex/euenc/eu1enc.def b/Master/texmf-dist/tex/latex/euenc/eu1enc.def
index 07fcd1f0ac3..0ca233ce239 100644
--- a/Master/texmf-dist/tex/xelatex/euenc/eu1enc.def
+++ b/Master/texmf-dist/tex/latex/euenc/eu1enc.def
@@ -7,17 +7,21 @@
%% euenc.dtx (with options: `eu1')
%%
%% _____________________________________
-%% Copyright ^^c2^^a9 2006-2008 Will Robertson
+%% The EUENC bundle
+%% Will Robertson, Elie Roux, Khaled Hosny
%%
%% License information appended.
%%
-\ProvidesFile{eu1enc.def}[2008/03/08 v0.1d Experimental unicode font encoding]
+\ProvidesFile{eu1enc.def}
+ [2010/01/28 v0.1f Experimental Unicode font encodings]
\DeclareFontEncoding{EU1}{}{}
\DeclareErrorFont{EU1}{lmr}{m}{n}{10}
\DeclareFontSubstitution{EU1}{lmr}{m}{n}
\g@addto@macro\nfss@catcodes{\@makeother:}
%%
-%% Copyright ^^c2^^a9 2006-2008 by Will Robertson <wspr81@gmail.com>
+%% Copyright 2006-2010 Will Robertson <wspr81@gmail.com>
+%% Copyright 2009-2010 Elie Roux <elie.roux@telecom-bretagne.eu>
+%% Copyright 2009-2010 Khaled Hosny <khaledhosny@eglug.org>
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/latex/euenc/eu1lmdh.fd b/Master/texmf-dist/tex/latex/euenc/eu1lmdh.fd
new file mode 100644
index 00000000000..ae54bc4ef8d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euenc/eu1lmdh.fd
@@ -0,0 +1,10 @@
+
+\ProvidesFile{eu1lmdh.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
+\DeclareFontFamily{EU1}{lmdh}{}
+\DeclareFontShape{EU1}{lmdh}{m}{n}
+ {<-> "[lmromandunh10-regular]:mapping=tex-text"}{}
+\DeclareFontShape{EU1}{lmdh}{m}{it}
+ {<->sub*lmdh/m/sl}{}
+\DeclareFontShape{EU1}{lmdh}{m}{sl}
+ {<-> "[lmromandunh10-oblique]:mapping=tex-text"}{}
+\endinput
diff --git a/Master/texmf-dist/tex/xelatex/euenc/eu1lmr.fd b/Master/texmf-dist/tex/latex/euenc/eu1lmr.fd
index 7cef622659b..0d280efb087 100644
--- a/Master/texmf-dist/tex/xelatex/euenc/eu1lmr.fd
+++ b/Master/texmf-dist/tex/latex/euenc/eu1lmr.fd
@@ -1,5 +1,5 @@
-\ProvidesFile{eu1lmr.fd}[2007/01/14 v1.3 Font defs for Latin Modern]
+\ProvidesFile{eu1lmr.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
\DeclareFontFamily{EU1}{lmr}{}
\DeclareFontShape{EU1}{lmr}{m}{n}%
{<-5.5> "[lmroman5-regular]:mapping=tex-text" <5.5-6.5> "[lmroman6-regular]:mapping=tex-text"
@@ -20,6 +20,8 @@
}{}
\DeclareFontShape{EU1}{lmr}{m}{sc}%
{<-> "[lmromancaps10-regular]:mapping=tex-text"}{}
+\DeclareFontShape{EU1}{lmr}{m}{ui}%
+ {<-> ec-lmu10}{}
\DeclareFontShape{EU1}{lmr}{m}{scsl}%
{<-> "[lmromancaps10-oblique]:mapping=tex-text"}{}
\DeclareFontShape{EU1}{lmr}{b}{n}
@@ -36,4 +38,6 @@
{<-> "[lmroman10-bolditalic]:mapping=tex-text"}{}
\DeclareFontShape{EU1}{lmr}{bx}{sl}
{<-> "[lmromanslant10-bold]:mapping=tex-text"}{}
+\DeclareFontShape{EU1}{lmr}{b}{it}
+ {<->sub * lmr/b/sl}{}
\endinput
diff --git a/Master/texmf-dist/tex/xelatex/euenc/eu1lmss.fd b/Master/texmf-dist/tex/latex/euenc/eu1lmss.fd
index e813c54856b..e6b610cbc22 100644
--- a/Master/texmf-dist/tex/xelatex/euenc/eu1lmss.fd
+++ b/Master/texmf-dist/tex/latex/euenc/eu1lmss.fd
@@ -1,5 +1,5 @@
-\ProvidesFile{eu1lmss.fd}[2007/01/14 v1.3 Font defs for Latin Modern]
+\ProvidesFile{eu1lmss.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
\DeclareFontFamily{EU1}{lmss}{}
\DeclareFontShape{EU1}{lmss}{m}{n}
{<-8.5> "[lmsans8-regular]:mapping=tex-text"
@@ -14,17 +14,23 @@
<11-15.5> "[lmsans12-oblique]:mapping=tex-text" <15.5-> "[lmsans17-oblique]:mapping=tex-text"
}{}
\DeclareFontShape{EU1}{lmss}{m}{sc}
- {<->sub*lmr/m/sc}{}
+ {<->sub*lmr/m/sc}{}
+\DeclareFontShape{EU1}{lmss}{b}{n}
+ {<->ssub * lmss/bx/n}{}
+\DeclareFontShape{EU1}{lmss}{b}{sl}
+ {<->ssub * lmss/bx/sl}{}
+\DeclareFontShape{EU1}{lmss}{b}{it}
+ {<->ssub * lmss/bx/it}{}
\DeclareFontShape{EU1}{lmss}{sbc}{n}
-{<-> "[lmsansdemicond10-regular]:mapping=tex-text"}{}
+ {<-> "[lmsansdemicond10-regular]:mapping=tex-text"}{}
\DeclareFontShape{EU1}{lmss}{sbc}{sl}
-{<-> "[lmsansdemicond10-oblique]:mapping=tex-text"}{}
+ {<-> "[lmsansdemicond10-oblique]:mapping=tex-text"}{}
\DeclareFontShape{EU1}{lmss}{sbc}{it}
-{<->ssub*lmss/sbc/sl}{}
+ {<->ssub*lmss/sbc/sl}{}
\DeclareFontShape{EU1}{lmss}{bx}{n}
-{<-> "[lmsans10-bold]:mapping=tex-text"}{}
+ {<-> "[lmsans10-bold]:mapping=tex-text"}{}
\DeclareFontShape{EU1}{lmss}{bx}{sl}
-{<-> "[lmsans10-boldoblique]:mapping=tex-text"}{}
+ {<-> "[lmsans10-boldoblique]:mapping=tex-text"}{}
\DeclareFontShape{EU1}{lmss}{bx}{it}
-{<->ssub*lmss/bx/sl}{}
+ {<->ssub*lmss/bx/sl}{}
\endinput
diff --git a/Master/texmf-dist/tex/xelatex/euenc/eu1lmssq.fd b/Master/texmf-dist/tex/latex/euenc/eu1lmssq.fd
index 781b3f07bea..a70b7b0ee2d 100644
--- a/Master/texmf-dist/tex/xelatex/euenc/eu1lmssq.fd
+++ b/Master/texmf-dist/tex/latex/euenc/eu1lmssq.fd
@@ -1,5 +1,5 @@
-\ProvidesFile{eu1lmssq.fd}[2007/01/14 v1.3 Font defs for Latin Modern]
+\ProvidesFile{eu1lmssq.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
\DeclareFontFamily{EU1}{lmssq}{}
\DeclareFontShape{EU1}{lmssq}{m}{n}
{<-> "[lmsansquot8-regular]:mapping=tex-text"}{}
@@ -9,4 +9,14 @@
{<-> "[lmsansquot8-bold]:mapping=tex-text"}{}
\DeclareFontShape{EU1}{lmssq}{bx}{sl}
{<-> "[lmsansquot8-boldoblique]:mapping=tex-text"}{}
+\DeclareFontShape{EU1}{lmssq}{m}{it}
+ {<->ssub*lmssq/m/sl}{}
+\DeclareFontShape{EU1}{lmssq}{bx}{it}
+ {<->ssub*lmssq/bx/sl}{}
+\DeclareFontShape{EU1}{lmssq}{b}{n}
+ {<->ssub * lmssq/bx/n}{}
+\DeclareFontShape{EU1}{lmssq}{b}{sl}
+ {<->ssub * lmssq/bx/sl}{}
+\DeclareFontShape{EU1}{lmssq}{b}{it}
+ {<->ssub * lmssq/bx/it}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/euenc/eu1lmtt.fd b/Master/texmf-dist/tex/latex/euenc/eu1lmtt.fd
new file mode 100644
index 00000000000..ce67d6f0655
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euenc/eu1lmtt.fd
@@ -0,0 +1,68 @@
+
+\ProvidesFile{eu1lmtt.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
+\DeclareFontFamily{EU1}{lmtt}{\hyphenchar \font\m@ne}
+
+\ifx\lmtt@use@light@as@normal\@empty
+\DeclareFontShape{EU1}{lmtt}{sb}{n}
+ {<-8.5> "[lmmono8-regular]" <8.5-9.5> "[lmmono9-regular]"
+ <9.5-11> "[lmmono10-regular]" <11-> "[lmmono12-regular]"
+ }{}
+\DeclareFontShape{EU1}{lmtt}{sb}{it}
+ {<-> "[lmmono10-italic]"}{}
+\DeclareFontShape{EU1}{lmtt}{sb}{sl}
+ {<-> "[lmmonoslant10-regular]"}{}
+\DeclareFontShape{EU1}{lmtt}{sb}{sc}
+ {<-> "[lmmonocaps10-regular]"}{}
+\DeclareFontShape{EU1}{lmtt}{sb}{scsl}
+ {<-> "[lmmonocaps10-oblique]"}{}
+\DeclareFontShape{EU1}{lmtt}{m}{n}
+ {<-> "[lmmonolt10-regular]"}{}
+\DeclareFontShape{EU1}{lmtt}{m}{it}
+ {<->sub*lmtt/l/sl}{}
+\DeclareFontShape{EU1}{lmtt}{m}{sl}
+ {<-> "[lmmonolt10-oblique]"}{}
+\DeclareFontShape{EU1}{lmtt}{c}{n}
+ {<-> "[lmmonoltcond10-regular]"}{}
+\DeclareFontShape{EU1}{lmtt}{c}{it}
+ {<->sub*lmtt/lc/sl}{}
+\DeclareFontShape{EU1}{lmtt}{c}{sl}
+ {<-> "[lmmonoltcond10-oblique]"}{}
+\else
+\DeclareFontShape{EU1}{lmtt}{m}{n}
+ {<-8.5> "[lmmono8-regular]" <8.5-9.5> "[lmmono9-regular]"
+ <9.5-11> "[lmmono10-regular]" <11-> "[lmmono12-regular]"
+ }{}
+\DeclareFontShape{EU1}{lmtt}{m}{it}
+ {<-> "[lmmono10-italic]"}{}
+\DeclareFontShape{EU1}{lmtt}{m}{sl}
+ {<-> "[lmmonoslant10-regular]"}{}
+\DeclareFontShape{EU1}{lmtt}{m}{sc}
+ {<-> "[lmmonocaps10-regular]"}{}
+\DeclareFontShape{EU1}{lmtt}{m}{scsl}
+ {<-> "[lmmonocaps10-oblique]"}{}
+\DeclareFontShape{EU1}{lmtt}{l}{n}
+ {<-> "[lmmonolt10-regular]"}{}
+\DeclareFontShape{EU1}{lmtt}{l}{it}
+ {<->sub*lmtt/l/sl}{}
+\DeclareFontShape{EU1}{lmtt}{l}{sl}
+ {<-> "[lmmonolt10-oblique]"}{}
+\DeclareFontShape{EU1}{lmtt}{lc}{n}
+ {<-> "[lmmonoltcond10-regular]"}{}
+\DeclareFontShape{EU1}{lmtt}{lc}{it}
+ {<->sub*lmtt/lc/sl}{}
+\DeclareFontShape{EU1}{lmtt}{lc}{sl}
+ {<-> "[lmmonoltcond10-oblique]"}{}
+\fi
+\DeclareFontShape{EU1}{lmtt}{b}{n}
+ {<-> "[lmmonolt10-bold]"}{}
+\DeclareFontShape{EU1}{lmtt}{b}{it}
+ {<->sub*lmtt/b/sl}{}
+\DeclareFontShape{EU1}{lmtt}{b}{sl}
+{<-> "[lmmonolt10-boldoblique]"}{}
+\DeclareFontShape{EU1}{lmtt}{bx}{it}
+ {<->sub*lmtt/b/sl}{}
+\DeclareFontShape{EU1}{lmtt}{bx}{n}
+ {<->ssub*lmtt/b/n}{}
+\DeclareFontShape{EU1}{lmtt}{bx}{sl}
+ {<->ssub*lmtt/b/sl}{}
+\endinput
diff --git a/Master/texmf-dist/tex/xelatex/euenc/eu1lmvtt.fd b/Master/texmf-dist/tex/latex/euenc/eu1lmvtt.fd
index 7d1503bdb92..ab03c0eb95d 100644
--- a/Master/texmf-dist/tex/xelatex/euenc/eu1lmvtt.fd
+++ b/Master/texmf-dist/tex/latex/euenc/eu1lmvtt.fd
@@ -1,6 +1,22 @@
-\ProvidesFile{eu1lmvtt.fd}[2007/01/14 v1.3 Font defs for Latin Modern]
+\ProvidesFile{eu1lmvtt.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
\DeclareFontFamily{EU1}{lmvtt}{}
+
+\ifx\lmtt@use@light@as@normal\@empty
+\DeclareFontShape{EU1}{lmvtt}{sb}{n}
+ {<-> "[lmmonoprop10-regular]:mapping=tex-text"}{}
+\DeclareFontShape{EU1}{lmvtt}{sb}{sl}
+ {<-> "[lmmonoprop10-oblique]:mapping=tex-text"}{}
+\DeclareFontShape{EU1}{lmvtt}{sb}{it}
+ {<->sub*lmvtt/m/sl}{}
+\DeclareFontShape{EU1}{lmvtt}{m}{n}
+ {<-> "[lmmonoproplt10-regular]:mapping=tex-text"}{}
+\DeclareFontShape{EU1}{lmvtt}{m}{sl}
+ {<-> "[lmmonoproplt10-oblique]:mapping=tex-text"}{}
+\DeclareFontShape{EU1}{lmvtt}{m}{it}
+ {<->sub*lmvtt/l/sl}{}
+
+\else
\DeclareFontShape{EU1}{lmvtt}{m}{n}
{<-> "[lmmonoprop10-regular]:mapping=tex-text"}{}
\DeclareFontShape{EU1}{lmvtt}{m}{sl}
@@ -13,6 +29,7 @@
{<-> "[lmmonoproplt10-oblique]:mapping=tex-text"}{}
\DeclareFontShape{EU1}{lmvtt}{l}{it}
{<->sub*lmvtt/l/sl}{}
+\fi
\DeclareFontShape{EU1}{lmvtt}{b}{n}
{<-> "[lmmonoproplt10-bold]:mapping=tex-text"}{}
\DeclareFontShape{EU1}{lmvtt}{b}{sl}
diff --git a/Master/texmf-dist/tex/latex/euenc/eu2enc.def b/Master/texmf-dist/tex/latex/euenc/eu2enc.def
new file mode 100644
index 00000000000..8e0466886da
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euenc/eu2enc.def
@@ -0,0 +1,36 @@
+%%
+%% This is file `eu2enc.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% euenc.dtx (with options: `eu2')
+%%
+%% _____________________________________
+%% The EUENC bundle
+%% Will Robertson, Elie Roux, Khaled Hosny
+%%
+%% License information appended.
+%%
+\ProvidesFile{eu2enc.def}
+ [2010/01/28 v0.1f Experimental Unicode font encodings]
+\DeclareFontEncoding{EU2}{}{}
+\DeclareErrorFont{EU2}{lmr}{m}{n}{10}
+\DeclareFontSubstitution{EU2}{lmr}{m}{n}
+\g@addto@macro\nfss@catcodes{\@makeother:}
+%%
+%% Copyright 2006-2010 Will Robertson <wspr81@gmail.com>
+%% Copyright 2009-2010 Elie Roux <elie.roux@telecom-bretagne.eu>
+%% Copyright 2009-2010 Khaled Hosny <khaledhosny@eglug.org>
+%%
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%%
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Will Robertson.
+%%
+%% This work consists of the file euenc.dtx and various derived files.
+%%
+%%
+%% End of file `eu2enc.def'.
diff --git a/Master/texmf-dist/tex/latex/euenc/eu2lmdh.fd b/Master/texmf-dist/tex/latex/euenc/eu2lmdh.fd
new file mode 100644
index 00000000000..27f249ce64e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euenc/eu2lmdh.fd
@@ -0,0 +1,10 @@
+
+\ProvidesFile{eu2lmdh.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
+\DeclareFontFamily{EU2}{lmdh}{}
+\DeclareFontShape{EU2}{lmdh}{m}{n}
+ {<-> file:lmromandunh10-regular:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmdh}{m}{it}
+ {<->sub*lmdh/m/sl}{}
+\DeclareFontShape{EU2}{lmdh}{m}{sl}
+ {<-> file:lmromandunh10-oblique:script=latn;+trep;+tlig;}{}
+\endinput
diff --git a/Master/texmf-dist/tex/latex/euenc/eu2lmr.fd b/Master/texmf-dist/tex/latex/euenc/eu2lmr.fd
new file mode 100644
index 00000000000..775e6a024f5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euenc/eu2lmr.fd
@@ -0,0 +1,43 @@
+
+\ProvidesFile{eu2lmr.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
+\DeclareFontFamily{EU2}{lmr}{}
+\DeclareFontShape{EU2}{lmr}{m}{n}%
+ {<-5.5> file:lmroman5-regular:script=latn;+trep;+tlig; <5.5-6.5> file:lmroman6-regular:script=latn;+trep;+tlig;
+ <6.5-7.5> file:lmroman7-regular:script=latn;+trep;+tlig; <7.5-8.5> file:lmroman8-regular:script=latn;+trep;+tlig;
+ <8.5-9.5> file:lmroman9-regular:script=latn;+trep;+tlig; <9.5-11> file:lmroman10-regular:script=latn;+trep;+tlig;
+ <11-15> file:lmroman12-regular:script=latn;+trep;+tlig;
+ <15-> file:lmroman17-regular:script=latn;+trep;+tlig;
+ }{}
+\DeclareFontShape{EU2}{lmr}{m}{sl}%
+ {<-8.5> file:lmromanslant8-regular:script=latn;+trep;+tlig; <8.5-9.5> file:lmromanslant9-regular:script=latn;+trep;+tlig;
+ <9.5-11> file:lmromanslant10-regular:script=latn;+trep;+tlig; <11-15> file:lmromanslant12-regular:script=latn;+trep;+tlig;
+ <15-> file:lmromanslant17-regular:script=latn;+trep;+tlig;
+ }{}
+\DeclareFontShape{EU2}{lmr}{m}{it}%
+ {<-7.5> file:lmroman7-italic:script=latn;+trep;+tlig;
+ <7.5-8.5> file:lmroman8-italic:script=latn;+trep;+tlig; <8.5-9.5> file:lmroman9-italic:script=latn;+trep;+tlig;
+ <9.5-11> file:lmroman10-italic:script=latn;+trep;+tlig; <11-> file:lmroman12-italic:script=latn;+trep;+tlig;
+ }{}
+\DeclareFontShape{EU2}{lmr}{m}{sc}%
+ {<-> file:lmromancaps10-regular:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmr}{m}{ui}%
+ {<-> ec-lmu10}{}
+\DeclareFontShape{EU2}{lmr}{m}{scsl}%
+ {<-> file:lmromancaps10-oblique:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmr}{b}{n}
+ {<-> file:lmromandemi10-regular:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmr}{b}{sl}
+ {<-> file:lmromandemi10-oblique:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmr}{bx}{n}
+ {<-5.5> file:lmroman5-bold:script=latn;+trep;+tlig; <5.5-6.5> file:lmroman6-bold:script=latn;+trep;+tlig;
+ <6.5-7.5> file:lmroman7-bold:script=latn;+trep;+tlig; <7.5-8.5> file:lmroman8-bold:script=latn;+trep;+tlig;
+ <8.5-9.5> file:lmroman9-bold:script=latn;+trep;+tlig; <9.5-11> file:lmroman10-bold:script=latn;+trep;+tlig;
+ <11-> file:lmroman12-bold:script=latn;+trep;+tlig;
+ }{}
+\DeclareFontShape{EU2}{lmr}{bx}{it}
+ {<-> file:lmroman10-bolditalic:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmr}{bx}{sl}
+ {<-> file:lmromanslant10-bold:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmr}{b}{it}
+ {<->sub * lmr/b/sl}{}
+\endinput
diff --git a/Master/texmf-dist/tex/latex/euenc/eu2lmss.fd b/Master/texmf-dist/tex/latex/euenc/eu2lmss.fd
new file mode 100644
index 00000000000..f5018a1902b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euenc/eu2lmss.fd
@@ -0,0 +1,36 @@
+
+\ProvidesFile{eu2lmss.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
+\DeclareFontFamily{EU2}{lmss}{}
+\DeclareFontShape{EU2}{lmss}{m}{n}
+ {<-8.5> file:lmsans8-regular:script=latn;+trep;+tlig;
+ <8.5-9.5> file:lmsans9-regular:script=latn;+trep;+tlig; <9.5-11> file:lmsans10-regular:script=latn;+trep;+tlig;
+ <11-15.5> file:lmsans12-regular:script=latn;+trep;+tlig; <15.5-> file:lmsans17-regular:script=latn;+trep;+tlig;
+ }{}
+\DeclareFontShape{EU2}{lmss}{m}{it}
+ {<->ssub*lmss/m/sl}{}
+\DeclareFontShape{EU2}{lmss}{m}{sl}
+ {<-8.5> file:lmsans8-oblique:script=latn;+trep;+tlig;
+ <8.5-9.5> file:lmsans9-oblique:script=latn;+trep;+tlig; <9.5-11> file:lmsans10-oblique:script=latn;+trep;+tlig;
+ <11-15.5> file:lmsans12-oblique:script=latn;+trep;+tlig; <15.5-> file:lmsans17-oblique:script=latn;+trep;+tlig;
+ }{}
+\DeclareFontShape{EU2}{lmss}{m}{sc}
+ {<->sub*lmr/m/sc}{}
+\DeclareFontShape{EU2}{lmss}{b}{n}
+ {<->ssub * lmss/bx/n}{}
+\DeclareFontShape{EU2}{lmss}{b}{sl}
+ {<->ssub * lmss/bx/sl}{}
+\DeclareFontShape{EU2}{lmss}{b}{it}
+ {<->ssub * lmss/bx/it}{}
+\DeclareFontShape{EU2}{lmss}{sbc}{n}
+ {<-> file:lmsansdemicond10-regular:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmss}{sbc}{sl}
+ {<-> file:lmsansdemicond10-oblique:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmss}{sbc}{it}
+ {<->ssub*lmss/sbc/sl}{}
+\DeclareFontShape{EU2}{lmss}{bx}{n}
+ {<-> file:lmsans10-bold:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmss}{bx}{sl}
+ {<-> file:lmsans10-boldoblique:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmss}{bx}{it}
+ {<->ssub*lmss/bx/sl}{}
+\endinput
diff --git a/Master/texmf-dist/tex/latex/euenc/eu2lmssq.fd b/Master/texmf-dist/tex/latex/euenc/eu2lmssq.fd
new file mode 100644
index 00000000000..7f8ba53e2a8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euenc/eu2lmssq.fd
@@ -0,0 +1,22 @@
+
+\ProvidesFile{eu2lmssq.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
+\DeclareFontFamily{EU2}{lmssq}{}
+\DeclareFontShape{EU2}{lmssq}{m}{n}
+ {<-> file:lmsansquot8-regular:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmssq}{m}{sl}
+ {<-> file:lmsansquot8-oblique:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmssq}{bx}{n}
+ {<-> file:lmsansquot8-bold:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmssq}{bx}{sl}
+ {<-> file:lmsansquot8-boldoblique:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmssq}{m}{it}
+ {<->ssub*lmssq/m/sl}{}
+\DeclareFontShape{EU2}{lmssq}{bx}{it}
+ {<->ssub*lmssq/bx/sl}{}
+\DeclareFontShape{EU2}{lmssq}{b}{n}
+ {<->ssub * lmssq/bx/n}{}
+\DeclareFontShape{EU2}{lmssq}{b}{sl}
+ {<->ssub * lmssq/bx/sl}{}
+\DeclareFontShape{EU2}{lmssq}{b}{it}
+ {<->ssub * lmssq/bx/it}{}
+\endinput
diff --git a/Master/texmf-dist/tex/latex/euenc/eu2lmtt.fd b/Master/texmf-dist/tex/latex/euenc/eu2lmtt.fd
new file mode 100644
index 00000000000..ca5d2e7e7bc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euenc/eu2lmtt.fd
@@ -0,0 +1,68 @@
+
+\ProvidesFile{eu2lmtt.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
+\DeclareFontFamily{EU2}{lmtt}{\hyphenchar \font\m@ne}
+
+\ifx\lmtt@use@light@as@normal\@empty
+\DeclareFontShape{EU2}{lmtt}{sb}{n}
+ {<-8.5> file:lmmono8-regular:script=latn <8.5-9.5> file:lmmono9-regular:script=latn
+ <9.5-11> file:lmmono10-regular:script=latn <11-> file:lmmono12-regular:script=latn
+ }{}
+\DeclareFontShape{EU2}{lmtt}{sb}{it}
+ {<-> file:lmmono10-italic:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{sb}{sl}
+ {<-> file:lmmonoslant10-regular:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{sb}{sc}
+ {<-> file:lmmonocaps10-regular:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{sb}{scsl}
+ {<-> file:lmmonocaps10-oblique:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{m}{n}
+ {<-> file:lmmonolt10-regular:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{m}{it}
+ {<->sub*lmtt/l/sl}{}
+\DeclareFontShape{EU2}{lmtt}{m}{sl}
+ {<-> file:lmmonolt10-oblique:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{c}{n}
+ {<-> file:lmmonoltcond10-regular:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{c}{it}
+ {<->sub*lmtt/lc/sl}{}
+\DeclareFontShape{EU2}{lmtt}{c}{sl}
+ {<-> file:lmmonoltcond10-oblique:script=latn}{}
+\else
+\DeclareFontShape{EU2}{lmtt}{m}{n}
+ {<-8.5> file:lmmono8-regular:script=latn <8.5-9.5> file:lmmono9-regular:script=latn
+ <9.5-11> file:lmmono10-regular:script=latn <11-> file:lmmono12-regular:script=latn
+ }{}
+\DeclareFontShape{EU2}{lmtt}{m}{it}
+ {<-> file:lmmono10-italic:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{m}{sl}
+ {<-> file:lmmonoslant10-regular:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{m}{sc}
+ {<-> file:lmmonocaps10-regular:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{m}{scsl}
+ {<-> file:lmmonocaps10-oblique:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{l}{n}
+ {<-> file:lmmonolt10-regular:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{l}{it}
+ {<->sub*lmtt/l/sl}{}
+\DeclareFontShape{EU2}{lmtt}{l}{sl}
+ {<-> file:lmmonolt10-oblique:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{lc}{n}
+ {<-> file:lmmonoltcond10-regular:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{lc}{it}
+ {<->sub*lmtt/lc/sl}{}
+\DeclareFontShape{EU2}{lmtt}{lc}{sl}
+ {<-> file:lmmonoltcond10-oblique:script=latn}{}
+\fi
+\DeclareFontShape{EU2}{lmtt}{b}{n}
+ {<-> file:lmmonolt10-bold:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{b}{it}
+ {<->sub*lmtt/b/sl}{}
+\DeclareFontShape{EU2}{lmtt}{b}{sl}
+{<-> file:lmmonolt10-boldoblique:script=latn}{}
+\DeclareFontShape{EU2}{lmtt}{bx}{it}
+ {<->sub*lmtt/b/sl}{}
+\DeclareFontShape{EU2}{lmtt}{bx}{n}
+ {<->ssub*lmtt/b/n}{}
+\DeclareFontShape{EU2}{lmtt}{bx}{sl}
+ {<->ssub*lmtt/b/sl}{}
+\endinput
diff --git a/Master/texmf-dist/tex/latex/euenc/eu2lmvtt.fd b/Master/texmf-dist/tex/latex/euenc/eu2lmvtt.fd
new file mode 100644
index 00000000000..6300dfc4e48
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/euenc/eu2lmvtt.fd
@@ -0,0 +1,45 @@
+
+\ProvidesFile{eu2lmvtt.fd}[2009/10/30 v1.6 Font defs for Latin Modern]
+\DeclareFontFamily{EU2}{lmvtt}{}
+
+\ifx\lmtt@use@light@as@normal\@empty
+\DeclareFontShape{EU2}{lmvtt}{sb}{n}
+ {<-> file:lmmonoprop10-regular:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmvtt}{sb}{sl}
+ {<-> file:lmmonoprop10-oblique:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmvtt}{sb}{it}
+ {<->sub*lmvtt/m/sl}{}
+\DeclareFontShape{EU2}{lmvtt}{m}{n}
+ {<-> file:lmmonoproplt10-regular:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmvtt}{m}{sl}
+ {<-> file:lmmonoproplt10-oblique:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmvtt}{m}{it}
+ {<->sub*lmvtt/l/sl}{}
+
+\else
+\DeclareFontShape{EU2}{lmvtt}{m}{n}
+ {<-> file:lmmonoprop10-regular:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmvtt}{m}{sl}
+ {<-> file:lmmonoprop10-oblique:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmvtt}{m}{it}
+ {<->sub*lmvtt/m/sl}{}
+\DeclareFontShape{EU2}{lmvtt}{l}{n}
+ {<-> file:lmmonoproplt10-regular:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmvtt}{l}{sl}
+ {<-> file:lmmonoproplt10-oblique:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmvtt}{l}{it}
+ {<->sub*lmvtt/l/sl}{}
+\fi
+\DeclareFontShape{EU2}{lmvtt}{b}{n}
+ {<-> file:lmmonoproplt10-bold:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmvtt}{b}{sl}
+ {<-> file:lmmonoproplt10-boldoblique:script=latn;+trep;+tlig;}{}
+\DeclareFontShape{EU2}{lmvtt}{b}{it}
+ {<->sub*lmvtt/b/sl}{}
+\DeclareFontShape{EU2}{lmvtt}{bx}{n}
+ {<->ssub*lmvtt/b/n}{}
+\DeclareFontShape{EU2}{lmvtt}{bx}{sl}
+ {<->ssub*lmvtt/b/sl}{}
+\DeclareFontShape{EU2}{lmvtt}{bx}{it}
+ {<->sub*lmvtt/b/sl}{}
+\endinput
diff --git a/Master/texmf-dist/tex/xelatex/euenc/eu1lmdh.fd b/Master/texmf-dist/tex/xelatex/euenc/eu1lmdh.fd
deleted file mode 100644
index dff5544bc08..00000000000
--- a/Master/texmf-dist/tex/xelatex/euenc/eu1lmdh.fd
+++ /dev/null
@@ -1,12 +0,0 @@
-
-\ProvidesFile{eu1lmdh.fd}[2007/01/14 v1.3 Font defs for Latin Modern]
-\DeclareFontFamily{EU1}{lmdh}{}
-\DeclareFontShape{EU1}{lmdh}{m}{n}{%
- <-> lmromandunh10-regular
- }{}
-\DeclareFontShape{EU1}{lmdh}{m}{it}
- {<->sub*lmdh/m/sl}{}
-\DeclareFontShape{EU1}{lmdh}{m}{sl}{%
- <-> lmromandunh10-oblique
- }{}
-\endinput
diff --git a/Master/texmf-dist/tex/xelatex/euenc/eu1lmtt.fd b/Master/texmf-dist/tex/xelatex/euenc/eu1lmtt.fd
deleted file mode 100644
index 8f59a44dbe3..00000000000
--- a/Master/texmf-dist/tex/xelatex/euenc/eu1lmtt.fd
+++ /dev/null
@@ -1,40 +0,0 @@
-
-\ProvidesFile{eu1lmtt.fd}[2007/01/14 v1.3 Font defs for Latin Modern]
-\DeclareFontFamily{EU1}{lmtt}{\hyphenchar \font\m@ne}
-\DeclareFontShape{EU1}{lmtt}{m}{n}
- {<-8.5> "[lmmono8-regular]" <8.5-9.5> "[lmmono9-regular]"
- <9.5-11> "[lmmono10-regular]" <11-> "[lmmono12-regular]"
- }{}
-\DeclareFontShape{EU1}{lmtt}{m}{it}
-{<-> "[lmmono10-italic]"}{}
-\DeclareFontShape{EU1}{lmtt}{m}{sl}
-{<-> "[lmmonoslant10-regular]"}{}
-\DeclareFontShape{EU1}{lmtt}{m}{sc}
-{<-> "[lmmonocaps10-regular]"}{}
-\DeclareFontShape{EU1}{lmtt}{m}{scsl}
-{<-> "[lmmonocaps10-oblique]"}{}
-\DeclareFontShape{EU1}{lmtt}{l}{n}
-{<-> "[lmmonolt10-regular]"}{}
-\DeclareFontShape{EU1}{lmtt}{l}{it}
- {<->sub*lmtt/l/sl}{}
-\DeclareFontShape{EU1}{lmtt}{l}{sl}
-{<-> "[lmmonolt10-oblique]"}{}
-\DeclareFontShape{EU1}{lmtt}{lc}{n}
-{<-> "[lmmonoltcond10-regular]"}{}
-\DeclareFontShape{EU1}{lmtt}{lc}{it}
- {<->sub*lmtt/lc/sl}{}
-\DeclareFontShape{EU1}{lmtt}{lc}{sl}
-{<-> "[lmmonoltcond10-oblique]"}{}
-\DeclareFontShape{EU1}{lmtt}{b}{n}
-{<-> "[lmmonolt10-bold]"}{}
-\DeclareFontShape{EU1}{lmtt}{b}{it}
- {<->sub*lmtt/b/sl}{}
-\DeclareFontShape{EU1}{lmtt}{b}{sl}
-{<-> "[lmmonolt10-boldoblique]"}{}
-\DeclareFontShape{EU1}{lmtt}{bx}{it}
- {<->sub*lmtt/b/sl}{}
-\DeclareFontShape{EU1}{lmtt}{bx}{n}
- {<->ssub*lmtt/b/n}{}
-\DeclareFontShape{EU1}{lmtt}{bx}{sl}
- {<->ssub*lmtt/b/sl}{}
-\endinput