From 08fc1629b2ad79d9d2b0526b720745e58535b65f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 14 Feb 2010 00:13:21 +0000 Subject: luainputenc update (13feb10) git-svn-id: svn://tug.org/texlive/trunk@16999 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/lualatex/luainputenc/eu2enc.def | 36 ---------- .../texmf-dist/tex/lualatex/luainputenc/eu2lmr.fd | 82 ---------------------- .../tex/lualatex/luainputenc/luainputenc.lua | 20 +++++- .../tex/lualatex/luainputenc/luainputenc.sty | 6 +- .../texmf-dist/tex/lualatex/luainputenc/lutf8.def | 4 +- .../texmf-dist/tex/lualatex/luainputenc/lutf8x.def | 4 +- 6 files changed, 25 insertions(+), 127 deletions(-) delete mode 100644 Master/texmf-dist/tex/lualatex/luainputenc/eu2enc.def delete mode 100644 Master/texmf-dist/tex/lualatex/luainputenc/eu2lmr.fd (limited to 'Master/texmf-dist/tex/lualatex') diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/eu2enc.def b/Master/texmf-dist/tex/lualatex/luainputenc/eu2enc.def deleted file mode 100644 index 20a674886cf..00000000000 --- a/Master/texmf-dist/tex/lualatex/luainputenc/eu2enc.def +++ /dev/null @@ -1,36 +0,0 @@ -%% -%% This is file `eu2enc.def', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% luainputenc.dtx (with options: `eu2') -%% This is a generated file. -%% -%% Copyright (C) 2009 by Elie Roux -%% -%% This work is under the CC0 license. As an exception, the files -%% luainputenc.sty, lutf8.def and lutf8x.def have more restrictions. -%% See these file for more details. -%% -%% People who helped on this package: -%% Javier Bezos -%% Will Robertson -%% Hans Hagen -%% Heiko Oberdiek -%% Javier Mugica -%% -%% This work consists of the main source file luainputenc.dtx -%% and the derived files -%% luainputenc.sty, luainputenc.lua, lutf8.def, lutf8x.def, -%% eu2enc.def, eu2lmr.fd and luainputenc.pdf -%% - -\ProvidesFile{eu2enc.def}[2009/11/20 v0.1 a unicode font encoding for LuaTeX.] -\DeclareFontEncoding{EU2}{}{} -\DeclareErrorFont{EU2}{lmr}{m}{n}{10} -\DeclareFontSubstitution{EU2}{lmr}{m}{n} - -\endinput -%% -%% End of file `eu2enc.def'. diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/eu2lmr.fd b/Master/texmf-dist/tex/lualatex/luainputenc/eu2lmr.fd deleted file mode 100644 index 6c926f2d8ca..00000000000 --- a/Master/texmf-dist/tex/lualatex/luainputenc/eu2lmr.fd +++ /dev/null @@ -1,82 +0,0 @@ -%% -%% This is file `eu2lmr.fd', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% luainputenc.dtx (with options: `lmr') -%% This is a generated file. -%% -%% Copyright (C) 2009 by Elie Roux -%% -%% This work is under the CC0 license. As an exception, the files -%% luainputenc.sty, lutf8.def and lutf8x.def have more restrictions. -%% See these file for more details. -%% -%% People who helped on this package: -%% Javier Bezos -%% Will Robertson -%% Hans Hagen -%% Heiko Oberdiek -%% Javier Mugica -%% -%% This work consists of the main source file luainputenc.dtx -%% and the derived files -%% luainputenc.sty, luainputenc.lua, lutf8.def, lutf8x.def, -%% eu2enc.def, eu2lmr.fd and luainputenc.pdf -%% - -\ProvidesFile{eu2lmr.fd} - [2009/11/20 v0.2 Font defs for Latin Modern for LuaTeX's EU2 encoding] -\DeclareFontFamily{EU2}{lmr}{} -\DeclareFontShape{EU2}{lmr}{m}{n}% - {<-5.5> "lmroman5-regular:+tlig;+tsub;+liga;+rlig;" - <5.5-6.5> "lmroman6-regular:+tlig;+tsub;+liga;+rlig;" - <6.5-7.5> "lmroman7-regular:+tlig;+tsub;+liga;+rlig;" - <7.5-8.5> "lmroman8-regular:+tlig;+tsub;+liga;+rlig;" - <8.5-9.5> "lmroman9-regular:+tlig;+tsub;+liga;+rlig;" - <9.5-11> "lmroman10-regular:+tlig;+tsub;+liga;+rlig;" - <11-15> "lmroman12-regular:+tlig;+tsub;+liga;+rlig;" - <15-> "lmroman17-regular:+tlig;+tsub;+liga;+rlig;" - }{} -\DeclareFontShape{EU2}{lmr}{m}{sl}% - {<-8.5> "lmroman8-oblique:+tlig;+tsub;+liga;+rlig;" - <8.5-9.5> "lmroman9-oblique:+tlig;+tsub;+liga;+rlig;" - <9.5-11> "lmroman10-oblique:+tlig;+tsub;+liga;+rlig;" - <11-15> "lmroman12-oblique:+tlig;+tsub;+liga;+rlig;" - <15-> "lmroman17-oblique:+tlig;+tsub;+liga;+rlig;" - }{} -\DeclareFontShape{EU2}{lmr}{m}{it}% - {<-7.5> "lmroman7-italic:+tlig;+tsub;+liga;+rlig;" - <7.5-8.5> "lmroman8-italic:+tlig;+tsub;+liga;+rlig;" - <8.5-9.5> "lmroman9-italic:+tlig;+tsub;+liga;+rlig;" - <9.5-11> "lmroman10-italic:+tlig;+tsub;+liga;+rlig;" - <11-> "lmroman12-italic:+tlig;+tsub;+liga;+rlig;" - }{} -\DeclareFontShape{EU2}{lmr}{m}{sc}% - {<-> "lmroman10-capsregular:+tlig;+tsub;+liga;+rlig;"}{} -\DeclareFontShape{EU2}{lmr}{m}{scsl}% - {<-> "lmroman10-capsoblique:+tlig;+tsub;+liga;+rlig;"}{} -%%%%%%% bold series -\DeclareFontShape{EU2}{lmr}{b}{n} - {<-> "lmroman10-demi:+tlig;+tsub;+liga;+rlig;"}{} -\DeclareFontShape{EU2}{lmr}{b}{sl} - {<-> "lmroman10-demioblique:+tlig;+tsub;+liga;+rlig;"}{} -%%%%%%%% bold extended series -\DeclareFontShape{EU2}{lmr}{bx}{n} - {<-5.5> "lmroman5-bold:+tlig;+tsub;+liga;+rlig;" - <5.5-6.5> "lmroman6-bold:+tlig;+tsub;+liga;+rlig;" - <6.5-7.5> "lmroman7-bold:+tlig;+tsub;+liga;+rlig;" - <7.5-8.5> "lmroman8-bold:+tlig;+tsub;+liga;+rlig;" - <8.5-9.5> "lmroman9-bold:+tlig;+tsub;+liga;+rlig;" - <9.5-11> "lmroman10-bold:+tlig;+tsub;+liga;+rlig;" - <11-> "lmroman12-bold:+tlig;+tsub;+liga;+rlig;" - }{} -\DeclareFontShape{EU2}{lmr}{bx}{it} - {<-> "lmroman10-bolditalic:+tlig;+tsub;+liga;+rlig;"}{} -\DeclareFontShape{EU2}{lmr}{bx}{sl} - {<-> "lmroman10-boldoblique:+tlig;+tsub;+liga;+rlig;"}{} - -\endinput -%% -%% End of file `eu2lmr.fd'. diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.lua b/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.lua index e5e27e76021..0d646dda33d 100644 --- a/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.lua +++ b/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.lua @@ -23,15 +23,15 @@ -- This work consists of the main source file luainputenc.dtx -- and the derived files -- luainputenc.sty, luainputenc.lua, lutf8.def, lutf8x.def, --- eu2enc.def, eu2lmr.fd and luainputenc.pdf +-- and luainputenc.pdf -- luainputenc = { } luainputenc.module = { name = "luainputenc", - version = 0.95, - date = "2009/11/20", + version = 0.96, + date = "2010/02/07", description = "Lua simple inputenc package.", author = "Elie Roux", copyright = "Elie Roux", @@ -46,6 +46,20 @@ luainputenc.log = luainputenc.log or function(...) luatextra.module_log('luainputenc', format(...)) end + +luainputenc.encoding = "utf8" +luainputenc.package_option = nil + +function luainputenc.set_option(option) + luainputenc.package_option = option + if option == "lutf8" or option == "lutf8x" or option == "utf8x" or option == "unactivate" then + luainputenc.encoding = "utf8" + else + luainputenc.encoding = option + end +end + + local char, utfchar, byte, format, gsub, utfbyte, utfgsub = string.char, unicode.utf8.char, string.byte, string.format, string.gsub, unicode.utf8.byte, unicode.utf8.gsub diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty b/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty index 88f6468ea09..0f915dd1372 100644 --- a/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty +++ b/Master/texmf-dist/tex/lualatex/luainputenc/luainputenc.sty @@ -23,12 +23,12 @@ %% This work consists of the main source file luainputenc.dtx %% and the derived files %% luainputenc.sty, luainputenc.lua, lutf8.def, lutf8x.def, -%% eu2enc.def, eu2lmr.fd and luainputenc.pdf +%% and luainputenc.pdf %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luainputenc} - [2009/11/20 v0.95 inputenc package for LuaTeX] + [2010/02/07 v0.96 inputenc package for LuaTeX] %% This file was adapted from inputenc.sty, which copyright is: %% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 @@ -124,6 +124,7 @@ by input encoding change to `#1'\MessageBreak}% \fi \the\inpenc@posthook + \luadirect{luainputenc.set_option([[#1]])} } \newtoks\inpenc@prehook \newtoks\inpenc@posthook @@ -167,6 +168,7 @@ \DeclareOption{unactivate}{% \edef\inputencodingname{unactivate}% + \luadirect{luainputenc.set_option([[unactivate]])} } diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/lutf8.def b/Master/texmf-dist/tex/lualatex/luainputenc/lutf8.def index b90bced1590..ea5a274a5c1 100644 --- a/Master/texmf-dist/tex/lualatex/luainputenc/lutf8.def +++ b/Master/texmf-dist/tex/lualatex/luainputenc/lutf8.def @@ -23,7 +23,7 @@ %% This work consists of the main source file luainputenc.dtx %% and the derived files %% luainputenc.sty, luainputenc.lua, lutf8.def, lutf8x.def, -%% eu2enc.def, eu2lmr.fd and luainputenc.pdf +%% and luainputenc.pdf %% %% This file was adapted from utf8.def, which copyright is: %% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 @@ -44,7 +44,7 @@ \ProvidesFile{lutf8.def} - [2009/11/20 v0.95 UTF-8 support for luainputenc] + [2010/02/07 v0.96 UTF-8 support for luainputenc] \makeatletter \catcode`\ \saved@space@catcode diff --git a/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def b/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def index 2f7bf95db30..9fa60b48c3f 100644 --- a/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def +++ b/Master/texmf-dist/tex/lualatex/luainputenc/lutf8x.def @@ -23,7 +23,7 @@ %% This work consists of the main source file luainputenc.dtx %% and the derived files %% luainputenc.sty, luainputenc.lua, lutf8.def, lutf8x.def, -%% eu2enc.def, eu2lmr.fd and luainputenc.pdf +%% and luainputenc.pdf %% %% This file was adapted from utf8.def, which copyright is: %% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 @@ -44,7 +44,7 @@ \ProvidesFile{lutf8x.def} - [2009/11/20 v0.95 UTF-8 support for luainputenc] + [2010/02/07 v0.96 UTF-8 support for luainputenc] \makeatletter \catcode`\ \saved@space@catcode -- cgit v1.2.3