diff --git a/.Rbuildignore b/.Rbuildignore index d775822..3195cea 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,10 +1,15 @@ data-raw data-csv logo +^.Rhistory$ ^.*\.Rproj$ ^\.Rproj\.user$ ^\.travis\.yml$ +^_pkgdown\.yml$ ^cran-comments\.md$ -^CRAN-RELEASE$ ^LICENSE$ +^CRAN-RELEASE$ +^CRAN-SUBMISSION$ +^docs$ +^pkgdown$ ^\.github$ diff --git a/DESCRIPTION b/DESCRIPTION index 09eb094..cfdfaf9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: ChineseNames Title: Chinese Name Database 1930-2008 -Version: 2021.12 +Version: 2023.8 Date: 2023-08-07 Authors@R: c(person(given = "Han-Wu-Shuang", diff --git a/NEWS.md b/NEWS.md index 39092ad..fc82b6e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ **Please check the [latest news (change log)](https://psychbruce.github.io/bruceR/news/index.html) and keep this package updated.** -# ChineseNames 2021.12 +# ChineseNames 2023.8 - Now use "YYYY.M" as package version number. diff --git a/R/ChineseNames.R b/R/ChineseNames.R index 0e359d4..84b3b93 100644 --- a/R/ChineseNames.R +++ b/R/ChineseNames.R @@ -13,7 +13,7 @@ #' #' @details #' Details are described in -#' \url{https://psychbruce.github.io/ChineseNames} +#' \url{https://psychbruce.github.io/ChineseNames/} #' #' @note #' This database does not contain any individual-level information @@ -26,8 +26,8 @@ #' originally obtained from the National Citizen Identity Information Center (NCIIC) of China in 2008. #' #' @section Citation: -#' Bao, H.-W.-S. (2021). ChineseNames: Chinese Name Database 1930-2008. -#' R package version 2021.12. +#' Bao, H.-W.-S. (2023). ChineseNames: Chinese Name Database 1930-2008. +#' R package version 2023.8. #' \url{https://CRAN.R-project.org/package=ChineseNames} #' #' Bao, H.-W.-S., Cai, H., Jing, Y., & Wang, J. (2021). @@ -54,9 +54,9 @@ NULL "), "\n", - "Bao, H.-W.-S. (2021). ", + "Bao, H.-W.-S. (2023). ", "ChineseNames: Chinese Name Database 1930-2008. ", - "R package version 2021.12. ", + "R package version 2023.8. ", "https://CRAN.R-project.org/package=ChineseNames\n", "\n", "Bao, H.-W.-S., Cai, H., Jing, Y., & Wang, J. (2021). ", @@ -82,7 +82,7 @@ NULL #' \item{\code{ppm.1930_2008}}{proportion in population (ppm = parts per million)} #' \item{\code{surname.uniqueness}}{surname uniqueness} #' } -#' @details \url{https://psychbruce.github.io/ChineseNames} +#' @details \url{https://psychbruce.github.io/ChineseNames/} NULL @@ -108,35 +108,35 @@ NULL #' \item{\code{name.warmth}}{name warmth/morality (based on subjective ratings from 10 raters, ICC = 0.774)} #' \item{\code{name.competence}}{name competence/assertiveness (based on subjective ratings from 10 raters, ICC = 0.712)} #' } -#' @details \url{https://psychbruce.github.io/ChineseNames} +#' @details \url{https://psychbruce.github.io/ChineseNames/} NULL #' Population statistics for the Chinese name database. #' @name population #' @usage data(population) -#' @details \url{https://psychbruce.github.io/ChineseNames} +#' @details \url{https://psychbruce.github.io/ChineseNames/} NULL #' Top 1,000 given names in 31 Chinese mainland provinces. #' @name top1000name.prov #' @usage data(top1000name.prov) -#' @details \url{https://psychbruce.github.io/ChineseNames} +#' @details \url{https://psychbruce.github.io/ChineseNames/} NULL #' Top 100 given names in 6 birth cohorts. #' @name top100name.year #' @usage data(top100name.year) -#' @details \url{https://psychbruce.github.io/ChineseNames} +#' @details \url{https://psychbruce.github.io/ChineseNames/} NULL #' Top 50 given-name characters in 6 birth cohorts. #' @name top50char.year #' @usage data(top50char.year) -#' @details \url{https://psychbruce.github.io/ChineseNames} +#' @details \url{https://psychbruce.github.io/ChineseNames/} NULL @@ -190,7 +190,7 @@ NULL #' \item \code{NC}: name competence (1~5). #' } #' -#' For details, see \url{https://psychbruce.github.io/ChineseNames} +#' For details, see \url{https://psychbruce.github.io/ChineseNames/} #' @param NU.approx Whether to \emph{approximately} compute name-character uniqueness (NU) #' using \emph{the nearest two birth cohorts with relative weights} #' (which would be more precise than just using a single birth cohort). @@ -208,11 +208,11 @@ NULL #' \code{name1}, \code{name2}, and \code{name3} (given-name characters). #' #' @note -#' For details and examples, see \url{https://psychbruce.github.io/ChineseNames} +#' For details and examples, see \url{https://psychbruce.github.io/ChineseNames/} #' #' @section Citation: -#' Bao, H.-W.-S. (2021). ChineseNames: Chinese Name Database 1930-2008. -#' R package version 2021.12. +#' Bao, H.-W.-S. (2023). ChineseNames: Chinese Name Database 1930-2008. +#' R package version 2023.8. #' \url{https://CRAN.R-project.org/package=ChineseNames} #' #' Bao, H.-W.-S., Cai, H., Jing, Y., & Wang, J. (2021). diff --git a/README.md b/README.md index a4e3488..cc68a6f 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ Han-Wu-Shuang (Bruce) Bao 包寒吴霜 ## Citation -- Bao, H.-W.-S. (2021). *ChineseNames: Chinese Name Database 1930-2008*. R package version 2021.12. -- Bao, H.-W.-S., Cai, H., Jing, Y., & Wang, J. (2021). Novel evidence for the increasing prevalence of unique names in China: A reply to Ogihara. *Frontiers in Psychology, 12*, 731244. +- Bao, H.-W.-S. (2023). *ChineseNames: Chinese Name Database 1930-2008*. R package version 2023.8. +- Bao, H.-W.-S., Cai, H., Jing, Y., & Wang, J. (2021). Novel evidence for the increasing prevalence of unique names in China: A reply to Ogihara. *Frontiers in Psychology, 12*, 731244. ## Install diff --git a/data-csv/README-CSV.md b/data-csv/README-CSV.md index 1fc6823..714ccef 100644 --- a/data-csv/README-CSV.md +++ b/data-csv/README-CSV.md @@ -28,8 +28,8 @@ For detailed description, see [README.md](https://github.com/psychbruce/ChineseN ### Citation -- Bao, H.-W.-S. (2021). ChineseNames: Chinese Name Database 1930-2008. R package version 1.1.1. -- Bao, H.-W.-S., Cai, H., Jing, Y., & Wang, J. (2021). Novel evidence for the increasing prevalence of unique names in China: A reply to Ogihara (2020). *Frontiers in Psychology, 12*, 731244. +- Bao, H.-W.-S. (2023). *ChineseNames: Chinese Name Database 1930-2008*. R package version 2023.8. +- Bao, H.-W.-S., Cai, H., Jing, Y., & Wang, J. (2021). Novel evidence for the increasing prevalence of unique names in China: A reply to Ogihara. *Frontiers in Psychology, 12*, 731244. ### Supplementary Information diff --git a/man/ChineseNames.Rd b/man/ChineseNames.Rd index 63e26a5..bf8c24a 100644 --- a/man/ChineseNames.Rd +++ b/man/ChineseNames.Rd @@ -21,7 +21,7 @@ name uniqueness, name gender, name valence, and name warmth/competence). } \details{ Details are described in -\url{https://psychbruce.github.io/ChineseNames} +\url{https://psychbruce.github.io/ChineseNames/} } \note{ This database does not contain any individual-level information @@ -31,8 +31,8 @@ Extremely rare characters are not included. } \section{Citation}{ -Bao, H.-W.-S. (2021). ChineseNames: Chinese Name Database 1930-2008. -R package version 2021.12. +Bao, H.-W.-S. (2023). ChineseNames: Chinese Name Database 1930-2008. +R package version 2023.8. \url{https://CRAN.R-project.org/package=ChineseNames} Bao, H.-W.-S., Cai, H., Jing, Y., & Wang, J. (2021). diff --git a/man/compute_name_index.Rd b/man/compute_name_index.Rd index 1025a5b..4db024f 100644 --- a/man/compute_name_index.Rd +++ b/man/compute_name_index.Rd @@ -49,7 +49,7 @@ By default, it computes all available name indices: \item \code{NC}: name competence (1~5). } -For details, see \url{https://psychbruce.github.io/ChineseNames}} +For details, see \url{https://psychbruce.github.io/ChineseNames/}} \item{NU.approx}{Whether to \emph{approximately} compute name-character uniqueness (NU) using \emph{the nearest two birth cohorts with relative weights} @@ -91,12 +91,12 @@ or just input a vector of full names is estimated by forecasting and thereby may not be accurate. } \note{ -For details and examples, see \url{https://psychbruce.github.io/ChineseNames} +For details and examples, see \url{https://psychbruce.github.io/ChineseNames/} } \section{Citation}{ -Bao, H.-W.-S. (2021). ChineseNames: Chinese Name Database 1930-2008. -R package version 2021.12. +Bao, H.-W.-S. (2023). ChineseNames: Chinese Name Database 1930-2008. +R package version 2023.8. \url{https://CRAN.R-project.org/package=ChineseNames} Bao, H.-W.-S., Cai, H., Jing, Y., & Wang, J. (2021). diff --git a/man/familyname.Rd b/man/familyname.Rd index 72efc5f..2740502 100644 --- a/man/familyname.Rd +++ b/man/familyname.Rd @@ -22,5 +22,5 @@ data(familyname) 1,806 Chinese surnames and nationwide frequency. } \details{ -\url{https://psychbruce.github.io/ChineseNames} +\url{https://psychbruce.github.io/ChineseNames/} } diff --git a/man/givenname.Rd b/man/givenname.Rd index 8bc5bc8..00344f6 100644 --- a/man/givenname.Rd +++ b/man/givenname.Rd @@ -30,5 +30,5 @@ data(givenname) 2,614 Chinese characters used in given names and nationwide frequency. } \details{ -\url{https://psychbruce.github.io/ChineseNames} +\url{https://psychbruce.github.io/ChineseNames/} } diff --git a/man/population.Rd b/man/population.Rd index e4150d2..928789c 100644 --- a/man/population.Rd +++ b/man/population.Rd @@ -10,5 +10,5 @@ data(population) Population statistics for the Chinese name database. } \details{ -\url{https://psychbruce.github.io/ChineseNames} +\url{https://psychbruce.github.io/ChineseNames/} } diff --git a/man/top1000name.prov.Rd b/man/top1000name.prov.Rd index b9053ed..d9adb93 100644 --- a/man/top1000name.prov.Rd +++ b/man/top1000name.prov.Rd @@ -10,5 +10,5 @@ data(top1000name.prov) Top 1,000 given names in 31 Chinese mainland provinces. } \details{ -\url{https://psychbruce.github.io/ChineseNames} +\url{https://psychbruce.github.io/ChineseNames/} } diff --git a/man/top100name.year.Rd b/man/top100name.year.Rd index 19e31ad..e077c35 100644 --- a/man/top100name.year.Rd +++ b/man/top100name.year.Rd @@ -10,5 +10,5 @@ data(top100name.year) Top 100 given names in 6 birth cohorts. } \details{ -\url{https://psychbruce.github.io/ChineseNames} +\url{https://psychbruce.github.io/ChineseNames/} } diff --git a/man/top50char.year.Rd b/man/top50char.year.Rd index 5211d60..5c85be4 100644 --- a/man/top50char.year.Rd +++ b/man/top50char.year.Rd @@ -10,5 +10,5 @@ data(top50char.year) Top 50 given-name characters in 6 birth cohorts. } \details{ -\url{https://psychbruce.github.io/ChineseNames} +\url{https://psychbruce.github.io/ChineseNames/} }