croatian hrlatex update

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

11 files changed, 194 insertions, 52 deletions

diff --git a/Master/texmf-dist/doc/latex/hrlatex/README b/Master/texmf-dist/doc/latex/hrlatex/README
index 58b70c5e21a..f9f7cb83f21 100644
--- a/Master/texmf-dist/doc/latex/hrlatex/README
+++ b/Master/texmf-dist/doc/latex/hrlatex/README
@@ -1,4 +1,4 @@
-HRLaTeX Package, version 0.2
+HRLaTeX Package, version 0.21
 
 Author: Marcel Maretic
 
@@ -18,13 +18,15 @@ Author: Marcel Maretic
 	----
 	hrlatex.dtx
 	hrlatex.ins
+	hrdipl.cls
+	README
 	sample.diplomski-rad.tex
-	sample.minimal.tex
+	sample.minimal.cp1250.tex
+	sample.minimal.latin2.tex
+	sample.minimal.utf8.tex
 	novi.diplomski-rad.tex
-	README
-	hrdipl.cls
 	hrlatex.pdf
-	-------
+	-----
 
 
 
diff --git a/Master/texmf-dist/doc/latex/hrlatex/hrlatex.pdf b/Master/texmf-dist/doc/latex/hrlatex/hrlatex.pdf
index 289431a012f..00b77430bff 100644
--- a/Master/texmf-dist/doc/latex/hrlatex/hrlatex.pdf
+++ b/Master/texmf-dist/doc/latex/hrlatex/hrlatex.pdf
diff --git a/Master/texmf-dist/doc/latex/hrlatex/sample.diplomski-rad.tex b/Master/texmf-dist/doc/latex/hrlatex/sample.diplomski-rad.tex
index 5f4f177a83f..372a1bb302e 100644
--- a/Master/texmf-dist/doc/latex/hrlatex/sample.diplomski-rad.tex
+++ b/Master/texmf-dist/doc/latex/hrlatex/sample.diplomski-rad.tex
@@ -1,11 +1,14 @@
-\documentclass{hrdipl}
+\documentclass[enc=cp1250]{hrdipl}
+
+% \usepackage{hrlatex}
 
 \usepackage{amsmath}
 \usepackage{pxfonts}
 
 \author{Hrvoje Horvat}
 \title{Novi diplomski rad}
-\date{Zagreb, lipanj 2006.}
+% \date{Zagreb, lipanj 2006.}
+
 
 
 \begin{document}
@@ -61,7 +64,10 @@ Curabitur vestibulum, dui vitae facilisis tincidunt, massa libero cursus nulla,
 Morbi vel dui nec sem pharetra facilisis. Nulla ut ligula nec eros suscipit ultrices. Donec ac quam. Nam interdum, sapien vitae consequat euismod, diam tellus auctor sem, in vulputate nisl lorem sit amet velit. Sed rutrum, erat in aliquam sollicitudin, velit ligula vehicula quam, in dapibus lectus nibh et diam. Fusce metus. Fusce semper. Nam libero nibh, tempus vitae, lobortis id, rutrum sed, tortor. Aenean varius lobortis nisl. Curabitur vestibulum, dui vitae facilisis tincidunt, massa libero cursus nulla, nec tincidunt dui tortor eget libero. In nunc neque, blandit porta, ullamcorper eu, porttitor elementum, enim. Ut mollis, purus euismod consectetuer scelerisque, enim mi tincidunt sapien, sed ultrices diam sapien iaculis ipsum. Integer ut sem sed dui posuere pulvinar. Praesent tempor varius massa.
 
 
+
+\appendix
 \chapter*{Zaklju\v{c}ak}
 �� �� �� �� ��
 
+% 
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.cp1250.tex b/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.cp1250.tex
new file mode 100644
index 00000000000..2e11cead120
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.cp1250.tex
@@ -0,0 +1,20 @@
+\documentclass{minimal}
+
+\usepackage[enc=cp1250]{hrlatex}
+
+
+\listfiles
+
+\begin{document}
+\noindent 	
+Minimalni dokument koji koristi \textsf{\textbf{\textsf{HR}}LaTeX}.
+	
+	% Windows codepage 1250 -- kodna stranica
+\noindent
+	\v{C} \v{c} \'{C} \'{c} \DJ{} \dj{} \v{S} \v{s} \v{Z} \v{z}\\
+% 	
+	� � � � � � � � � �
+
+
+
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.latin2.tex b/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.latin2.tex
new file mode 100644
index 00000000000..fa9302d91ab
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.latin2.tex
@@ -0,0 +1,19 @@
+% iso 8859-2 ili latin2 kodna stranica
+% 
+\documentclass{minimal}
+
+\usepackage[enc=latin2]{hrlatex}
+
+
+\listfiles
+
+\begin{document}
+\noindent
+% \tableofcontents
+Minimalni dokument koji koristi \textsf{\textbf{\textsf{HR}}LaTeX}.\\
+% 	
+% 	
+\noindent \v{C} \v{c} \'{C} \'{c} \DJ{} \dj{} \v{S} \v{s} \v{Z} \v{z}\\
+\noindent  �     �    �     �     �      �     �     �     �     �
+% 
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.tex b/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.tex
deleted file mode 100644
index 31d58b9503d..00000000000
--- a/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass{minimal}
-
-\usepackage{hrlatex}
-
-
-
-\begin{document}
-Minimalni dokument koji koristi \textsf{\textbf{\textsf{HR}}LaTeX}.
-
-% Windows codepage 1250 encoded...
-�� �� �� �� ��\\
-
-
-\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.utf8.tex b/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.utf8.tex
new file mode 100644
index 00000000000..418c15823c7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.utf8.tex
@@ -0,0 +1,35 @@
+% UTF-8
+\documentclass{minimal}
+
+% \usepackage[enc=utf8]{hrlatex}
+\usepackage{hrlatex}
+
+
+
+\listfiles
+
+\begin{document}
+\noindent 	
+% \rule{7pt}{7pt}\rule[7pt]{7pt}{7pt}%
+\fontsize{20pt}{10pt}%
+\selectfont%
+\textsf{\textbf{\textsf{HR}}LaTeX} \\
+\rule{\textwidth}{1pt}\\
+\normalsize
+Mini dokument koji koristi \textsf{hrlatex} paket i \textsf{utf8} kodnu stranicu.\\
+
+\medskip
+
+\noindent
+% 
+\fontsize{20pt}{25pt}%
+\selectfont%
+%  
+\strut\hfil \v{C} $\cdot$ \v{c} $\cdot$ {\'{C}} $\cdot$ {\'{c}} $\cdot$ \DJ{} $\cdot$ \dj{} $\cdot$ \v{S} $\cdot$ \v{s} $\cdot$ \v{Z} $\cdot$ \v{z}\\
+% 	
+\strut\hfil Č  $\cdot$    č  $\cdot$   Ć  $\cdot$   ć  $\cdot$   Đ  $\cdot$    đ  $\cdot$   Š  $\cdot$   š  $\cdot$   Ž  $\cdot$  ž\\
+\rule{\textwidth}{1pt}\\
+\vfill
+% \end{tabbing}
+% \chaptername
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/hrlatex/hrlatex.dtx b/Master/texmf-dist/source/latex/hrlatex/hrlatex.dtx
index f80e3c60d40..53095f5fba8 100644
--- a/Master/texmf-dist/source/latex/hrlatex/hrlatex.dtx
+++ b/Master/texmf-dist/source/latex/hrlatex/hrlatex.dtx
@@ -7,31 +7,62 @@
 %<*driver>
 \ProvidesFile{hrlatex.dtx}
 %</driver>
-%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{hrlatex}
-%<*package>
-   [2006/20/06 v0.2 LaTeX Macros for HRLaTeX project]
-	\RequirePackage[cp1250]{inputenc}
-	\RequirePackage[T1]{fontenc}
-	\RequirePackage{tracefnt}
-	\RequirePackage[croatian]{babel}
-	\RequirePackage{amsopn}
-%</package>
-%
+
 %<*driver>
 \documentclass{ltxdoc}
-\usepackage{hrlatex}
+\RequirePackage{hrlatex}
+\RequirePackage{enumerate}
 
 
 \EnableCrossrefs         
 \CodelineIndex
 \RecordChanges
 \begin{document}
-%%  \tableofcontents
+%    \tableofcontents
   \DocInput{hrlatex.dtx}
 \end{document}
 %</driver>
+%<*package>
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{hrlatex}[2006/25/06 v0.21 LaTeX Macros for HRLaTeX project]
+% 
+% 
+	\usepackage{xkeyval}
+% 
+	\DeclareOption{slovene}{\PassOptionsToPackage{slovene}{babel}}
+% 
+% ^^A	\newif\ifenc@valundef
+% ^^A	\enc@valundeftrue
+	\DeclareOptionX{enc}[utf8]{%
+% ^^A		\enc@valundeffalse
+		\PassOptionsToPackage{#1}{inputenc}
+	}
+
+	\DeclareOption{last}{
+
+	}
+
+	\DeclareOption*{}
+	\DeclareOptionX*{}
+
+ 
+% ^^A	\ifenc@valundef
+	\PassOptionsToPackage{utf8}{inputenc} %% Default
+% ^^A	\fi
+	\PassOptionsToPackage{croatian}{babel}
+
+	\ProcessOptions* 
+	\ProcessOptionsX
+
+	\RequirePackage{inputenc}
+	\RequirePackage[T1]{fontenc}
+	\RequirePackage{tracefnt}
+	\RequirePackage[croatian]{babel}
+	\RequirePackage{amsopn}
+
+%</package>
 % \fi
+% 
 %
 % \CheckSum{21}
 %
@@ -55,6 +86,7 @@
 % \changes{v0.1}{2006/11/02}{Prva verzija}
 % \changes{v0.15}{2006/20/05}{.dtx verzija}
 % \changes{v0.2}{2006/20/06}{CTAN upload}
+% \changes{v0.21}{2006/25/06}{utf8 kao default input encoding}
 %
 % \GetFileInfo{hrlatex.sty}
 %
@@ -71,7 +103,7 @@
 %
 % \textsf{HRLaTeX} paket (hrlatex.sty) je \LaTeX2e prilagodba prosje\v{c}nom hrvatskom \LaTeX{} korisniku.
 % \textsf{hrlatex} uklju\v{c}uje \textsf{babel}, \textsf{inputenc}, \textsf{fontenc} pakete s uobi\v{c}ajenim opcijama
-% i definira uobi\v{c}ajene matemati\v{c}ke operatore $\tg$ i sl.
+% i definira uobi\v{c}ajene matemati\v{c}ke operatore, npr.: $\tg$, $\ch$ i dr.
 %
 % \subsubsection*{Za\v{s}to?}
 % % %   ^^A Iz iskustva znam da ve\'cina hrvatskih \LaTeX{} hakera ima vlastite pomo\'cne datoteke u kojima sa sobom vu\v{c}e ono \v{s}to bi svaki dobar \TeX{} dokument trebao imati. Ili jednostavno svaki novi dokument po\v{c}inje tako da se pi\v{s}e preko zadnjeg.
@@ -83,16 +115,28 @@
 % \end{itemize}
 % \section{Uporaba}
 %
-% \DescribeMacro{\usepackage\{hrlatex\}}
+% \DescribeMacro{\usepackage\{hrlatex\}} \DescribeMacro{\RequirePackage\{hrlatex\}}
 % U preambuli treba uklju\v{c}iti \textsf{hrlatex} paket.
 % 
 %
 %
 % \StopEventually{\PrintChanges}
-%
-% \section{\emph{Quirks}}
-% \DescribeMacro{cp1250}
-%    Kodna stranica je stavljena na |cp1250| -- \v{s}to odgovara hrvatskim MS Windows instalacijama. To i na linuxu nije problem. Npr.~kile se lako mo\v{z}e namjestiti tako da mu je cp1250 \textit{default encoding} za editor. Po\v{s}to je cp1250 kodna stranica pro\v{s}irenje ascii-ja sa starijim \LaTeX datotekama nema problema.
+% \section{Kodne stranice}
+% \DescribeMacro{enc=utf8} \DescribeMacro{enc=cp1250} \DescribeMacro{enc=latin2}
+% \textsf{hrlatex} u\v{c}itava paket \textsf{inputenc} kojim omogu\'cuje direktan unos hrvatskih znakova.
+% Ukoliko koristite kodnu stranicu koja nije ASCII ili UTF-8 u opcijama prilikom u\v{c}itavanja paketa 
+% morate to\v{c}no navesti koju kodnu stranicu koristite. Npr., zasad je na hrvatskim windows instalacijama (default) kodna stranica u kojoj se 
+% unosi hrvatski tekst windows-CP1250. Tako npr.~ako \v{z}elite u WinEdt-u unositi hrvatske znakove paket hrlatex u\v{c}itavate s
+% $$\verb+\usepackage[enc=cp1250]{hrlatex}+ $$
+% Analogno se navode ostale kodne stranice, uz napomenu da opciju \verb+utf8+ \textit{default}  ne treba se specijalno navoditi.
+% Za o\v{c}ekivati je da \'ce unicode UTF-8 kodiranje istisnuti starija 8-bitna kodiranja, pa ovu opciju ne\'ce trebati navoditi.
+% 
+% 
+% ^^A ===============================================
+% 
+% \section{Napomene}
+% 
+%    Kodna stranica je (sad ipak) po defaultu stavljena na |utf8| -- u nadi da \'ce to uskoro postati standard na hrvatskim MS Windows instalacijama. Na linuxu to nije problem. Npr.~kile se lako mo\v{z}e namjestiti tako da mu je cp1250 \textit{default encoding} za editor. Po\v{s}to je cp1250 kodna stranica pro\v{s}irenje ascii-ja sa starijim \LaTeX datotekama nema problema.
 % ^^A |\th|
 % 
 % $$\th 1, \tg \frac{\pi}2, \arctg{1}, \sh 1, \ch 0$$
@@ -113,9 +157,15 @@
 %    \end{macrocode}
 % 
 % 
-% 
+% \section{Promjene}
+% \begin{enumerate}[\qquad --]
+% \item[v0.10] Inicijalna verzija 
+% \item[v0.15] .dtx verzija
+% \item[v0.20] prva verzija na na CTAN-u
+% \item[v0.21] Popravio da je \textit{default} ulazna kodna stranica UTF-8 pomo\'cu \textsf{xkeyval} paketa (hvala Mojci Miklavec)
+% \end{enumerate}
 % 
 % \section{Primjedbe}
-%    Javite mi ako imate prijedbi.
+%    Molim Vas da mi javite svoje prijedbe i komentare.
 % \Finale
 \endinput
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}
diff --git a/Master/texmf-dist/tpm/hrlatex.tpm b/Master/texmf-dist/tpm/hrlatex.tpm
index 65e28ce81fe..ffdf5e36aa1 100644
--- a/Master/texmf-dist/tpm/hrlatex.tpm
+++ b/Master/texmf-dist/tpm/hrlatex.tpm
@@ -3,27 +3,29 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/hrlatex.zip">
     <TPM:Name>hrlatex</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/06/20 09:48:00</TPM:Date>
+    <TPM:Date>2006/06/27 16:16:00</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>karl</TPM:Creator>
     <TPM:Title>The hrlatex package.</TPM:Title>
     <TPM:Description></TPM:Description>
     <TPM:Author></TPM:Author>
-    <TPM:Size>271865</TPM:Size>
+    <TPM:Size>273084</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="3833">
+    <TPM:RunFiles size="4226">
 texmf-dist/tex/latex/hrlatex/hrdipl.cls
 texmf-dist/tex/latex/hrlatex/hrlatex.sty
 texmf-dist/tpm/hrlatex.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="262892">
+    <TPM:DocFiles size="285078">
 texmf-dist/doc/latex/hrlatex/README
 texmf-dist/doc/latex/hrlatex/hrlatex.pdf
 texmf-dist/doc/latex/hrlatex/novi.diplomski-rad.tex
 texmf-dist/doc/latex/hrlatex/sample.diplomski-rad.tex
-texmf-dist/doc/latex/hrlatex/sample.minimal.tex
+texmf-dist/doc/latex/hrlatex/sample.minimal.cp1250.tex
+texmf-dist/doc/latex/hrlatex/sample.minimal.latin2.tex
+texmf-dist/doc/latex/hrlatex/sample.minimal.utf8.tex
     </TPM:DocFiles>
-    <TPM:SourceFiles size="6359">
+    <TPM:SourceFiles size="8265">
 texmf-dist/source/latex/hrlatex/hrlatex.dtx
 texmf-dist/source/latex/hrlatex/hrlatex.ins
     </TPM:SourceFiles>