From 27641243bb80c512247076301649db517d4eb35d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 27 Apr 2010 01:11:09 +0000 Subject: hrlatex update (25apr10) git-svn-id: svn://tug.org/texlive/trunk@18020 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/hrlatex/fsbispit.cls | 134 +++++++++ Master/texmf-dist/tex/latex/hrlatex/fsbmath.sty | 353 +++++++++++++++++++++++ Master/texmf-dist/tex/latex/hrlatex/hrlatex.sty | 3 +- 3 files changed, 488 insertions(+), 2 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/hrlatex/fsbispit.cls create mode 100644 Master/texmf-dist/tex/latex/hrlatex/fsbmath.sty (limited to 'Master/texmf-dist/tex/latex/hrlatex') 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} -- cgit v1.2.3