From 04688b620d03dc2f28985c95962155595cd60c03 Mon Sep 17 00:00:00 2001 From: Michael Hanke <michael.hanke@gmail.com> Date: Sat, 20 Feb 2021 18:04:21 +0100 Subject: [PATCH] Let figures and tables float. Not much (yet), but the removal of `H` needed unnesting of floats to get it too compile. This is done here. --- docs/basics/101-130-yodaproject.rst | 6 +++--- docs/basics/101-137-history.rst | 4 ++-- docs/basics/101-139-gin.rst | 4 +--- docs/conf.py | 5 ++++- docs/usecases/reproducible-paper.rst | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/docs/basics/101-130-yodaproject.rst b/docs/basics/101-130-yodaproject.rst index d0ca063b3..c17b381b6 100644 --- a/docs/basics/101-130-yodaproject.rst +++ b/docs/basics/101-130-yodaproject.rst @@ -607,14 +607,14 @@ syllabus, this should be done via :term:`GitHub`. content from GitHub. GitHub can also resolve subdataset links to other GitHub repositories, which lets you navigate through nested datasets in the web-interface. - .. figure:: ../artwork/src/screenshot_midtermproject.png + .. image:: ../artwork/src/screenshot_midtermproject.png :alt: The midterm project repository, published to GitHub The above screenshot shows the linkage between the analysis project you will create and its subdataset. Clicking on the subdataset (highlighted) will take you to the iris dataset the handbook provides, shown below. - .. figure:: ../artwork/src/screenshot_submodule.png + .. image:: ../artwork/src/screenshot_submodule.png :alt: The input dataset is linked .. _publishtogithub: @@ -840,7 +840,7 @@ reproduce your data science project easily from scratch (take a look into the :r Proud of your midterm project you can not wait to use those principles the next time again. - .. figure:: ../artwork/src/reproduced.svg + .. image:: ../artwork/src/reproduced.svg :width: 50% .. gitusernote:: Push internals diff --git a/docs/basics/101-137-history.rst b/docs/basics/101-137-history.rst index b2e56c7af..ac84b84c0 100644 --- a/docs/basics/101-137-history.rst +++ b/docs/basics/101-137-history.rst @@ -238,7 +238,7 @@ with the HEAD pointer. a pointer to the branch you are currently on, and thus to the last commit in the given branch. - .. figure:: ../artwork/src/git_branch_HEAD.png + .. image:: ../artwork/src/git_branch_HEAD.png :width: 50% Using ``HEAD``, you can identify the most recent commit, or count backwards @@ -799,4 +799,4 @@ to remove the ``Gitjoke2.txt`` file. and tutorials. It is out of the scope of this handbook to be a complete guide on rebasing, and not all interactive rebasing operations are complication-free. However, you can always undo mistakes that occur - during rebasing with the help of the `reflog <https://git-scm.com/docs/git-reflog>`_. \ No newline at end of file + during rebasing with the help of the `reflog <https://git-scm.com/docs/git-reflog>`_. diff --git a/docs/basics/101-139-gin.rst b/docs/basics/101-139-gin.rst index f42a2009a..a2024ac8a 100644 --- a/docs/basics/101-139-gin.rst +++ b/docs/basics/101-139-gin.rst @@ -187,9 +187,7 @@ an SSH key as detailed above, and cloning via the SSH url: Private repos are marked with a lock sign. To make it public, untick the "Private" box, found under "Settings": - .. figure:: ../artwork/src/GIN_private.png - - Private Gin repository are marked. They can be made public in the settings. + .. image:: ../artwork/src/GIN_private.png In order to publish changes to a Gin repository, the repository needs to be cloned via its SSH url. diff --git a/docs/conf.py b/docs/conf.py index 7adcec8be..56cdee05d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -288,7 +288,7 @@ latex_elements = { 'papersize': 'a4paper', 'pointsize': '11pt', - 'figure_align': 'H', + 'figure_align': 'htbp', 'sphinxsetup': r""" verbatimwithframe=false,% VerbatimColor={rgb}{1,1,1},% @@ -335,6 +335,9 @@ \usepackage[defaultsans]{lato} \usepackage{inconsolata} +% make sure all float stay in their respective chapter +%\usepackage[chapter]{placeins} + \usepackage{xcolor} \definecolor{dataladyellow}{HTML}{FFA200} \definecolor{dataladblue}{HTML}{7FD5FF} diff --git a/docs/usecases/reproducible-paper.rst b/docs/usecases/reproducible-paper.rst index b8ef3fd21..022925a6c 100644 --- a/docs/usecases/reproducible-paper.rst +++ b/docs/usecases/reproducible-paper.rst @@ -360,7 +360,7 @@ in the actual manuscript, if you want!). This was step number 1 of 4. This figure looks like this in the manuscript: - .. figure:: ../artwork/src/img/remodnav2.png + .. image:: ../artwork/src/img/remodnav2.png For step 2 and 3, the print statements need to be captured and bound to the ``.tex`` file. The `tee <https://en.wikipedia.org/wiki/Tee_(command)>`_ command can write all of the output to