Code cleanup

1 files changed, 7 insertions, 12 deletions

diff --git a/lib/bib2ref.awk b/lib/bib2ref.awk
index 4d9e595..137c6ad 100644
--- a/lib/bib2ref.awk
+++ b/lib/bib2ref.awk
@@ -5,25 +5,20 @@
 function bib_pass(raw) { }
 
 function r_field(tag, v) {
-  if (v != "") {
-    gsub(/[{}]/, "", v)
-    gsub(/[ \t\r\n]+/, " ", v)
-    printf "%%%s %s\n", tag, bib_trim(v)
-  }
+  v = bib_clean(v)
+  if (v != "")
+    printf "%%%s %s\n", tag, v
 }
 
 function r_names(tag, v,    n, parts, i) {
-  gsub(/[{}]/, "", v)
-  gsub(/[ \t\r\n]+/, " ", v)
-  n = split(v, parts, / +[Aa][Nn][Dd] +/)
+  n = split(bib_clean(v), parts, / +[Aa][Nn][Dd] +/)
   for (i = 1; i <= n; i++)
-    if (bib_trim(parts[i]) != "")
-      printf "%%%s %s\n", tag, bib_trim(parts[i])
+    if (parts[i] != "")
+      printf "%%%s %s\n", tag, parts[i]
 }
 
 function bib_entry(type, key,    d, p, m) {
-  if (bib_out_n++)
-    print ""
+  bib_sep()
   r_names("A", bib_get("author"))
   r_names("E", bib_get("editor"))
   r_field("T", bib_get("title"))