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

Jump to bottom

Highlight spacing #26

Merged
merged 4 commits into from Apr 29, 2011
Merged

Highlight spacing #26

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
060c03c
R/pgfSweaveDriver.R: Generates Hinput environments instead of Houtput.
Apr 18, 2011
e64011b
R/pgfSweaveDriver.R: Removed newline_latex() at the beginning of Sinput.
Apr 18, 2011
1e17cc8
R/pgfSweaveDriver.R: cancel out the effect of hard newline at the end…
Apr 19, 2011
dada019
Removed hard newline_latex at the end of {Sinput}
Apr 19, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 13 additions & 25 deletions R/pgfSweaveDriver.R
View file
Open in desktop
Expand Up @@ -154,7 +154,7 @@ pgfSweaveWritedoc <- function(object, chunk)
which <- grep(begindoc, chunk)

# add definitions for highlight environment
hstyle <- c(hstyle, "\\newenvironment{Houtput}{\\raggedright}{%\n%\n}")
hstyle <- c(hstyle, "\\newenvironment{Hinput}{\\begin{trivlist}\\item}{\\end{trivlist}}")

# put in the style definitions after the \documentclass command
if(length(which)) {
Expand Down Expand Up @@ -291,8 +291,10 @@ pgfSweaveRuncode <- function(object, chunk, options) {

openSinput <- FALSE
openSchunk <- FALSE
# for the highlighted output environment
openHoutput <- FALSE

Sinputenv <- ifelse(options$highlight, "Hinput", "Sinput")
## Flag for the beginning of Hinput. If so, don't add hard newline_latex
beginSinput <- FALSE

if(length(chunkexps)==0)
return(object)
Expand Down Expand Up @@ -353,22 +355,16 @@ pgfSweaveRuncode <- function(object, chunk, options) {
cat("\nRnw> ", paste(dce, collapse="\n+ "),"\n")

if(options$echo && length(dce)){
if(!openSinput & !options$highlight){
if(!openSinput){
if(!openSchunk){
cat("\\begin{Schunk}\n",file=chunkout, append=TRUE)
linesout[thisline + 1] <- srcline
thisline <- thisline + 1
openSchunk <- TRUE
}
cat("\\begin{Sinput}",file=chunkout, append=TRUE)
cat("\\begin{", Sinputenv, "}", sep="", file=chunkout, append=TRUE)
openSinput <- TRUE
}else if(!openHoutput & options$highlight){

cat("\\begin{Houtput}\n",file=chunkout, append=TRUE)
linesout[thisline + 1] <- srcline
thisline <- thisline + 1
openHoutput <- TRUE

beginSinput <- TRUE
}

# Actual printing of chunk code
Expand All @@ -384,16 +380,14 @@ pgfSweaveRuncode <- function(object, chunk, options) {

}else{

if(nce == 1)
cat(newline_latex(),file=chunkout, append=TRUE)
if (!beginSinput) cat(newline_latex(), file=chunkout, append=TRUE)

highlight(parser.output=parser(text=dce),
renderer=renderer_latex(document=FALSE),
output = chunkout, showPrompts=TRUE,final.newline = TRUE)
# highlight doesnt put in an ending newline for some reason
cat(newline_latex(),file=chunkout, append=TRUE)
output = chunkout, showPrompts=TRUE)

}
beginSinput <- FALSE

}else{
# regular output, may be tidy'd or not
Expand Down Expand Up @@ -438,7 +432,7 @@ pgfSweaveRuncode <- function(object, chunk, options) {

if(length(output)>0 & (options$results != "hide")){
if(openSinput){
cat("\n\\end{Sinput}\n", file=chunkout,append=TRUE)
cat("\n\\end{", Sinputenv, "}\n", sep="", file=chunkout, append=TRUE)
linesout[thisline + 1:2] <- srcline
thisline <- thisline + 2
openSinput <- FALSE
Expand Down Expand Up @@ -488,7 +482,7 @@ pgfSweaveRuncode <- function(object, chunk, options) {
cat("\n", file=chunkout, append=TRUE)

if(openSinput){
cat("\n\\end{Sinput}\n", file=chunkout, append=TRUE)
cat("\n\\end{", Sinputenv, "}\n", sep="", file=chunkout, append=TRUE)
linesout[thisline + 1:2] <- srcline
thisline <- thisline + 2
}
Expand All @@ -499,12 +493,6 @@ pgfSweaveRuncode <- function(object, chunk, options) {
thisline <- thisline + 1
}

if(openHoutput){
cat("\\end{Houtput}\n", file=chunkout, append=TRUE)
linesout[thisline + 1] <- srcline
thisline <- thisline + 1
}

if(is.null(options$label) & options$split)
close(chunkout)

Expand Down