התחלחה של השיטה החדשה. נראה טוב ☺

agordoj/komuna/enhavo.tex

@@ -2,7 +2,7 @@
 
 \newcommand{\enhavorango}[1]{%
 	\ifthenelse{\equal{#1}{4}}{{\ \footnotesize\kvarOk}}{}%
-	\ifthenelse{\equal{#1}{6}}{{\ \footnotesize\sesOK}}{}
+	\ifthenelse{\equal{#1}{6}}{{\ \footnotesize\sesOk}}{}
 }
 
 \newcommand{\enhavero}[7]{%

agordoj/komuna/muzikajxoj.tex

 \newcommand{\muzikajxo}[8]{
 	\clearpage
 	\noindent
-	\parbox[t]{0.49\textwidth}{\EO{\textbf{#4}~/ {\small #5}}}
-	\parbox[t]{0.18\textwidth}{\LR{\parbox[t]{1.5em}{\centering\symbolglyph{#8}}\label{muz:#1}}}
-	\parbox[t]{0.32\textwidth}{{\begin{RTL}\Heb{\textbf{#2}~/ {\small #3}}\end{RTL}}}\\[0.5ex]
+	\parbox[t]{0.33\textwidth}{\EO{\textbf{#4}}}
+	\parbox[t]{0.33\textwidth}{\centering\LR{\parbox[t]{1.5em}{\centering\symbolglyph{#8}} #6\label{muz:#1}}}
+	\parbox[t]{0.33\textwidth}{{\begin{RTL}\Heb{\textbf{#2}}\end{RTL}}}\\
+	\parbox[t]{0.33\textwidth}{\EO{{#5}}}
+	\parbox[t]{0.33\textwidth}{\centering\ifthenelse{\equal{#7}{}}{~}{}}
+	\parbox[t]{0.33\textwidth}{{\begin{RTL}\Heb{{#3}}\end{RTL}}}
+
 	\begin{notacio}
 		\input{muzikajxoj/#1}
 	\end{notacio}

agordoj/okarino/notacio-postbidi.tex

@@ -9,6 +9,7 @@
 	   \pgfusepath{stroke}
    }
 
+\renewcommand{\B  }{\presuokarinon{fill}{fill}{fill}{fill}{1}{1}{1}}
 \renewcommand{\c  }{\presuokarinon{fill}{fill}{fill}{fill}{0}{1}{1}}
   \newcommand{\cis}{\presuokarinon{pattern=diagolines, pattern color = black!50}{fill}{fill}{fill}{0}{1}{1}}
 \renewcommand{\d  }{\presuokarinon{    }{fill}{fill}{fill}{0}{1}{1}}
@@ -22,7 +23,7 @@
   \newcommand{\ais}{\presuokarinon{    }{fill}{    }{    }{0}{1}{1}}
 \renewcommand{\b  }{\presuokarinon{fill}{    }{    }{    }{0}{1}{1}}
 \renewcommand{\C  }{\presuokarinon{    }{    }{    }{    }{0}{1}{1}}
-\renewcommand{\B  }{\presuokarinon{fill}{fill}{fill}{fill}{1}{1}{1}}
+  \newcommand{\CIS}{\presuokarinon{fill}{    }{    }{    }{0}{1}{0}}
   \newcommand{\D  }{\presuokarinon{    }{    }{    }{    }{0}{1}{0}}
   \newcommand{\DIS}{\presuokarinon{fill}{    }{    }{    }{0}{0}{0}}
   \newcommand{\E  }{\presuokarinon{    }{    }{    }{    }{0}{0}{0}}
@@ -31,6 +32,7 @@
 \newcommand{\ges}{\fis}
 \newcommand{\aes}{\gis}
 \newcommand{\bes}{\ais}
+\newcommand{\DES}{\CIS}
 \newcommand{\EES}{\DIS}
 \newcommand{\z}{\presulongan}
 \newcommand{\w}{\presupauxzon}
@@ -39,6 +41,7 @@
 \newcommand{\X}{\presutaktstrekon{0}{0}{1}}
 \renewcommand{\r}[2]{\presutaktstrekon{#1}{#2}{0}}
 \newcommand{\R}[2]{\presutaktstrekon{#1}{#2}{1}}
+\newcommand{\sx}{\presunevidablantaktstrekon}
 \newcommand{\alt}[1]{{#1}}
 \newcommand{\takto}[3]{{\parbox[t]{1em}{\presualternativon{#1}}#2\parbox[t]{3mm}{#3}}}
 \newcommand{\reludu}{\raisebox{0.5\baselineskip}{\symbolglyph{\huge\textcolor{gray}{⟲}}}}

agordoj/okarino/notacio.tex

@@ -76,6 +76,17 @@
 	\ifhmode\ifdim\lastskip>0pt \unskip\fi\fi
 }
 
+\newcommand{\presunevidablantaktstrekon}{
+	\ifhmode\ifdim\lastskip>0pt \unskip\fi\fi
+	\scalebox{\skalaro}{
+		\begin{tikzpicture}
+			[line width = 1mm, opacity=0, rounded corners = 2mm]
+			\draw (0, -2) -- (0, +2);
+		\end{tikzpicture}
+	}
+}
+	
+
 \newcommand{\presuokarinon}[7]{
 	\ifhmode\ifdim\lastskip>0pt \unskip\hspace{1mm}\fi\fi
 	\scalebox{\skalaro}{
@@ -112,3 +123,15 @@
 		{\textcolor{darkgray}{{\fontspec{Symbola}⌈}#1}}
 	}
 }
+
+\newcommand{\duo}[2]{
+	\ifhmode\ifdim\lastskip>0pt \unskip\hspace{1mm}\fi\fi
+	\scalebox{\skalaro}{
+		\begin{tikzpicture}
+			\node at (0, +1) {#1};
+			\node at (0, -1) {#2};
+			\draw [inner sep = 6mm, line width = 1mm, draw, opacity=0, rounded corners = 2mm]
+				(-2, -2) rectangle (2, 2);
+		\end{tikzpicture}
+	}
+}

enhavo.tex

@@ -2,6 +2,7 @@
 \enhavokategorio{he}{שירים עבריים}{Hebrealingvaj kantoj}
 \enhavero{ima}{אמא יקרה לי}{נחום נרדי}{Mia kara patrino}{Naĥum Nardi}{♥}{4}
 \enhavero{bamaagal}{אני עומדת במעגל}{עממי}{Mi staras en la cirklo}{{\popola}}{○}{4}
+\enhavero{gina}{גינה לי}{דוד מערבי}{Mia ĝardeno}{David Maaravi}{🌷}{6}
 \enhavero{dugit}{דוגית נוסעת}{לב שוורץ}{Boato moviĝas}{Lev Ŝvarc}{⛵}{4}
 \enhavero{rakevet}{הנה באה הרכבת}{עממי}{Jen la traĵno venas}{{\popola}}{🚂}{4}
 \enhavero{rakefet}{הרקפת}{עממי}{La ciklameno}{{\popola}}{⚘}{4}
@@ -9,9 +10,11 @@
 \enhavero{kova}{לכובע שלי}{עממי}{Mia ĉapelo}{{\popola}}{△}{4}
 \enhavero{sade}{לשדה יצוא יצאתי}{עממי}{Barieroj}{{\popola}}{🐎}{4}
 \enhavero{zakan}{שיר המסיכות}{נחום נרדי}{La kanto de la maskoj}{Naĥum Nardi}{👹}{4}
+\enhavero{šalom}{שיר לשלום}{יאיר רוזנבלום}{Kanto por la paco}{Jair Rozenblum}{🕊}{6}
 
 \enhavokategorio{antikva}{מוזיקה מוקדמת}{Antikva muziko}
 \enhavero{wilsons}{וילסון׳ז ויילד}{אלמוני/ת}{Wilson’s Wilde}{{\sennoma}}{❦}{4}
+\enhavero{lachrymae}{זִלגו דמעותי}{ג׳ון דוולנד}{La pavano de la larmoj}{John Dowland}{😢}{6}
 \enhavero{midnight}{חצות־הלילה של מר דוולנד}{ג׳ון דוולנד}{La noktomezo de S-ro Dowland}{John Dowland}{🕛}{4}
 \enhavero{tordion}{טורדיון}{אלמוני/ת}{Tordiono}{{\sennoma}}{🔀}{4}
 \enhavero{follia}{לה פוליה}{אלמוני/ת}{La Folia}{{\sennoma}}{ℱ}{4}
@@ -33,6 +36,10 @@
 \enhavero{totoro}{השכן שלי טוטורו}{ג׳ו היסאישי}{Mia najbaro Totoro}{Ĝo Hisaiŝi}{🌳}{4/6⚙}
 \enhavero{sanpo}{השכן שלי טוטורו: סמפו}{ג׳ו היסאישי}{Mia najbaro Totoro: Sanpo}{Ĝo Hisaiŝi}{🐛}{4}
 
+\enhavokategorio{albumoj}{שירים מאלבומים לילדים}{Kantoj de muzikalbumoj por infanoj}
+\enhavero{ruti}{זרעים של מסטיק: הכל קרה בגלל רותי}{נחום נחצ׳ה היימן}{Semoj de maĉgumo: Ĉio fariĝis pro Ruti}{Naĥum Naĥĉe Hejman}{🍇}{6}
+\enhavero{mastik}{זרעים של מסטיק: זרעים של מסטיק}{נחום נחצ׳ה היימן}{Semoj de maĉgumo: Semoj de maĉgumo}{Naĥum Naĥĉe Hejman}{🍬}{6}
+
 \enhavokategorio{klasika}{מוזיקה קלאסית}{Klasika muziko}
 \enhavero{freude}{אוֹדָה לשמחה (מפושט)}{לודוויג ון בטהובן}{Odo al ĝojo (simpligita)}{Ludwig van Beethoven}{☺}{4}
 

muzikajxoj/.vim/ftplugin/tex.vim

+function! Lyoc()
+	gg9<G
+	%s/r/w/g
+	%s/c'/C/g
+	%s/cis'/CIS/g
+	%s/des'/DES/g
+	%s/d'/D/g
+	%s/dis'/DIS/g
+	%s/ees'/EES/g
+	%s/e'/E/g
+	%s/\\\d//g
+	%s/(\|)//g
+	%s/\<\(\a\S*\)/\\\1/g
+	%s/ //g
+endfunction
+
+function! Lyoc8()
+	call Lyoc()
+	%s/\<\(\a*\)8\>/\1/g
+	%s/\<\(\a*\)4\./\1\\z\\z/g
+	%s/\<\(\a*\)4/\1\\z/g
+	%s/\<\(\a*\)2\./\1\\z\\z\\z\\z\\z/g
+	%s/\<\(\a*\)2/\1\\z\\z\\z/g
+	%s/\<\(\a*\)1\>/\1\\z\\z\\z\\z\\z\\z\\z/g
+endfunction
+
+function! Lyoc4()
+	call Lyoc()
+	%s/\<\(\a*\)4\>/\1/g
+	%s/\<\(\a*\)2\./\1\\z\\z/g
+	%s/\<\(\a*\)2/\1\\z/g
+	%s/\<\(\a*\)1/\1\\z\\z\\z/g
+endfunction
+
+function! Lyocfix16()
+	%s/\(\\\a*\)\.\(\\\a*\)16/\1\\duo{\\z}{\2}/g
+	%s/\(\\\a*\)16\(\\\a*\)16/\\duo{\1}{\2}/g
+endfunction
+
+function! Takto()
+	%s/^/\\takto{}{/g
+	%s/\([^|]\)$/\1}{}/g
+	%s/|$/}{\\x}/g
+endfunction

muzikajxoj/lachrymae.tex

+\takto{}{\g\z\z\duo{\f}{\ees}\d\z\bes\z}{}\par
+\takto{}{\z\z\a\g\fis\z\z\z}{\x}\par
+\takto{}{\g\z\d\z\z\d\f\f}{}\par
+\takto{}{\ees\z\c\z\d\z\z\a}{\x}\par
+\takto{}{\bes\z\g\z\a\z\fis\z}{}\par
+\takto{}{\g\bes\duo{\z}{\a}\g\fis\z\bes\z}{\x}\par
+\takto{}{\a\g\g\z\z\duo{\fis}{\e}\fis\z}{}\par
+\takto{}{\g\z\z\z\z\z\z\z}{\r{1}{1}}
+\newpage
+\takto{}{\bes\z\z\a\g\f\bes\z}{}\par
+\takto{}{\z\duo{\a}{\g}\a\z\bes\z\f\z}{\x}\par
+\takto{}{\w\g\z\fis\g\ees\d\z}{}\par
+\takto{}{\w\c\ees\z\w\ees\g\z}{\x}\par
+\takto{}{\w\g\bes\z\w\f\a\duo{\z}{\bes}}{}\par
+\takto{}{\C\z\w\c\ees\duo{\z}{\f}\g\z}{\x}\par
+\takto{}{\w\bes\z\a\bes\duo{\z}{\a}\duo{\g}{\fis}\g}{}\par
+\takto{}{\fis\z\z\z\z\z\z\z}{\r{1}{1}}
+\newpage
+\takto{}{\fis\z\z\g\a\z\bes\z}{}\par
+\takto{}{\a\g\g\z\z\z\fis\z}{\x}\par
+\takto{}{\g\z\z\bes\a\bes\g\z}{}\par
+\takto{}{\fis\z\z\z\w\w\w\w}{\x}\par
+\takto{}{\D\z\z\a\C\z\z\g}{}\par
+\takto{}{\bes\z\a\z\g\z\fis\z}{\x}\par
+\takto{}{\bes\z\a\g\g\z\z\duo{\fis}{\e}}{}\par
+\takto{}{\fis\z\g\z\z\z\z\z}{\R{1}{0}}

muzikajxoj/mastik.tex

+\renewcommand{\skalaro}{0.22}
+\takto{}{\s\s\s}{\sx}
+\takto{}{\s\s\s}{\sx}
+\takto{}{\s\s\s}{\sx}
+\takto{}{\s\s\c}{\x}\par
+\takto{}{\f\e\f}{\x}
+\takto{}{\d\z\f}{\x}
+\takto{}{\e\z\g}{\x}
+\takto{}{\f\z\c}{\x}\par
+\takto{}{\C\a\g}{\x}
+\takto{}{\f\bes\a}{\x}
+\takto{}{\g\e\f}{\x}
+\takto{}{\g\z\g}{\x}\par
+\takto{}{\f\e\d}{\x}
+\takto{}{\c\f\g}{\x}
+\takto{}{\a\bes\C}{\x}
+\takto{}{\D\bes\a}{\x}\par
+\takto{}{\g\C\bes}{\x}
+\takto{}{\a\f\e}{\x}
+\takto{}{\d\g\f}{\x}
+\takto{}{\e\c\c}{\x}\par
+%
+\takto{}{\f\f\f}{\x}
+\takto{}{\e\z\d}{\x}
+\takto{}{\c\d\e}{\x}
+\takto{}{\f\z\g}{\x}\par
+\takto{}{\a\d\e}{\x}
+\takto{}{\f\bes\a}{\x}
+\takto{}{\g\z\z}{\x}
+\takto{}{\z\z\bes}{\x}\par
+\takto{}{\a\g\a}{\x}
+\takto{}{\f\z\e}{\x}
+\takto{}{\d\e\f}{\x}
+\takto{}{\g\z\f}{\x}\par
+\takto{}{\e\d\c}{\x}
+\takto{}{\bes\a\g}{\x}
+%
+\takto{1}{\f\z\z}{\x}
+\takto{}{\z\z\c}{\r{1}{0}}\par
+%
+\takto{2}{\f\z\z}{\x}
+\takto{}{\z\z\z}{\X}
+\renewcommand{\skalaro}{\normaskalaro}

muzikajxoj/osondoar.tex

+\takto{}{\s\s\s\s\d\e}{\r{0}{1}}\par
+%
+\takto{}{\f\duo{\z}{\e}\f\g\duo{\z}{\f}\g}{\x}\par
+\takto{}{\a\duo{\z}{\g}\f\d\duo{\z}{\f}\a}{\x}\par
+\takto{}{\C\duo{\z}{\D}\C\b\duo{\z}{\C}\b}{\x}\par
+\takto{}{\b\a\duo{\z}{\g}\a\d\e}{\x}\par
+\takto{}{\f\duo{\z}{\e}\f\g\duo{\z}{\f}\g}{\x}\par
+\takto{}{\a\duo{\z}{\g}\f\d\duo{\z}{\f}\g}{\x}\par
+\takto{}{\f\duo{\z}{\e}\d\c\duo{\z}{\d}\e}{}\par
+%
+\takto{1}{\d\z\z~\d\d\e}{\r{1}{0}}\par
+%
+\takto{2}{\d\z\z~\d\duo{\a}{\g}\duo{\f}{\e}}{\r{0}{1}}\newpage
+%
+\takto{}{\d\z\e\c\z\e}{\x}\par
+\takto{}{\d\duo{\z}{\e}\f\g\duo{\z}{\f}\e}{\x}\par
+\takto{}{\d\z\e\c\z\e}{\x}\par
+\takto{}{\e\d\duo{\z}{\c}\d\duo{\a}{\g}\duo{\f}{\e}}{\x}\par
+\takto{}{\d\z\e\c\z\e}{\x}\par
+\takto{}{\d\duo{\z}{\e}\f\g\duo{\z}{\f}\e}{\x}\par
+\takto{}{\f\duo{\z}{\e}\d\e\duo{\z}{\d}\c}{}\par
+%
+\takto{1}{\d\z\z~\d\duo{\a}{\g}\duo{\f}{\e}}{\r{1}{0}}\par
+%
+\takto{2}{\d\z\z\z\z\z}{\X}\par

muzikajxoj/ruti.tex

+\renewcommand{\skalaro}{0.22}
+\takto{}{\s\s\s}{\sx}
+\takto{}{\s\s\s}{\sx}
+\takto{}{\s\s\s}{\sx}
+\takto{}{\s\s\c}{\x}\par
+\takto{}{\d\z\f}{\x}
+\takto{}{\a\g\a}{\x}
+\takto{}{\g\z\z}{\x}
+\takto{}{\f\z\c}{\x}\par
+\takto{}{\d\f\a}{\x}
+\takto{}{\C\a\C}{\x}
+\takto{}{\bes\z\z}{\x}
+\takto{}{\a\z\g}{\x}\par
+\takto{}{\f\g\a}{\x}
+\takto{}{\bes\C\D}{\x}
+\takto{}{\C\a\g}{\x}
+\takto{}{\f\d\d}{\x}\par
+\takto{}{\e\d\e}{\x}
+\takto{}{\c\a\g}{\x}
+\takto{}{\f\D\D}{\x}
+\takto{}{\C\z\a}{\x}\par
+\takto{}{\w\bes\bes}{\x}
+\takto{}{\a\z\f}{\x}
+\takto{}{\e\d\e}{\x}
+\takto{}{\c\a\g}{\x}\par
+\takto{}{\f\z\z}{\X}
+\takto{}{\z\z\c}{\x}
+\takto{}{\f\e\f}{\x}
+\takto{}{\d\g\f}{\x}\par
+\takto{}{\e\z\c}{\x}
+\takto{}{\f\z\c}{\x}
+\takto{}{\f\e\f}{\x}
+\takto{}{\d\g\f}{\x}\par
+\takto{}{\e\z\c}{\x}
+\takto{}{\f\z\g}{\x}
+\takto{}{\a\g\a}{\x}
+\takto{}{\f\g\a}{\x}\par
+\takto{}{\bes\z\a}{\x}
+\takto{}{\g\z\g}{\x}
+\takto{}{\a\g\a}{\x}
+\takto{}{\f\g\a}{\x}\par
+\takto{}{\C\z\bes}{\x}
+\takto{}{\a\z\a}{\x}
+\takto{}{\g\a\bes}{\x}
+\takto{}{\D\C\bes}{\x}\par
+\takto{}{\a\z\g}{\x}
+\takto{}{\f\z\f}{\x}
+\takto{}{\g\a\bes}{\x}
+\takto{}{\C\g\bes}{\x}\par
+\takto{}{\a\z\g}{\x}
+\takto{}{\f\z\z}{\reludu}
+\renewcommand{\skalaro}{\normaskalaro}

muzikajxoj/šalom.tex

+\renewcommand{\skalaro}{0.30}
+\takto{}{\d\z\a\z\a\z\z\a}{\x}\par
+\takto{}{\a\z\g\g\z\z\w\g}{\x}\par
+\takto{}{\C\z\bes\z\a\g\z\a}{\x}\par
+\takto{}{\z\z\z\z\z\z\w\w}{\x}\par
+\takto{}{\f\z\f\z\f\z\z\a}{\x}\par
+\takto{}{\a\z\g\g\z\z\w\f}{\x}\par
+%
+\takto{1}{\f\z\e\z\g\a\z\f}{\x}\par
+\takto{}{\z\z\z\z\z\z\w\w}{\r{1}{0}}\par
+%
+\takto{2}{\f\z\e\z\g\e\z\d}{\x}\par
+\takto{}{\z\z\z\z\z\z\w\w}{\x}\newpage
+%
+\takto{}{\c\z\bes\z\bes\z\z\C}{\x}\par
+\takto{}{\bes\z\a\a\z\z\w\c}{\x}\par
+\takto{}{\c\z\bes\z\bes\C\z\a}{\x}\par
+\takto{}{\z\z\z\bes\a\g\f\e}{\x}\par
+\takto{}{\d\z\a\z\a\z\z\a}{\x}\par
+\takto{}{\a\z\g\g\z\z\w\f}{\x}\par
+\takto{}{\f\z\e\z\g\e\z\d}{\x}\par
+\takto{}{\z\z\z\z\w\d\f\a}{\x}\par
+\takto{}{\D\z\z\z\D\z\z\z}{\x}\par
+\takto{}{\D\duo{\C}{\bes}\C\z\z\z\w\a}{\x}\par
+\takto{}{\bes\z\a\z\g\D\z\a}{\x}\par
+\takto{}{\z\z\z\z\w\d\f\a}{\x}\par
+\takto{}{\D\z\z\z\D\z\z\z}{\x}\par
+\takto{}{\D\duo{\C}{\bes}\C\z\z\z\w\a}{\x}\par
+\takto{}{\bes\z\a\z\g\f\z\e}{\x}\par
+\takto{}{\z\z\z\z\a\z\z\z}{\reludu}\par
+\takto{}{\d\z\z\z\z\z\z\z}{\X}
+\renewcommand{\skalaro}{\normaskalaro}

muzikaĵoj.py

@@ -5,12 +5,14 @@ import sqlite3
 conn = sqlite3.connect("../datumaro/datumaro.db")
 conn.row_factory = sqlite3.Row
 
+xstr = lambda s: s or ""
+
 
 def process_category(category):
     c = conn.cursor()
     for row in c.execute("SELECT * FROM muzikaĵoj\
-                              WHERE (mk='cur') AND kategorio='" + category + "'\
-                              ORDER BY `titolo-he`"):
+                         WHERE (mk='cur') AND kategorio='" + category + "'\
+                         ORDER BY `titolo-he`"):
         # print("*" + row['dosiernomo'] + "*")
         print("\muzikajxo" +
               "{" + row['dosiernomo'] + "}" +
@@ -18,8 +20,8 @@ def process_category(category):
               "{" + row['komponisto-he'] + "}"
               "{" + row['titolo-eo'] + "}" +
               "{" + row['komponisto-eo'] + "}" +
-              "{" + str(row['titolo-xx']) + "}" +
-              "{" + str(row['komponisto-xx']) + "}" +
+              "{" + xstr(row['titolo-xx']) + "}" +
+              "{" + xstr(row['komponisto-xx']) + "}" +
               "{" + row['ikono'] + "}"
               )
     print()
@@ -28,7 +30,7 @@ def process_category(category):
 c = conn.cursor()
 for row in c.execute("SELECT kategorio, COUNT(*)\
                      FROM muzikaĵoj\
-                     WHERE (mk = 'v' or mk = 'vv')\
+                     WHERE (mk = 'v' OR mk = 'vv' OR mk = 'cur')\
                      GROUP BY kategorio\
                      ORDER BY COUNT(*) DESC\
                      "):