Stundenplandarstellung mit Boxen optimiert

2025-09-12 17:14:34 +02:00
parent a3c3b3bbdf
commit 46e71d7293
10 changed files with 278 additions and 246 deletions
--- a/src/data/a4.pdf
+++ b/src/data/a4.pdf
@@ -37,42 +37,42 @@ endobj
 endobj
 8 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 34 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 116.9796 680.5767 160.7541 696.3267 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 34 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 114.9796 676.0767 158.7541 691.8267 ] /Subtype /Link /Type /Annot
 >>
 endobj
 9 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 174 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 215.6986 680.5767 259.4731 696.3267 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 174 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 213.6986 676.0767 257.4731 691.8267 ] /Subtype /Link /Type /Annot
 >>
 endobj
 10 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 174 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 116.9796 645.0767 160.7541 660.8267 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 174 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 114.9796 632.5767 158.7541 648.3267 ] /Subtype /Link /Type /Annot
 >>
 endobj
 11 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 403 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 220.6598 645.0767 254.5118 660.8267 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 403 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 218.6598 632.5767 252.5118 648.3267 ] /Subtype /Link /Type /Annot
 >>
 endobj
 12 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 34 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 314.4176 645.0767 358.1921 660.8267 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 34 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 312.4176 632.5767 356.1921 648.3267 ] /Subtype /Link /Type /Annot
 >>
 endobj
 13 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 310 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 125.7313 609.5767 152.0023 625.3267 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 310 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 123.7313 589.0767 150.0023 604.8267 ] /Subtype /Link /Type /Annot
 >>
 endobj
 14 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 403 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 319.3789 609.5767 353.2309 625.3267 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 403 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 317.3789 589.0767 351.2309 604.8267 ] /Subtype /Link /Type /Annot
 >>
 endobj
 15 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 310 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 224.4503 554.3267 250.7213 570.0767 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 310 0 R /XYZ 18.17323 833.6681 0 ] /Rect [ 222.4503 517.8267 248.7213 533.5767 ] /Subtype /Link /Type /Annot
 >>
 endobj
 16 0 obj
@@ -2737,7 +2737,7 @@ endobj
 endobj
 495 0 obj
 <<
-/Author () /CreationDate (D:20250911181029+02'00') /Creator (\(unspecified\)) /Keywords () /ModDate (D:20250911181029+02'00') /Producer (xhtml2pdf <https://github.com/xhtml2pdf/xhtml2pdf/>) 
+/Author () /CreationDate (D:20250912171237+02'00') /Creator (\(unspecified\)) /Keywords () /ModDate (D:20250912171237+02'00') /Producer (xhtml2pdf <https://github.com/xhtml2pdf/xhtml2pdf/>) 
  /Subject () /Title () /Trapped /False
 >>
 endobj
@@ -2762,10 +2762,10 @@ endobj
 endobj
 499 0 obj
 <<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 2132
+/Filter [ /ASCII85Decode /FlateDecode ] /Length 2307
 >>
 stream
-Gb!SngN!ue&:O:SkV8c?Tt<dtWB`'N*ZXkY*+H,mG$QhliqLpU)/1@U1t,p-0S/5h46N,O[JK)B^^5Xcr:KlU4X!&XaRbagE'\Yc$!1)gh='FDmc'js/,7(21d'\s$:tG>WRarI(EV$k=J\#,s*T3<E?LEC5&fF`.PrlC1<Tkp0#u;!2rs?^d&31&$_OEKAh\8$3X$)_lme>?a1*o:e.,*&dcod+S81co&Au)22TddOE74b/iU]W,#Y(YSlT+_`CZUq6r!!"0U(3>9UWb3QSOs:b0E^Yu"!Z;\e6\507[a:ma/UKtj>7C58Iilb]bledD!>=ag$K+/4t[-<5VRaQ;M\,_,N"^@4kW!i@BWGTI[*XAPiG.IBrk(DB50AbS#^he=7lTqBgMI4BdJUe-IE$nTXE!/"r\kp55l]Cs/5oTrbJ8IYE.:r`t(+Qa.#nkbFIFfOu$%_/nV0<igg6fW'FtAoh^RR1r<AN=.E+i;4L_>a4hQ-YLCoFj@3iC%.n)MZ@g^JgtP,qX2.jdPPMPg9L=PT`@9!;[S6@[BhccKVkD:5UH,Q-8!0MIU.E$?hEF'iYE*mW',M%A$a^6uk])#V>-5(KpH,K$U8a7*V57%HC=gp";516P04)ZXj9e=q"SiLI^Rt4b5CU=s&c6+]NHeguY4'Ku"N1;%'?93t`%VN)\tFg(M@CIC,gmN%,Cp[/O@QS#A"uF16YRh8JfjU*cOAGSOiD>Y1VDY$4JX`39<C7M6lJF,,]NeUWn];FERVeXK>lk_HjgDJoF4gE/3V$"[F0Cs0GqHEAonH_YL.C'h"KX\rql]oqXtL\69c:K#Jqqcjdns9j]\dg/nD+":CbMfLHTMl/2>D5SqGkD/dKV!!:0Gt9)+"SZ8Jd?g2!76/3KkRo"3+[m=QP2`]NbX*0jFUU2kX0UhQ,$Z&tm50MRFs>tHdG;]d,9=h]2A*3\8E]omA>]jd6[3^5]'%1DWT9_>6pS&:"4eVr><ENPnbMXsbHe8W/oU2#!u4FV[&F$$:gZ!0q;@8V"Alr<dG\RW^T4rb%kO',UAH6ZELGsO91IT7C.=UZe/Q]H*l8S:8][cSWs;n)jc0<cencabAg,@bb1A.*4'?1?MsBQ[T`SSHjKEH1RFN^lr$d_6C:Wg*m.Y$1/1DHm;fI:WS0lZZV"mAs\+KKHP*BZ:]8@O2ml0LK4&"`sD"U:8NLC\PBC2VR4aLDm9;c;O8`XYVrdlLT:l,?rGjTB_r+;ZABg.b\N`Yk:YjA/)2taWR8Z"tdF+(c3p6oXEKFrgIi9:)]T(r2,fH6&^'bH`C+R@8#.QKu&0%_QZo&[9$fM.Nm6r:;Th9H(SS9$++.'QXM=ab:`*jr.`f*?b[t+POgQrnV6G<!;&JAGKMr?Zn$CC\,M*I$S=8(CU%lMQ&ZgTB#27$j_"=/=buinH+JJ7505sm10e?b?c70+iQVu/.IBd"LXG@7orJ_?8Bm<B&e0[5)UKj49K/)%'H)8[#$=<r4e@h.-!D_5EQ#0Ij\'LrLP-US't'.e;R<03M&&];VoDH7?@"Ce,i%#q9=9lF;R<03M&&^1U<G=)Gj3K2ODk<'U)"AIC6nKCd6_PCZn^&:pB_]W&oN5"e3]m&c'"Z"']m"Bk?"tEpPJ7R-iq$HkbWMQd.2;'J(X7i9`bg*=#*u\Y1X:,G@h("<j-&B**dP(546XT9nCeER4[IM9SSTiZNC]<=#+!/Xa(9rG@h("<j-&B9Nq0f`&UldiA5</jT)Gt0!2cOO'hMs$5GYerr>Ed'tc^d+bN7)J0EGM?D!@A5pJD`!D]cTopH('1m.qLWE/Nb%"o$-aT7,q.sMLZ<ZMiN=r5r^N*82!?n7+-__/ab(Hp?c"AW,`TQ"'<XiE?0LliTP33@e`@i8Oi8<$Q/dOJonG/6V+e:>DM'so$_i$(X*5iK'W>/PM`G=7\F2"Ti<>'P+?<qM^//?u,!4Z5So9fdV&Tp0RqO$un(,'*gZP]BZ_4]()]1X%aH.4=dj!u3FD-P/m!-hZ*n'eV6h&5"B!ea6B.6,^"WIhAoh+04ZXXdA!KLC#j_-!e\J$4.X.oU@!JM.%)21qq'j6UVR)-mWJR;f@DH,_f/ed.esE$kZ&>UQD/Ie+*HDP)K>?`IFL+~>endstream
+Gb"/*a`?/p&A@B[E-,=sN#fho'g#(-#K9WP.unF;nVesgV#:+($jdIF!DZ#Q,,Jh:QPoLDh<;lE#"b9t#!_qBpU=?nIb9_uY;kKmCu,c,W$7_gaNMiM5::+5MbhoCJQjQK)7ZMH9*&/)9F#!kk+qqHpAN*n85Aur!Ge[]`(8$%)_<ui5Moe/GL(i4=tVCSVH02&a:[\OQuH\>Z.(bQSH5X3:_K-*+"-5V>:P=DeethlQ2uW%rW`b%%h(cY.\0h*_(SqA`rs=6i%GacOAm*/<h\lA>-JMP@##)FR/`7p5u&;/rWaOOSm7@U*A!BoQp5jO*\2'k?o6PQ$0U.u&:6oD5jp/s-dTkXA91I'cb8)>6eTeki_)9IZ3XsJp`?EjZu3&/AY7KhYf6jo)lJrH"u_;r5QtB8$tQ$9OS/8WaneL3aRNV-ZLMOVI_5W)EOEOeBfXGsN@[(GmFaq9Wa!+l5n+Tc%!Fep,#+%N<qdnQj?P!Rp%eUXK';e_2$pdT)@d-<Lp>`$CC9Lc6*&i"S#"1(fp=$/`7T(P1p+0bhDD?S=m?];o2KB5Uu.<1aFHh00=uEe\(gNQe_e<a7-+QR6k+J/Y=kip\oGL5.O:GiBjI/GV5SQ#)^nVVjlY[*R%0\?8<+h-6L<=Q>l">r'3MLMVB!P/Ek6]BD\=9!#!$)(*^L4POB<=g&4A7GYtcL%Tf<\V![$DM`]VgFKJ=02@U@u&*;Q!'lQsCbNajt#n0&:@%+S7V:+m4!:`P>&^NrojN,[RZE;!]0\/?qe6_1rbMOC='\>3/Obm=T4Qd1PIJc6Q6a31afp@@)OfB8L0J._X30]*O=aj8QqW\<OMNOf\3Air(%G9$=h)\?oQUuu-sg#[f''d,Y(VM%_^[&pUVB[:g'ZLC>cPM^'aCEE[&2^#7"a/G6N()>l!4\_\FJ;ktZL,(3,mnAVTTDH>)'BSPLh>[?N]N6k)CTgk%PKrV;W.r;R+9VT4l=0KB$T1;\-E\*5>&jR='fFbW8Q8HgpA7WED_L9M1N[Dr>%e8'h`Fe$;!o/UWAhHF`GLpl%,M7):0uk<h*7qMN[tALl)S$uZUq3i5[1WDgqYX@I"@m-5@[L[2]7ktFW"[6>"F=]?1?5kf]p&rSSHRCYrVW)a.oRM@F%?i[5,U/?&QUt:e,FEiKRi_3t0cqBpK)+SZ9RLCK*VuU&;B=XC]t,!<o53DS?#E1`gK!)0=;d$&^'rKIuU7F*,XOI#JeL4N@6D>OU=Mfq01K-<!sBdpl'Jh0<DGR3n0iOepLKPNj1%]Bu`Z.cIk:A9*n2^SiC`&14,snD/!CrQ<qk[^r$@F12g;\gP0R?G4RRDm!XJ3QrM`<qZ8L'l6E5#I52Rkc3E+JLR+=(m@.<afpi5D"0c_QgO%InMmO=#4_1YjKQV;rde=`7[1ILM"8loO:U?_-e''.jO?1K9*Ktu/FQHY`.78qo4.P0q+*@U#LcqmPsQJ:,aY7rLo$E\5@4?'8McbW+)*@fZq,961uf[(eVJ^trig$gIuAJt7-"r[(h(`uYatamnFUPl&l7LOBE!:Jp7;%1:YDF!AR/r7PM6>b0iRUVbW^t4Z[CRK+L%g//WoN_g_)-T$^nmKnSN8jQc+<p[O'4gdHM,6bRf_qS0dYi)?MKM5QXt[04Y\nV!f0?bURGrop"qsd"2QNRq:(7R,/*l#r\/NfKu6(c4Z]P=ti6:NLO7ooL?&XY]5FLfg;?)c4Z]P=tjf%;@_0VR,/*l#r\/NfKu6(c4Z]P=tjfM2K6D`g`7Tk-.lU+@1.W=3D4Ug;3^be40FA'?Q9d$W_fG_WhPj@,sb2Q2>pt>-SgO%=M>F$P&a9?GeXh2mBCsaZDHKJg@0P9HJT?,^(T*3DG=Yd^C_LRY^@b&V:V0En9uTCg0seLA4r_@*R/d,Ya:2,Z!3)G=P$Y*@U>Laht2a4k<9VHYf$$sa?EI0rQaV7LZL%KIA4UTS^DFU+SeW?T;\uCB6:Aqns.9[;.9FKk[92-/!2EGeo_\o/2%3K@^aX(0WoCJV7a#R^ZZ=Fb'1/kK,KiS_"ENjkqn!E)3V,;oa(rh1kOaO^p+Wa4qSs/7W:%KZ5'l5!?n"'E%jYb'tAu8X,;a79%$D<ZdD+DPA,_h.G*#An@;%I#d;?&T8ZT?3N,G#.!H7`)53F<:le:HmNODc)oInmHK9Wt(QjmnMCAf'a9(HU+t"TL;\#hNX/:M__c$G%K8'5*Q"MPZb`6h%i/":Af.mb%@ZB:;7pSLo__<@epe?4e70G=R6Xl&4e43e4&Ap1If(_see3sKp$q"LkYE&X(K:MiEjmYXW~>endstream
 endobj
 500 0 obj
 <<
@@ -3598,57 +3598,57 @@ xref
 0000089576 00000 n 
 0000089672 00000 n 
 0000090115 00000 n 
-0000092340 00000 n 
-0000104054 00000 n 
-0000117065 00000 n 
-0000130065 00000 n 
-0000143065 00000 n 
-0000163468 00000 n 
-0000170375 00000 n 
-0000190779 00000 n 
-0000197686 00000 n 
-0000213276 00000 n 
-0000217114 00000 n 
-0000228852 00000 n 
-0000240590 00000 n 
-0000250407 00000 n 
-0000257851 00000 n 
-0000269262 00000 n 
-0000282045 00000 n 
-0000294829 00000 n 
-0000307613 00000 n 
-0000328008 00000 n 
-0000334137 00000 n 
-0000354533 00000 n 
-0000360662 00000 n 
-0000373460 00000 n 
-0000384984 00000 n 
-0000396508 00000 n 
-0000406168 00000 n 
-0000413610 00000 n 
-0000422748 00000 n 
-0000434138 00000 n 
-0000445529 00000 n 
-0000465562 00000 n 
-0000467904 00000 n 
-0000477976 00000 n 
-0000488048 00000 n 
-0000496606 00000 n 
-0000503683 00000 n 
-0000515423 00000 n 
-0000529224 00000 n 
-0000543028 00000 n 
-0000562997 00000 n 
-0000574260 00000 n 
-0000594230 00000 n 
-0000605493 00000 n 
-0000618103 00000 n 
-0000630713 00000 n 
-0000641169 00000 n 
+0000092515 00000 n 
+0000104229 00000 n 
+0000117240 00000 n 
+0000130240 00000 n 
+0000143240 00000 n 
+0000163643 00000 n 
+0000170550 00000 n 
+0000190954 00000 n 
+0000197861 00000 n 
+0000213451 00000 n 
+0000217289 00000 n 
+0000229027 00000 n 
+0000240765 00000 n 
+0000250582 00000 n 
+0000258026 00000 n 
+0000269437 00000 n 
+0000282220 00000 n 
+0000295004 00000 n 
+0000307788 00000 n 
+0000328183 00000 n 
+0000334312 00000 n 
+0000354708 00000 n 
+0000360837 00000 n 
+0000373635 00000 n 
+0000385159 00000 n 
+0000396683 00000 n 
+0000406343 00000 n 
+0000413785 00000 n 
+0000422923 00000 n 
+0000434313 00000 n 
+0000445704 00000 n 
+0000465737 00000 n 
+0000468079 00000 n 
+0000478151 00000 n 
+0000488223 00000 n 
+0000496781 00000 n 
+0000503858 00000 n 
+0000515598 00000 n 
+0000529399 00000 n 
+0000543203 00000 n 
+0000563172 00000 n 
+0000574435 00000 n 
+0000594405 00000 n 
+0000605668 00000 n 
+0000618278 00000 n 
+0000630888 00000 n 
+0000641344 00000 n 
 trailer
 <<
 /ID 
-[<49dbbe900107bf5a28686887e8dd6a71><49dbbe900107bf5a28686887e8dd6a71>]
+[<4b4e343a322bea7d41283f9f6d2704f8><4b4e343a322bea7d41283f9f6d2704f8>]
 % ReportLab generated PDF document -- digest (http://www.reportlab.com)

 /Info 495 0 R
@@ -3656,5 +3656,5 @@ trailer
 /Size 547
 >>
 startxref
-648249
+648424
 %%EOF
--- a/src/data/input.ini
+++ b/src/data/input.ini
@@ -18,7 +18,7 @@ stundenplandatei = stundenplan.md
 csvtrenner = ;

 # Ausgabegerät: rm2, paperpro, a4
-device = rm2
+device = a4


 [klasse-5a]
--- a/src/data/paperpro.pdf
+++ b/src/data/paperpro.pdf
@@ -37,42 +37,42 @@ endobj
 endobj
 8 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 34 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 98.45286 518.4349 142.2274 534.1849 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 34 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 96.45286 513.9349 140.2274 529.6849 ] /Subtype /Link /Type /Annot
 >>
 endobj
 9 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 174 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 182.2653 518.4349 226.0398 534.1849 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 174 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 180.2653 513.9349 224.0398 529.6849 ] /Subtype /Link /Type /Annot
 >>
 endobj
 10 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 174 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 98.45286 482.9349 142.2274 498.6849 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 174 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 96.45286 470.4349 140.2274 486.1849 ] /Subtype /Link /Type /Annot
 >>
 endobj
 11 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 403 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 187.2265 482.9349 221.0785 498.6849 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 403 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 185.2265 470.4349 219.0785 486.1849 ] /Subtype /Link /Type /Annot
 >>
 endobj
 12 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 34 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 266.0777 482.9349 309.8522 498.6849 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 34 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 264.0777 470.4349 307.8522 486.1849 ] /Subtype /Link /Type /Annot
 >>
 endobj
 13 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 310 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 107.2046 447.4349 133.4756 463.1849 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 310 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 105.2046 426.9349 131.4756 442.6849 ] /Subtype /Link /Type /Annot
 >>
 endobj
 14 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 403 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 271.039 447.4349 304.891 463.1849 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 403 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 269.039 426.9349 302.891 442.6849 ] /Subtype /Link /Type /Annot
 >>
 endobj
 15 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 310 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 191.017 392.1849 217.288 407.9349 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 310 0 R /XYZ 18.17323 671.5264 0 ] /Rect [ 189.017 355.6849 215.288 371.4349 ] /Subtype /Link /Type /Annot
 >>
 endobj
 16 0 obj
@@ -2817,7 +2817,7 @@ endobj
 endobj
 503 0 obj
 <<
-/Author () /CreationDate (D:20250911181018+02'00') /Creator (\(unspecified\)) /Keywords () /ModDate (D:20250911181018+02'00') /Producer (xhtml2pdf <https://github.com/xhtml2pdf/xhtml2pdf/>) 
+/Author () /CreationDate (D:20250912171219+02'00') /Creator (\(unspecified\)) /Keywords () /ModDate (D:20250912171219+02'00') /Producer (xhtml2pdf <https://github.com/xhtml2pdf/xhtml2pdf/>) 
  /Subject () /Title () /Trapped /False
 >>
 endobj
@@ -2843,10 +2843,10 @@ endobj
 endobj
 507 0 obj
 <<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 2129
+/Filter [ /ASCII85Decode /FlateDecode ] /Length 2305
 >>
 stream
-Gb!SngN!ue&:O:SkV8c?U!)XTYGjc>'cn@g#972,0"e?S:%A*pc&?roc"NunP/>-OfXlLUkuLHTV%K"e^`PT7qrXKT*tR`69?Eu=LUTs#]OQ`Sfo*beh\TA`=&*H(5WZ#(Zc;K0aptrN1&&h57^DU^j1C3o;jMW&3Qn5YatTU$l'uk^Ed[h1_qmS0!8L05i&,_uHE0Q=(L5%q=.<H4HN73)l?oKqBm;X,QPqj7a__2k4"!:efAVY,f;!qA*(Ht&o(T$IKnB4;r%JSn'AQcidM>gk[0:rJ!\mB"_?l%;=6pRB&\d=.p>c<=9nX0`K(>f^-?4n`pXZRd4d.Y>"lU$6E>'P8q!:*94ZhH(_m9pJC7+arD"a-dB!TKfF8?!Hl\C&GY^UQH=6h*`d^!;5N*#M$1WG$2QJ?fK3R6]3!IQEu.R9-rg*t).e+Mbcj3@JM9ruNL:9To(X(fs6VJC=62\r?d!c(d0?K\.^esV9PTE_)LYHC[12p>N:Bl\6j1fBgjNTCN$Z>f+:g=#gYA[6eDQHAl2b:1WAeYcTo[+Y%-f=_lI/sGq_fp4+]"JJH&*oB/c*c%!=CX&eV@rGYaCo%fSRqtM]69"XHs1'Tdp;<3iK*p,&]QcG<-0#b@;=$54qJP"\rqQ;@$Q%5nCqo`+T)+#O:/M'("_C(E9oq1EGeoGd'K\*.$IT&K,CpYYbTl$&WDSa(BGr\>i5[s;_ZD\&dKE,dJJW^XUBc,OD]>Go:!b_/Gkgp2m""W!Bq4*E*]3CsYf$)Cmt=t-%U+\;KB!@W9A=?+ND^`*-d1oVc0[_;m]LIMR1dY)=7ukG3W%oucOS1+C:u]@Y$IY>OW.&@dL,1keK\B2]:)q6=E#Qt(i^)L!sp3>HAi/6_iRjueW,$D3N[`3e=@<9r#Ct6=u]E?Y>7:&1*ou,['6p=YjU9t(%gZaFgN],4WI8LmkE.Z>?ra#qD=^>c:epWk-Q9YqU>>2j2X",S6_V03%&uicCT:e"ubb'219s8I<p-ZS#2XY/#d8[[Cndd;ddL'>LA?)E'2u>k%2g4[9S&<PXs2m]i5a=602e%^3kThRWPZDjOsYPp9S_Jq;RB*I`]U*%&`/gaVNOf=^c\W2I:,ib#XNCC<1T[Np;c%SP&U:9QIUfD3qm**!k_L!KRbOKoO]08@jGU&0@O#!QAR6mb3^OPef!o"`sBTn(UuGS$tIdCUD1s*GMm<oo@e)DB=&hV"C<5lQ':*:A;<UfdZXp@S*8E[Kg$IR8bjC!Lja_&mXX[C)S@T:^1&dcK=3$;oe;C^Zf('QrQq3CGjpLfNCq^44qmH%QhYd\en?](6EKlDr;WNXp/'W'1L!VRIA.9m[e:(8,@)3#,XK]`#Wo"L.sRGNEul,i8/U)h`pK8?HTt]nbS=CNj&2J^9Q8!;=BhKg[.,Hqe)bprcrfFo-)NYd$(=3SDapi4,t+M1*h!LncFbG=5'uI";<XciZK-Q/MpkKFEVss8OSE?B5WC)W7Aped^)=LV9j&Ul#*@UK4Dd;_CsGKU.`aoSg@Pgh(pYUGVdg;^i?5@e5@f/\Pt-$=d$<*@,\%EhT3&m5:0&l/[]&N9>uLR-^b@uZOX]bV*6,TA&=50'fF3VTioh8.49Bn`J#q1q`U'I(aPh7S\,Xi"_q@Mo,T]9C6+1GlBTS^L"GZ\O#s\QkX<+I=gRORdHG#$*+;7CJld$[MSH)EB.h&WC'Cm)dksqK_p7V)U[",gRQ9!uK=G6PHhIkPGW:<,1m\taTZ9"FN'rPoXSW8JWYN0)'+oj@)/DrF.sOc0,0#SsLn\VFX>^)T![8@V1p*;!AfP8R,Y&\KXl*2Q\EXbr),k@\1MYmuLg<k_)Kc'%he98'-#g0.,Dr?ucs#d&Mhk=`0hJF=27S>U0JXl/Um.'HS3i$d6j/X:E`S)eBE=56;)GD,<jCDZ.hEGE.l-eY$sImrK!+;h/QlP<f.H\=6qp_S"<o;VU_[a-_BC^9QD0V-)Os*N(5W]ZU6AGX>d5@XGnEEkaZ(kq+@SZ["<o;VUifnDXae9Fe9;1#fM8O5/1m4I7)S$AM3P)B5uC2"oYnN`!_J!<OJ'_]HT+:P#QfLqdb"*!4Al<95D/3YG;fSd"@XJ"LJPrtZXamP!]334FT~>endstream
+Gb"/*bAuAr&A7<ZE(jLKN&SOf.WujJ+(T<OXuN^uQ*mX5S+?#\5S>1>!o/@fQX"P\[TD5>1E<%m6SdVR_*<>FrUi#k5OZ\BkF?KWG&IXf<0?"/jOrt^hifkkQd9@?Jm0ZL0j7Mp\H4C29qAL\F&N!_qt=PrKV?NqCC%CKBVHg'b&U-MVpDggjNS>D5V8<<5#\MA1NMJ97N!9PZ,rhS!0Dc1egUntj2X/@QbY>AD_#Lr/-CSlqHkLqSeR]kE2E,-r_BMF$-6Jh?fk!_N#Ddug7kmX[X\l]^r@Z3E</Dr"Z_9Wpg8CuHh)l\(W%rL62@8lj)Ko-F[hSN2<!?2"^rLo;XG]_puD\N,M?@bh%Ln(Cg?_@D"WLO=0fnWF87t!%HE-]^OP6cT@L,Q9?[)6dS@SbXO[TO,cAWo8)m4m$fF>PU&l&)T-NHBFZ@-!I(4EF\-R4;c0:3C3AGI+eT+[aG\;RG.^2G)i+-.4@BAlF:=MNCkJd8Unq-)s=IPc8-k2MhEauY4[Og4GK=8/$:79>`SRliZe8i\eD=smb12Z_I8`daU>KXl)[AKio;$'UkhtM&,a:N-O;d7L;M5dte>up4.r?eS$E9QEom(ZLg^j4S]I\HnP.*nJ<<QVa><<W+"P.m@qPF'%U:hG+oX5irc4B(.$="0"-U7b2987O'-"CCRb*lZ6[N=oq6V3/P$I`s$$hm$$&NSu]0Gejo9'Z0u18u+2+7KP7<0olA%_49bK&nqcPZ,$=IB4V;VK;Q)9%WTjS?\9B]T2<MNg2YJ+X;i7Y_-#-aaYcE3BK0<>pTH7MH[g0eGtS8RqPc/5&PgGd=*/FiVUatf+`f)fA45jQncWIL?^`4r!2l8k?SJ7,F+;.2bQf,j@.#c'CQ4Z34K(..S`[<Q"=P!tqYiJ^bp9Wo*+'_"P%@7%A8,Fe).r5`ZP:cYPu+tA?ejuYkAOk)3OcP#*;!s4;=9i#\BIR)9_=Zq(]+_WW]@]!nh;FOVsh=i&.EA3+D^iAE;4\LqD(c&@5h)LTP=[TmnA9AF1/k!ok(tR\BW3cnQWO60U-ORm_)U(oKco*aZdInS!nH&B&qMI+Pab3.R$40ih*G0EU?uK.S!e,fZ7)%eDDcM\'!EEa\ga^WC)[@cJtjnLd-^Vr5^.E2(oFeT/q;]BF!h4QtM$)9M5Q9:=]-[QC,G(6%ZLP\7O7-eLEOGiSJp_7$qoY<?(kH5+T-g#c;:9>KE<Tla+gB6;02;s*X3DqePoc_\s0RifSMKl@`:L$dN:L)5bj:PBB!6S(k]HgCM'5d[DNW]AM/-64XcL[X@[0E74^%4]&S6TXo1TKR:l#d6$6<GF!]fXD.Q7c(0m&g(S]q<G<VB<J6i^Va\oU7LdQcQ;;@<ncN7:GS?1BiT"bFd+6UZU\NtAGq6VG,d5t#R(;N3k%#G3O$1:n_]cH7.2:<)gSFe!EJ8n*g!TeN#.jab:\&Sp"*[I%_3XcL=I*GsQ.4H[o#R\/e\@]hgatD.Qk-j,nO,raqD]0OW$N_3cu8h1;6#f<[T!,t6Jd3@fZlinHp6^Wa5d.p=[+s+^V9>Km+R6bcroPmp4ID0dJ8#*J"(:frMDZ<TU>>o.H0T<9oKAHJ]8eM\('@O(AGe[/pSL-kEk@i63&5f9B%?<&hPrU'[T.DpHXQ`1A8QoY_lW]H:iLLBVFKo1CWkZT\^+N#r`WKXVMOTCR4TDd6d)d81pfa5eRKj(MZ4;[6g0p`IaU+RHjirYk,K!^?GHI),Y1OOQ9TM@-:,D6J"Uc:8JMG878'/"0A44o3?!qoR+bXSkF$-]D4[1.%""e7.d@?fA`VlbKDd#@DaJdLcDJBa_Y+iAiG+maBjaae16q=lW/t!%i`S%L/][J/]UoiKoHt\$Oj"8&6h?#GmYWOZ6Kj[=#+"BXSZYH_-!9Ng'MY6ide22<_U/\:I")"'/"[Dq#_,-=#0ZsKT3UJA'pEb-*tcjfW^JX?q@\WfB4M\b_7!E8@='%B-qHIKcP,7]oq&(BAGcaB6eJ.-a8kk"1Y5=[dXVerLhJ-W7]5+%kse__<Wlh12%rR>3"*>?C-G/0`sA-E*>9&cTdeIOW%(VXdmsT*+[8a%PX\^_/#FBlBI*&P%IHp5V&VTd#-]6VBpE`gg_-ge7<dL+I#c!lELXF>\&T3@[(n2LI4nc!cc4fF>?IL1QI6J]R[i^A=O]&TV=m;$plE)Uq3[Cq`eOllFR=(foB'Tes=KuXCLiDM3R@-L/CLgps"7E6mOLG6@q\qn"UHrLEZF#(;HKNjWfIfp^7qRH&kFN,_f/ed/MeaIfLW>rrZRP;)8~>endstream
 endobj
 508 0 obj
 <<
@@ -3743,65 +3743,65 @@ xref
 0000091678 00000 n 
 0000091774 00000 n 
 0000092284 00000 n 
-0000094506 00000 n 
-0000106215 00000 n 
-0000118765 00000 n 
-0000131314 00000 n 
-0000143863 00000 n 
-0000160662 00000 n 
-0000169995 00000 n 
-0000186794 00000 n 
-0000196127 00000 n 
-0000209141 00000 n 
-0000214543 00000 n 
-0000225918 00000 n 
-0000237293 00000 n 
-0000247086 00000 n 
-0000254533 00000 n 
-0000265932 00000 n 
-0000278268 00000 n 
-0000290606 00000 n 
-0000302944 00000 n 
-0000319710 00000 n 
-0000328373 00000 n 
-0000345139 00000 n 
-0000353802 00000 n 
-0000366133 00000 n 
-0000377294 00000 n 
-0000388455 00000 n 
-0000398105 00000 n 
-0000405549 00000 n 
-0000414676 00000 n 
-0000425699 00000 n 
-0000436723 00000 n 
-0000453176 00000 n 
-0000458523 00000 n 
-0000468313 00000 n 
-0000478103 00000 n 
-0000486657 00000 n 
-0000493746 00000 n 
-0000505145 00000 n 
-0000506263 00000 n 
-0000517749 00000 n 
-0000520262 00000 n 
-0000531748 00000 n 
-0000534261 00000 n 
-0000550640 00000 n 
-0000562800 00000 n 
-0000565839 00000 n 
-0000582218 00000 n 
-0000594378 00000 n 
-0000597417 00000 n 
-0000609231 00000 n 
-0000610423 00000 n 
-0000622237 00000 n 
-0000623429 00000 n 
-0000633737 00000 n 
-0000634660 00000 n 
+0000094682 00000 n 
+0000106391 00000 n 
+0000118941 00000 n 
+0000131490 00000 n 
+0000144039 00000 n 
+0000160838 00000 n 
+0000170171 00000 n 
+0000186970 00000 n 
+0000196303 00000 n 
+0000209317 00000 n 
+0000214719 00000 n 
+0000226094 00000 n 
+0000237469 00000 n 
+0000247262 00000 n 
+0000254709 00000 n 
+0000266108 00000 n 
+0000278444 00000 n 
+0000290782 00000 n 
+0000303120 00000 n 
+0000319886 00000 n 
+0000328549 00000 n 
+0000345315 00000 n 
+0000353978 00000 n 
+0000366309 00000 n 
+0000377470 00000 n 
+0000388631 00000 n 
+0000398281 00000 n 
+0000405725 00000 n 
+0000414852 00000 n 
+0000425875 00000 n 
+0000436899 00000 n 
+0000453352 00000 n 
+0000458699 00000 n 
+0000468489 00000 n 
+0000478279 00000 n 
+0000486833 00000 n 
+0000493922 00000 n 
+0000505321 00000 n 
+0000506439 00000 n 
+0000517925 00000 n 
+0000520438 00000 n 
+0000531924 00000 n 
+0000534437 00000 n 
+0000550816 00000 n 
+0000562976 00000 n 
+0000566015 00000 n 
+0000582394 00000 n 
+0000594554 00000 n 
+0000597593 00000 n 
+0000609407 00000 n 
+0000610599 00000 n 
+0000622413 00000 n 
+0000623605 00000 n 
+0000633913 00000 n 
+0000634836 00000 n 
 trailer
 <<
 /ID 
-[<bbc797134d55496afb9d44323c9e69d4><bbc797134d55496afb9d44323c9e69d4>]
+[<e8a7cc0ef5c813b1eaf4a12c2b33d6bc><e8a7cc0ef5c813b1eaf4a12c2b33d6bc>]
 % ReportLab generated PDF document -- digest (http://www.reportlab.com)

 /Info 503 0 R
@@ -3809,5 +3809,5 @@ trailer
 /Size 563
 >>
 startxref
-641753
+641929
 %%EOF
--- a/src/data/rm2.pdf
+++ b/src/data/rm2.pdf
@@ -37,42 +37,42 @@ endobj
 endobj
 8 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 31 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 84.58848 432.8286 128.363 448.5786 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 31 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 82.58848 428.3286 126.363 444.0786 ] /Subtype /Link /Type /Annot
 >>
 endobj
 9 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 141 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 157.2457 432.8286 201.0202 448.5786 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 141 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 155.2457 428.3286 199.0202 444.0786 ] /Subtype /Link /Type /Annot
 >>
 endobj
 10 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 141 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 84.58848 397.3286 128.363 413.0786 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 141 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 82.58848 384.8286 126.363 400.5786 ] /Subtype /Link /Type /Annot
 >>
 endobj
 11 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 316 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 162.2069 397.3286 196.0589 413.0786 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 316 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 160.2069 384.8286 194.0589 400.5786 ] /Subtype /Link /Type /Annot
 >>
 endobj
 12 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 31 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 229.9029 397.3286 273.6774 413.0786 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 31 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 227.9029 384.8286 271.6774 400.5786 ] /Subtype /Link /Type /Annot
 >>
 endobj
 13 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 247 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 93.34023 361.8286 119.6112 377.5786 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 247 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 91.34023 341.3286 117.6112 357.0786 ] /Subtype /Link /Type /Annot
 >>
 endobj
 14 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 316 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 234.8641 361.8286 268.7161 377.5786 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 316 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 232.8641 341.3286 266.7161 357.0786 ] /Subtype /Link /Type /Annot
 >>
 endobj
 15 0 obj
 <<
-/Border [ 0 0 0 ] /Contents () /Dest [ 247 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 165.9974 306.5786 192.2684 322.3286 ] /Subtype /Link /Type /Annot
+/Border [ 0 0 0 ] /Contents () /Dest [ 247 0 R /XYZ 29.47377 590.3189 0 ] /Rect [ 163.9974 270.0786 190.2684 285.8286 ] /Subtype /Link /Type /Annot
 >>
 endobj
 16 0 obj
@@ -2271,7 +2271,7 @@ endobj
 endobj
 392 0 obj
 <<
-/Author () /CreationDate (D:20250911181000+02'00') /Creator (\(unspecified\)) /Keywords () /ModDate (D:20250911181000+02'00') /Producer (xhtml2pdf <https://github.com/xhtml2pdf/xhtml2pdf/>) 
+/Author () /CreationDate (D:20250912171207+02'00') /Creator (\(unspecified\)) /Keywords () /ModDate (D:20250912171207+02'00') /Producer (xhtml2pdf <https://github.com/xhtml2pdf/xhtml2pdf/>) 
  /Subject () /Title () /Trapped /False
 >>
 endobj
@@ -2298,10 +2298,10 @@ endobj
 endobj
 396 0 obj
 <<
-/Filter [ /ASCII85Decode /FlateDecode ] /Length 2029
+/Filter [ /ASCII85Decode /FlateDecode ] /Length 2179
 >>
 stream
-Gb!SngJT"M&:N^lo]Wf:XNO-Q]r#7ZWVD%K5Ca%W..:&:Dp#heSr7n?c%p)=:k=uh'KbKJDRFRi)VL8[plbUMX"@gGD:jV"aeWC8)^ZN\Yg"9Vj6#FkPB6LL7l3>i:+OSJot2#/!Z)pL<k/E`aa``nSEuV@gc&Pb-660B23p0n8BXb`htPahjuik2^3VmiC[2p,`CjpTCV;%SXl;tJQASb<j];2to+uh+!$CJSqDp+-@]5r/Vh0ipcWIgCJKClVKU/;/]b?Sh:QDp8Yg!pfgr0HU/s,+jM\P0WGO,RC\S%E+?.eato$3FJ<6[BC=WWXL@7P1a3,ht&3:?D"&Nlqe\TU<LQ<EX7Yookh[k2B@&1nTh%0]!#..U^qjg[9TmLS3XmgdsC/uL/3:aRR1<B-I#>Sr_pM3s_NB=1?)TWBqL72Rlf7JLtM\@lM:1+GR`/sJW<!q2-As!`Nt>Zh-_%)(XH9&Md8R+M\Mjj)FV!$qmcphb6H^c[WAV3[R('LV>9M=EY[<S@_O2p%LXJ-sfbIltX=Vqc+dMZ"$QhN)OPcX0GWE*XBgh/&R!='sWLN"UZ^-j'NbJts!p1OdCigBOWSO=!L:&No)`*pNAjNIiuQe!T&25NIrDgXIWB'-rPCT(+NGA%44#S@U+>'/Y[ThE=$JqcGhe26GgUcY`Fo%Q!,m]Ff>T32sI;rRjOUDFELif>&"f_o[;d]t41*li#r4*YMK8K<d]sak<ll*$(D]Pr`m*>^7?\3%N9YdL,1k`P\![)subi(0jEkoGDKhXrD_Hl*U:1Wt&)iI%@.Anl`'E7NS+qjfS'TVr`/CR&1uP(:&Uijdl,9fIS1!CR_aUAbkS!GI[Q+Xd+QD=t9q"U#kg$.P>.BUa>m/h=^2?P%qidc+JSOWbqFVWCdZD9G;2fG;su"\@S5/:"Z:ASVE-FQt'&P:_mu^VH*:t\%CKEF\V[cA2V#k=eXWuFTlD+,<RF.ZTYs.`%)rRQc]Y0<V,X#oB`#>5%eM[-;DUeO=d]MQ,?I!HEktpQElcCMsBmK"65s3dFgD.>&@JZF`+ig/H%<Y'Ypu^O^O5ff6&YjgqZ,;\eC<ucDZD618n"R5'p4$frL,$bmcOV,9mXt1%2W#mB1.dWVJZ[C%R!kR\uTdXibR2+e`P?4AlDsAS(cr;D;Hn<8Bfl#\B\).r7ga4))@<)6N:XMSYe8X5?`Jo,m=sAt_*7Vm_>f.[Lp6Oq:*@a=tbWj^cn&64pM3VCSj7]B5HX%eHgp"ZS%(=72?K19<6eX#,IohRQqP]mniQ4I'^^f^qKNVd8LG^9Yhi7Bb>>D>'Lq27$2*bri^i[9]Nrp8l0d9`G-"&Vp6.fd4&NGo_j)2qO6[!#%52@P8W4br!"khN%%KOXMsX`!rpS[ISQ_HBMs="DI8E/"#$!FqGO!F1%+nJn@JJ'2=a":7W@X?tqLM79j(@F#?X5VO>ns6o1Yk[-M>:I&Y@u(NBOn5qO?Cf?EJNU7'Gq2>o[aGOo12_(O^OfRd9tFKV%\du'=$(ZW)EQMNe.SJ``H+*I3\4;TDkHHCZdn?G[hNiJF%McO/g*Bii/7N>D]A!S+Ij>M>>M2dFFW0];5`a(>;4mp5u33$<1/GXG1>P,E=45d&`3O<8EAKN)@MgQ&-?o'G@n<2qhatr\Z6(O]?Z(pt6?pqD]=(s!b:a@9EW0[#>N'n)3A6]?r[>\1",%=@o#8g;ij4,$'(_k'm7T@QU"Z%bl##WBNg[Bfa3At7]'^(4AJVObNX@!:6/bOXgBk=Y$gQ3U''i?fiPZD93>"#1Ge<@6p>)cg$&Wmu.1p)^;@hi08U]qN-/#*hq\*+;iBu:U&:8""68*GQ]gmU73s1QE!KW*;@*^M'JPZ23+8iU>c&4n;oe_#Kg%[gb6.7u%g`YtXla;dJkV3Fqh$W8rpNZaK_8m8[TOq/*K@fITZAj<Q!1Ug\B',;irM%m'q5uEHb'oRMm"HimZ@7&EZq.^0\$&V'&VD%5b&4dEJKa:C[`2b&C,Ua!3\pHL9mn7ip0/L7k%0~>endstream
+Gb"/*gN!ue&:O:Sk`J]Hct.<G9a,R:n6ioJ]0d"H`NC_';uD)j0'\QU)K-!&C]ejsf'],N\u2CRlJ2K_"T6F$ml+IjIbCr<0-la=D;I&$nW%Jc@a?u'ruR`H+$$%R%I(7Jbh0_E0G:nb2YY@:n>(HEIWr//9(C73'ps)J):hsI.3U9)*hQf3ZaW^R5lWq(6!;sh)(Jrb_jq=(N44Zp&Ngf3K]cBiS+@F`JH-eX.#'c4XCA9(@`O(Yrb&6:nqNa9l%G@qr2CKr\5&'2CY35,(Ym%7iBE@`VN2GOZR>)e[^fq<Vg[3]@I[*u,ui^-*(:o-Y$k,ne9'ZR$1PN%l;qqgQKHm-iB4I%).Ps)95Zoa4Gp9U^rHML!YkI&"6DMuT3^nMT"j0Ta1<8RoT_0l3UO]&EoG#O/5!e/gc2?7?34]/Be$uq5q'UnZi.j'1M98c;Y!Ed,])td=Plj[m,*dKYhdq^^-i8oD[VaI6$hs89*J.D:k:iSDm*9Yld)PGbsI;mpO.naG?h/\&O:8t/WB`FW0dP^"^Z](/ZrHc59\M!WNEr3m>)/%Vm/5+[cMN%JXrYd!Jl=_,*4-B)@=(7a#o5hO;\::Ju"OE$U3^8+0X0B8/!h>).)fB*lYBYNIiuQdR`:"+7h1@$NnC_Mh3cOe!T+m]-h/3MfW+c%G*SKiS-'19X!q\fVRW(k"ZGnLGIY@/rZra/W,:Hjh^iVikH"jB,B0]W%u\`rL$7&I_Xt-^g(ZW"38WNdE0>[0Q2NcTtdZ=>JYO;/MC4F-0<chJq:FLl7o0f)D51cTXEbE32`n)@U:"!lPqMN-MTjLnT6uK5u(\,'"1h[3lp&f$$f\.q2U^$bH'Ium+o<U1@Ek&;;_^3DkEuf&l(o"U;+E,hgN^Hc.He^0As)*?JdeDa^LZQ@SPbKpReVF>g00Zm'Tf`L4dR7gSS_Y/AVH`X6S5QGCH+52<V.gX5W*,(!>@DY2B_"6m*fQiYk!fUcT\DYE]i3"Pup5GM\bK*Hid.3NqLWarFKg<IkB*a&,h@;<q)eCus<DL4$t]GbTF<];Abeg6Qi4G;7u-#fZ?>*+LS-&*)_q&D*d]Y+QKLh=,AKDce=oeq2irVG+MP%aIo&:LA.6DsKh"d-J\W(e#i1>C=N8fiY(rVH%B$C&@)J5'DG/rV3UM?tk?]194?E0W@pcRI!&R<-nFc[@55#eSf1[eM'PJ#N,GKh65W3FJ\eUTABF0jl(u#*k,G;k'&JZ$'U]s-HrNiiM2c;9oBlH.#V5W<KiUgq-)e=s'7YV>9-?NoBP9FnP7oX$u[W9R/PfMbj0TmqE/#l(J3Kda!rI+X:dD3I;f+>53G+MUYl_BYN/DnEj2QAaN>;U[Aprirb@YJ1grT=Rc71b0CJTi(#8%6dTQRb:Q_f\A9bFjqtkrMrTJ3[a2IJDSGs4/o&"$WGSknDp,VIikAY)cE:O$_bCcqUa$KV'43d>^FsJLOmm="fSm,fK]\tZZJ@D<6]dh\ODd2dY(n^5ZcO(7Xe1?H/BM>e[fFB!s`Z%*u-o(G>NNe;oqXp*F/C?cjcll)lHWi5X-!Z*TeRG6fc%;N7ROc4C3]Z$_C!C%PE,gXaeM,C)AkC;]/X3\;_eCsak\8:LQZ+1NU)"DJC6nKCd6_Qj]&B6/nEh+[&oNA&e7,.Fc'"Z"PiTL\-]Obt774nm)?nMI3dN5]$ESNak!*VU`$U;8lBTRn.p$OWO,N?B8(B,WCC[MXN?/nho;3YqQ-;,GekAPoMep=/oh+A8?YeMma$hoGW-Tb2c(oJ(brD*7o0YXV/^59_2:[SPQgjO12H/#?V^@3ZWa<e`1_hb5bXNRPY@+f,MAg\Nj/*saQ-;-b;<,sgLnj7#bViBsj3I"IU[",g23ZU>KK(?;K/nK7]H"aFc)$[Akja?b6]kh*q`hrRC'Cfg9XLH`7MnuSkHu1a(_k*%%qo\]YK]JRTLb(sU0>BK1Cu8hOs>pa<q'/6=EP%H3mBJ$cCfl"-YPqeC"EtZ4E%J6+_n=+-P/iu-T0S2&e:<A6rM/u/N+c+6Y9S?MGd2aYm2]t1+*W).4;OUJeS]_'8WHKPNqkAq#E,nocF5Np(LGsV=cU6BJ@8R8BJ"L'SQ\GYiu[P5a!6=b\6i"58XGnJte@"l'qNW#UB_66@u(Qie&D9,Ua!+\pnr%T-<RbIr59GT)~>endstream
 endobj
 397 0 obj
 <<
@@ -3129,71 +3129,71 @@ xref
 0000071450 00000 n 
 0000071546 00000 n 
 0000072102 00000 n 
-0000074224 00000 n 
-0000085763 00000 n 
-0000096679 00000 n 
-0000098244 00000 n 
-0000109153 00000 n 
-0000110718 00000 n 
-0000121627 00000 n 
-0000123192 00000 n 
-0000138586 00000 n 
-0000148145 00000 n 
-0000163536 00000 n 
-0000173095 00000 n 
-0000184820 00000 n 
-0000190157 00000 n 
-0000200932 00000 n 
-0000211707 00000 n 
-0000221321 00000 n 
-0000228576 00000 n 
-0000239801 00000 n 
-0000250509 00000 n 
-0000252074 00000 n 
-0000262783 00000 n 
-0000264348 00000 n 
-0000275057 00000 n 
-0000276622 00000 n 
-0000291986 00000 n 
-0000300875 00000 n 
-0000316236 00000 n 
-0000325125 00000 n 
-0000336741 00000 n 
-0000347325 00000 n 
-0000357909 00000 n 
-0000367384 00000 n 
-0000374639 00000 n 
-0000383603 00000 n 
-0000394412 00000 n 
-0000405222 00000 n 
-0000420266 00000 n 
-0000425835 00000 n 
-0000435114 00000 n 
-0000444393 00000 n 
-0000452775 00000 n 
-0000459684 00000 n 
-0000470344 00000 n 
-0000472036 00000 n 
-0000482781 00000 n 
-0000485885 00000 n 
-0000496631 00000 n 
-0000499735 00000 n 
-0000514728 00000 n 
-0000524988 00000 n 
-0000530077 00000 n 
-0000545067 00000 n 
-0000555327 00000 n 
-0000560416 00000 n 
-0000571055 00000 n 
-0000572808 00000 n 
-0000583447 00000 n 
-0000585200 00000 n 
-0000594898 00000 n 
-0000596315 00000 n 
+0000074374 00000 n 
+0000085913 00000 n 
+0000096829 00000 n 
+0000098394 00000 n 
+0000109303 00000 n 
+0000110868 00000 n 
+0000121777 00000 n 
+0000123342 00000 n 
+0000138736 00000 n 
+0000148295 00000 n 
+0000163686 00000 n 
+0000173245 00000 n 
+0000184970 00000 n 
+0000190307 00000 n 
+0000201082 00000 n 
+0000211857 00000 n 
+0000221471 00000 n 
+0000228726 00000 n 
+0000239951 00000 n 
+0000250659 00000 n 
+0000252224 00000 n 
+0000262933 00000 n 
+0000264498 00000 n 
+0000275207 00000 n 
+0000276772 00000 n 
+0000292136 00000 n 
+0000301025 00000 n 
+0000316386 00000 n 
+0000325275 00000 n 
+0000336891 00000 n 
+0000347475 00000 n 
+0000358059 00000 n 
+0000367534 00000 n 
+0000374789 00000 n 
+0000383753 00000 n 
+0000394562 00000 n 
+0000405372 00000 n 
+0000420416 00000 n 
+0000425985 00000 n 
+0000435264 00000 n 
+0000444543 00000 n 
+0000452925 00000 n 
+0000459834 00000 n 
+0000470494 00000 n 
+0000472186 00000 n 
+0000482931 00000 n 
+0000486035 00000 n 
+0000496781 00000 n 
+0000499885 00000 n 
+0000514878 00000 n 
+0000525138 00000 n 
+0000530227 00000 n 
+0000545217 00000 n 
+0000555477 00000 n 
+0000560566 00000 n 
+0000571205 00000 n 
+0000572958 00000 n 
+0000583597 00000 n 
+0000585350 00000 n 
+0000595048 00000 n 
+0000596465 00000 n 
 trailer
 <<
 /ID 
-[<5c274e1809c50adbe036df660b564b1c><5c274e1809c50adbe036df660b564b1c>]
+[<52cd56a45cc75fb677d0f45f8c1d5cfb><52cd56a45cc75fb677d0f45f8c1d5cfb>]
 % ReportLab generated PDF document -- digest (http://www.reportlab.com)

 /Info 392 0 R
@@ -3201,5 +3201,5 @@ trailer
 /Size 458
 >>
 startxref
-603228
+603378
 %%EOF
--- a/src/data/stundenplan.md
+++ b/src/data/stundenplan.md
@@ -3,6 +3,6 @@
 | :------: | :----------: | :----------: | :----------: | :----------: | :----------: |
 | 1.<br>2. | [klasse-5a]  | [klasse-6b]  |              |              |              |
 | 3.<br>4. | [klasse-6b]  | [kurs-if-ef] | [klasse-5a]  |              |              |
-| 5.<br>6. | [kurs-if-9]  |              | [kurs-if-ef] |              |              |
+| 5.<br>6. | [kurs-if-9]  | [[VERT]]     | [kurs-if-ef] |              |              |
 |    7.    |              |              |              |              |              |
 | 8.<br>9. |              | [kurs-if-9]  |              |              |              | 
--- a/src/devices/css/color.css
+++ b/src/devices/css/color.css
@@ -1,35 +1,33 @@
+/* Navizelle oben links in der Ecke neutral grau */
+
 .n0 {
    background-color: lightgrey;
 }

+
+/* Navizelle, Titel und Stundenplanlink einheitlich eingefärbt */
+
 .n1, .h1, .t1 {
    background-color: lightpink;
 }
-
 .n2, .h2, .t2 {
    background-color: powderblue;
 }
-
 .n3, .h3, .t3 {
    background-color: lightgreen;
 }
-
 .n4, .h4, .t4 {
    background-color: peachpuff;
 }
-
 .n5, .h5, .t5 {
    background-color: lavender;
 }
-
 .n6, .h6, .t6 {
-    background-color: lemonchiffon;
+    background-color: lightgoldenrodyellow;
 }
-
 .n7, .h7, .t7 {
    background-color: darkseagreen;
 }
-
 .n8, .h8, .t8 {
    background-color: cadetblue;
 }
--- a/src/devices/css/general.css
+++ b/src/devices/css/general.css
@@ -85,6 +85,38 @@ img.icon {
 }


+/* Alle Tabellen */
+table, tr, td {
+    border: 0.3px solid black;
+}
+th, td {
+    padding-top: 3pt;
+    padding-bottom: -1pt;
+    padding-left: 2pt;
+    vertical-align: middle;
+    text-align: left;
+}
+th.nr, td.nr {
+    width: 5.5%;
+    text-align: right;
+    padding-right: 2pt;
+    vertical-align: middle;
+}
+th.name, td.name {
+    width: 30%;
+    vertical-align: middle;
+    border-right: 1px solid black;
+}
+tr.header, tr.muster {
+    border-bottom: 1px solid black;
+}
+th.luecke, td.luecke {
+    width: 5.5%;
+    text-align: center;
+    border: none;
+}
+
+
 /* Startseite inkl. Stundenplan */
 h1.start {
    margin-top: 60pt;
@@ -117,39 +149,24 @@ th.tag, td.tag {
 table.timetable th.stunde, th.tag {
    border-bottom: 1px solid black;
 }
- 
-
-/* Alle Tabellen */
-table, tr, td {
+table.timetable div {
+    padding-top: 4pt;
+    padding-bottom: -3pt;
+    padding-left: 2pt;
+    padding-right: 2pt;
+    margin-left: 0pt;
+    margin-right: 2pt;
    border: 0.3px solid black;
 }
-th, td {
+table.timetable td.tag {
    padding-top: 3pt;
-    padding-bottom: -1pt;
-    padding-left: 2pt;
-    vertical-align: middle;
-    text-align: left;
+    padding-bottom: 1pt;
 }
-th.nr, td.nr {
-    width: 5.5%;
-    text-align: right;
-    padding-right: 2pt;
-    vertical-align: middle;
+table.timetable td.stunde {
+    padding-top: 5pt;
+    padding-bottom: 1pt;
 }
-th.name, td.name {
-    width: 30%;
-    vertical-align: middle;
-    border-right: 1px solid black;
-}
-tr.header, tr.muster {
-    border-bottom: 1px solid black;
-}
-th.luecke, td.luecke {
-    width: 5.5%;
-    text-align: center;
-    border: none;
-}
-
+ 

 /* Übersichtstabelle */
 table.overview th.nr, th.name, th.endnote {
--- a/src/devices/css/sw.css
+++ b/src/devices/css/sw.css
@@ -1,5 +1,5 @@

-/* SW-Konzept: keine Farben in Navileiste, Überschrift, Stundenplan */
+/* Navileiste: aktiv grau hinterlegt, sonst weiß */

 td.group {
    background-color: white; /* keine Einfärbung */
@@ -7,7 +7,18 @@ td.group {
 td.current {
    background-color: lightgrey; /* aktiv = schwach grau hinterlegt */
 }
-
-table.timetable a {
-    background-color: #f2f2f2; /* Links = leicht grau hinterlegt */
+.n1, .n2, .n3, .n4, .n5, .n6, .n7, .n8 {
+}
+
+
+/* Überschrift: aktuell ohne Schattierung */
+
+.h1, .h2, .h3, .h4, .h5, .h6, .h7, .h8 {
+}
+
+
+/* Stundenplan: Links nur leicht grau schattiert Ü*/
+
+.t1, .t2, .t3, .t4, .t5, .t6, .t7, .t8 {
+    background-color: #f2f2f2;
 }
--- a/src/pages/start.py
+++ b/src/pages/start.py
@@ -2,6 +2,7 @@ import os
 import markdown

 import header
+import re


 def erstelleStartseite(lerngruppen, path,config, inputs):
@@ -80,7 +81,11 @@ def erstelleStartseite(lerngruppen, path,config, inputs):
                print('Der Schlüssel "bezeichnung" fehlt im Bereich "'+kursid+'" der Input-Datei!')
                exit(0)

-            html = html.replace('['+kursid+']','<span class="'+mycss+'"><a href="#'+klassekurs_aktuell+'">'+klassekurs_aktuell_kurz+'</a></span>')
+            html = re.sub('\\['+kursid+'\\](.+)?<br>','<div class="'+mycss+'"><a href="#'+klassekurs_aktuell+'">'+klassekurs_aktuell_kurz+'</a>\\1</div>',html)
+            html = re.sub('\\['+kursid+'\\](.+)?</td>','<div class="'+mycss+'"><a href="#'+klassekurs_aktuell+'">'+klassekurs_aktuell_kurz+'</a>\\1</div></td>',html)
+
+        html = re.sub('\\[\\[(.+)?\\]\\](.+)?<br>','<div class="t-empty">\\1 \\2</div>',html)
+        html = re.sub('\\[\\[(.+)?\\]\\](.+)?</td>','<div class="t-empty">\\1 \\2</div></td>',html)

        table += html