Browse Source

FIXES #35

tags/0.13
Frans Bouma 9 years ago
parent
commit
51207e657a
4 changed files with 6 additions and 6 deletions
  1. +2
    -2
      src/DocNet/Config.cs
  2. +2
    -2
      src/DocNet/Properties/AssemblyInfo.cs
  3. +1
    -1
      src/DocNet/SimpleNavigationElement.cs
  4. +1
    -1
      src/DocNet/Utils.cs

+ 2
- 2
src/DocNet/Config.cs View File

@@ -41,7 +41,7 @@ namespace Docnet
{
_configFileSourcePath = Path.GetDirectoryName(configFile);

var configData = File.ReadAllText(configFile, Encoding.Default);
var configData = File.ReadAllText(configFile, Encoding.UTF8);
if(string.IsNullOrWhiteSpace(configData))
{
Console.WriteLine("[ERROR] '{0}' is empty.", configFile);
@@ -58,7 +58,7 @@ namespace Docnet
Console.WriteLine("[ERROR] Theme '{0}' or Themes folder not found.", this.ThemeFolder);
return false;
}
_templateContents = File.ReadAllText(this.PageTemplateFile);
_templateContents = File.ReadAllText(this.PageTemplateFile, Encoding.UTF8);
if(string.IsNullOrWhiteSpace(_templateContents))
{
Console.WriteLine("[ERROR] Page template '{0}' is empty.", _configData.PageTemplate);


+ 2
- 2
src/DocNet/Properties/AssemblyInfo.cs View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.11.0.0")]
[assembly: AssemblyFileVersion("0.11.0")]
[assembly: AssemblyVersion("0.12.0.0")]
[assembly: AssemblyFileVersion("0.12.0")]

+ 1
- 1
src/DocNet/SimpleNavigationElement.cs View File

@@ -65,7 +65,7 @@ namespace Docnet
var relativePathToRoot = Utils.MakeRelativePathForUri(Path.GetDirectoryName(destinationFile), activeConfig.Destination);
if(File.Exists(sourceFile))
{
this.MarkdownFromFile = File.ReadAllText(sourceFile);
this.MarkdownFromFile = File.ReadAllText(sourceFile, Encoding.UTF8);
// Check if the content contains @@include tag
content = Utils.IncludeProcessor(this.MarkdownFromFile, Utils.MakeAbsolutePath(activeConfig.Source, activeConfig.IncludeFolder));
content = Utils.ConvertMarkdownToHtml(content, Path.GetDirectoryName(destinationFile), activeConfig.Destination, _relativeH2LinksOnPage);


+ 1
- 1
src/DocNet/Utils.cs View File

@@ -227,7 +227,7 @@ namespace Docnet
string filePath = Path.Combine(includeFolder, fileName);
if (File.Exists(filePath))
{
content = content.Replace(tagToReplace, File.ReadAllText(filePath));
content = content.Replace(tagToReplace, File.ReadAllText(filePath, Encoding.UTF8));
}
}
m = m.NextMatch();


Loading…
Cancel
Save