Simplified formatting macros

softwarebib.tex

@@ -314,20 +314,30 @@
 % Macros to format output
 %
 \newbibmacro*{swtitleauthoreditoryear}{%
-  \printnames{author},%
+  \printnames{author}\addcomma%
   \setunit{\addspace}%
+  \printfield{title}\addspace%
+  \printfield{version}\addspace%
+  \ifnameundef{editor}%
+    {}%
+    {\printtext[parens]{%
+        \bibstring{edited}\addspace%
+        \printnames{editor}}}%
+    \addcomma%
+    \addspace%
+    \printfield{year}%
+}
+
+%
+\newbibmacro*{swsubtitleauthoreditoryear}{%
+  \printnames{author}\addcomma\addspace%
   \iffieldundef{subtitle}%
-               {\printfield{title}\addspace}%
-               {\iffieldundef{title}%
-                 {\printfield{subtitle}\addspace}%
-                 {\printfield{subtitle}\addcomma\addspace%
-                   \bibstring{swpartof}\addspace%
-                   \printfield{title}\addspace%
-                 }
+               {}
+               {\printfield{subtitle}\addcomma\addspace%
+                 \bibstring{swpartof}\addspace
                }%
-  \iffieldundef{version}%
-               {}%
-               {\printfield{version}\addspace}%
+  \printfield{title}\addspace%
+  \printfield{version}\addspace%
   \ifnameundef{editor}%
     {}
     {\printtext[parens]{%
@@ -339,20 +349,14 @@
 }
 
 \newbibmacro*{codefragmenttitleauthoreditoryear}{%
-  \printnames{author},%
-  \setunit{\addspace}%
+  \printnames{author}\addcomma\addspace%
   \iffieldundef{subtitle}%
-               {\printfield{title}\addspace}%
-               {\iffieldundef{title}%
-                 {\printfield{subtitle}\addspace}%
-                 {\printfield{subtitle}\addcomma\addspace%
-                   \bibstring{swexc}\addspace%
-                   \printfield{title}\addspace%
-                 }
+               {}
+               {\printfield{subtitle}\addcomma\addspace%
+                 \bibstring{swexc}\addspace
                }%
-  \iffieldundef{version}%
-               {}%
-               {\printfield{version}\addspace}%
+  \printfield{title}\addspace%
+  \printfield{version}\addspace%
   \ifnameundef{editor}%
     {}
     {\printtext[parens]{%
@@ -404,7 +408,7 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \iftoggle{bbx:swlabels}{\bibstring{swversion}\addspace}{}%
-  \usebibmacro{swtitleauthoreditoryear}%
+  \usebibmacro{swsubtitleauthoreditoryear}%
   \newunit\newblock
   \usebibmacro{swids}%
   \newunit\newblock
@@ -415,7 +419,7 @@
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
   \iftoggle{bbx:swlabels}{\bibstring{swmodule}\addspace}{}%
-  \usebibmacro{swtitleauthoreditoryear}%
+  \usebibmacro{swsubtitleauthoreditoryear}%
   \newunit\newblock
   \usebibmacro{swids}%
   \newunit\newblock