From e74e57e12ebdd2fc1e1027960360532e4c1aad6a Mon Sep 17 00:00:00 2001
From: Nikola Igniatovic <nigniatovic@haproxy.com>
Date: Thu, 19 Jul 2018 02:17:21 +0200
Subject: [PATCH] Changed converted to use rst2html5 Added rst2html5.py

(cherry picked from commit c12a13c9089eccb6c8ae3f72eae1e2b55bf765df)
---
 converter.rb | 12 ++++++++----
 rst2html5.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 rst2html5.py

diff --git a/converter.rb b/converter.rb
index 64b639c..16567c0 100644
--- a/converter.rb
+++ b/converter.rb
@@ -1,4 +1,5 @@
 require 'rbst'
+require 'nokogiri'
 
 module Jekyll
   class RestConverter < Converter
@@ -8,15 +9,18 @@ module Jekyll
 
     def matches(ext)
       ext =~ /rst/i
-    end 
+    end
 
     def output_ext(ext)
       ".html"
     end
 
     def convert(content)
-      RbST.executables = {:html => "#{File.expand_path(File.dirname(__FILE__))}/rst2html.py"}
-      RbST.new(content).to_html(:part => :fragment, :initial_header_level => 2)
+      # RbST.executables = {:html => "/usr/local/bin/rst2html5"}
+      RbST.executables = {:html => "#{File.expand_path(File.dirname(__FILE__))}/rst2html5.py"}
+      rst2htmlcontent = RbST.new(content).to_html(:initial_header_level => 1)
+      document = Nokogiri::HTML(rst2htmlcontent)
+      content = document.css('body').inner_html
     end
   end
 
@@ -27,4 +31,4 @@ module Jekyll
       converter.convert(input)
     end
   end
-end  
\ No newline at end of file
+end
diff --git a/rst2html5.py b/rst2html5.py
new file mode 100644
index 0000000..bf81c2e
--- /dev/null
+++ b/rst2html5.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+# -*- coding: utf8 -*-
+# :Copyright: © 2015 Günter Milde.
+# :License: Released under the terms of the `2-Clause BSD license`_, in short:
+#
+#    Copying and distribution of this file, with or without modification,
+#    are permitted in any medium without royalty provided the copyright
+#    notice and this notice are preserved.
+#    This file is offered as-is, without any warranty.
+#
+# .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause
+#
+# Revision: $Revision: 7847 $
+# Date: $Date: 2015-03-17 18:30:47 +0100 (Di, 17. Mär 2015) $
+
+"""
+A minimal front end to the Docutils Publisher, producing HTMLÂ 5 documents.
+
+The output also conforms to XHTML 1.0 transitional
+(except for the doctype declaration).
+"""
+
+try:
+    import locale # module missing in Jython
+    locale.setlocale(locale.LC_ALL, '')
+except locale.Error:
+    pass
+
+from docutils.core import publish_cmdline, default_description
+
+description = (u'Generates HTMLÂ 5 documents from standalone '
+               u'reStructuredText sources '
+               + default_description)
+
+publish_cmdline(writer_name='html5')