From bad8301aa7d06b0b87ef965252d38c78a714f8e9 Mon Sep 17 00:00:00 2001 From: Fabrice Salvaire Date: Mon, 24 Dec 2018 17:46:37 +0100 Subject: [PATCH] doc fixes --- PythonicGcodeMachine/Gcode/Rs274/Config.py | 4 ++-- doc/sphinx/source/gcode-reference/index.rst | 5 +---- doc/sphinx/source/gcode-reference/rs-274/index.rst | 2 +- tools/make-api-doc | 2 ++ 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/PythonicGcodeMachine/Gcode/Rs274/Config.py b/PythonicGcodeMachine/Gcode/Rs274/Config.py index 6dae9f3..b8ee6a7 100644 --- a/PythonicGcodeMachine/Gcode/Rs274/Config.py +++ b/PythonicGcodeMachine/Gcode/Rs274/Config.py @@ -343,7 +343,7 @@ class ExecutionOrder(YamlMixin, RstMixin): path, headers=('Order', 'G-codes', 'Comment'), columns=('index', 'gcodes', 'meaning'), - str_gcodes=lambda item: ', '.join(item), + str_gcodes=lambda item: ' '.join(item), ) #################################################################################################### @@ -411,7 +411,7 @@ class ModalGroups(YamlMixin, RstMixin): path, headers=('Group', 'G-codes', 'Comment'), columns=('index', 'gcodes', 'meaning'), - str_gcodes=lambda item: '(' + ', '.join(item) + ')', + str_gcodes=lambda item: ' '.join(item), ) #################################################################################################### diff --git a/doc/sphinx/source/gcode-reference/index.rst b/doc/sphinx/source/gcode-reference/index.rst index b724872..f3e9d20 100644 --- a/doc/sphinx/source/gcode-reference/index.rst +++ b/doc/sphinx/source/gcode-reference/index.rst @@ -1,4 +1,4 @@ -.. include:: abbreviation.txt +.. include:: ../abbreviation.txt .. _gcode-reference-page: @@ -7,8 +7,5 @@ ================== .. toctree:: - :maxdepth: 3 - :numbered: - rs-274/index.rst diff --git a/doc/sphinx/source/gcode-reference/rs-274/index.rst b/doc/sphinx/source/gcode-reference/rs-274/index.rst index ea46555..a8e8b8a 100644 --- a/doc/sphinx/source/gcode-reference/rs-274/index.rst +++ b/doc/sphinx/source/gcode-reference/rs-274/index.rst @@ -1,4 +1,4 @@ -.. include:: abbreviation.txt +.. include:: ../../abbreviation.txt .. _rs-274-reference-page: diff --git a/tools/make-api-doc b/tools/make-api-doc index d877796..746d3e4 100755 --- a/tools/make-api-doc +++ b/tools/make-api-doc @@ -10,6 +10,8 @@ find PythonicGcodeMachine -name "lextab.py" -exec rm {} \; api=doc/sphinx/source/api rm -rf ${api} +python3 PythonicGcodeMachine/Gcode/Rs274/data/make-rst.py + echo echo Generate RST API files pyterate-rst-api PythonicGcodeMachine -- GitLab