From 0ae7a590ae93af9b84a61f599507ec81ae1b61cf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 3 Aug 2015 22:03:43 +0000 Subject: kotex-oblivoir (3aug15) git-svn-id: svn://tug.org/texlive/trunk@38033 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/kotex-oblivoir/oblivoir-base.cls | 36 ++++++++++++---------- .../tex/latex/kotex-oblivoir/oblivoir-xlua.cls | 8 ++--- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/tex/latex/kotex-oblivoir') diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls index dcd3ff77576..8274a9c8221 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls @@ -1,6 +1,6 @@ %% File `oblivoir.cls` %% -%% (C) Copyright 2006-2014 Kangsoo Kim +%% (C) Copyright 2006-2015 Kangsoo Kim %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -11,7 +11,7 @@ %% version 2006/05/20 or later. %% \ProvidesClass{oblivoir-base} - [2014/06/12 v0.6 article-like class to typeset UTF-8 korean using memoir.] + [2015/08/01 v0.7 article-like class to typeset UTF-8 korean using memoir.] %\typeout{oblivoir requires memoir, dhucs, and memhangul. 2008/10/23.} %%% Acknowledgements: @@ -47,7 +47,7 @@ %%% unfonts-type-1 %%% -\RequirePackage{etex} +%\RequirePackage{etex} \RequirePackage{xkeyval} \newif\ifnokorean\nokoreanfalse @@ -119,20 +119,21 @@ \ProcessOptionsX %%% moreroom, reported by Juho Lee, 2013-09-26. -\if@FULLROOM -\def\alloc@#1#2#3#4#5% - {\ifnum\count1#1<#4% make sure there's still room - \allocationnumber\count1#1 - \global\advance\count1#1\@ne - \global#3#5\allocationnumber - \wlog{\string#5=\string#2\the\allocationnumber}% - \else\ifnum#1<6 - \def\etex@dummy@definition{}% <-- code added - \begingroup \escapechar\m@ne - \expandafter\alloc@@\expandafter{\string#2}#5% - \else\errmessage{No room for a new #2}\fi\fi - } -\fi +%%% 2015-08-01: LaTeX will do auto-alloc. +%\if@FULLROOM +%\def\alloc@#1#2#3#4#5% +% {\ifnum\count1#1<#4% make sure there's still room +% \allocationnumber\count1#1 +% \global\advance\count1#1\@ne +% \global#3#5\allocationnumber +% \wlog{\string#5=\string#2\the\allocationnumber}% +% \else\ifnum#1<6 +% \def\etex@dummy@definition{}% <-- code added +% \begingroup \escapechar\m@ne +% \expandafter\alloc@@\expandafter{\string#2}#5% +% \else\errmessage{No room for a new #2}\fi\fi +% } +%\fi %%% moreverb : 2008/10/23 \if@moreverb @@ -524,6 +525,7 @@ \endinput %%% ChangeLog: +%%% 2015/08/01 : etex.sty dropped %%% ver0.6 2014/06/12 : introduce new xob-font.sty %%% ver0.5 2014/06/06 : replace \renewcommand's with \setlength's. %%% ver0.4.3 2013/10/26 : move \kscntformat definition to memhangul-ucs diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xlua.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xlua.cls index 32b10d6a16f..48f86918ac2 100644 --- a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xlua.cls +++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xlua.cls @@ -28,6 +28,7 @@ \DeclareOptionX{finemath}{\@DisabledOption{\CurrentOption}} \DeclareOptionX{nofinemath}{\@DisabledOption{\CurrentOption}} \DeclareOptionX{strictcharcheck}{\@DisabledOption{\CurrentOption}} +\DeclareOptionX{noreserveinserts}{\@DisabledOption{\CurrentOption}} %%% active Options \newif\ifnokorean\nokoreanfalse @@ -75,8 +76,6 @@ \newif\if@amsmath\@amsmathfalse \DeclareOptionX{amsmath}{\@amsmathtrue} \DeclareOptionX{nowinname}{\PassOptionsToPackage{\CurrentOption}{memhangul-x}} -\newif\if@noinserts\@noinsertsfalse -\DeclareOptionX{noreserveinserts}{\@noinsertstrue} % \newif\ifPRELOAD\PRELOADfalse \DeclareOptionX{preload}[]{\PRELOADtrue\def\PRELOADstr{#1}} @@ -134,9 +133,7 @@ \fi %%% fontspec problem -\if@noinserts\else - \RequirePackage{etex}\reserveinserts{40}% -\fi +% \RequirePackage{etex}\reserveinserts{40}% %%% workaround with flowfram \if@foursix @@ -461,6 +458,7 @@ \endinput %%% ChangeLog: +%%%% 2015-08-01 : drop etex.sty %%% 2015-07-27 : fix nokorean bug %%% 2015-07-10 : etex-pkg conflicts fixed. %%% 2015-04-19 : suppress space factors -- cgit v1.2.3