shahondin1624/songbook
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Update TOC and footer to use imported reference books

Browse Source 
Replace MO/PfLB columns with the actual reference books from the
Carmina Leonis import: BuLiBu, CL (gr.), SwA, Barde, LiBock.
Add third LaTeX pass to Makefile for TOC stabilization.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
shahondin1624
2026-04-02 15:55:55 +02:00
parent 93f451eef9
commit 44d2fb9b5e
2 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -13,6 +13,7 @@ $(OUTDIR):
$(OUTDIR)/$(MAIN).pdf: $(MAIN).tex songbook-style.sty songs/*.tex | $(OUTDIR)
TEXINPUTS=.:$(shell pwd):$(shell pwd)/$(OUTDIR): $(ENGINE) $(FLAGS) $(MAIN).tex
TEXINPUTS=.:$(shell pwd):$(shell pwd)/$(OUTDIR): $(ENGINE) $(FLAGS) $(MAIN).tex
TEXINPUTS=.:$(shell pwd):$(shell pwd)/$(OUTDIR): $(ENGINE) $(FLAGS) $(MAIN).tex
clean:
rm -f $(OUTDIR)/*.aux $(OUTDIR)/*.log $(OUTDIR)/*.out \

60
songbook-style.sty
View File

@@ -85,8 +85,11 @@
\ExplSyntaxOn
\iow_new:N \g__sb_toc_iow
\tl_new:N \l__sb_title_tl
\tl_new:N \l__sb_mo_tl
\tl_new:N \l__sb_pflb_tl
\tl_new:N \l__sb_bulibu_tl
\tl_new:N \l__sb_cl_tl
\tl_new:N \l__sb_swa_tl
\tl_new:N \l__sb_barde_tl
\tl_new:N \l__sb_libock_tl
\tl_new:N \l__sb_num_tl
\tl_new:N \l__sb_songid_tl
\bool_new:N \g__sb_toc_opened_bool
@@ -119,14 +122,20 @@
\stepcounter{songnumber}
\tl_set:Nx \l__sb_num_tl { \int_use:N \c@songnumber }
\tl_set:Nx \l__sb_title_tl { \songproperty{title} }
\tl_set:Nx \l__sb_mo_tl { \songproperty{mundorgel} }
\tl_set:Nx \l__sb_pflb_tl { \songproperty{pfadfinderliederbuch} }
\tl_set:Nx \l__sb_bulibu_tl { \songproperty{bulibu} }
\tl_set:Nx \l__sb_cl_tl { \songproperty{cl} }
\tl_set:Nx \l__sb_swa_tl { \songproperty{swa} }
\tl_set:Nx \l__sb_barde_tl { \songproperty{barde} }
\tl_set:Nx \l__sb_libock_tl { \songproperty{libock} }
\iow_now:Nx \g__sb_toc_iow
{
\exp_not:N \songtocrow
{ \l__sb_title_tl }
{ \l__sb_mo_tl }
{ \l__sb_pflb_tl }
{ \l__sb_bulibu_tl }
{ \l__sb_cl_tl }
{ \l__sb_swa_tl }
{ \l__sb_barde_tl }
{ \l__sb_libock_tl }
{ \exp_not:N \pageref { song: \l__sb_num_tl } }
}
}
@@ -138,8 +147,9 @@
\ExplSyntaxOff
% --- Render one TOC row ---
\newcommand{\songtocrow}[4]{%
#1 & #2 & #3 & \cellcolor{tocheadgray}\textbf{#4} \\
% #1=title #2=BuLiBu #3=CL #4=SwA #5=Barde #6=LiBock #7=page
\newcommand{\songtocrow}[7]{%
#1 & #2 & #3 & #4 & #5 & #6 & \cellcolor{tocheadgray}\textbf{#7} \\
\hline
}
@@ -156,16 +166,27 @@
\footnotesize
\rowcolors{2}{tocrowgray}{white}%
\begin{longtable}{%
>{\raggedright\arraybackslash}p{0.52\textwidth}|%
>{\centering\arraybackslash}p{0.10\textwidth}|%
>{\centering\arraybackslash}p{0.10\textwidth}|%
>{\centering\arraybackslash\columncolor{tocheadgray}}p{0.12\textwidth}%
>{\raggedright\arraybackslash}p{0.36\textwidth}|%
>{\centering\arraybackslash}p{0.07\textwidth}|%
>{\centering\arraybackslash}p{0.07\textwidth}|%
>{\centering\arraybackslash}p{0.07\textwidth}|%
>{\centering\arraybackslash}p{0.07\textwidth}|%
>{\centering\arraybackslash}p{0.07\textwidth}|%
>{\centering\arraybackslash\columncolor{tocheadgray}}p{0.09\textwidth}%
}
& \rotheader{MO} & \rotheader{PfLB}
& \rotheader{BuLiBu}
& \rotheader{CL (gr.)}
& \rotheader{SwA}
& \rotheader{Barde}
& \rotheader{LiBock}
& \rotheader{\normalsize Lieder-\newline\normalsize buch} \\
\hline
\endfirsthead
& \rotheader{MO} & \rotheader{PfLB}
& \rotheader{BuLiBu}
& \rotheader{CL (gr.)}
& \rotheader{SwA}
& \rotheader{Barde}
& \rotheader{LiBock}
& \rotheader{\normalsize Lieder-\newline\normalsize buch} \\
\hline
\endhead
@@ -199,10 +220,13 @@
\endgroup
\vspace{3mm}%
\begingroup\footnotesize\centering
\begin{tabular}{ccc}
MO & PfLB & Liederbuch \\
\ifsongproperty{mundorgel}{\songproperty{mundorgel}}{} &
\ifsongproperty{pfadfinderliederbuch}{\songproperty{pfadfinderliederbuch}}{} &
\begin{tabular}{cccccc}
BuLiBu & CL (gr.) & SwA & Barde & LiBock & Liederbuch \\
\ifsongproperty{bulibu}{\songproperty{bulibu}}{} &
\ifsongproperty{cl}{\songproperty{cl}}{} &
\ifsongproperty{swa}{\songproperty{swa}}{} &
\ifsongproperty{barde}{\songproperty{barde}}{} &
\ifsongproperty{libock}{\songproperty{libock}}{} &
\thepage
\end{tabular}\par
\endgroup