Update maker na verzi z letosniho ADS1.

diff --git a/Makerules b/Makerules
index af8215cefabfe8c818cece60b6d017ed7dd85315..b521d4c301a152f006158be087c050182821ec7b 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1,54 +1,29 @@
-ifndef R
-R=..
-endif
-
-export TEXINPUTS=.:$(R):
+export TEXINPUTS=.:..:../ucw:
 
-all: $P.pdf
+all: $P.ps $P.pdf
 
-%.dvi: %.tex $(R)/lecnotes.tex $(R)/mjmac.tex
+%.dvi: %.tex ../lecnotes.tex
        csplain $<
 
 %.ps: %.dvi
-       dvips -D600 -o $@ -O-15.4mm,-15.4mm -t a5 $<
-
-#%.pdf: %.dvi
-#      dvipdfm -o $@ -x 9mm -y 9mm -p a5 -r 600 -z 9 $<
+       dvips -D600 -o $@ -t a5 $<
 
 %.pdf: %.ps
-       ps2pdf13 $< $@
-
-%-booklet.pdf: %.pdf
-       pspdftool 'book nup(2, paper=a4)' $< $@
-
-%-2in1.pdf: %.pdf
-       pspdftool 'nup(2, paper=a4)' $< $@
-
-#%-booklet.ps: %.ps
-#      psbook <$< | pstops '2:0L(210mm,0)+1L(210mm,148mm)' | ../utils/pstopsfix | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
-#
-#%-2in1.ps: %.ps
-#      pstops '2:0L(210mm,0mm)+1L(210mm,148mm)' <$< | ../utils/pstopsfix | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
-
-%.stamp: force
-       date '+%Y-%m-%d' >$@
-
-force:
+       ps2pdf $< $@
 
 mostlyclean:
        rm -f *.dvi *.log *~ core *.o *.aux *.bbl *.blg
 
 clean:: mostlyclean
-       rm -f *.ps *.pdf *.stamp
+       rm -f *.ps *.pdf
+
+UPDIR=vyuka/1011/ads1
 
-UPDIR=vyuka/0910/ads2
 ifndef CUSTOM_UPLOAD
 upload::
-       make $P.pdf $P.stamp
-       scp -C $P.pdf $P.stamp jabberwock:www/$(UPDIR)/
-       ssh jabberwock 'cd www && make'
+       make $P.pdf
+       rsync $P.pdf jabberwock:www/$(UPDIR)/$P.pdf
+       ssh jabberwock 'cd www && date "+%Y-%m-%d" >$(UPDIR)/$(P).stamp && make'
 endif
 
 .SECONDARY:
-
-.PHONY: force upload clean mostlyclean

diff --git a/lecnotes.tex b/lecnotes.tex
index 9300c9d6b86616a7d9ebbf28d75d2e4f00010890..f089af6723ff4d10362176e61f7beaaf1df7a049 100644 (file)
--- a/lecnotes.tex
+++ b/lecnotes.tex
@@ -1,28 +1,25 @@
 % Makra pro sazbu zapisku z prednasky
 
-\input mjmac.tex
+\input ucwmac.tex
+\input ucw-verb.tex
+\input ucw-ofs.tex
 \input epsf.tex
-%%\input btxmac.tex
 
 \language=\czech
 \chyph
 \lefthyphenmin=2
 \righthyphenmin=2
-
-% A4 s 0.5in okraji
-%\hsize=184.6mm
-%\vsize=271.6mm
-%\parindent=0.25in
+\inlineverbon
 
 % A5 s 1cm okraji, dolni rozsiren o 10pt, aby se tam veslo cislo stranky
-\hsize=128mm
-\vsize=190mm
-\advance\vsize by -10pt
+\setmargins{1cm}
+\advance\bottommargin by 10pt
+\setpaper{a5}
 \parindent=0.8cm
 
 % Zacatek prednasky {cislo prednasky}{jmeno prednasky}{jmeno zapisovatele}
 \def\prednaska#1#2#3{%
-\line{{\Large\bf #1. #2} \hfil {\it #3}}
+\line{{\setfonts[/14]\bf #1. #2} \hfil {\it #3}}
 \vskip 4pt
 \hrule
 \medskip
@@ -32,18 +29,18 @@
 \def\h#1{\medbreak\leftline{\bf #1}\nobreak\smallskip\nobreak}
 
 % Zvyrazneny zacatek odstavce coby podnadpis (napr. vety apod.)
-\def\s#1{\noindent {\bo #1}}
+\def\s#1{\smallskip\noindent {\bo #1}}
 
 % A kdyz stoji samostatne (aby se naodlamoval)
-\def\ss#1{\noindent {\bo #1}\par\nobreak}
+\def\ss#1{\smallskip\noindent {\bo #1}\par\nobreak}
 
 % Dùkaz
-\def\proof{\noindent {\sl Dùkaz:} }
+\def\proof{\nobreak\noindent {\sl Dùkaz:} }
 
 % Srdicko na konci dukazu
 \def\qed{{\parfillskip=0pt\allowbreak\hfill\nobreak $\heartsuit$\par}}
 
-% pokud je v seznamu:
+% ... pokud je v seznamu:
 \def\qeditem{{\parfillskip=0pt\hfill\rlap{\hskip\rightskip\llap{$\heartsuit$}}\par}}
 
 % Poznamky pod carou
@@ -64,14 +61,14 @@
 %      \endalgo
 
 \def\algo{
-\interlistskip
 \begingroup
+\vskip\preitemizeskip
 \let\:=\algoitem
 \parskip=1pt plus 1pt minus 0.3pt
 \rightskip=2em
 \itemcount=0
 }
-\def\endalgo{\interlistskip\endgroup}
+\def\endalgo{\vskip\postitemizeskip\endgroup}
 \def\algopar{\par
 \parindent=2em
 \hangindent=4em
@@ -89,7 +86,7 @@
 % Priraditko
 \def\={\leftarrow}
 
-% Komentar
+% Komentar v programu
 \def\cmt#1{~~{\sl (#1)}}
 
 % Nekolikapismenkova promenna (mozno pouzit v textovem i math modu)
@@ -99,9 +96,7 @@
 \def\O{{\cal O}}
 
 % Vlozeni obrazku {obrazek}{popisek}{sirka}
-\def\figure#1#2#3{\midinsert
-\vbox{\centerline{\epsfxsize=#3\epsfbox{#1}}\smallskip\centerline{#2}}
-\endinsert}
+\def\figure#1#2#3{\bigskip\vbox{\centerline{\epsfxsize=#3\epsfbox{#1}}\smallskip\centerline{#2}}\bigskip}
 
 % Varianta bez popisku
 \def\fig#1#2{\medskip\centerline{\epsfxsize=#2\epsfbox{#1}}\medskip}
@@ -135,32 +130,10 @@
 % Todo
 \def\todo#1{{\bf TODO: \it #1}}
 
-% Blackboard bold font
-\newfam\bbfam
-\font\bbten=bbold10
-\font\bbseven=bbold7
-\font\bbfive=bbold5
-\textfont\bbfam=\bbten
-\scriptfont\bbfam=\bbseven
-\scriptscriptfont\bbfam=\bbfive
-\def\bb{\bbten\fam\bbfam}
-
-% Reference na konci kapitoly
-%\bibliographystyle{abbrv}
-%\def\references{\h{Literatura}\dumprefs}
-%\def\dumprefs{
-%\def\bblhook{\parskip=2pt plus 1pt minus 0.5pt}
-%\bibliography{../ga}
-%}
-
-% Predefinujeme odsazovani odrazek z mjmacu
-\def\itemspacingrules{\ifitem\advance\leftskip by \parindent\parindent=0pt\itemfalse\else
-\advance\leftskip by 2.5em\fi\rightskip=\leftskip}
-
 % Matematicke symboly
 \def\symdiff{\mathop{\Delta}}
 
-% Cislovani verzi
+%%% Cislovani verzi %%%
 
 \def\currentversion{%
 \the\year
@@ -168,4 +141,4 @@
 -\ifnum\day<10\relax 0\fi\the\day
 }
 
-\footline={\hfil {\tenrm\the\count0} \hfil \llap{\sevenrm\currentversion}}
+\footline={\hfil {\tenrm\the\count0}\hfil \llap{\sevenrm\currentversion}}