fix images in oneart (#287)

* move ci to ubuntu-latest
* switch from imagemagik to inkscape for svg conversion

Author: rscohn2

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ on: [push, pull_request]
 
 jobs:
   ci:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2

.reuse/dep5

@@ -55,7 +55,7 @@ Files: source/elements/oneVPL/source/snippets/*.c
 Copyright: 2020 Intel Corporation
 License: MIT
 
-Files: source/elements/oneART/source/images/*.png source/elements/oneART/source/images/*.jpg source/elements/oneART/source/images/*.pdf source/elements/oneART/source/images/*.ico source/elements/oneART/source/images/*.fig
+Files: source/elements/oneART/source/images/*.png source/elements/oneART/source/images/*.jpg source/elements/oneART/source/images/*.pdf source/elements/oneART/source/images/*.ico source/elements/oneART/source/images/*.fig source/elements/oneART/source/images/*.ico source/elements/oneART/source/images/*.svg
 Copyright: 2020 Intel Corporation
 License: CC-BY-4.0
 

requirements.txt

@@ -17,5 +17,6 @@ sphinx-prompt
 sphinx_substitution_extensions
 sphinx_tabs
 sphinxcontrib-spelling
+sphinxcontrib-svg2pdfconverter
 graphviz
 lxml

scripts/oneapi.py

@@ -239,6 +239,20 @@ def remove_elements(l, elements):
     return l
 
 
+@action
+def update_oneart(root, target=None):
+    for component in ['embree', 'ospray']:
+        copy(
+            f'repos/{component}/doc/{component}-spec.rst',
+            'source/elements/oneART/source',
+        )
+    for component in ['oidn', 'openvkl']:
+        copy(
+            f'repos/{component}/doc/tmp/{component}-spec.rst',
+            'source/elements/oneART/source',
+        )
+
+
 @action
 def sort_words(root, target=None):
     with open(join('source', 'spelling_wordlist.txt')) as fin:
@@ -259,6 +273,7 @@ def sort_words(root, target=None):
     'singlehtml': build,
     'prep': prep,
     'sort-words': sort_words,
+    'update-oneart': update_oneart,
 }
 
 dirs = [

source/conf/common_conf.py

@@ -8,6 +8,9 @@
 from os.path import abspath, join
 
 import docutils
+from pygments import token
+from pygments.lexer import RegexLexer
+from sphinx.highlighting import lexers
 
 # oneDAL uses custom API generator based on `breathe`.
 # Extend path to let Sphinx find `dalapi` module:
@@ -23,11 +26,12 @@
     'sphinx.ext.coverage',
     'sphinx.ext.mathjax',
     'sphinx.ext.ifconfig',
-    'sphinx.ext.imgconverter',
+    #    'sphinx.ext.imgconverter',
     'sphinx.ext.viewcode',
     'sphinx.ext.githubpages',
     'sphinx.ext.graphviz',
     'sphinxcontrib.spelling',
+    'sphinxcontrib.inkscapeconverter',
     'sphinx-prompt',
     'sphinx_substitution_extensions',
     'breathe',
@@ -151,6 +155,23 @@ def supsub_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
     return [node], []
 
 
+class BCLLexer(RegexLexer):
+    name = 'regexp'
+
+    tokens = {
+        'root': [
+            (r'MyKeyword', token.Keyword),
+            (r'[a-zA-Z]', token.Name),
+            (r'\s', token.Text),
+        ]
+    }
+
+
+# oneart/oidn uses regexp code tag so make a faker lexer to avoid
+# warnings
+lexers['regexp'] = BCLLexer(startinline=True)
+
+
 def setup(app):
     app.add_role('supsub', supsub_role)
     add_custom_css = getattr(

source/conf/element_conf.py

@@ -104,10 +104,12 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
+pro = project.translate(project.maketrans(' ', '-'))  # noqa: F821
+file_name = f'{pro}-spec.tex'
 latex_documents = [
     (
         master_doc,
-        project + '-spec.tex',  # noqa: F821
+        file_name,
         project + u' Specification',  # noqa: F821
         u'Intel',
         'manual',