diff options
author | Karl Berry <karl@freefriends.org> | 2010-02-15 00:56:51 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-02-15 00:56:51 +0000 |
commit | adf08a68b3e6d7d88c1953a1f5cb99a80b32b08c (patch) | |
tree | 60333c71dd96d3c909c29d0cbb7ba48bc5c9c323 /Master/texmf-dist/source | |
parent | 4ccbc52dab3e0854855023d871eb57c855e1edad (diff) |
euenc update (13feb10)
git-svn-id: svn://tug.org/texlive/trunk@17015 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/euenc/Makefile | 90 | ||||
-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.ins | 66 |
3 files changed, 265 insertions, 330 deletions
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'. |