kotex-oblivoir (20oct15)

git-svn-id: svn://tug.org/texlive/trunk@38679 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 31 insertions, 2 deletions

diff --git a/Master/texmf-dist/doc/latex/kotex-oblivoir/ChangeLog b/Master/texmf-dist/doc/latex/kotex-oblivoir/ChangeLog
index 42696c453e6..8f7e9d132c9 100644
--- a/Master/texmf-dist/doc/latex/kotex-oblivoir/ChangeLog
+++ b/Master/texmf-dist/doc/latex/kotex-oblivoir/ChangeLog
@@ -1,3 +1,12 @@
+2015-10-19  Kangsoo Kim  <karnes at ktug org>
+
+	Version 2.1.7
+
+	* oblivor-base.cls: version 0.8.1
+	fix conflicts with etextools package.
+	* oblivor-xlua.cls: version 0.8.3
+	fix conflicts with etextools package.
+
 2015-10-15  Kangsoo Kim  <karnes at ktug org>
 
 	Version 2.1.6
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 fd8c3370d25..bff68d1565e 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-base.cls
@@ -11,7 +11,7 @@
 %% version 2006/05/20 or later.
 %%
 \ProvidesClass{oblivoir-base}
-  [2015/08/24 v0.8 article-like class to typeset UTF-8 korean using memoir.]
+  [2015/10/19 v0.8.1 article-like class to typeset UTF-8 korean using memoir.]
 %\typeout{oblivoir requires memoir, dhucs, and memhangul. 2008/10/23.}
 
 %%% Acknowledgements:
@@ -135,6 +135,9 @@
 % }
 %\fi
 
+%% expl3
+\RequirePackage{xparse,expl3}
+
 %%% moreverb : 2008/10/23
 \if@moreverb
  \RequirePackage{moreverb}
@@ -547,9 +550,16 @@
 }
 \fi
 
+%%% to avoid conflicts with etextools
+\ExplSyntaxOn
+\cs_if_exist:NF \globcount
+{ \let\globcount\newcount }
+\ExplSyntaxOff
+
 \endinput
 
 %%% ChangeLog:
+%%%          2015/10/19 : fix conflicts with etextools package.
 %%%          2015/08/24 : dhuce-enumerate compatibility.
 %%%          2015/08/01 : etex.sty dropped
 %%% ver0.6   2014/06/12 : introduce new xob-font.sty
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 48f86918ac2..5afc06b4b9e 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xlua.cls
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/oblivoir-xlua.cls
@@ -14,7 +14,7 @@
 %% depends upon Dohyun Kim's xetexko and the author's memhangul-x.
 %%
 \ProvidesClass{oblivoir-xlua}
-  [2015/07/27 v0.8.2 article-like class to typeset UTF-8 korean using memoir.]
+  [2015/10/19 v0.8.3 article-like class to typeset UTF-8 korean using memoir.]
 \typeout{A variant of oblivoir class for Lua- or XeLaTeX.}
 
 \providecommand\@DisabledOption[1]{%
@@ -105,6 +105,9 @@
 %
 \ProcessOptionsX
 
+% expl3
+\RequirePackage{expl3,xparse}
+
 %%% moreverb
 \if@moreverb
  \RequirePackage{moreverb}
@@ -455,9 +458,16 @@
 }
 \fi
 
+%%% to avoid conflicts with etextools
+\ExplSyntaxOn
+\cs_if_exist:NF \globcount
+{ \let\globcount\newcount }
+\ExplSyntaxOff
+
 \endinput
 
 %%% ChangeLog:
+%%% 2015-10-19 : fix conflicts with etextools package.
 %%%% 2015-08-01 : drop etex.sty 
 %%% 2015-07-27 : fix nokorean bug 
 %%% 2015-07-10 : etex-pkg conflicts fixed.