Properly handle Cyrillic initials and make it easier to add other languages later.
Handle hyphenated initials properly Treat nbsp as space
This commit is contained in:
parent
8b20586ccc
commit
83c61374ef
1 changed files with 14 additions and 10 deletions
|
@ -140,15 +140,19 @@ Zotero.Utilities = {
|
||||||
* @return {Object} firstName, lastName, and creatorType
|
* @return {Object} firstName, lastName, and creatorType
|
||||||
*/
|
*/
|
||||||
"cleanAuthor":function(author, type, useComma) {
|
"cleanAuthor":function(author, type, useComma) {
|
||||||
const allCapsRe = /^[A-Z\u0400-\u042f]+$/;
|
var allCaps = 'A-Z' +
|
||||||
|
'\u0400-\u042f'; //cyrilic
|
||||||
|
|
||||||
|
var allCapsRe = new RegExp('^[' + allCaps + ']+$');
|
||||||
|
|
||||||
if(typeof(author) != "string") {
|
if(typeof(author) != "string") {
|
||||||
throw "cleanAuthor: author must be a string";
|
throw "cleanAuthor: author must be a string";
|
||||||
}
|
}
|
||||||
|
|
||||||
author = author.replace(/^[\s\.\,\/\[\]\:]+/, '');
|
author = author.replace(/^[\s\00A0\.\,\/\[\]\:]+/, '')
|
||||||
author = author.replace(/[\s\,\/\[\]\:\.]+$/, '');
|
.replace(/[\s\00A0\.\,\/\[\]\:]+$/, '')
|
||||||
author = author.replace(/ +/, ' ');
|
.replace(/[\s\00A0]+/, ' ');
|
||||||
|
|
||||||
if(useComma) {
|
if(useComma) {
|
||||||
// Add spaces between periods
|
// Add spaces between periods
|
||||||
author = author.replace(/\.([^ ])/, ". $1");
|
author = author.replace(/\.([^ ])/, ". $1");
|
||||||
|
@ -182,12 +186,12 @@ Zotero.Utilities = {
|
||||||
var names = firstName.replace(/^[\s\.]+/,'')
|
var names = firstName.replace(/^[\s\.]+/,'')
|
||||||
.replace(/[\s\,]+$/,'')
|
.replace(/[\s\,]+$/,'')
|
||||||
//remove spaces surronding any dashes
|
//remove spaces surronding any dashes
|
||||||
.replace(/\s*([\u002D\u00AD\u2010-\u2015\u2212\u2E3A\u2E3B])\s*/,'$1')
|
.replace(/\s*([\u002D\u00AD\u2010-\u2015\u2212\u2E3A\u2E3B])\s*/,'-')
|
||||||
.split(/[\s\.]+/);
|
.split(/[\s\.]+/);
|
||||||
var newFirstName = '';
|
var newFirstName = '';
|
||||||
for(var i=0, n=names.length; i<n; i++) {
|
for(var i=0, n=names.length; i<n; i++) {
|
||||||
newFirstName += names[i];
|
newFirstName += names[i];
|
||||||
if(names[i].match(/^[A-Z]$/)) newFirstName += '.';
|
if(names[i].match('^-?[' + allCaps + ']$')) newFirstName += '.';
|
||||||
newFirstName += ' ';
|
newFirstName += ' ';
|
||||||
}
|
}
|
||||||
firstName = newFirstName.trim();
|
firstName = newFirstName.trim();
|
||||||
|
|
Loading…
Reference in a new issue