From 619d5effa60dc1a9997b7edc68c71856cea25e01 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Mon, 4 Apr 2016 18:25:31 +0300
Subject: [PATCH] Tabulate badges

Inspired by https://github.com/pytest-dev/pytest-cov/blob/master/README.rst

[CI skip]
---
 README.rst | 47 +++++++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/README.rst b/README.rst
index e996ed4f7..63bc62604 100644
--- a/README.rst
+++ b/README.rst
@@ -6,41 +6,56 @@ Python Imaging Library (Fork)
 
 Pillow is the friendly PIL fork by `Alex Clark and Contributors <https://github.com/python-pillow/Pillow/graphs/contributors>`_. PIL is the Python Imaging Library by Fredrik Lundh and Contributors.
 
-.. image:: https://zenodo.org/badge/17549/python-pillow/Pillow.svg
-   :target: https://zenodo.org/badge/latestdoi/17549/python-pillow/Pillow
+.. start-badges
 
-.. image:: https://readthedocs.org/projects/pillow/badge/?version=latest
+.. list-table::
+    :stub-columns: 1
+
+    * - docs
+      - |docs|
+    * - tests
+      - | |linux| |osx| |windows| |coverage| |health|
+    * - package
+      - |zenodo| |version| |downloads|
+
+.. |docs| image:: https://readthedocs.org/projects/pillow/badge/?version=latest
    :target: http://pillow.readthedocs.org/?badge=latest
    :alt: Documentation Status
 
-.. image:: https://img.shields.io/travis/python-pillow/Pillow/master.svg?label=Linux%20build
+.. |linux| image:: https://img.shields.io/travis/python-pillow/Pillow/master.svg?label=Linux%20build
    :target: https://travis-ci.org/python-pillow/Pillow
    :alt: Travis CI build status (Linux)
 
-.. image:: https://img.shields.io/travis/python-pillow/pillow-wheels/latest.svg?label=OS%20X%20build
+.. |osx| image:: https://img.shields.io/travis/python-pillow/pillow-wheels/latest.svg?label=OS%20X%20build
    :target: https://travis-ci.org/python-pillow/pillow-wheels
    :alt: Travis CI build status (OS X)
 
-.. image:: https://img.shields.io/appveyor/ci/python-pillow/Pillow/master.svg?label=Windows%20build
+.. |windows| image:: https://img.shields.io/appveyor/ci/python-pillow/Pillow/master.svg?label=Windows%20build
    :target: https://ci.appveyor.com/project/python-pillow/Pillow
    :alt: AppVeyor CI build status (Windows)
 
-.. image:: https://img.shields.io/pypi/v/pillow.svg
-   :target: https://pypi.python.org/pypi/Pillow/
-   :alt: Latest PyPI version
-
-.. image:: https://img.shields.io/pypi/dm/pillow.svg
-   :target: https://pypi.python.org/pypi/Pillow/
-   :alt: Number of PyPI downloads
-
-.. image:: https://coveralls.io/repos/python-pillow/Pillow/badge.svg?branch=master&service=github
+.. |coverage| image:: https://coveralls.io/repos/python-pillow/Pillow/badge.svg?branch=master&service=github
    :target: https://coveralls.io/github/python-pillow/Pillow?branch=master
    :alt: Code coverage
 
-.. image:: https://landscape.io/github/python-pillow/Pillow/master/landscape.svg
+.. |health| image:: https://landscape.io/github/python-pillow/Pillow/master/landscape.svg
    :target: https://landscape.io/github/python-pillow/Pillow/master
    :alt: Code health
 
+.. |zenodo| image:: https://zenodo.org/badge/17549/python-pillow/Pillow.svg
+   :target: https://zenodo.org/badge/latestdoi/17549/python-pillow/Pillow
+
+.. |version| image:: https://img.shields.io/pypi/v/pillow.svg
+   :target: https://pypi.python.org/pypi/Pillow/
+   :alt: Latest PyPI version
+
+.. |downloads| image:: https://img.shields.io/pypi/dm/pillow.svg
+   :target: https://pypi.python.org/pypi/Pillow/
+   :alt: Number of PyPI downloads
+
+.. end-badges
+
+
 
 More Information
 ----------------