croatian hrlatex update

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

2 files changed, 26 insertions, 4 deletions

diff --git a/Master/texmf-dist/tex/latex/hrlatex/hrdipl.cls b/Master/texmf-dist/tex/latex/hrlatex/hrdipl.cls
index 33d9cd2b6d1..ab8440657e4 100644
--- a/Master/texmf-dist/tex/latex/hrlatex/hrdipl.cls
+++ b/Master/texmf-dist/tex/latex/hrlatex/hrdipl.cls
@@ -3,7 +3,9 @@
 % University of Zagreb, Croatia
 \LoadClass[12pt, a4paper]{book}
 
-\RequirePackage{hrlatex} % <- hrdipl depends on hrlatex.sty
+\ProcessOptions*{}
+
+\RequirePackage[enc=cp1250]{hrlatex} % <- hrdipl depends on hrlatex.sty
 %
 \RequirePackage[
 	a4paper,
diff --git a/Master/texmf-dist/tex/latex/hrlatex/hrlatex.sty b/Master/texmf-dist/tex/latex/hrlatex/hrlatex.sty
index fb2698875a9..062c5253c16 100644
--- a/Master/texmf-dist/tex/latex/hrlatex/hrlatex.sty
+++ b/Master/texmf-dist/tex/latex/hrlatex/hrlatex.sty
@@ -7,14 +7,34 @@
 %% hrlatex.dtx  (with options: `package')
 %% 
 %% 
+
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{hrlatex}
-   [2006/20/06 v0.2 LaTeX Macros for HRLaTeX project]
-\RequirePackage[cp1250]{inputenc}
+\ProvidesPackage{hrlatex}[2006/25/06 v0.21 LaTeX Macros for HRLaTeX project]
+\usepackage{xkeyval}
+\DeclareOption{slovene}{\PassOptionsToPackage{slovene}{babel}}
+\DeclareOptionX{enc}[utf8]{%
+\PassOptionsToPackage{#1}{inputenc}
+}
+
+\DeclareOption{last}{
+
+}
+
+\DeclareOption*{}
+\DeclareOptionX*{}
+
+\PassOptionsToPackage{utf8}{inputenc} %% Default
+\PassOptionsToPackage{croatian}{babel}
+
+\ProcessOptions*
+\ProcessOptionsX
+
+\RequirePackage{inputenc}
 \RequirePackage[T1]{fontenc}
 \RequirePackage{tracefnt}
 \RequirePackage[croatian]{babel}
 \RequirePackage{amsopn}
+
 \DeclareMathOperator{\tg}{tg}
 \DeclareMathOperator{\arctg}{arc\,tg}
 \DeclareMathOperator{\ctg}{ctg}