Merge branch 'master' of https://github.com/jsdoc3/jsdoc

Conflicts:
	plugins/prettyPrintSource.js

Author: hegemonic

plugins/prettyPrintSource.js

@@ -50,7 +50,8 @@ exports.handlers = {
 
             sourceFileName  = toRelativePath(sourceFileName);
             sourceFileName  = relativePathToNamespace(sourceFileName);
-            return sourceFileName += extension;
+            sourceFileName = sourceFileName += extension;
+            return sourceFileName;
         }
 
         function getOutputDirectory() {
@@ -72,12 +73,12 @@ exports.handlers = {
             var outputFileName  = makeOutputFileName(e.filename);
             var sourceCode      = e.source;
 
-            /*// Debug
+            /*
             print('source file name = ' + e.filename);
             print('output file name = ' + outputFileName);
             print('output directory = ' + outputDirectory);
             print('sourceCode       = ' + sourceCode);
-            //*/
+            */
 
             // write source to file with a unique name
             generateHighlightedSourceFile(outputDirectory, outputFileName, sourceCode);

templates/prettyPrintSource/publish.js

@@ -31,12 +31,12 @@ exports.publish = function(outputDirectory, outputFileName, sourceCode) {
     var view               = new template.Template(templatePath);
     var outputContent      = view.render(templateName, templateData);
 
-    /*// Debug
+    /*
     console.log('templateData    : ' + templateData);
     console.log('outputDirectory : ' + outputDirectory);
     console.log('outputFile      : ' + outputFile);
     console.log('outputContent   : ' + outputContent);
-    //*/
+    */
     fs.mkPath(outputDirectory);
     fs.writeFileSync(outputFile, outputContent);
 };