Skip to content

Commit b4bc86d

Browse files
committed
update documentation
1 parent b1578f9 commit b4bc86d

File tree

2 files changed

+32
-27
lines changed

2 files changed

+32
-27
lines changed

R/rncl.R

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,21 @@
88
##' relevant elements as a list. \code{phylo} (from the ape package)
99
##' or \code{phylo4} (from the phylobase package) can be constructed
1010
##' from the elements contained in this list.
11-
##' @title Get all the elements from a NEXUS (or Newick) file
11+
##'
12+
##' @title Get the elements from a NEXUS (or Newick) file
1213
##' @param file path to a NEXUS or Newick file
1314
##' @param file.format a character string indicating the type of file
1415
##' to be parsed.
1516
##' @param spacesAsUnderscores In the NEXUS file format white spaces
16-
##' are not allowed in taxa labels and are represented by
17-
##' underscores. Therefore, NCL converts underscores found in taxa
18-
##' labels in the NEXUS file into white spaces (e.g. \code{species_1}
19-
##' will become \code{"species 1"}. If you want to preserve the
20-
##' underscores, set as TRUE, the default).
21-
##' @param char.all If TRUE (default), returns all characters, even
22-
##' those excluded in the NEXUS file (only when NEXUS file contains
23-
##' DATA block).
17+
##' are not allowed and are represented by underscores. Therefore, NCL
18+
##' converts underscores found in taxon labels in the NEXUS file into
19+
##' white spaces (e.g. \code{species_1} will become \code{"species
20+
##' 1"}). If you want to preserve the underscores, set as \code{TRUE}
21+
##' (default). This option affects taxon labels, character labels and
22+
##' state labels.
23+
##' @param char.all If \code{TRUE} (default), returns all characters,
24+
##' even those excluded in the NEXUS file (only when NEXUS file
25+
##' contains DATA block).
2426
##' @param polymorphic.convert If TRUE (default), converts polymorphic
2527
##' characters to missing data (only when NEXUS file contains DATA
2628
##' block).
@@ -35,12 +37,13 @@
3537
##' Lewis, P. O. 2003. NCL: a C++ class library for interpreting data
3638
##' files in NEXUS format. Bioinformatics 19 (17) : 2330-2331.
3739
##' @author Francois Michonneau
38-
##' @seealso For example on how to use the elements from the list
40+
##' @seealso For examples on how to use the elements of the list
3941
##' returned by this function to build tree objects, inspect the
40-
##' source code of this package and how \code{read_newick_phylo} and
41-
##' \code{read_nexus_phylo} work. For a more complex example that also
42-
##' use the data contained in NEXUS files, inspect the source code of
43-
##' the \code{readNCL} function in the phylobase package.
42+
##' source code of this package, in particular how
43+
##' \code{read_newick_phylo} and \code{read_nexus_phylo} work. For a
44+
##' more complex example that also use the data contained in NEXUS
45+
##' files, inspect the source code of the \code{readNCL} function in
46+
##' the phylobase package.
4447
##' @return A list that contains the elements extracted from a NEXUS
4548
##' or a Newick file.
4649
##'

man/rncl.Rd

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ rncl(file, file.format = c("nexus", "newick"), spacesAsUnderscores = TRUE,
1616
to be parsed.}
1717

1818
\item{spacesAsUnderscores}{In the NEXUS file format white spaces
19-
are not allowed in taxa labels and are represented by
20-
underscores. Therefore, NCL converts underscores found in taxa
21-
labels in the NEXUS file into white spaces (e.g. \code{species_1}
22-
will become \code{"species 1"}. If you want to preserve the
23-
underscores, set as TRUE, the default).}
19+
are not allowed and are represented by underscores. Therefore, NCL
20+
converts underscores found in taxon labels in the NEXUS file into
21+
white spaces (e.g. \code{species_1} will become \code{"species
22+
1"}). If you want to preserve the underscores, set as \code{TRUE}
23+
(default). This option affects taxon labels, character labels and
24+
state labels.}
2425

25-
\item{char.all}{If TRUE (default), returns all characters, even
26-
those excluded in the NEXUS file (only when NEXUS file contains
27-
DATA block).}
26+
\item{char.all}{If \code{TRUE} (default), returns all characters,
27+
even those excluded in the NEXUS file (only when NEXUS file
28+
contains DATA block).}
2829

2930
\item{polymorphic.convert}{If TRUE (default), converts polymorphic
3031
characters to missing data (only when NEXUS file contains DATA
@@ -157,11 +158,12 @@ Lewis, P. O. 2003. NCL: a C++ class library for interpreting data
157158
files in NEXUS format. Bioinformatics 19 (17) : 2330-2331.
158159
}
159160
\seealso{
160-
For example on how to use the elements from the list
161+
For examples on how to use the elements of the list
161162
returned by this function to build tree objects, inspect the
162-
source code of this package and how \code{read_newick_phylo} and
163-
\code{read_nexus_phylo} work. For a more complex example that also
164-
use the data contained in NEXUS files, inspect the source code of
165-
the \code{readNCL} function in the phylobase package.
163+
source code of this package, in particular how
164+
\code{read_newick_phylo} and \code{read_nexus_phylo} work. For a
165+
more complex example that also use the data contained in NEXUS
166+
files, inspect the source code of the \code{readNCL} function in
167+
the phylobase package.
166168
}
167169

0 commit comments

Comments
 (0)