refactor

notes/cvtdat.sh

@@ -189,6 +189,26 @@ function getpc {
 	fi
 }
 
+function anchorIt {
+	local id=$cw idhtm idltx lbl=$line lblhtm lblltx ltxit
+
+	idhtm=${|tohtm "$id";}
+	idltx=${|totex "$id";}
+	if [[ -z $lbl ]]; then
+		lbl=$id lblhtm=$idhtm lblltx=$idltx
+		ltxit="{$idltx}"
+	else
+		lblhtm=${|tohtm "$lbl";}
+		lblltx=${|totex "$lbl";}
+		ltxit="[$lblltx]{$idltx}"
+	fi
+	[[ $li = li ]] || print -nru4 -- "<dt>$lblhtm</dt>"
+	print -nru4 -- "<$li$xmllang id=\"$idhtm\">"
+	xnl=
+	print -ru5 -- "\\bibitem$ltxit$ltxlang{%"
+	tnl=' '
+}
+
 init=0
 inpq=0
 inao=0
@@ -267,18 +287,12 @@ while IFS= read -r line; do
 		if [[ -z $cw ]]; then
 			[[ $li = li ]] || print -nru4 -- "<dt>✹</dt>"
 			print -nru4 -- "<$li$xmllang>"
+			xnl=
 			print -ru5 -- '\item[\TwelweStar\hfill]'"$ltxlang{%"
-		elif [[ -z $line ]]; then
-			[[ $li = li ]] || print -nru4 -- "<dt>${|tohtm "$cw";}</dt>"
-			print -nru4 -- "<$li$xmllang id=\"${|tohtm "$cw";}\">"
-			print -ru5 -- "\\bibitem{${|totex "$cw";}}$ltxlang{%"
+			tnl=' '
 		else
-			[[ $li = li ]] || print -nru4 -- "<dt>${|tohtm "$line";}</dt>"
-			print -nru4 -- "<$li$xmllang id=\"${|tohtm "$cw";}\">"
-			print -ru5 -- "\\bibitem[${|totex "$line";}]{${|totex "$cw";}}$ltxlang{%"
+			anchorIt
 		fi
-		xnl=
-		tnl=' '
 		init=1
 		;;
 	(a)