Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Incorporate reasonable changes to some of the R files within R/ #38

Merged
merged 12 commits into from
Jul 7, 2021
Merged

Incorporate reasonable changes to some of the R files within R/ #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ec07a2a
Fix typo in comment
Anirban166 Jun 10, 2021
9160e91
Changed the working directory inside doc.R so as to suitably run dldo…
Anirban166 Jun 10, 2021
0ff30e4
Add an informative message for the error related to wrong set up of w…
Anirban166 Jun 11, 2021
9e727aa
Remove the setwd() call to set working directory to docs
Anirban166 Jun 14, 2021
9c70572
Remove remaining setwd calls (needs fixes)
Anirban166 Jun 29, 2021
7161c14
Fix docdirs file path error (cannot open the connection in file(con, r))
Anirban166 Jul 2, 2021
d0ba98f
Fix errors with setwd(docs) removal (dldoc works like before)
Anirban166 Jul 6, 2021
0715166
Remove the 2nd setwd() call
Anirban166 Jul 6, 2021
60b6e08
Remove unnecessary indentation before ### in R/doc.R
Anirban166 Jul 6, 2021
2285c65
Revert back unwanted whitespace changes
Anirban166 Jul 6, 2021
dbc4c8d
Revert unwanted whitespace changes
Anirban166 Jul 6, 2021
b4782d9
Bring back the setwd() call inside on.exit()
Anirban166 Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions R/doc.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,14 @@ dldoc <- function # Make directlabels documentation
version <- read.dcf("DESCRIPTION")[,"Version"]
git.line <- system('git log -1 --pretty=format:"%h %aD"', intern=TRUE)
foot.info <- list(version=version,git=as.character(git.line))
setwd(file.path("..","..","www","docs"))
foot <- filltemplate(foot.info,"templates/foot.html")
foot <- filltemplate(foot.info,"docs/templates/foot.html")
makehtml <- function # Make HTML documentation
## Make plots and HTML for documentation website.
(L
## List of positioning method and plots to match up.
){
Anirban166 marked this conversation as resolved.
Show resolved Hide resolved
## all paths are relative to the docs directory
subdir <- L$type
subdir <- file.path("docs",L$type)
pngurls <- matrix("",nrow=length(L$posfuns),ncol=length(L$plots),
dimnames=list(names(L$posfuns),
sapply(L$plots,function(x)x$name)))
Expand Down Expand Up @@ -128,15 +127,15 @@ dldoc <- function # Make directlabels documentation
parname=item$name,
url=file.path("..",row,paste(f$name,".html",sep="")))
})
rowfile <- paste("templates/",row,"-row.html",sep="")
rowfile <- paste("docs/templates/",row,"-row.html",sep="")
rowhtml <- sapply(tmp,filltemplate,rowfile)
item$table <- paste(c("<table>",rowhtml,"</table>"),collapse="\n")
}
item$type <- L$type
item$pagetitle <- item$name
item$head <- filltemplate(item,"templates/head.html")
item$head <- filltemplate(item,"docs/templates/head.html")
item$foot <- foot
html <- filltemplate(item,paste("templates/",main,".html",sep=""))
html <- filltemplate(item,paste("docs/templates/",main,".html",sep=""))
write(html,file.path(subdir,main,paste(item$name,".html",sep="")))
item
}
Expand Down Expand Up @@ -165,12 +164,12 @@ dldoc <- function # Make directlabels documentation
},simplify=FALSE)
}
links <- apply(m,1,extract.links)
tmp <- list(head=filltemplate(list(pagetitle="home"),"templates/head.html"),
tmp <- list(head=filltemplate(list(pagetitle="home"),"docs/templates/head.html"),
foot=foot)
rows <- lapply(links,filltemplate,"templates/index-row.html")
rows <- lapply(links,filltemplate,"docs/templates/index-row.html")
tmp$table <- paste(rows,collapse="\n")
html <- filltemplate(tmp,"templates/index.html")
write(html,"index.html")
html <- filltemplate(tmp,"docs/templates/index.html")
write(html,"docs/index.html")

m
### Matrix of lists describing example plots and matching builtin
Expand Down Expand Up @@ -248,4 +247,3 @@ filltemplate <- function
}
txt
}

4 changes: 2 additions & 2 deletions R/positioning.functions.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ dlgrob <- function
axes2native=identity,
...
){
## increment dlgrob.id to get a unique name because as explaine on
## increment dlgrob.id to get a unique name because as explained on
## ?grid::gTree "Grob names need not be unique in general, but all
## children of a gTree must have different names."
dl.env$dlgrob.id <- dl.env$dlgrob.id+1L
Expand Down Expand Up @@ -147,7 +147,7 @@ direct.label <- structure(function # Direct labels for color decoding
print(direct.label(ratplot))
## To put them on the same side, just manually specify the
## Positioning Method.
print(direct.label(ratplot,"last.qp"))
Anirban166 marked this conversation as resolved.
Show resolved Hide resolved
print(direct.label(ratplot,"last.qp"))

lattice.options(oldopt)
})
Expand Down