kotex-oblivoir (30jul15)

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

3 files changed, 38 insertions, 23 deletions

diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/memhangul-x.sty b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/memhangul-x.sty
index e55fadebe03..7a5b74ae1d0 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/memhangul-x.sty
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/memhangul-x/memhangul-x.sty
@@ -14,10 +14,10 @@
 %%    part of oblivoir v2
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\filedate{2014/06/12}
-\def\fileversion{11.8}
+\def\filedate{2015/07/27}
+\def\fileversion{11.9}
 \ProvidesPackage{memhangul-x}[\filedate Hangul Typography for (x)oblivoir]
-\typeout{Hangul Typography for (x)oblivoir}
+%\typeout{Hangul Typography for (x)oblivoir}
 
 %% Options :
 
@@ -64,6 +64,8 @@
 \DeclareOption{hangulpagestyle}{\@defaulthangulpagestyletrue}
 \newif\if@pdfbookmark{\@pdfbookmarkfalse}
 \DeclareOption{pdfbookmark}{\@pdfbookmarktrue}
+\newif\if@polyglos\@polyglosfalse
+\DeclareOption{polyglossia}{\@polyglostrue}
 
 \ifxetex
 %%% xetexko options
@@ -119,6 +121,17 @@
 
 \ProcessOptions \relax
 
+\if@polyglos
+  \RequirePackage{polyglossia}
+  \RequirePackage{xparse}
+  \NewDocumentCommand\sethangulfont{mo}{%
+    \IfValueTF{#2}{%
+      \newfontfamily\hangulfont{#1}[#2]%
+    }{%
+      \newfontfamily\hangulfont{#1}%
+    }
+  }
+\else
 \ifluatex
   \RequirePackage{luatexko}
   \RequirePackage{xob-font}
@@ -127,12 +140,12 @@
   \RequirePackage{xetexko-var}
   \RequirePackage{xob-dotemph}
   \else
-	\ifKOTEXCJK
+    \ifKOTEXCJK
      \RequirePackage{cjkutf8-ko}
 %    \else
 %     \RequirePackage{dhucs}
     \fi
-\fi\fi
+\fi\fi\fi
 
 %% define memh@hu
 \newdimen\memh@hu\memh@hu=0.059375em
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 3cbe791be24..32b10d6a16f 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/10 v0.8.1 article-like class to typeset UTF-8 korean using memoir.]
+  [2015/07/27 v0.8.2 article-like class to typeset UTF-8 korean using memoir.]
 \typeout{A variant of oblivoir class for Lua- or XeLaTeX.}
 
 \providecommand\@DisabledOption[1]{%
@@ -32,6 +32,8 @@
 %%% active Options
 \newif\ifnokorean\nokoreanfalse
 \DeclareOptionX{nokorean}{\nokoreantrue}
+\newif\if@polyglossia\@polyglossiafalse
+\DeclareOptionX{polyglossia}{\@polyglossiatrue}
 \newif\iftwosidedoc\twosidedocfalse
 \DeclareOptionX{twoside}{\twosidedoctrue}
 \newif\ifopenrightdoc\openrightdocfalse
@@ -161,18 +163,17 @@
 %\fi\fi
 
 \def\@Load@Memhangul{%
-  \ifluatex
-      \usepackage[nonfrench,hangulpagestyle]{memhangul-x}
-  \else\ifxetex
-      \usepackage[nonfrench,hangulpagestyle]{memhangul-x}
+  \if@polyglossia
+    \RequirePackage[polyglossia]{memhangul-x}
   \else
-  	  \usepackage[nonfrench,hangulpagestyle]{memhangul-x}
-  \fi\fi
+    \RequirePackage[nonfrench,hangulpagestyle]{memhangul-x}
+  \fi
 }
 
 \ifnokorean\else
   \@Load@Memhangul
 \fi
+
 \if@chapter\else
   \counterwithout{section}{chapter}
 \fi
@@ -205,15 +206,15 @@
 	\def\memucshangulskips{}%
 	\def\memucsinterwordskip{%
 		\spaceskip = .390\BASE@FONTsize plus .1\BASE@FONTsize minus .1\BASE@FONTsize
-		\if@nonfrench
+%		\if@nonfrench
 		\xspaceskip = .432\BASE@FONTsize plus .11\BASE@FONTsize minus .1\BASE@FONTsize
-		\fi
+%		\fi
 	}%
 	\def\memucsinterwordchapterskip{%
 		\spaceskip = .41\BASE@FONTsize plus .11\BASE@FONTsize minus .1\BASE@FONTsize
-		\if@nonfrench
+%		\if@nonfrench
 		\xspaceskip = .55\BASE@FONTsize plus .1\BASE@FONTsize minus .1\BASE@FONTsize
-		\fi
+%		\fi
 	}%
 }
 \let\DEFAULTskips\ob@DEFAULTskips
@@ -460,6 +461,7 @@
 \endinput
 
 %%% ChangeLog:
+%%% 2015-07-27 : fix nokorean bug 
 %%% 2015-07-10 : etex-pkg conflicts fixed.
 %%% 2015-04-19 : suppress space factors
 %%% 2014-06-12 : introduce new xob-font.sty
diff --git a/Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls b/Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls
index f7afbac9044..4d7851eba89 100644
--- a/Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls
+++ b/Master/texmf-dist/tex/latex/kotex-oblivoir/xoblivoir.cls
@@ -1,6 +1,6 @@
 %% File `xoblivoir.cls`
 %%
-%% (C) Copyright 2006-2014 Kangsoo Kim <karnes at ktug org>
+%% (C) Copyright 2006-2015 Kangsoo Kim <karnes at ktug org>
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -10,7 +10,7 @@
 %% and version 1.3c or later is part of all distributions of LaTeX
 %% version 2006/05/20 or later.
 %%
-\ProvidesClass{xoblivoir}[2014/06/12]
+\ProvidesClass{xoblivoir}[2015/07/27]
 
 \RequirePackage{xkeyval}
 
@@ -36,11 +36,11 @@
 
 \ifLuaOrXeTeX
 \LoadClassWithOptions{oblivoir-xlua}
-  \ifLuaTeX
-		\typeout{HANGUL DRIVER: luatexko}
-  \else
-		\typeout{HANGUL DRIVER: xetexko}
-  \fi
+%  \ifLuaTeX
+%		\typeout{HANGUL DRIVER: luatexko}
+%  \else
+%		\typeout{HANGUL DRIVER: xetexko}
+%  \fi
 \else
   \if@CJK
     \LoadClassWithOptions{oblivoir-xlua}