Accomodate entry without byline and software with container-title

apa.csl

@@ -80,7 +80,8 @@
   </macro>
   <macro name="container-contributors">
     <choose>
-      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
         <text macro="container-contributors-booklike"/>
       </if>
       <else-if type="paper-conference">
@@ -120,7 +121,8 @@
   </macro>
   <macro name="secondary-contributors">
     <choose>
-      <if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+      <!-- book is here to catch software with container titles -->
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
         <text macro="secondary-contributors-booklike"/>
       </if>
       <else-if type="personal_communication">
@@ -257,6 +259,14 @@
             </names>
             <choose>
               <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
                 <names variable="translator">
                   <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
                     <label form="short" prefix=" (" suffix=")" text-case="title"/>
@@ -360,7 +370,14 @@
             <names variable="director"/>
             <choose>
               <if variable="container-title">
-                <names variable="translator"/>
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
               </if>
             </choose>
             <names variable="editor"/>
@@ -512,7 +529,8 @@
   <macro name="description">
     <group prefix="(" suffix=")">
       <choose>
-        <if type="report">
+        <!-- book is here to catch software with container titles -->
+        <if type="book report">
           <choose>
             <if variable="container-title">
               <text macro="secondary-contributors"/>
@@ -651,7 +669,8 @@
       <else-if type="speech thesis" match="any">
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
-      <else-if type="report">
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report">
         <choose>
           <if variable="container-title" match="none">
             <text macro="format-report"/>
@@ -1157,7 +1176,8 @@
           </if>
         </choose>
       </else-if>
-      <else-if type="report" variable="container-title" match="all">
+      <!-- book is here to catch software with container titles -->
+      <else-if type="book report" variable="container-title" match="all">
         <group delimiter=" ">
           <text term="in" text-case="capitalize-first" suffix=" "/>
           <group delimiter=", ">
@@ -1199,7 +1219,7 @@
           </else>
         </choose>
       </else-if>
-      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+      <else-if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
         <text macro="container-booklike"/>
       </else-if>
       <else-if type="bill legal_case legislation treaty" match="any">