Skip to content

Commit

Permalink
[2023.8]
Browse files Browse the repository at this point in the history
  • Loading branch information
Bruce committed Aug 7, 2023
1 parent f254c82 commit ee09e9b
Show file tree
Hide file tree
Showing 14 changed files with 40 additions and 35 deletions.
7 changes: 6 additions & 1 deletion .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$
2 changes: 1 addition & 1 deletion 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",
Expand Down
2 changes: 1 addition & 1 deletion 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.

Expand Down
30 changes: 15 additions & 15 deletions R/ChineseNames.R
Expand Up @@ -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
Expand All @@ -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).
Expand All @@ -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). ",
Expand All @@ -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


Expand All @@ -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


Expand Down Expand Up @@ -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).
Expand All @@ -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).
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -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. <https://CRAN.R-project.org/package=ChineseNames>
- 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. <https://www.frontiersin.org/articles/10.3389/fpsyg.2021.731244/full>
- Bao, H.-W.-S. (2023). *ChineseNames: Chinese Name Database 1930-2008*. R package version 2023.8. <https://CRAN.R-project.org/package=ChineseNames>
- 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. <https://doi.org/10.3389/fpsyg.2021.731244>

## Install

Expand Down
4 changes: 2 additions & 2 deletions data-csv/README-CSV.md
Expand Up @@ -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. <https://CRAN.R-project.org/package=ChineseNames>
- 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. <https://www.frontiersin.org/articles/10.3389/fpsyg.2021.731244/full>
- Bao, H.-W.-S. (2023). *ChineseNames: Chinese Name Database 1930-2008*. R package version 2023.8. <https://CRAN.R-project.org/package=ChineseNames>
- 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. <https://doi.org/10.3389/fpsyg.2021.731244>

### Supplementary Information

Expand Down
6 changes: 3 additions & 3 deletions man/ChineseNames.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions man/compute_name_index.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/familyname.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/givenname.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/population.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/top1000name.prov.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/top100name.year.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/top50char.year.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ee09e9b

Please sign in to comment.