Browse code

bug fixed

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/ggtree@119118 bc3139a8-67e5-0310-9ffc-ced21a209358

Guangchuang Yu authored on 04/07/2016 12:55:54
Showing 2 changed files

... ...
@@ -59,7 +59,7 @@ rm.singleton.newick <- function(nwk, outfile = NULL) {
59 59
     ## remove singleton of tips
60 60
     nodePattern <- "\\w+:[\\.0-9Ee\\+\\-]+"
61 61
     singletonPattern.with.nodename <- paste0(".*(\\(", nodePattern, "\\)\\w+:[\\.0-9Ee\\+\\-]+).*")
62
-    singletonPattern.wo.nodename <- paste0(".*(\\(", nodePattern, "\\)[\\.0-9Ee\\+\\-]+).*")
62
+    singletonPattern.wo.nodename <- paste0(".*(\\(", nodePattern, "\\):[\\.0-9Ee\\+\\-]+).*")
63 63
     
64 64
     while(length(grep("\\([^,]+\\)", tree)) > 0) {
65 65
         singleton <- gsub(singletonPattern.with.nodename, "\\1", tree)
... ...
@@ -10,52 +10,9 @@
10 10
 [![download](http://www.bioconductor.org/shields/downloads/ggtree.svg)](https://bioconductor.org/packages/stats/bioc/ggtree/)
11 11
 
12 12
 
13
-
14 13
 The `ggtree` package extending the `ggplot2` package. It based on grammar of graphics and takes all the good parts of `ggplot2`. 
15 14
 
16
-`ggtree` is designed for not only viewing phylogenetic tree but also displaying annotation data in the tree. 
17
-
18
-A discussion forum can be found at <https://groups.google.com/forum/#!forum/bioc-ggtree>
19
-
20
-## Authors ##
21
-
22
-Guangchuang Yu and Tommy Tsan-Yuk Lam, School of Public Health, The University of Hong Kong.
23
-
24
-## Citation ##
25
-
26
-Please cite the following article when using `ggtree`:
27
-
28
-```
29
-G Yu, D Smith, H Zhu, Y Guan, TTY Lam,
30
-ggtree: an R package for visualization and annotation of phylogenetic trees 
31
-        with their covariates and other associated data.
32
-Methods in Ecology and Evolution, revised
33
-```
34
-
35
-## License ##
36
-
37
-All source code is copyright, under the Artistic-2.0 License.
38
-For more information on Artistic-2.0 License see <http://opensource.org/licenses/Artistic-2.0>
39
-
40
-## Installation ##
41
-
42
-To install:
43
- * the latest released version: `biocLite("ggtree")`
44
- * the latest development version: `devtools::install_github("GuangchuangYu/ggtree")`
45
-
46
-## Documentation ##
47
-
48
-To view the vignette of `ggtree` installed in your system, start `R` and enter:
49
-```r
50
-vignette("ggtree", package = "ggtree")
51
-```
52
-
53
-More documents can be found in <https://guangchuangyu.github.io/ggtree>.
54
-
55
-
56
-## Feedback ##
15
+`ggtree` is designed for not only viewing phylogenetic tree but also displaying annotation data on the tree. 
57 16
 
58
- - For bugs or feature request, please post to [github issue](https://github.com/GuangchuangYu/ggtree/issues).
59
- - For user questions, please post to [google group](https://groups.google.com/forum/#!forum/bioc-ggtree) or post to [Bioconductor support site](https://support.bioconductor.org/) or [Biostars](https://www.biostars.org/). We are following every post tagged with **ggtree**.
60
- 
61 17
 
18
+For details, please visit our project website, <https://guangchuangyu.github.io/ggtree>.