Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into issue-2923
Browse files Browse the repository at this point in the history
  • Loading branch information
abellgithub committed Feb 12, 2020
2 parents 3ec842d + 84502f2 commit c6c8734
Show file tree
Hide file tree
Showing 84 changed files with 6,635 additions and 1,286 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ mark_as_advanced(CMAKE_VERBOSE_MAKEFILE)
set(PDAL_API_VERSION "9")
set(PDAL_BUILD_VERSION "10")

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

Expand Down
1 change: 1 addition & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ jobs:
- template: ./scripts/azp/linux-conda.yml
- template: ./scripts/azp/win.yml
- template: ./scripts/azp/osx.yml
- template: ./scripts/azp/doc.yml
42 changes: 31 additions & 11 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,26 +140,46 @@ def read_version(filename):

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'rtd_theme'
html_theme = 'pdal_rtd'
html_theme_path = ['.']
html_title = "pdal.io"

# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.

# Add any paths that contain custom themes here, relative to this directory.
html_context = {
'display_github': True,
'theme_vcs_pageview_mode': 'edit',
'github_user': 'PDAL',
'github_repo': 'PDAL',
'github_version': '/master/doc/'
}

html_theme_options = {
'canonical_url': 'https://pdal.io/',
'analytics_id': '', # Provided by Google in your dashboard
'logo_only': True,
'display_version': True,
'prev_next_buttons_location': 'both',
'style_external_links': False,
#'vcs_pageview_mode': '',
# Toc options
'collapse_navigation': True,
'sticky_navigation': True,
#'navigation_depth': 4,
'includehidden': True,
'logo_only': True,
'titles_only': False
}

#html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
html_theme_path = ['.']
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
html_title = "pdal.io"

# A shorter title for the navigation bar. Default is the same as html_title.
html_short_title = "Documentation"

# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
# html_logo = './_static/pdal_logo_small.png'
#html_logo = './_static/pdal_logo_small.png'
#html_logo = './_static/logo/pdal_logo_only.png'

theme_logo_only=False

# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
Expand Down
52 changes: 52 additions & 0 deletions doc/pdal_rtd/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Boundless Read the Docs Theme

Operates as an extension of ``sphinx_rtd_theme`` originated by Boundless

Reference:

* https://github.com/rtfd/sphinx_rtd_theme

## Configuration

Configuration options provided by ``boundess_rtd`:

```
html_theme_options = {
'display_connect': False #Ask a Question
}
```

Configuration options provided by `sphinx_rtd_theme`:

```
html_theme_options = {
'canonical_url': '',
'analytics_id': '',
'logo_only': False,
'display_version': True,
'prev_next_buttons_location': 'both',
'style_external_links': True,
'vcs_pageview_mode': '',
# Toc options
'collapse_navigation': False,
'sticky_navigation': True,
'navigation_depth': 3,
'includehidden': True,
'titles_only': False
}
```

For the navigation bar to work correctly be sure to include captions in your `tocreee` definitions.

## Implementation

Care is taken to override the `sphinx_rtd_theme` CSS settings as required, rather than duplicate the files. This approach allows us to update `sphinx_rtd_theme` over time to take advantage features and fixes.

The following is an outline of `boundless_rtd` contents:

* static/css/boundless.css - provides font selection and overides branding elements
* static/fonts/proximanova-*
* static/fonts/sourcecodepro-*
* static/img/boundless-logo-32.png
* static/img/powered-by-boundless*.png
* static/js/
85 changes: 85 additions & 0 deletions doc/pdal_rtd/breadcrumbs.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
{# Support for Sphinx 1.3+ page_source_suffix, but don't break old builds. #}

{% if page_source_suffix %}
{% set suffix = page_source_suffix %}
{% else %}
{% set suffix = source_suffix %}
{% endif %}

{% if meta is defined and meta is not none %}
{% set check_meta = True %}
{% else %}
{% set check_meta = False %}
{% endif %}

{% if check_meta and 'github_url' in meta %}
{% set display_github = True %}
{% endif %}

{% if check_meta and 'bitbucket_url' in meta %}
{% set display_bitbucket = True %}
{% endif %}

{% if check_meta and 'gitlab_url' in meta %}
{% set display_gitlab = True %}
{% endif %}

<div role="navigation" aria-label="breadcrumbs navigation">

<ul class="wy-breadcrumbs">
{% if title != project %}
<li><a href="{{ pathto(master_doc) }}"> {{ shorttitle }} </a> &raquo;</li>
{% for doc in parents %}
<li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
{% endfor %}
<li>{{ title }}</li>
{% else %}
<li><a href="{{ pathto(master_doc) }}"> {{ shorttitle }} </a></li>
{% endif %}

{% block breadcrumbs_aside %}
<li class="wy-breadcrumbs-aside">
{% if hasdoc(pagename) %}
{% if display_github %}
{% if check_meta and 'github_url' in meta %}
<!-- User defined GitHub URL -->
<a href="{{ meta['github_url'] }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
{% else %}
<a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/{{ theme_vcs_pageview_mode|default("blob") }}/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
{% endif %}
{% elif display_bitbucket %}
{% if check_meta and 'bitbucket_url' in meta %}
<!-- User defined Bitbucket URL -->
<a href="{{ meta['bitbucket_url'] }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
{% else %}
<a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ suffix }}?mode={{ theme_vcs_pageview_mode|default("view") }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
{% endif %}
{% elif display_gitlab %}
{% if check_meta and 'gitlab_url' in meta %}
<!-- User defined GitLab URL -->
<a href="{{ meta['gitlab_url'] }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
{% else %}
<a href="https://{{ gitlab_host|default("gitlab.com") }}/{{ gitlab_user }}/{{ gitlab_repo }}/{{ theme_vcs_pageview_mode|default("blob") }}/{{ gitlab_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
{% endif %}
{% elif show_source and source_url_prefix %}
<a href="{{ source_url_prefix }}{{ pagename }}{{ suffix }}">{{ _('View page source') }}</a>
{% elif show_source and has_source and sourcename %}
<a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> {{ _('View page source') }}</a>
{% endif %}
{% endif %}
</li>
{% endblock %}
</ul>

{% if (theme_prev_next_buttons_location == 'top' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
<div class="rst-breadcrumbs-buttons" role="navigation" aria-label="breadcrumb navigation">
{% if next %}
<a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
{% endif %}
{% if prev %}
<a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
{% endif %}
</div>
{% endif %}
<hr/>
</div>
30 changes: 14 additions & 16 deletions doc/rtd_theme/footer.html → doc/pdal_rtd/footer.html
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
<footer>
{% if next or prev %}
{% if (theme_prev_next_buttons_location == 'bottom' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
{% if next %}
<a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
<a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n" rel="next">{{ _('Next') }} <span class="fa fa-arrow-circle-right"></span></a>
{% endif %}
{% if prev %}
<a href="{{ prev.link|e }}" class="btn btn-neutral" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
<a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> {{ _('Previous') }}</a>
{% endif %}
</div>
{% endif %}

<hr/>

<div role="contentinfo">
<p>
{%- if show_copyright %}
<div class="info">
<a class="logo-link" href="https://hobu.co">
<div class="hobu-logo"></div>
</a>
<div class="copyright">
{% if copyright %}

&copy; {{ copyright }}
<a href="https://github.com/abellgithub">Andrew Bell</a>,
<a href="https://github.com/chambbj">Brad Chambers</a>,
<a href="http://github.com/hobu">Howard Butler</a>,
<a href="http://github.com/mpgerlek">Michael Gerlek</a>,
and
<a href="https://github.com/PDAL/PDAL/graphs/contributors">others</a>.

{%- endif %}

{%- if build_id and build_url %}
{% endif %}
{%- if build_id and build_url %}
{% trans build_url=build_url, build_id=build_id %}
<span class="build">
Build
Expand All @@ -41,11 +44,6 @@
{%- elif last_updated %}
{% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
{%- endif %}

</p>
</div>

{%- block extrafooter %} {% endblock %}

</div>
</div>
</footer>

4 changes: 2 additions & 2 deletions doc/rtd_theme/searchbox.html → doc/pdal_rtd/searchbox.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{%- if builder != 'singlehtml' %}
{% if theme_searchbox|tobool %}
<div role="search">
<form id="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
<input type="text" name="q" placeholder="Search" />
<input type="text" name="q" placeholder="{{ _('Search docs') }}" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
Expand Down

0 comments on commit c6c8734

Please sign in to comment.