Use serial comma in author lists

mwmclean · mwmclean · commit 3df019a8a628 · 2019-04-02T19:14:29.000+11:00
diff --git a/R/05makeBibLatex.R b/R/05makeBibLatex.R
@@ -218,7 +218,7 @@ MakeBibLaTeX <- function(docstyle = "text", authortitle = FALSE) {
             out <- paste(paste(out, paste0(vapply(res[-c(1L, length(res))],
                                                   shortName, ""),
                                            collapse = ", "), sep = ', '),
-                       shortName(res[length(res)]), sep = ' and ')
+                       shortName(res[length(res)]), sep = ', and ')
         }
       }
     }
diff --git a/R/07makeBibLatexAuthoryear.R b/R/07makeBibLatexAuthoryear.R
@@ -159,8 +159,8 @@ MakeAuthorYear <- function(docstyle = "text"){
           }else{
               out <- paste(paste(out, paste0(vapply(res[-c(1L, length(res))],
                                                     shortName, ""),
-                                             collapse = ", "), sep = ', '),  
-                         shortName(res[length(res)]), sep = ' and ')
+                                             collapse = ", "), sep = ', '),
+                         shortName(res[length(res)]), sep = ', and ')
           }
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ MakeBibLaTeX <- function(docstyle = "text", authortitle = FALSE) {`
`218`	`218`	`out <- paste(paste(out, paste0(vapply(res[-c(1L, length(res))],`
`219`	`219`	`shortName, ""),`
`220`	`220`	`collapse = ", "), sep = ', '),`
`221`		`- shortName(res[length(res)]), sep = ' and ')`
	`221`	`+ shortName(res[length(res)]), sep = ', and ')`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,8 +159,8 @@ MakeAuthorYear <- function(docstyle = "text"){`
`159`	`159`	`}else{`
`160`	`160`	`out <- paste(paste(out, paste0(vapply(res[-c(1L, length(res))],`
`161`	`161`	`shortName, ""),`
`162`		`- collapse = ", "), sep = ', '),`
`163`		`- shortName(res[length(res)]), sep = ' and ')`
	`162`	`+ collapse = ", "), sep = ', '),`
	`163`	`+ shortName(res[length(res)]), sep = ', and ')`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`}`