correct handling of preamble

rstudio · Jan 31, 2013 · 46c7001 · 46c7001
1 parent 575f47d
commit 46c7001
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/cpp/session/modules/learning/SessionLearning.cpp b/src/cpp/session/modules/learning/SessionLearning.cpp
@@ -256,6 +256,7 @@ void handleLearningPaneRequest(const http::Request& request,
       // build template variables
       std::map<std::string,std::string> vars;
       vars["title"] = slideDeck.title();
+      vars["preamble"] = slideDeck.preamble();
       vars["slides"] = slides;
       vars["slide_commands"] = slideCommands;
       vars["slides_css"] =  resourceFiles().get("learning/slides.css");

diff --git a/src/cpp/session/modules/learning/SlideParser.cpp b/src/cpp/session/modules/learning/SlideParser.cpp
@@ -232,7 +232,7 @@ Error SlideDeck::readSlides(const FilePath& filePath)
    preamble_.clear();
    if (!headerLines.empty())
    {
-      for (std::size_t i = 0; i<headerLines[0]; i++)
+      for (std::size_t i = 0; i<(headerLines[0]-1); i++)
          preamble_.append(lines[i]);
    }
 

diff --git a/src/cpp/session/modules/learning/SlideRenderer.cpp b/src/cpp/session/modules/learning/SlideRenderer.cpp
@@ -210,9 +210,6 @@ Error renderSlides(const SlideDeck& slideDeck,
    // render the slides to HTML and slide commands to case statements
    std::ostringstream ostr, ostrRevealConfig, ostrInitActions, ostrSlideActions;
 
-   // first the preamble
-   ostr << slideDeck.preamble() << std::endl;
-
    // now the slides
    std::string cmdPad(8, ' ');
    int slideNumber = 0;

diff --git a/src/cpp/session/resources/learning/slides.html b/src/cpp/session/resources/learning/slides.html
@@ -16,7 +16,9 @@
 #!r_highlight#
 
 #!mathjax#  
-
+
+#!preamble#
+
 </head>
 
 <body>