put all key sorting funs in common format fun env

Author: mwmclean

R/05makeBibLatex.R

@@ -77,55 +77,6 @@ MakeBibLaTeX <- function(docstyle = "text", authortitle = FALSE) {
     addPeriod(res)
   }
 
-  sortKeysLA <- function(bib, yrs){
-      result <- character(length(bib))
-      max.names <- .BibOptions$max.names
-      for (i in seq_along(bib)) {
-          res <- bib[[i]]$shorthand
-          if (!length(res)){
-            res <- bib[[i]]$label
-            if (!length(res))
-              res <- ProcessNamesLA(bib[[i]]$shortauthor, max.names)
-            if (!length(res))
-              res <- ProcessNamesLA(bib[[i]]$shorteditor, max.names)
-            if (!length(res))
-              res <- ProcessNamesLA(bib[[i]]$author, max.names)
-            if (!length(res))
-              res <- ProcessNamesLA(bib[[i]]$editor, max.names)
-            if (!length(res))
-              res <- ProcessNamesLA(bib[[i]]$translator, max.names)
-            res <- paste0(res, substr(yrs[i], 3, 4))
-          }
-          result[i] <- res
-      }
-      result
-  }
-
-  ProcessNamesLA <- function(nam, mn = .BibOptions$max.names){
-    nam.len <- length(nam)
-    if (nam.len){
-      if (!inherits(nam, 'person'))
-        nam <- ArrangeAuthors(nam)
-      if (nam.len == 1){
-        res <- paste0(nam$family, collapse = '')
-        res <- regmatches(res, regexpr('[[:upper:]][[:punct:]]?[[:alpha:]][[:punct:]]?[[:alpha:]]',
-                                       res, useBytes = TRUE))
-        res <- gsub('[[:punct:]]', '', res, useBytes = TRUE)
-      }else if (nam.len == 2 || nam.len == 3){
-        res <- sapply(nam$family, paste0, collapse = '')
-        res <- paste0(regmatches(res, regexpr('[[:upper:]]', res, useBytes = TRUE)), collapse = '')
-      }else{
-        res <- paste0(nam$family[[1]], collapse = '')
-        res <- regmatches(res, regexpr('[[:upper:]][[:punct:]]?[[:alpha:]][[:punct:]]?[[:alpha:]]',
-                                       res, useBytes = TRUE))
-        res <- gsub('[[:punct:]]', '', res, useBytes = TRUE)
-        res <- paste0(res, '+')
-      }
-      res
-    }
-  }
-
-
   sortKeysV <- function(bib){
     result <- numeric(length(bib))
     for (i in seq_along(bib)){

R/07makeBibLatexAuthoryear.R

@@ -34,47 +34,14 @@ MakeAuthorYear <- function(docstyle = "text"){
       sub("([^.?!])$", "\\dQuote{\\1.}", string, useBytes = TRUE)
     }
 
-    GetLastNames <- function(bib){
-        result <- character(length(bib))
-        for (i in seq_along(bib)) {
-          authors <- paste0(unlist(bib[[i]]$author$family), collapse = '')
-          if (authors == "")
-            authors <- paste0(unlist(bib[[i]]$editor$family), collapse = '')
-          if (authors == "")
-            authors <- paste0(unlist(bib[[i]]$translator$family), collapse = '')
-          if (authors == "")
-            authors <- cleanupLatex(bib[[i]]$title)
-          if (!length(authors))
-            authors <- ""
-          result[i] <- authors
-        }
-        result
-    }
-    
-    sortKeysV <- function(bib){
-      result <- numeric(length(bib))
-      for (i in seq_along(bib)){
-        res <- bib[[i]]$volume
-        if (!length(res)){
-          res <- '0000'
-        }else{
-          tmp <- try(sprintf("%04d", as.numeric('res')), TRUE)
-          if (!inherits(tmp, 'try-error'))
-            res <- tmp
-        }
-        result[i] <- res
-      }
-      result
-    }  
-
     #####################################################################################
     ## FIELDS: 
     #####################################################################################
 
     fmtDate <- function(dat, ind = ''){
-     if (length(dat)){
-       paste0('(', DateFormatter(dat), ind, ').')
-     }
+      if (length(dat)){
+        paste0('(', DateFormatter(dat), ind, ').')
+      }
     }
 
     fmtPages <- function(pgs, pref){

R/CommonFormatFuns.R

@@ -96,6 +96,9 @@ GetFormatFunctions <- function(docstyle = "text", DateFormatter){
     fmtAddOn <- cleanap
     fmtHowPublished <- cleanap
     fmtOtherField <- cleanap
+    fmtVolumes <- label(suffix = ' vols.')
+    fmtOrganization <- label(suffix = '.')
+
 
     fmtJTitle <- function(title){
       if (!is.null(title))  
@@ -492,8 +495,56 @@ GetFormatFunctions <- function(docstyle = "text", DateFormatter){
       result
     }
 
-    fmtVolumes <- label(suffix = ' vols.')
-    fmtOrganization <- label(suffix = '.')
+    sortKeysLA <- function(bib, yrs){
+        result <- character(length(bib))
+        max.names <- .BibOptions$max.names
+        for (i in seq_along(bib)) {
+            res <- bib[[i]]$shorthand
+            if (!length(res)){
+              res <- bib[[i]]$label
+              if (!length(res))
+                res <- ProcessNamesLA(bib[[i]]$shortauthor, max.names)
+              if (!length(res))
+                res <- ProcessNamesLA(bib[[i]]$shorteditor, max.names)
+              if (!length(res))
+                res <- ProcessNamesLA(bib[[i]]$author, max.names)
+              if (!length(res))
+                res <- ProcessNamesLA(bib[[i]]$editor, max.names)
+              if (!length(res))
+                res <- ProcessNamesLA(bib[[i]]$translator, max.names)
+              res <- paste0(res, substr(yrs[i], 3, 4))
+            }
+            result[i] <- res
+        }
+        result
+    }
 
+    ProcessNamesLA <- function(nam, mn = .BibOptions$max.names){
+      nam.len <- length(nam)
+      if (nam.len){
+        if (!inherits(nam, 'person'))
+          nam <- ArrangeAuthors(nam)
+        if (nam.len == 1){
+          res <- paste0(nam$family, collapse = '')
+          res <- regmatches(res,
+                            regexpr('[[:upper:]][[:punct:]]?[[:alpha:]][[:punct:]]?[[:alpha:]]',
+                                         res, useBytes = TRUE))
+          res <- gsub('[[:punct:]]', '', res, useBytes = TRUE)
+        }else if (nam.len == 2 || nam.len == 3){
+          res <- sapply(nam$family, paste0, collapse = '')
+          res <- paste0(regmatches(res, regexpr('[[:upper:]]', res, useBytes = TRUE)),
+                        collapse = '')
+        }else{
+          res <- paste0(nam$family[[1]], collapse = '')
+          res <- regmatches(res,
+                            regexpr('[[:upper:]][[:punct:]]?[[:alpha:]][[:punct:]]?[[:alpha:]]',
+                                         res, useBytes = TRUE))
+          res <- gsub('[[:punct:]]', '', res, useBytes = TRUE)
+          res <- paste0(res, '+')
+        }
+        res
+      }
+    }
+    
     environment()
 }