Merge branch 'docutils-0.13-support' into 'master'

Make rest2html work with docutils 0.13

See merge request !5

.gitlab-ci.yml

@@ -8,7 +8,7 @@ variables:
   before_script:
     - apt update
     - apt install python-pip git build-essential -y
-    - pip install 'docutils==0.12'
+    - pip install 'docutils==0.13.1'
     - bundle install --jobs $(nproc)
   script:
     - bundle exec rake test

HISTORY.md

+## 1.6.0
+
+* Updated docutils support (now requires 0.13.1)
+
 ## 1.5.1 (2017-01-09)
 * Disable rendering from `.. raw::` content block

README.md

-GitHub Markup
+GitLab Markup
 =============
 [![build status](https://gitlab.com/gitlab-org/gitlab-markup/badges/master/build.svg)](https://gitlab.com/gitlab-org/gitlab-markup/commits/master)
-This library is the first step of a journey that every markup file in a repository goes on before it is rendered on GitHub.com:
+This library is a fork of GitHub Markup, which is used to render all non Markdown markups:
 0. This library converts the raw markup to HTML. See the list of [supported markup formats](#markups) below.
 0. The HTML is sanitized, aggressively removing things that could harm you and your kin—such as `script` tags, inline-styles, and `class` or `id` attributes. See the [sanitization filter](https://github.com/jch/html-pipeline/blob/master/lib/html/pipeline/sanitization_filter.rb) for the full whitelist.
 0. Syntax highlighting is performed on code blocks. See [github/linguist](https://github.com/github/linguist#syntax-highlighting) for more information about syntax highlighting.
 0. The HTML is passed through other filters in the [html-pipeline](https://github.com/jch/html-pipeline) that add special sauce, such as [emoji](https://github.com/jch/html-pipeline/blob/master/lib/html/pipeline/emoji_filter.rb), [task lists](https://github.com/github/task_list/blob/master/lib/task_list/filter.rb), [named anchors](https://github.com/jch/html-pipeline/blob/master/lib/html/pipeline/toc_filter.rb), [CDN caching for images](https://github.com/jch/html-pipeline/blob/master/lib/html/pipeline/camo_filter.rb), and  [autolinking](https://github.com/jch/html-pipeline/blob/master/lib/html/pipeline/autolink_filter.rb).
-0. The resulting HTML is rendered on GitHub.com.
+0. The resulting HTML is rendered.
 Please see our [contributing guidelines](CONTRIBUTING.md) before reporting an issue.
@@ -25,7 +25,7 @@ you wish to run the library. You can also run `script/bootstrap` to fetch them a
 * [.org](http://orgmode.org/) -- `gem install org-ruby`
 * [.creole](http://wikicreole.org/) -- `gem install creole`
 * [.mediawiki, .wiki](http://www.mediawiki.org/wiki/Help:Formatting) -- `gem install wikicloth`
-* [.rst](http://docutils.sourceforge.net/rst.html) -- `easy_install docutils`
+* [.rst](http://docutils.sourceforge.net/rst.html) -- `pip install docutils==0.13.1`
 * [.asciidoc, .adoc, .asc](http://asciidoc.org/) -- `gem install asciidoctor` (http://asciidoctor.org)
 * [.pod](http://search.cpan.org/dist/perl/pod/perlpod.pod) -- `Pod::Simple::HTML`
   comes with Perl >= 5.10. Lower versions should install [Pod::Simple](http://search.cpan.org/~dwheeler/Pod-Simple-3.28/lib/Pod/Simple.pod) from CPAN.
@@ -34,7 +34,7 @@ Installation
 -----------
 ```
-gem install github-markup
+gem install gitlab-markup
 ```
 Usage

lib/github/commands/rest2html

@@ -142,9 +142,9 @@ class GitHubHTMLTranslator(HTMLTranslator):
             # toss off `object` tag
             self.body.pop()
-        # add on `img` with attributes
+            # add on `img` with attributes
             self.body.append(self.starttag(node, 'img', **atts))
-        self.body.append(self.context.pop())
+        HTMLTranslator.depart_image(self, node)
 def kbd(name, rawtext, text, lineno, inliner, options=None, content=None):