Latest vignette build.

DOI-USGS · Oct 13, 2014 · e8c0058 · e8c0058
1 parent 36c3e9a
commit e8c0058
Show file tree

Hide file tree

Showing 44 changed files with 8 additions and 8 deletions.
diff --git a/inst/doc/EGRET.R b/inst/doc/EGRET.R
@@ -82,7 +82,7 @@ addSpace <- function(x) ifelse(x != "1", "[5pt]","")
 #  INFO$shortName <- "Choptank River at Greensboro, MD"
 #  
 #  # Merge discharge with sample data:
-#  Sample <- mergeReport()
+#  Sample <- mergeReport(Daily, Sample)
 #  ############################
 #  
 #  ############################
@@ -237,7 +237,7 @@ tableFlowChange(istat=3, qUnit=3,yearPoints=c(1890,1950,2010))
 #  INFO$shortName <- "Choptank River"
 #  
 #  Sample <- getNWISSample(siteNumber,param,startDate,endDate)
-#  Sample <- mergeReport()
+#  Sample <- mergeReport(Daily, Sample)
 
 ## ----wrtds2,eval=TRUE,echo=FALSE--------------------------
 siteNumber <- "01491000" #Choptank River at Greensboro, MD

diff --git a/inst/doc/EGRET.Rnw b/inst/doc/EGRET.Rnw
@@ -77,14 +77,14 @@
 \titlecontents{table}
 [0em]                 % adjust left margin
 {\sffamily}             % font formatting
-{\textbf{Table}\hspace*{2em} \contentslabel {2em}} % section label and offset
+{Table\hspace*{2em} \contentslabel {2em}} % section label and offset
 {\hspace*{4em}}
 {\titlerule*[0.25pc]{.}\contentspage}
 
 \titlecontents{figure}
 [0em]                 % adjust left margin
 {\sffamily}             % font formatting
-{\textbf{Figure}\hspace*{2em} \contentslabel {2em}} % section label and offset
+{Figure\hspace*{2em} \contentslabel {2em}} % section label and offset
 {\hspace*{4em}}
 {\titlerule*[0.25pc]{.}\contentspage}
 
@@ -265,7 +265,7 @@ INFO<- getNWISInfo(siteNumber,parameter_cd)
 INFO$shortName <- "Choptank River at Greensboro, MD"
 
 # Merge discharge with sample data:
-Sample <- mergeReport()
+Sample <- mergeReport(Daily, Sample)
 ############################
 
 ############################
@@ -803,7 +803,7 @@ INFO<- getNWISInfo(siteNumber,param,interactive=FALSE)
 INFO$shortName <- "Choptank River"
 
 Sample <- getNWISSample(siteNumber,param,startDate,endDate)
-Sample <- mergeReport()
+Sample <- mergeReport(Daily, Sample)
 @
 
 <<wrtds2,eval=TRUE,echo=FALSE>>=

diff --git a/inst/doc/EGRET.pdf b/inst/doc/EGRET.pdf
diff --git a/vignettes/EGRET.Rnw b/vignettes/EGRET.Rnw
@@ -77,14 +77,14 @@
 \titlecontents{table}
 [0em]                 % adjust left margin
 {\sffamily}             % font formatting
-{\textbf{Table}\hspace*{2em} \contentslabel {2em}} % section label and offset
+{Table\hspace*{2em} \contentslabel {2em}} % section label and offset
 {\hspace*{4em}}
 {\titlerule*[0.25pc]{.}\contentspage}
 
 \titlecontents{figure}
 [0em]                 % adjust left margin
 {\sffamily}             % font formatting
-{\textbf{Figure}\hspace*{2em} \contentslabel {2em}} % section label and offset
+{Figure\hspace*{2em} \contentslabel {2em}} % section label and offset
 {\hspace*{4em}}
 {\titlerule*[0.25pc]{.}\contentspage}
 

diff --git a/vignettes/figure/Merced1.pdf b/vignettes/figure/Merced1.pdf
diff --git a/vignettes/figure/Merced2.pdf b/vignettes/figure/Merced2.pdf
diff --git a/vignettes/figure/Mississippi.pdf b/vignettes/figure/Mississippi.pdf
diff --git a/vignettes/figure/adjustSize1.pdf b/vignettes/figure/adjustSize1.pdf
diff --git a/vignettes/figure/adjustSize2.pdf b/vignettes/figure/adjustSize2.pdf
diff --git a/vignettes/figure/boxConcThree.pdf b/vignettes/figure/boxConcThree.pdf
diff --git a/vignettes/figure/boxResidMonth1.pdf b/vignettes/figure/boxResidMonth1.pdf
diff --git a/vignettes/figure/boxResidMonth2.pdf b/vignettes/figure/boxResidMonth2.pdf
diff --git a/vignettes/figure/customPanel.pdf b/vignettes/figure/customPanel.pdf
diff --git a/vignettes/figure/easyFontChange.pdf b/vignettes/figure/easyFontChange.pdf
diff --git a/vignettes/figure/fluxBiasMulti.pdf b/vignettes/figure/fluxBiasMulti.pdf
diff --git a/vignettes/figure/modifiedContour1.pdf b/vignettes/figure/modifiedContour1.pdf
diff --git a/vignettes/figure/modifiedDiffContour.pdf b/vignettes/figure/modifiedDiffContour.pdf
diff --git a/vignettes/figure/multiPlotDataOverview.pdf b/vignettes/figure/multiPlotDataOverview.pdf
diff --git a/vignettes/figure/plotBoxes1.pdf b/vignettes/figure/plotBoxes1.pdf
diff --git a/vignettes/figure/plotBoxes2.pdf b/vignettes/figure/plotBoxes2.pdf
diff --git a/vignettes/figure/plotConcQComparison1.pdf b/vignettes/figure/plotConcQComparison1.pdf
diff --git a/vignettes/figure/plotConcQComparison2.pdf b/vignettes/figure/plotConcQComparison2.pdf
diff --git a/vignettes/figure/plotConcQSmooth1.pdf b/vignettes/figure/plotConcQSmooth1.pdf
diff --git a/vignettes/figure/plotConcQSmooth2.pdf b/vignettes/figure/plotConcQSmooth2.pdf
diff --git a/vignettes/figure/plotConcTime1.pdf b/vignettes/figure/plotConcTime1.pdf
diff --git a/vignettes/figure/plotConcTime2.pdf b/vignettes/figure/plotConcTime2.pdf
diff --git a/vignettes/figure/plotConcTimeDaily1.pdf b/vignettes/figure/plotConcTimeDaily1.pdf
diff --git a/vignettes/figure/plotConcTimeDaily2.pdf b/vignettes/figure/plotConcTimeDaily2.pdf
diff --git a/vignettes/figure/plotConcTimeSmooth1.pdf b/vignettes/figure/plotConcTimeSmooth1.pdf
diff --git a/vignettes/figure/plotConcTimeSmooth2.pdf b/vignettes/figure/plotConcTimeSmooth2.pdf
diff --git a/vignettes/figure/plotContours.pdf b/vignettes/figure/plotContours.pdf
diff --git a/vignettes/figure/plotDiffContours.pdf b/vignettes/figure/plotDiffContours.pdf
diff --git a/vignettes/figure/plotFluxHist1.pdf b/vignettes/figure/plotFluxHist1.pdf
diff --git a/vignettes/figure/plotFluxHist2.pdf b/vignettes/figure/plotFluxHist2.pdf
diff --git a/vignettes/figure/plotFluxPred1.pdf b/vignettes/figure/plotFluxPred1.pdf
diff --git a/vignettes/figure/plotFluxPred2.pdf b/vignettes/figure/plotFluxPred2.pdf
diff --git a/vignettes/figure/plotFluxQ.pdf b/vignettes/figure/plotFluxQ.pdf
diff --git a/vignettes/figure/plotFour.pdf b/vignettes/figure/plotFour.pdf
diff --git a/vignettes/figure/plotFourStats.pdf b/vignettes/figure/plotFourStats.pdf
diff --git a/vignettes/figure/plotResidQ1.pdf b/vignettes/figure/plotResidQ1.pdf
diff --git a/vignettes/figure/plotResidQ2.pdf b/vignettes/figure/plotResidQ2.pdf
diff --git a/vignettes/figure/plotSingleandSD1.pdf b/vignettes/figure/plotSingleandSD1.pdf
diff --git a/vignettes/figure/plotSingleandSD2.pdf b/vignettes/figure/plotSingleandSD2.pdf
diff --git a/vignettes/figure/tinyPlot1.pdf b/vignettes/figure/tinyPlot1.pdf