hrlatex update (25apr10)

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

14 files changed, 710 insertions, 280 deletions

diff --git a/Master/texmf-dist/doc/latex/hrlatex/README b/Master/texmf-dist/doc/latex/hrlatex/README
index 35e28f196e5..41c531c7cbe 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.22
+HRLaTeX Package, version 0.23
 
 Author: Marcel Maretic
 
@@ -6,7 +6,7 @@ Author: Marcel Maretic
 * Copyright
 ===========
 
-	Copyright (C) 2006 Marcel Maretic
+	Copyright (C) 2010 Marcel Maretic
 	
 	This material is subject to the LaTeX Project Public License. 
 	See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html 
@@ -15,19 +15,19 @@ Author: Marcel Maretic
 	
 	HRLaTeX consists of the following files:
 
-	----
-	hrlatex.dtx
-	hrlatex.ins
-	hrlatex.sty
-	hrdipl.cls
-	README
-	sample.diplomski-rad.tex
-	sample.minimal.cp1250.tex
-	sample.minimal.latin2.tex
-	sample.minimal.utf8.tex
-	novi.diplomski-rad.tex
-	hrlatex.pdf
-	-----
+        ----
+        hrlatex.dtx
+        hrlatex.ins
+        fsbispit.cls
+        fsbmath.sty
+        README
+        sample.fsbispit.tex
+        sample.minimal.cp1250.tex
+        sample.minimal.latin2.tex
+        sample.minimal.utf8.tex
+        sample.prezentacija.tex
+        hrlatex.pdf
+        -------
 
 
 
@@ -36,8 +36,8 @@ Author: Marcel Maretic
 =============
 
 	This package simplifies creation of new documents for (average) croatian user.
-	As an example - a class file hrdipl.cls (graduation thesis at the University 
-	of Zagreb) and sample thesis documents are included.
+	As an example - a class file fsbispit.cls (exam style for FSB at University 
+	of Zagreb) and a sample document are included.
 
 
 
@@ -48,16 +48,15 @@ Author: Marcel Maretic
 	
 	- Run LaTeX on the file `hrlatex.ins' to create the style file `hrlatex.sty'.
 	- Run LaTeX on the file `hrlatex.dtx' to create the doc   file `hrlatex.dvi'.
-	- Install these files anywhere you see fit. I recommend to do it locally 
-	(current directory) for now.
+	- Install these files anywhere you see fit.
 
 
 
 -------------------------------------------
 	Marcel Maretic
-	Katedra za matematiku i nacrtnu geometriju
+	Katedra za matematiku
 	Fakultet strojarstva i brodogradnje
 	Ivana Lucica 5
 	10002 Zagreb
 	Croatia
-	http://www.fsb.hr/matematika/?ulaz=marcel
+	http://www.fsb.hr/matematika/marcel/
diff --git a/Master/texmf-dist/doc/latex/hrlatex/hrlatex.pdf b/Master/texmf-dist/doc/latex/hrlatex/hrlatex.pdf
index f7b4565cb9a..acfc34358a1 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/novi.diplomski-rad.tex b/Master/texmf-dist/doc/latex/hrlatex/novi.diplomski-rad.tex
deleted file mode 100644
index 84b2c3753e5..00000000000
--- a/Master/texmf-dist/doc/latex/hrlatex/novi.diplomski-rad.tex
+++ /dev/null
@@ -1,27 +0,0 @@
-\documentclass[12pt]{hrdipl}
-
-
-\author{Hrvoje Horvat}
-\title{Novi diplomski rad}
-\date{Zagreb, lipanj 2006.}
-
-% --------------------------------------
-\hrImeFakulteta{Agronomski fakultet}
-\hrVoditeljRada{Marko Mari\'c}
-% --------------------------------------
-
-
-\begin{document}
-
-
-
-\titlepage
-
-\tableofcontents
-
-
-\chapter{Uvod}
-
-
-%
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/hrlatex/novi.ispit.tex b/Master/texmf-dist/doc/latex/hrlatex/novi.ispit.tex
deleted file mode 100644
index b0c0bd4cd90..00000000000
--- a/Master/texmf-dist/doc/latex/hrlatex/novi.ispit.tex
+++ /dev/null
@@ -1,102 +0,0 @@
-\documentclass{ispit}
-
-
-\title{Matematika 3}
-
-\begin{document}
-
-\begin{ispit}{06.~srpnja 2006.}
-
-    \begin{napomena}
-    Matematika 3A rje\v{s}ava zadatke 1--6; Matematika 3  rje\v{s}ava 1,3, 4, 6, 7, 9;
-    Matematika 3B rje\v{s}ava zadatke~4--9.
-    \end{napomena}
-
-    \bigskip
-
-
-%>>>>>>>>>>>>>>>>>>>>>.
-
-\begin{zadatak}
-	Funkciju $\sin x + \sh x$ aproksimiramo u ra\v{c}unalu,
-	kori\v{s}tenjem po\v{c}etnih komada Taylorovih redova oko $0$ za te
-	funkcije. \v{C}lanove svakog reda zbrajamo sve dok prvi odba\v{c}eni
-	\v{c}lan ne padne ispod zadane to\v{c}nosti $\varepsilon$,
-	$0 < \varepsilon \ll 1$. Ho\'{c}e li za $x = 10$ takva aproksimacija
-	biti pribli\v{z}no to\v{c}na ili ne? Objasnite.
-\end{zadatak}
-
-\begin{zadatak}
-	Profesor Senilkovi\'{c} na\v{s}ao se u problemima, jer je
-	zaboravio je li LR faktorizaciju matrice radio s parcijalnim
-	pivotiranjem ili bez njega. Dobivena matrica $L$ bila je
-	\begin{displaymath}
-		L = \left[
-			\begin{array}{rrr}
-			 1 &   &   \\
-			 2 & 1 &   \\
-			 0 & 0 & 1
-			\end{array}
-			\right].
-	\end{displaymath}
-	Pomozite prof.\ Senilkovi\'{c}u i objasnite mu zbog \v{c}ega je
-	odmah vidljivo je li koristio pivotiranje ili ne. 
-\end{zadatak}
-
-\begin{zadatak}
-	Na\dj ite koliko je podintervala potrebno (po ocjeni gre\v{s}ke),
-	a zatim produljenom Simpsonovom metodom izra\v{c}unajte
-	pribli\v{z}nu vrijednost integrala
-	\begin{displaymath}
-		\int_1^2 \left( \frac{x^5}{60} + \frac{x^4}{4} + 2x^2
-				- x \right) \, dx
-	\end{displaymath}
-	tako da gre\v{s}ka bude manja od $10^{-4}$.
-\end{zadatak}
-
-%>>>>>>>>>>>>>>>>>>>>>.
- 
-\begin{zadatak}
-Bacamo dvije igra\'ce kocke. Dobiveni zbroj na njima je 8. Koja je vjerojatnost da je na jednoj od njih (svejedno kojoj) pala 2-ojka?
-\end{zadatak}
-
-\begin{zadatak}
-Za slu\v{c}ajnu varijablu $X$ koja ima normalnu razdiobu
-$\mathcal{N}(\mu =100, \sigma)$ odredite standardnu devijaciju $\sigma$ tako da vrijedi
-$$P(99 < X < 101)=0.5 .$$
-\end{zadatak}
-
-    \begin{zadatak}
-    Predsjedni\v{c}ki kandidat $A$ pobijediti \'ce kandidata $B$ na predsjedni\v{c}kim izborima sa $55\%$ glasova.
-\begin{compactenum}[a)]
-\item Kolika je vjerojatnost da slu\v{c}ajni uzorak veli\v{c}ine $N=200$ glasa\v{c}a predvidi krivi ishod izbora -- odnosno da u tom uzorku $A$ dobije manje od $50\%$ glasova?
-\item Kolika mora biti veli\v{c}ina uzorka da vjerojatnost krive prognoze izbora bude manja od $5\%$?
-\end{compactenum}
-    \end{zadatak}
-
-\begin{zadatak}
-     Polo\v{z}aji dviju \v{c}estica koje se gibaju u prostoru  dani su parametrizacijama
-      $$\vec{r}_1(t) = (2t^3, 1-t, t^2), \qquad \vec{r}_2 = (1+t, t^2+2, t^3)\ .$$
-\begin{compactenum}[a)]
-\item Kolika je me\dj{}usobna udaljenost \v{c}estica u trenutku $t=0$?
-\item Koja \v{c}estica ima ve\'ce ubrzanje u trenutku $t=1$?
-\end{compactenum}
-\end{zadatak}
-
-\begin{zadatak}
-  Neka je $U$ skalarno polje zadano s
-    $ U = xyz +  yz + z-1$.
-  Izra\v cunajte $$\int_{K} U |d\overrightarrow{r}|$$ gdje je $K$
-  du\v zina koja spaja to\v cke $A(3,0,1)$ i $B(3,1,2)$.
-\end{zadatak}
-
-\begin{zadatak}
-Izra\v{c}unajte
-$$\oint_C \vec{F} d\vec{r}$$
-za polje $\overrightarrow{F}=(y^2, zy, xy)$. Krivulja $C$ je pozitivno orijentirani rub kvadrata s vrhovima $(1,1)$, $(-1,1)$, $(-1,-1)$, $(1,-1)$ u $xy$-ravnini.
-%   \bodovi{20 bodova}
-\end{zadatak}
-
-\end{ispit}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/hrlatex/sample.diplomski-rad.tex b/Master/texmf-dist/doc/latex/hrlatex/sample.diplomski-rad.tex
deleted file mode 100644
index 372a1bb302e..00000000000
--- a/Master/texmf-dist/doc/latex/hrlatex/sample.diplomski-rad.tex
+++ /dev/null
@@ -1,73 +0,0 @@
-\documentclass[enc=cp1250]{hrdipl}
-
-% \usepackage{hrlatex}
-
-\usepackage{amsmath}
-\usepackage{pxfonts}
-
-\author{Hrvoje Horvat}
-\title{Novi diplomski rad}
-% \date{Zagreb, lipanj 2006.}
-
-
-
-\begin{document}
-
-
-\titlepage
-
-\tableofcontents
-
-
-\chapter{Uvod}
-
-In publishing and graphic design, lorem ipsum (or simply lipsum) is standard placeholder text used to demonstrate the graphic elements of a document or visual presentation, such as font, typography, and layout. Lipsum also serves as placeholder text in mock-ups of visual design projects before the actual words are inserted into the finished product. When used in this manner, lipsum is also called greeking.
-
-
-
-Although using "lorem ipsum" often arouses curiosity due to its resemblance to classical Latin, it is not intended to have broader meaning. Where text is visible in a document, people tend to focus on the textual content rather than upon overall presentation, so publishers use lorem ipsum when displaying a typeface or design in order to direct the focus to presentation. "Lorem ipsum" is also said to approximate a typical distribution of letters in English, which helps to shift the focus to presentation.
-
-
-\section{Odjeljak (\textit{section})}
-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. 
-% 
-$$\oint_a^b x^2 \sin x\cos x\, \text{d}x$$
-% 
-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.
-
-\subsection{Pododjeljak (\textit{subsection})}
-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.
-\begin{equation}
-\lim_{n\to\infty} \left(1+n\right)^\frac{1}{n} = e
-\end{equation}
-% d
-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.
-
-
-\subsection{Pododjeljak (\textit{subsection})}
-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.
-\begin{equation}
-\lim_{n\to\infty} \left(1+n\right)^\frac{1}n = e
-\end{equation}
-% d
-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.
-
-
-
-
-
-
-
-
-\chapter{Lorem ipsum}
-% 
-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.fsbispit.tex b/Master/texmf-dist/doc/latex/hrlatex/sample.fsbispit.tex
new file mode 100644
index 00000000000..64650963302
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hrlatex/sample.fsbispit.tex
@@ -0,0 +1,83 @@
+\documentclass[12pt]{fsbispit}
+% CP1250
+
+
+
+\let\ispitFooter\empty
+\newenvironment{obavijest}[1][konj]{}{}
+
+\usepackage{tgtermes}
+
+\begin{document}
+
+ 
+
+
+\title{Probni ispit}
+\begin{ispit}{2010-04-09}
+
+\begin{zadatak}%[10 bodova]
+Rije�i ne�to       
+Lorem Ipsum is simply dummy text of the printing and typesetting industry. \\
+Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type
+% 
+ \begin{align*}
+              \oint_\Gamma z^2-\overline{z}\ \  dz  
+ \end{align*}
+
+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type
+% 
+
+% \begin{rjesenje}
+%  Ja?       
+% % \end{rjesenje}
+
+\end{zadatak}
+
+\begin{zadatak}[5 bodova]
+ \begin{enumerate}[a)]
+        \item Prvo pitanje
+        \item Drugo pitanje
+ \end{enumerate}
+
+\end{zadatak}
+
+
+
+\begin{zzadatak}[20 bodova]
+ Rije�i jo� ne�to       
+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
+\rjesenje{Kratko rje\v{s}enje}
+\end{zzadatak}
+
+
+\begin{zadatak}[30 bodova]
+Rije�i ne�to       
+Lorem Ipsum is simply dummy text of the printing and typesetting industry. \\
+Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type
+% 
+ \begin{align*}
+              \oint_\Gamma z^2-\overline{z}\ \  dz  
+ \end{align*}
+
+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type
+% 
+\end{zadatak}
+
+ 
+
+
+      
+\end{ispit}
+\begin{obavijest}
+{\small \dotfill }
+
+\vfill \vfill
+% #1
+ Rezultati ispita su sljede�i radni dan u 13:00 sati.       
+\end{obavijest}
+
+\newpage
+\printRjesenja
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.utf8.tex b/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.utf8.tex
index 5365a2600d2..abe60403e07 100644
--- a/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.utf8.tex
+++ b/Master/texmf-dist/doc/latex/hrlatex/sample.minimal.utf8.tex
@@ -1,5 +1,5 @@
 % UTF-8
-\documentclass{minimal}
+\documentclass[12pt]{minimal}
 
 % \usepackage[enc=utf8]{hrlatex}
 \usepackage{hrlatex}
@@ -32,4 +32,84 @@ Mini dokument koji koristi \textsf{hrlatex} paket i \textsf{utf8} kodnu stranicu
 \vfill
 % \end{tabbing}
 % \chaptername
+
+\newpage
+\normalsize
+\fontsize{12pt}{15pt}%
+\selectfont%
+
+\noindent 
+Marcel Maretić \\
+Hrvatskih branitelja 4a\\
+42000 Varaždin\\[0.5ex]
+GSM: 091 5111 599 \\[0.5ex]
+29. siječnja 2010.
+
+\strut\hfill
+\begin{minipage}[t]{7cm}
+        Republika Hrvatska\\
+        Državni inspektorat\\
+        Područna jedinica Varaždin  \\
+        n/r Pročelniku Vladimiru Benkoviću\\
+        Stanka Vraza 4\\
+        Varaždin
+\end{minipage}
+
+
+
+\vspace*{2cm}
+
+\textbf{Predmet}:
+\begin{minipage}[t]{12cm}
+\raggedright
+ Zahtjev za provedbom inspekcijskog nadzora nad elektromehaničarskim obrtom Marković, Varaždin, K.~Filića 9 \\
+(ovlašteni servis kućanskih aparata marke Blomberg)     
+\end{minipage}
+
+\vspace*{2cm}
+
+\noindent
+Poštovani,\\
+ovim putem Vam dostavljam Zahtjev za provedbom inspekcijskog nadzora nad obrtom Marković, K.~Filića 9, Varaždin.
+
+\bigskip 
+
+Predmetni obrt odbija ispoštovati uvjete garancije u kojima piše:
+% \begin{quotation}
+
+\medskip
+
+ \dots \textit{da ćemo u jamstvenom roku na svoj trošak otkloniti sve nedostatke i eventualne tehničke manjkavosti koje bi mogle nastati pri normalnoj i pravilnoj uporabi (u skladu s uputama) najkasnije u roku od 45 dana od dana prijave kvara, tj.~od dana dostave aparata u najbliži servis s priloženog popisa ovlaštenih servisa.}
+
+\medskip 
+
+% \end{quotation}
+% 
+% 
+%  da se aparat zamjenjuje novim ako servis traje 45 dana. U privitku je kopija garantnog lista.
+U ovom slučaju prošlo je 79 dana od zaprimanja sušilice u servis.
+
+\bigskip 
+
+Predmetnom obrtu sam kao ovlaštenom serviseru kućanskih aparata marke Blomberg 13.11.2009. dao servisirati sušilicu rublja .... .
+Sušilicu sam kupio 05.01.2008. u trgovini Elipso u Varaždinu. Sušilica se pokvarila unutar 5-godišnjeg garantnog roka.
+
+
+\bigskip
+
+\bigskip 
+
+Sukladno svemu navedenom, molim Vas da obavite inspekcijski nadzor u obrtu Marković i da u okviru Vaših nadležnosti poduzmete što je potrebno kako bi spomenuti servis ispoštovao uvjete jamstva.
+
+\medskip
+
+Za sve dodatne informacije stojim Vam na raspolaganju i srdačno Vas pozdravljam,\\
+
+\bigskip
+        \strut \hfill Marcel Maretić
+
+
+
+
+
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/hrlatex/sample.prezentacija.tex b/Master/texmf-dist/doc/latex/hrlatex/sample.prezentacija.tex
index 1c2342c1ed9..60936f258c9 100644
--- a/Master/texmf-dist/doc/latex/hrlatex/sample.prezentacija.tex
+++ b/Master/texmf-dist/doc/latex/hrlatex/sample.prezentacija.tex
@@ -1,46 +1,40 @@
 \documentclass[%
-% a4paper,
-marcelix,
-draft,
-% slideColor,
-slideBW,
-% colorBG,
-% ps2pdf,
-pdf]{prosper}
+% draft,%
+handout, %
+% serif,%
+t,% top-centered frametitles
+]{beamer}
 
 
-\hypersetup{pdfpagemode=FullScreen}%
-
-% \usepackage{enumerate}
-
 \usepackage{hrlatex}
 
 
-\usepackage{amsmath}
+        \usepackage{amsmath}
+        \usepackage{amsthm}
+        \usepackage{txfonts}
+        \usepackage{framed}
 
-\usepackage{txfonts}
 
 
 
+        \title{Mini prezentacija}
+	\subtitle{ mali podnaslov }
+	\author{NN}
 
-\title{Naslov prezentacije}
-	\subtitle{ podnaslov }
-	\author{Marcelix}
- 	\email{marcelix@spam.hr}
- 	\institution{\href{http://www.tug.hr/}{\sffamily \textbf{HR}LaTeX}}
 
 
+% BEGIN NOT
+\usetheme[titleline=true]{Torino}
+\usepackage{tgheros}
+\usepackage{microtype}
+% END NOT
 
 
 
 \begin{document}
 
 
-% \Logo(-1,-1){\footnotesize\usefont{T1}{phv}{m}{n}\fontsize{4pt}{14pt}%
-%   \selectfont \textbf{HR}LaTeX}
-  
-  \Logo{\footnotesize\usefont{T1}{phv}{m}{n}\fontsize{4pt}{14pt}%
-  \selectfont \textbf{HR}LaTeX}
+
 
 \maketitle
 
@@ -48,36 +42,23 @@ pdf]{prosper}
 
 % =============================
 
-\begin{slide}{Prvi slajd}
+\begin{frame}{Prvi slajd}{Podnaslov}
 \begin{itemize} 
  \item prvi red
  \item drugi red
 \end{itemize}
 
-\end{slide}
-
-
-\overlays{4}{
-\begin{slide}{Drugi slajd}
-\untilSlide{3}{{\scriptsize (ovo je tekst koji \'ce nestati s ekrana poslije 3.~linije)}}
-\begin{itemstep}
-\item $1+1=2$
-\item $\displaystyle \int_1^x \frac{1}t dt= \ln x$
-\item tre\'ci redak
-\item $1+2+3+\dots +n = ?$
-\end{itemstep}
-\end{slide}
-}
-
-
-\begin{slide}{Kraj}
- 
- \bigskip
- 
- \hfil
- Hvala.
-\end{slide}
-
+\end{frame}
+
+% 
+\begin{frame}{Drugi slajd}
+    \begin{itemize}
+    \item $1+1=2$
+    \item $\displaystyle \int_1^x \frac{1}t dt= \ln x$
+    \item tre\'ci redak
+    \item $1+2+3+\dots +n = ?$
+    \end{itemize}
+\end{frame}
 
 
 \end{document}
diff --git a/Master/texmf-dist/source/latex/hrlatex/hrlatex.dtx b/Master/texmf-dist/source/latex/hrlatex/hrlatex.dtx
index 90975be1fe7..1cc8f4bfc9e 100644
--- a/Master/texmf-dist/source/latex/hrlatex/hrlatex.dtx
+++ b/Master/texmf-dist/source/latex/hrlatex/hrlatex.dtx
@@ -24,7 +24,7 @@
 %</driver>
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{hrlatex}[2006/10/05 v0.22 LaTeX Macros for HRLaTeX project]
+\ProvidesPackage{hrlatex}[2010/04/05 v0.23 LaTeX Macros for HRLaTeX project]
 % 
 % 
 	\usepackage{xkeyval}
@@ -56,7 +56,7 @@
 
 	\RequirePackage{inputenc}
 	\RequirePackage[T1]{fontenc}
-	\RequirePackage{tracefnt}
+% 	\RequirePackage{tracefnt}
 	\RequirePackage[croatian]{babel}
 	\RequirePackage{amsopn}
 
@@ -88,6 +88,7 @@
 % \changes{v0.2}{2006/06/20}{CTAN upload}
 % \changes{v0.21}{2006/06/25}{utf8 kao default input encoding}
 % \changes{v0.22}{2006/09/20}{MikTeX fix}
+% \changes{v0.23}{2010/04/25}{Ciscenje}
 %
 % \GetFileInfo{hrlatex.sty}
 %
@@ -96,7 +97,7 @@
 %
 % \title{{\Large \textsf{HRLaTeX}} paket\thanks{Ovaj dokument
 %   odnosi se na \textsf{hrlatex}~\fileversion, \filedate.}}
-% \author{Marcel Mareti\'c \\ \texttt{marcelix at gmail dot com} \\ \texttt{http://www.tug.hr/}}
+% \author{Marcel Mareti\'c \\ \texttt{marcelix at gmail dot com} \\ \texttt{http://hrlatex.wordpress.com/}}
 %
 % \maketitle
 %
@@ -127,7 +128,7 @@
 % \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
+% unosi hrvatski tekst windows-CP1250. Tako npr.~ako \v{z}elite u WinEdt-u unositi hrvatske znakove paket hrlatex u\v{c}itajte 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.
@@ -165,6 +166,7 @@
 % \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)
 % \item[v0.22] fix za MikTeX
+% \item[v0.23] ...
 % \end{enumerate}
 % 
 % \section{Primjedbe}
diff --git a/Master/texmf-dist/source/latex/hrlatex/hrlatex.ins b/Master/texmf-dist/source/latex/hrlatex/hrlatex.ins
index b8b78eb88a5..8ff64beeb67 100644
--- a/Master/texmf-dist/source/latex/hrlatex/hrlatex.ins
+++ b/Master/texmf-dist/source/latex/hrlatex/hrlatex.ins
@@ -20,7 +20,7 @@
 \preamble
 
 %
-%     Copyright (C) 2005  HRLaTeX team
+%     Copyright (C) 2010  HRLaTeX team
 % 
 %     This program is free software; you can redistribute it and/or modify
 %     it under the terms of the GNU General Public License as published by
diff --git a/Master/texmf-dist/tex/latex/hrlatex/fsbispit.cls b/Master/texmf-dist/tex/latex/hrlatex/fsbispit.cls
new file mode 100644
index 00000000000..b5f0fb948e8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/hrlatex/fsbispit.cls
@@ -0,0 +1,134 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{fsbispit}[2010/04/09 Marcelix za FSB]
+\LoadClassWithOptions{article}
+
+\RequirePackage[%
+a4paper,%
+left=2.2cm,%
+top=2.15cm,%
+right=1.6cm,
+bottom=2cm%
+%,showframe
+]{geometry}
+
+
+
+
+\RequirePackage{fsbmath} % fsbmath poziva hrlatex.sty
+% 
+% \ProcessOptions
+
+\RequirePackage{txfonts}
+
+\ProcessOptions*
+
+
+
+
+
+
+
+\newcommand{\novirok}{
+    \newpage
+    \setcounter{zad}{0}
+    \malititle
+}
+
+
+
+
+
+\pagestyle{plain}
+
+
+
+\newcommand{\malititle}{
+    \maketitle
+    \section*{}
+    \addcontentsline{toc}{subsubsection}{\@date}
+}
+
+
+\renewcommand{\maketitle}{%
+   %\addcontentsline{toc}{subsection}{\@date}
+    \thispagestyle{empty}
+    \let\footnote\thanks
+
+    \vskip 1.5em
+    \noindent
+    {\Large \textsf{\textbf{\@grupa}}}
+     \\[-5ex]
+    \parbox[t][][c]{\textwidth}{
+        \Large\centering
+        \textbf{
+            \textsf{
+                \MakeUppercase\@title}
+            }
+        } %parbox
+
+    \begin{center}
+        \textsf{(\@date)}
+    \end{center}
+
+    \vskip 1em
+}                 %maketitle
+
+
+\newcommand{\printtitle}{\@title}
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5555
+
+
+
+
+\let\@grupa\empty
+\newcommand{\grupa}[1]{\def\@grupa{#1}}
+
+
+
+%%%%%
+%
+% obicni title
+
+\newcommand{\makeheadertitle}{%
+     \let\footnote\thanks
+
+    \vskip 1.5em
+    \noindent
+    {\Large \textsf{\textbf{\@grupa}}}
+     \\[-5ex]
+    \parbox[t][][c]{\textwidth}{
+        \Large\centering
+        \textbf{
+            \textsf{
+                \MakeUppercase\@title}
+            }
+        } %parbox
+
+    \begin{center}
+        \textsf{(\@date)}
+    \end{center}
+
+    \vskip 1em
+}                 %maketitle
+
+\definecolor{shadecolor}{rgb}{0.8,0.85,0.95}
+
+
+
+%%%============================
+% trik za optional argument...
+% Treba napraviti par \tcmd i \@tcmd komandi. \@dblarg pomaze da ako [#1] nije pozvan nego samo jedan argument, default
+%          #1 <-  #2
+%
+
+\def\tcmd{\@dblarg{\@tcmd}}
+
+\long\def\@tcmd[#1]#2{%
+#1, #2
+}
+%
+%===========================
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/hrlatex/fsbmath.sty b/Master/texmf-dist/tex/latex/hrlatex/fsbmath.sty
new file mode 100644
index 00000000000..5448972028c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/hrlatex/fsbmath.sty
@@ -0,0 +1,353 @@
+% 
+% 
+%  Style for  FSB Math docs
+% 
+% 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{fsbmath}[2010/04/09 v0.31 LaTeX Macros for FSB Math Dept, University of Zagreb]
+			
+
+\RequirePackage{amsmath, amsthm, amssymb}
+% \RequirePackage{esvect}
+%\RequirePackage{theorem}
+
+
+
+\RequirePackage[dvips]{graphicx}
+\RequirePackage[default, rjesenja]{optional}
+
+
+\RequirePackage{calc}
+\RequirePackage{ifthen}
+
+\RequirePackage[enc=cp1250]{hrlatex}
+
+
+\RequirePackage{framed}
+% \RequirePackage{picins}
+\RequirePackage{multicol}
+
+
+
+\RequirePackage{enumerate}
+\RequirePackage{paralist}
+
+
+\RequirePackage{xcolor}
+
+
+
+% \RequirePackage{pst-plot}
+% \RequirePackage{pstricks-add}
+% \RequirePackage{pstricks, pst-node, pst-tree}
+
+\RequirePackage{cancel}
+
+
+% \RequirePackage{txfonts}
+
+\RequirePackage[%
+	linkcolor=blue,%
+	urlcolor=blue,%
+	colorlinks,%
+% 	breaklinks,%
+]{hyperref}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\R}{\mathbb{R}}
+\newcommand{\Q}{\mathbb{Q}}
+\newcommand{\Z}{\mathbb{Z}}
+\newcommand{\N}{\mathbb{N}}
+\newcommand{\C}{\mathbb{C}}
+\newcommand{\D}{\displaystyle}
+\newcommand{\F}{\mathbf{F}}
+
+\renewcommand{\Re}{\mathop{\textrm{Re}}}
+\renewcommand{\Im}{\mathop{\textrm{Im}}}
+\newcommand{\Ln}{\mathop{\textrm{Ln}}}
+\newcommand{\Arg}{\mathop{\textrm{Arg}}}
+% \newcommand{\ch}{\mathop{\textrm{ch}}}
+% \newcommand{\sh}{\mathop{\textrm{sh}}}
+
+
+
+\newcommand{\hpm}{\ensuremath{\hphantom{-}}}
+
+
+\newcommand{\eqdef}{\ensuremath{\stackrel{\mathrm{def}}{=}}}
+
+% \DeclareMathOperator{\arccos}{arc cos}
+
+
+
+\ProcessOptions*
+
+%>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+%       fsbmath.sty macros
+%>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+
+\newcommand{\ispitFooter}{\noindent\emph{\textbf{Rezultati ispita}: sljede\'ci radni dan u 13:00 sati}}
+
+
+\let\@fsbZadatakBodovi\empty
+\def\bodovi#1{%
+%  PROVJERI jel #1 prazan string:
+\ifthenelse{\equal{#1}{}}%
+{\def\@fsbZadatakBodovi{}}%
+{\def\@fsbZadatakBodovi{(#1)}}%
+}
+
+\newcommand{\fsbShowBodovi}{\medskip\hfill \small \@fsbZadatakBodovi\relax}
+
+
+\newenvironment{zadaca}[1]
+{
+    \newpage
+    \pagestyle{marcelstyleb}
+    \setcounter{zad}{0}
+
+    \phantomsection
+    \addcontentsline{toc}{subsubsection}{#1}
+
+    \date{#1}
+    \makeheadertitle
+}
+{
+    \pagebreak
+}
+
+\newenvironment{ispit}[1]
+{
+    \newpage
+    \thispagestyle{empty}
+
+    \setcounter{zad}{0}
+    \date{#1}
+
+    \phantomsection
+    \addcontentsline{toc}{subsubsection}{#1}
+
+    \makeheadertitle
+}
+{
+    \vfill
+    \ispitFooter
+%     \pagebreak
+}
+
+
+
+\newenvironment{kolokvij}[2]
+{
+    % #1 -> datum
+    % #2 -> grupa (A ili B)
+
+    \newpage
+    \pagestyle{empty}
+    \setcounter{zad}{0}
+    \date{#1}
+    \grupa{#2}
+
+    \phantomsection
+    \addcontentsline{toc}{subsubsection}{#1\   --\  #2}
+
+    \makeheadertitle
+}
+{
+%     \pagebreak
+}
+
+
+
+%--------------------------------------------------------
+%
+%  section styles
+%
+%
+\renewcommand\section{\@startsection {section}{1}{\z@}%
+                                   {-3.5ex \@plus -1ex \@minus -.2ex}%
+                                   {2.3ex \@plus.2ex}%
+                                   {\normalfont\Large\bfseries\sffamily}}
+
+\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
+                                     {-3.25ex\@plus -1ex \@minus -.2ex}%
+                                     {1.5ex \@plus .2ex}%
+                                     {\normalfont\large\bfseries\sffamily}}
+
+\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+                                     {-3.25ex\@plus -1ex \@minus -.2ex}%
+                                     {1.5ex \@plus .2ex}%
+                                     {\normalfont\bfseries\sffamily}}
+
+\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
+                                    {3.25ex \@plus1ex \@minus.2ex}%
+                                    {-1em}%
+				    {\normalfont\bfseries\sffamily}}
+
+\renewcommand\subparagraph{\@startsection{subparagraph}{5}{\z@}%\parindent}%
+                                       {3.25ex \@plus1ex \@minus .2ex}%
+                                       {-1em}%
+                                      {\normalfont\normalsize\bfseries\sffamily}}
+
+%--------------------------------------------------------
+
+\newenvironment{lekcija}[1]%
+{\newpage\section*{#1}}%
+{}
+
+\newtheorem{primjer}{Primjer}
+\newtheorem*{napomena}{Napomena}
+
+% \theoremstyle{definition}
+
+\newtheoremstyle{zadatakstyle}%
+{\topsep}{\topsep}%
+{\rmfamily}%
+{0cm}%{-0.145cm}%-12pt}%
+{\bfseries}%
+{}%
+{0pt}%
+{\makebox[0cm]{{\makebox[1cm][r]{\thmnumber{ #2}.\,}}}}%
+
+
+\newtheoremstyle{zzadatakstyle}%
+{\topsep}{\topsep}%
+{\rmfamily}%
+{0cm}%{-0.145cm}%-12pt}%
+{\bfseries}%
+{}%
+{0pt}%
+{\makebox[0cm]{{\makebox[1cm][r]{\thmnumber{ #2}.\!$^{*}$\,}}}}%
+
+\newtheoremstyle{zvjezdastibrojac}%
+{\topsep}{\topsep}%
+{\rmfamily}%
+{}%-12pt}%-12pt}%
+{\bfseries}%
+{.\!$^{*}$}%
+{ }%
+{}%
+
+
+
+
+
+%\theoremstyle{plain}
+
+\theoremstyle{zadatakstyle}%
+\newtheorem{zad}{}%
+
+\theoremstyle{zzadatakstyle}%
+\newtheorem{zzad}[zad]{}%
+
+
+% ======================================
+
+
+
+\newenvironment{zadatak}[1][]{
+% \if\notempty{##1}%d
+% \relax
+% \else 
+% \ifthenelse{\equal{#1}{}}%
+% {\bodovi{}}%
+\bodovi{#1}
+% \bodovi{#1}
+% \fi
+\begin{zad}% 
+\begin{list}{}{%
+\setlength\leftmargin{0.8165cm}%\makebox{\textbf{\textsf{111.\  }}\ }}
+% \setlength{\labelwidth}{1cm}%
+\setlength{\labelsep}{0pt}%
+\setlength{\listparindent}{0cm}%
+\setlength{\itemindent}{0cm}%
+}
+\item 
+\setlength{\labelsep}{1ex}%
+}%
+{%END environment
+\end{list}%
+\end{zad}%
+\fsbShowBodovi\relax
+\bigskip% 
+}
+
+\newenvironment{zzadatak}[1][]{%kopija zadatak environmenta
+\bodovi{#1}
+\begin{zzad}% 
+\begin{list}{}{%
+\setlength\leftmargin{0.8165cm}%\makebox{\textbf{\textsf{111.\  }}\ }}
+% \setlength{\labelwidth}{1cm}%
+\setlength{\labelsep}{0pt}%
+\setlength{\listparindent}{0cm}%
+\setlength{\itemindent}{0cm}%
+}
+\item 
+}%
+{%END environment
+\end{list}%
+\end{zzad}%
+\fsbShowBodovi\relax
+\bigskip% 
+}
+
+
+
+\setlength{\parindent}{0pt}
+
+
+%BEGIN  RJESENJA ...............
+% otvori novi filedescriptor
+\newwrite\tf@rjesenja
+
+\newcommand{\rjesenje}[1]{%
+\opt{inlinerjesenja}{%
+\par\textcolor{lightgray}{\fbox{\scriptsize \textcolor{red}{Rj. }\textcolor{lightgray}{ #1}}}
+}% end opt inlinerjesenja
+\protected@write{\@auxout}
+  {}
+  {\string\@writefile{rjesenja}{
+  {\protect\par {\small \textbf{\thezad.} #1}}
+  }}}
+
+\newcommand{\rjesenjeSection}[1]{
+\protected@write{\@auxout}
+  {}
+  {\string\@writefile{rjesenja}{
+  {\protect{\bigskip}\protect\par \protect\itshape \protect\fbox\protect{#1\protect} \protect\dotfill {str.~\thepage}\protect\par\protect\medskip   }
+  }}}
+% }
+
+
+%BEGIN ispis rjesenja
+
+
+\newcommand{\printRjesenja}{%
+\section*{Rje\v{s}enja zadataka}
+\addcontentsline{toc}{section}{Rje\v{s}enja zadataka}
+
+    \begin{multicols*}{2} %mcols* je nebalansirana verzija...
+    \raggedright
+    \makeatletter
+    \@starttoc{rjesenja}
+    \makeatother
+    \vfill 
+    \end{multicols*}
+% 
+}
+
+%END ispis rjesenja
+
+
+\newcommand{\stopRjesenja}{
+    \let\oldrjesenjeMacro\rjesenje
+    \let\rjesenje\@gobble
+}
+
+% \continueRjesenja
+%     \let\rjesenje\oldrjesenjeMacro
+
+%END rjesenja
+
diff --git a/Master/texmf-dist/tex/latex/hrlatex/hrlatex.sty b/Master/texmf-dist/tex/latex/hrlatex/hrlatex.sty
index bb28aa46cc9..802ad5fb89a 100644
--- a/Master/texmf-dist/tex/latex/hrlatex/hrlatex.sty
+++ b/Master/texmf-dist/tex/latex/hrlatex/hrlatex.sty
@@ -9,7 +9,7 @@
 %% 
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{hrlatex}[2006/10/05 v0.22 LaTeX Macros for HRLaTeX project]
+\ProvidesPackage{hrlatex}[2010/04/05 v0.23 LaTeX Macros for HRLaTeX project]
 \usepackage{xkeyval}
 \DeclareOption{slovene}{\PassOptionsToPackage{slovene}{babel}}
 \DeclareOptionX{enc}[utf8]{%
@@ -31,7 +31,6 @@
 
 \RequirePackage{inputenc}
 \RequirePackage[T1]{fontenc}
-\RequirePackage{tracefnt}
 \RequirePackage[croatian]{babel}
 \RequirePackage{amsopn}
 
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 376fb14c9e9..f3295462b83 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1389,6 +1389,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
  'geometry'	=> 'tex',
  'german'	=> 'tex',
  'graphics-pln' => "env TEXINPUTS=$Master/texmf-dist/source/latex/base: latex",
+ 'hrlatex'	=> 'latex',  # requires interaction
  'isodoc'	=> 'latex',  # requires interaction
  'labelcas'	=> 'latex',  # requires interaction
  'lcd'		=> 'latex -translate-file=empty.tcx',  # no 8-bit