a bunch of refactors

.JuliaFormatter.toml

@@ -1,12 +0,0 @@
-always_for_in = true
-import_to_using = false
-align_pair_arrow = true
-align_assignment = true
-align_conditional = true
-always_use_return = false
-conditional_to_if = false
-whitespace_in_kwargs = true
-remove_extra_newlines = true
-whitespace_ops_in_indices = true
-short_to_long_function_def = false
-annotate_untyped_fields_with_any = false

.gitattributes

@@ -1,6 +0,0 @@
-# Set default behaviour to automatically normalize line endings.
-* text=auto
-
-# Force bash scripts to always use lf line endings so that if a repo is accessed
-# in Unix via a file share from Windows, the scripts will work.
-*.sh text eol=lf

.github/ISSUE_TEMPLATE/bug.md

@@ -1,33 +0,0 @@
----
-name: Bug report
-about: Create a bug report
-title: "[BUG]"
-labels: bug
-assignees: ''
-
----
-
-<!-- Please search existing issues to avoid duplicates. -->
-
-## Details
-
-
-### Backends
-
-This bug occurs on ( insert `x` below )
-
-Backend      | yes | no  | untested
--------------|-----|-----|---------
-gr (default) |     |     |
-pyplot       |     |     |
-plotlyjs     |     |     |
-pgfplotsx    |     |     |
-unicodeplots |     |     |
-inspectdr    |     |     |
-gaston       |     |     |
-
-### Versions
-
-Plots.jl version:
-Backend  version (`]st -m <backend(s)>`):
-Output of `versioninfo()`:

.github/ISSUE_TEMPLATE/feature request.md

@@ -1,10 +0,0 @@
----
-name: Feature request
-about: Suggest a feature or enhancement
-title: "[FR]"
-labels: feature request
-assignees: ''
-
----
-
-Please search existing issues to avoid duplicates.

.github/workflows/CompatHelper.yml

@@ -1,17 +0,0 @@
-name: CompatHelper
-
-on:
-  schedule:
-    - cron: '00 00 * * *'
-
-jobs:
-  CompatHelper:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pkg.add("CompatHelper")
-        run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
-      - name: CompatHelper.main()
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}  # optional
-        run: julia -e 'using CompatHelper; CompatHelper.main()'

.github/workflows/SnoopCompile.yml

@@ -1,108 +0,0 @@
-# NOTE: this file should be named 'SnoopCompile.yml', cf github.com/aminya/CompileBot.jl/blob/master/src/CompileBot.jl#L57
-
-name: SnoopCompile
-
-on:
-  push:
-    branches:
-      - master  # NOTE: to run the bot only on pushes to master
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  SnoopCompile:
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    env:
-      GKS_ENCODING: "utf8"
-      GKSwstype: "nul"
-      PLOTS_TEST: "true"
-    runs-on: ${{matrix.os}}
-    continue-on-error: ${{ matrix.version == '~1.8.0-0' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        version:   # NOTE: the versions below should match those in your botconfig
-          - '1.6'       # ⎤
-          - '1.7'       # |
-          - '~1.8.0-0'  # |
-          # - 'nightly'   # ⎦ <<< keep these versions in sync with deps/SnoopCompile/snoop_bot_config.jl
-          # ^^^^^^^^^ for 'nightly', see github.com/JuliaPlots/Plots.jl/issues/4079
-        os:        # NOTE: should match the os setting of your botconfig
-          - ubuntu-latest
-        arch:
-          - x64
-    steps:
-      # Setup environment
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@latest
-        with:
-          version: ${{matrix.version}}
-          
-      - name: Set Swap Space
-        uses: pierotofy/set-swap-space@master
-        with:
-          swap-size-gb: 10  # required (not enough memory on github actions virtual machine)
-
-      - name: Install dependencies
-        run: |
-          cat /proc/cpuinfo
-          cat /proc/meminfo
-          cat /proc/swaps
-          free
-          df -h
-          julia --project -e 'using Pkg; Pkg.instantiate()'
-          julia -e 'using Pkg; Pkg.add(PackageSpec(name="CompileBot", version="1")); Pkg.develop(PackageSpec(; path=pwd())); using CompileBot; CompileBot.addtestdep()'
-
-      # TESTCMD
-      - name: Default TESTCMD
-        run: echo "TESTCMD=julia" >> $GITHUB_ENV
-      - name: Ubuntu TESTCMD
-        if: startsWith(matrix.os,'ubuntu')
-        run: echo "TESTCMD=xvfb-run --auto-servernum julia" >> $GITHUB_ENV
-
-      # Generate precompile files
-      - name: Generating precompile files
-        run: $TESTCMD --project -e 'include("deps/SnoopCompile/snoop_bot.jl")'   # NOTE: must match path
-
-      # Run benchmarks
-      - name: Running Benchmark
-        run: $TESTCMD --project -e 'include("deps/SnoopCompile/snoop_bench.jl")' # NOTE: optional, if have benchmark file
-
-      - name: Upload all
-        uses: actions/upload-artifact@v2.0.1
-        with:
-          path: ./
-
-  Create_PR:
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    needs: SnoopCompile
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Download all
-        uses: actions/download-artifact@v2
-
-      - name: CompileBot postprocess
-        run: |
-          if ! grep -m1 -q 'format: off' artifact/src/precompile_includer.jl; then sed -i '1 i\#! format: off' artifact/src/precompile_includer.jl; fi
-          julia -e 'using Pkg; Pkg.add(PackageSpec(name="CompileBot", version="1")); using CompileBot; CompileBot.postprocess()'
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: Update precompile_*.jl file [skip ci]
-          title: "[AUTO] Update precompiles [skip ci]"
-          labels: |
-            SnoopCompile
-            no changelog
-          branch: "Test_SnoopCompile_AutoPR_${{ github.ref }}"
-
-  Skip:
-    if: "contains(github.event.head_commit.message, '[skip ci]')"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Skip CI 🚫
-        run: echo skip ci

.github/workflows/TagBot.yml

@@ -1,15 +0,0 @@
-name: TagBot
-on:
-  issue_comment:
-    types:
-      - created
-  workflow_dispatch:
-jobs:
-  TagBot:
-    if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: JuliaRegistries/TagBot@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          ssh: ${{ secrets.TAGBOT_KEY }}

.github/workflows/benchmark.yml

@@ -1,31 +0,0 @@
-name: benchmarks
-
-on:
-  pull_request:
-
-jobs:
-  Benchmark:
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@latest
-        with:
-          version: '1.7'
-
-      # Setup
-      - name: Ubuntu TESTCMD
-        run: echo "TESTCMD=xvfb-run --auto-servernum julia" >> $GITHUB_ENV
-      - name: Install Plots dependencies
-        uses: julia-actions/julia-buildpkg@latest
-      - name: Install Benchmarking dependencies
-        run: julia -e 'using Pkg; pkg"add PkgBenchmark BenchmarkCI@0.1"'
-
-      - name: Run benchmarks
-        run: $TESTCMD -e 'using BenchmarkCI; BenchmarkCI.judge()'
-      - name: Print judgement
-        run: julia -e 'using BenchmarkCI; BenchmarkCI.displayjudgement()'
-      - name: Post results
-        run: julia -e 'using BenchmarkCI; BenchmarkCI.postjudge()'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -1,93 +0,0 @@
-name: ci
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  CI:
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    env:
-      GKS_ENCODING: "utf8"
-      GKSwstype: "nul"
-
-    name: Julia ${{ matrix.version }} - ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.version == 'nightly' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        version:
-          - '1.6' # LTS
-          - '1.7' # latest stable
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-latest
-        arch:
-          - x64
-          # - x86
-        include:
-          - version: 'nightly'
-            os: ubuntu-latest
-
-    steps:
-      # Setup environment
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@latest
-        with:
-          version: ${{ matrix.version }}
-      - name: Cache artifacts
-        uses: actions/cache@v1
-        env:
-          cache-name: cache-artifacts
-        with:
-          path: ~/.julia/artifacts
-          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-test-
-            ${{ runner.os }}-
-
-      # TESTCMD
-      - name: Default TESTCMD
-        run: echo "TESTCMD=julia" >> $GITHUB_ENV
-      - name: Ubuntu TESTCMD
-        if: startsWith(matrix.os,'ubuntu')
-        run: |
-          echo "TESTCMD=xvfb-run --auto-servernum julia" >> $GITHUB_ENV
-          sudo apt-get -y update
-          sudo apt-get -y install gnuplot poppler-utils texlive-{latex-base,latex-extra,luatex}
-          sudo fc-cache -vr
-
-      # Julia Dependencies
-      - name: Install Julia dependencies
-        uses: julia-actions/julia-buildpkg@latest
-
-      # Run tests
-      - name: Run Graphical test
-        run:  |
-          $TESTCMD --project -e 'using Pkg; Pkg.test(coverage=true)'
-          $TESTCMD -e 'using Pkg; Pkg.activate(tempdir()); Pkg.develop(path=abspath(".")); Pkg.add("StatsPlots"); Pkg.test("StatsPlots")'
-          $TESTCMD -e 'using Pkg; Pkg.activate(tempdir()); Pkg.develop(path=abspath(".")); Pkg.add("GraphRecipes"); Pkg.test("GraphRecipes")'
-
-      # Codecov
-      - uses: julia-actions/julia-processcoverage@v1
-        if: startsWith(matrix.os,'ubuntu')
-      - uses: codecov/codecov-action@v2
-        if: startsWith(matrix.os,'ubuntu')
-        with:
-          file: lcov.info
-
-  Skip:
-    if: "contains(github.event.head_commit.message, '[skip ci]')"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Skip CI 🚫
-        run: echo skip ci

.github/workflows/docs.yml

@@ -1,34 +0,0 @@
-name: docs
-
-on:
- workflow_dispatch:
- push:
-  branches:
-    - master
-  tags: '*'
- 
-jobs:
-  Build_docs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          repository: JuliaPlots/PlotDocs.jl
-      - uses: julia-actions/setup-julia@v1
-      - name: Cache artifacts
-        uses: actions/cache@v1
-        env:
-          cache-name: cache-artifacts
-        with:
-          path: ~/.julia/artifacts 
-          key: ${{runner.os}}-test-${{env.cache-name}}-${{hashFiles('**/Project.toml')}}
-          restore-keys: |
-            ${{runner.os}}-test-${{env.cache-name}}-
-            ${{runner.os}}-test-
-            ${{runner.os}}-
-      - name: Build documentation
-        env:
-          PYTHON: ""
-          DOCUMENTER_KEY: ${{secrets.DOCUMENTER_KEY}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-        run: bash docs/ci_build.sh

.github/workflows/format_check.yml

@@ -1,54 +0,0 @@
-name: format
-
-on:
-  pull_request:
-  push:
-    branches:
-      - 'master'
-
-jobs:
-  code-style:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
-      - name: Install dependencies
-        run: |
-          using Pkg
-          Pkg.add([
-              PackageSpec("JuliaFormatter"),
-              PackageSpec(url = "https://github.com/tkf/JuliaProjectFormatter.jl.git"),
-          ])
-        shell: julia --color=yes {0}
-
-      - name: Format Julia files
-        run: |
-          using JuliaFormatter
-          format(["src", "test"])
-        shell: julia --color=yes --compile=min -O0 {0}
-      - name: suggester / JuliaFormatter
-        uses: reviewdog/action-suggester@v1
-        with:
-          tool_name: JuliaFormatter
-          fail_on_error: true
-
-      # reviewdog/action-suggester not using `cleanup` flag?
-      - name: Cleanup
-        if: success() || failure()
-        run: |
-          git checkout -- .
-          git clean --force
-        shell: bash
-
-      - name: Format Julia project files
-        if: success() || failure()
-        run: |
-          using JuliaProjectFormatter
-          format_projects()
-        shell: julia --color=yes --compile=min -O0 {0}
-      - name: suggester / JuliaProjectFormatter
-        if: success() || failure()
-        uses: reviewdog/action-suggester@v1
-        with:
-          tool_name: JuliaProjectFormatter
-          fail_on_error: true

.github/workflows/format_pr.yml

@@ -1,35 +0,0 @@
-name: format
-
-on:
-  schedule:
-    - cron: '0 0 1 * *'
-
-jobs:
-  pr:
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install JuliaFormatter and format
-        run: |
-          julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter"))'
-          julia -e 'using JuliaFormatter; [format(["src", "test"]) for _ in 1:2]'
-          git diff --exit-code
-
-      - name: Create Pull Request
-        if: ${{ failure() }}
-        id: cpr
-        uses: peter-evans/create-pull-request@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "Format .jl files [skip ci]"
-          title: 'Automatic JuliaFormatter.jl run'
-          branch: auto-juliaformatter-pr
-          delete-branch: true
-          labels: formatting, automated pr, no changelog
-
-      - name: Check outputs
-        if: ${{ failure() }}
-        run: |
-          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
-          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"

.gitignore

@@ -4,12 +4,7 @@
 .DS_Store
 examples/.ipynb_checkpoints/*
 examples/meetup/.ipynb_checkpoints/*
-deps/plotly-*
+deps/plotly-latest.min.js
 deps/build.log
 deps/deps.jl
 Manifest.toml
-dev/
-test/tmpplotsave.hdf5
-/.benchmarkci
-/benchmark/*.json
-.vscode/

.travis.yml

@@ -0,0 +1,20 @@
+# Documentation: http://docs.travis-ci.com/user/languages/julia/
+language: julia
+os:
+  - linux
+  # - osx
+julia:
+  - 1.1
+  - nightly
+  
+matrix:
+  allow_failures:
+    - julia: nightly
+
+sudo: required
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pwd ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./test/install_wkhtmltoimage.sh ; fi
+
+notifications:
+  email: true

.zenodo.json

@@ -1,722 +0,0 @@
-{
-    "title": "Plots.jl",
-    "license": "MIT",
-    "creators": [
-        {
-            "affiliation": "Headlands Technologies",
-            "name": "Tom Breloff"
-        }
-    ],
-    "contributors":[
-        {
-            "affiliation": "TU Wien",
-            "name": "Daniel Schwabeneder",
-            "orcid": "0000-0002-0412-0777",
-            "type": "ProjectLeader"
-        },
-        {
-            "affiliation": "GLOBE Institute, University of Copenhagen",
-            "name": "Michael Krabbe Borregaard",
-            "orcid": "0000-0002-8146-8435",
-            "type": "ProjectLeader"
-        },
-        {
-            "affiliation": "Leibniz Universit\u00e4t Hannover",
-            "name": "Simon Christ",
-            "orcid": "0000-0002-5866-1472",
-            "type": "ProjectLeader"
-        },
-        {
-            "affiliation": "Forschungszentrum J\u00fclich",
-            "name": "Josef Heinen",
-            "orcid": "0000-0001-6509-1925",
-            "type": "ProjectMember"
-        },
-        {
-            "name": "Yuval",
-            "type": "Other"
-        },
-        {
-            "name": "Andrew Palugniok",
-            "type": "ProjectMember"
-        },
-        {
-            "affiliation": "@beacon-biosignals",
-            "name": "Simon Danisch",
-            "type": "Other"
-        },
-        {
-            "affiliation": "Veos Digital (https://veos.digital/)",
-            "name": "Pietro Vertechi",
-            "type": "ProjectMember"
-        },
-        {
-            "affiliation": "Korea Advanced Inst. of Science and Technology (KAIST)",
-            "name": "Zhanibek Omarov",
-            "type": "ProjectMember",
-            "orcid": "0000-0002-8783-8791"
-        },
-        {
-            "name": "Thatcher Chamberlin",
-            "type": "Other"
-        },
-        {
-            "name": "@ma-laforge",
-            "type": "ProjectMember"
-        },
-        {
-            "affiliation": "Massachusetts Institute of Technology",
-            "name": "Christopher Rackauckas",
-            "orcid": "0000-0001-5850-0663",
-            "type": "Other"
-        },
-        {
-            "affiliation": "Max Planck Institute for Physics",
-            "name": "Oliver Schulz",
-            "type": "Other"
-        },
-        {
-            "affiliation": "@JuliaComputing",
-            "name": "Sebastian Pfitzner",
-            "type": "Other"
-        },
-        {
-            "name": "Takafumi Arakaki",
-            "type": "Other"
-        },
-        {
-            "affiliation": "University of Manitoba",
-            "name": "Amin Yahyaabadi",
-            "type": "Other"
-        },
-        {
-            "name": "Jack Devine",
-            "type": "Other"
-        },
-        {
-            "name": "Sebastian Pech",
-            "type": "Other"
-        },
-        {
-            "affiliation": "@JuliaComputing",
-            "name": "Patrick Kofod Mogensen",
-            "type": "Other",
-            "orcid": "0000-0002-4910-1932"
-        },
-        {
-            "name": "Samuel S. Watson",
-            "type": "Other"
-        },
-        {
-            "affiliation": "UC Davis",
-            "name": "Naoki Saito",
-            "orcid": "0000-0001-5234-4719",
-            "type": "Other"
-        },
-        {
-            "affiliation": "University of Southern California (USC)",
-            "name": "Benoit Pasquier",
-            "orcid": "0000-0002-3838-5976",
-            "type": "Other"
-        },
-        {
-            "affiliation": "NTNU Trondheim",
-            "name": "Ronny Bergmann",
-            "orcid": "0000-0001-8342-7218",
-            "type": "Other"
-        },
-        {
-            "name": "Andy Nowacki",
-            "affiliation": "University of Leeds",
-            "orcid": "0000-0001-7669-7383",
-            "type": "Other"
-        },
-        {
-            "name": "Ian Butterworth",
-            "type": "Other"
-        },
-        {
-            "affiliation": "Lund University",
-            "name": "David Gustavsson",
-            "type": "Other"
-        },
-        {
-            "name": "Anshul Singhvi",
-            "affiliation": "Columbia University",
-            "orcid": "0000-0001-6055-1291",
-            "type": "Other"
-        },
-        {
-            "name": "david-macmahon",
-            "type": "Other"
-        },
-        {
-            "name": "Fredrik Ekre",
-            "type": "Other"
-        },
-        {
-            "name": "Maaz Bin Tahir Saeed",
-            "type": "Other"
-        },
-        {
-            "name": "Kristoffer Carlsson",
-            "type": "Other"
-        },
-        {
-            "name": "Will Kearney",
-            "type": "Other"
-        },
-        {
-            "name": "Niklas Korsbo",
-            "type": "Other"
-        },
-        {
-            "name": "Miles Lucas",
-            "type": "Other"
-        },
-        {
-            "name": "@Godisemo",
-            "type": "Other"
-        },
-        {
-            "name": "Florian Oswald",
-            "type": "Other"
-        },
-        {
-            "name": "Diego Javier Zea",
-            "type": "Other"
-        },
-        {
-            "name": "@WillRam",
-            "type": "Other"
-        },
-        {
-            "name": "Fedor Bezrukov",
-            "type": "Other"
-        },
-        {
-            "name": "Spencer Lyon",
-            "type": "Other"
-        },
-        {
-            "name": "Darwin Darakananda",
-            "type": "Other"
-        },
-        {
-            "name": "Lukas Hauertmann",
-            "type": "Other"
-        },
-        {
-            "name": "Huckleberry Febbo",
-            "type": "Other"
-        },
-        {
-            "name": "@H-M-H",
-            "type": "Other"
-        },
-        {
-            "name": "Josh Day",
-            "type": "Other"
-        },
-        {
-            "name": "@wfgra",
-            "type": "Other"
-        },
-        {
-            "name": "Sheehan Olver",
-            "type": "Other"
-        },
-        {
-            "name": "Jerry Ling",
-            "type": "Other"
-        },
-        {
-            "name": "Jks Liu",
-            "type": "Other"
-        },
-        {
-            "name": "Seth Axen",
-            "type": "Other"
-        },
-        {
-            "name": "@o01eg",
-            "type": "Other"
-        },
-        {
-            "name": "Sebastian Micluța-Câmpeanu",
-            "type": "Other"
-        },
-        {
-            "name": "Tim Holy",
-            "type": "Other"
-        },
-        {
-            "name": "Tony Kelman",
-            "type": "Other"
-        },
-        {
-            "name": "Antoine Levitt",
-            "type": "Other"
-        },
-        {
-            "name": "Iblis Lin",
-            "type": "Other"
-        },
-        {
-            "name": "Harry Scholes",
-            "type": "Other"
-        },
-        {
-            "name": "@djsegal",
-            "type": "Other"
-        },
-        {
-            "name": "Goran Nakerst",
-            "type": "Other"
-        },
-        {
-            "name": "Felix Hagemann",
-            "type": "Other"
-        },
-        {
-            "name": "Matthieu Gomez",
-            "type": "Other"
-        },
-        {
-            "name": "@biggsbiggsby",
-            "type": "Other"
-        },
-        {
-            "name": "Jonathan Anderson",
-            "type": "Other"
-        },
-        {
-            "name": "Michael Kraus",
-            "type": "Other"
-        },
-        {
-            "name": "Carlo Lucibello",
-            "type": "Other"
-        },
-        {
-            "name": "Robin Deits",
-            "type": "Other"
-        },
-        {
-            "name": "Misha Mkhasenko",
-            "type": "Other"
-        },
-        {
-            "name": "Benoît Legat",
-            "type": "Other"
-        },
-        {
-            "name": "Steven G. Johnson",
-            "type": "Other"
-        },
-        {
-            "name": "John Verzani",
-            "type": "Other"
-        },
-        {
-            "name": "Mattias Fält",
-            "type": "Other"
-        },
-        {
-            "name": "Rashika Karki",
-            "type": "Other"
-        },
-        {
-            "name": "Morten Piibeleht",
-            "type": "Other"
-        },
-        {
-            "name": "Filippo Vicentini",
-            "type": "Other"
-        },
-        {
-            "name": "David Anthoff",
-            "type": "Other"
-        },
-        {
-            "name": "Leon Wabeke",
-            "type": "Other"
-        },
-        {
-            "name": "Yusuke Kominami",
-            "type": "Other"
-        },
-        {
-            "name": "Oscar Dowson",
-            "type": "Other"
-        },
-        {
-            "name": "Max G",
-            "type": "Other"
-        },
-        {
-            "name": "Fabian Greimel",
-            "type": "Other"
-        },
-        {
-            "name": "Jérémy",
-            "type": "Other"
-        },
-        {
-            "name": "Pearl Li",
-            "type": "Other"
-        },
-        {
-            "name": "David P. Sanders",
-            "type": "Other"
-        },
-        {
-            "name": "Asbjørn Nilsen Riseth",
-            "type": "Other"
-        },
-        {
-            "name": "Jan Weidner",
-            "type": "Other"
-        },
-        {
-            "name": "@jakkor2",
-            "type": "Other"
-        },
-        {
-            "name": "Pablo Zubieta",
-            "type": "Other"
-        },
-        {
-            "name": "Hamza Yusuf Çakır",
-            "type": "Other"
-        },
-        {
-            "name": "John Rinehart",
-            "type": "Other"
-        },
-        {
-            "name": "Martin Biel",
-            "type": "Other"
-        },
-        {
-            "name": "Moritz Schauer",
-            "type": "Other"
-        },
-        {
-            "name": "Mosè Giodano",
-            "type": "Other"
-        },
-        {
-            "name": "@olegshtch",
-            "type": "Other"
-        },
-        {
-            "name": "Leon Shen",
-            "type": "Other"
-        },
-        {
-            "name": "Jeff Fessler",
-            "type": "Other"
-        },
-        {
-            "name": "@hustf",
-            "type": "Other"
-        },
-        {
-            "name": "Asim H Dar",
-            "type": "Other"
-        },
-        {
-            "name": "@8uurg",
-            "type": "Other"
-        },
-        {
-            "name": "Abel Siqueira",
-            "type": "Other"
-        },
-        {
-            "name": "Adrian Dawid",
-            "type": "Other"
-        },
-        {
-            "name": "Alberto Lusiani",
-            "type": "Other"
-        },
-        {
-            "name": "Balázs Mezei",
-            "type": "Other"
-        },
-        {
-            "name": "Ben Ide",
-            "type": "Other"
-        },
-        {
-            "name": "Benjamin Lungwitz",
-            "type": "Other"
-        },
-        {
-            "affiliation": "University of Graz",
-            "name": "Bernd Riederer",
-            "type": "Other",
-            "orcid": "0000-0001-8390-0087"
-        },
-        {
-            "name": "Christina Lee",
-            "type": "Other"
-        },
-        {
-            "name": "Christof Stocker",
-            "type": "Other"
-        },
-        {
-            "name": "Christoph Finkensiep",
-            "type": "Other"
-        },
-        {
-            "name": "@Cornelius-G",
-            "type": "Other"
-        },
-        {
-            "name": "Daniel Høegh",
-            "type": "Other"
-        },
-        {
-            "name": "Denny Biasiolli",
-            "type": "Other"
-        },
-        {
-            "name": "Dieter Castel",
-            "type": "Other"
-        },
-        {
-            "name": "Elliot Saba",
-            "type": "Other"
-        },
-        {
-            "name": "Fengyang Wang",
-            "type": "Other"
-        },
-        {
-            "name": "Fons van der Plas",
-            "type": "Other"
-        },
-        {
-            "name": "Fredrik Bagge Carlson",
-            "type": "Other"
-        },
-        {
-            "name": "Graham Smith",
-            "type": "Other"
-        },
-        {
-            "name": "Hayato Ikoma",
-            "type": "Other"
-        },
-        {
-            "name": "Hessam Mehr",
-            "type": "Other"
-        },
-        {
-            "name": "@InfiniteChai",
-            "type": "Other"
-        },
-        {
-            "name": "Jack Dunn",
-            "type": "Other"
-        },
-        {
-            "name": "Jeff Bezanson",
-            "type": "Other"
-        },
-        {
-            "name": "Jeff Eldredge",
-            "type": "Other"
-        },
-        {
-            "name": "Jinay Jain",
-            "type": "Other"
-        },
-        {
-            "name": "Johan Blåbäck",
-            "type": "Other"
-        },
-        {
-            "name": "@jmert",
-            "type": "Other"
-        },
-        {
-            "name": "Lakshya Khatri",
-            "type": "Other"
-        },
-        {
-            "name": "Lia Siegelmann",
-            "type": "Other"
-        },
-        {
-            "name": "@marekkukan-tw",
-            "type": "Other"
-        },
-        {
-            "affiliation": "ETH Zurich",
-            "name": "Mauro Werder",
-            "type": "Other",
-            "orcid": "0000-0003-0137-9377"
-        },
-        {
-            "name": "Maxim Grechkin",
-            "type": "Other"
-        },
-        {
-            "name": "Michael Cawte",
-            "type": "Other"
-        },
-        {
-            "name": "@milesfrain",
-            "type": "Other"
-        },
-        {
-            "name": "Nicholas Bauer",
-            "type": "Other"
-        },
-        {
-            "name": "Nicolau Leal Werneck",
-            "type": "Other"
-        },
-        {
-            "name": "@nilshg",
-            "type": "Other"
-        },
-        {
-            "name": "Oliver Evans",
-            "type": "Other"
-        },
-        {
-            "name": "Peter Gagarinov",
-            "type": "Other"
-        },
-        {
-            "name": "Páll Haraldsson",
-            "type": "Other"
-        },
-        {
-            "name": "Rik Huijzer",
-            "type": "Other"
-        },
-        {
-            "name": "Romain Franconville",
-            "type": "Other"
-        },
-        {
-            "name": "Ronan Pigott",
-            "type": "Other"
-        },
-        {
-            "name": "Roshan Shariff",
-            "type": "Other"
-        },
-        {
-            "name": "Scott Thomas",
-            "type": "Other"
-        },
-        {
-            "name": "Sebastian Rollén",
-            "type": "Other"
-        },
-        {
-            "name": "Seth Bromberger",
-            "type": "Other"
-        },
-        {
-            "name": "Siva Swaminathan",
-            "type": "Other"
-        },
-        {
-            "name": "Tim DuBois",
-            "type": "Other"
-        },
-        {
-            "name": "Travis DePrato",
-            "type": "Other"
-        },
-        {
-            "name": "Will Thompson",
-            "type": "Other"
-        },
-        {
-            "name": "Yakir Luc Gagnon",
-            "type": "Other"
-        },
-        {
-            "name": "Benjamin Chislett",
-            "type": "Other"
-        },
-        {
-            "name": "@hhaensel",
-            "type": "Other"
-        },
-        {
-            "name": "@improbable22",
-            "type": "Other"
-        },
-        {
-            "name": "Johannes Fleck",
-            "type": "Other"
-        },
-        {
-            "name": "Peter Czaban",
-            "type": "Other"
-        },
-        {
-            "name": "@innerlee",
-            "type": "Other"
-        },
-        {
-            "name": "Mats Cronqvist",
-            "type": "Other"
-        },
-        {
-            "name": "Shi Pengcheng",
-            "type": "Other"
-        },
-        {
-            "name": "@wg030",
-            "type": "Other"
-        },
-        {
-            "affiliation": "University of Cambridge",
-            "name": "Will Tebbutt",
-            "type": "Other"
-        },
-        {
-            "name": "@t-bltg",
-            "type": "Other"
-        },
-        {
-            "name": "Fred Callaway",
-            "type": "Other"
-        },
-        {
-            "name": "Jan Thorben Schneider",
-            "type": "Other"
-        },
-        {
-            "orcid": "0000-0003-4102-2460",
-            "affiliation": "Alogus Research Corporation",
-            "name": "Lee Phillips",
-            "type": "Other"
-        },
-        {
-            "name": "Tom Gillam",
-            "type": "Other"
-        },
-        {
-            "name": "Steve Leung",
-            "type": "Other"
-        },
-        {
-            "name": "Xu Zhi-Yuan",
-            "type": "Other"
-        }
-    ],
-    "upload_type": "software"
-}

NEWS.md

@@ -3,22 +3,13 @@
 
 #### notes on release changes, ongoing development, and future planned work
 
-## NOTE: this file is deprecated, see the [TagBot](https://github.com/marketplace/actions/julia-tagbot) auto-generated changelogs instead
+- Minor version 0.17 is the last one to support Julia 0.6!!
+- Minor version 0.11 is the last one to support Julia 0.5!!
+	- Critical bugfixes only
+    - `backports` branch is for Julia 0.5
 
-## 0.28.3
+---
-- support generalized array interface
+## (current master)
-- save to pdf, svg and eps in plotlyjs
-- fix for clims in line_z
-- optimize heatmap logic in gr
-
-## 0.26.3
-- fix `vline` with dates
-- fix PyPlot logscale bug
-- avoid annotation clipping for PyPlot
-- allow plotting of Any vectors and 3D plotting again in convertToAnyVector
-- specify legend title font in GR and PyPlot
-- delete `pushtomaster.sh`
-- use `=== nothing`
 
 ## 0.26.2
 - improve empty animation build error

Project.toml

@@ -1,19 +1,17 @@
 name = "Plots"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 author = ["Tom Breloff (@tbreloff)"]
-version = "1.29.0"
+version = "0.26.2"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 Contour = "d38c429a-6771-53c6-b99e-75d170b6e991"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
-Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 FFMPEG = "c87230d0-a227-11e9-1b43-d7ebe4e7570a"
 FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
 GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
-GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
+GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Measures = "442fdcdd-2543-5da2-b0f3-8c86c306513e"
 NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
@@ -24,70 +22,36 @@ Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
-RecipesPipeline = "01d81517-befc-4cb6-b9ec-a95719d0359c"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
-Scratch = "6c6a2e73-6563-6170-7368-637461726353"
 Showoff = "992d4aef-0814-514b-bc4d-f2e9a6c4116f"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
-UnicodeFun = "1cfade01-22cf-5700-b092-accc4b62d6e1"
-Unzip = "41fe7b60-77ed-43a1-b4f0-825fd5a5650d"
 
 [compat]
-Contour = "0.5"
+FixedPointNumbers = "≥ 0.3.0"
-FFMPEG = "0.2 - 0.4"
+GR = "≥ 0.31.0"
-FixedPointNumbers = "0.6 - 0.8"
+PlotThemes = "≥ 0.1.3"
-GR = "0.64"
+PlotUtils = "≥ 0.4.1"
-GeometryBasics = "0.2, 0.3.1, 0.4"
+RecipesBase = "≥ 0.6.0"
-JSON = "0.21, 1"
+StatsBase = "≥ 0.14.0"
-Latexify = "0.14 - 0.15"
+julia = "≥ 1.0.0"
-Measures = "0.3"
-NaNMath = "0.3, 1"
-PGFPlotsX = "1"
-PlotThemes = "2, 3"
-PlotUtils = "1"
-PlotlyBase = "0.7"
-PlotlyJS = "0.18"
-PyPlot = "2"
-RecipesBase = "1.2"
-RecipesPipeline = "0.5"
-Reexport = "0.2, 1.0"
-Requires = "1"
-Scratch = "1"
-Showoff = "0.3.1, 1.0"
-StatsBase = "0.32 - 0.33"
-UnicodeFun = "0.4"
-UnicodePlots = "2.10"
-Unzip = "0.1"
-julia = "1.6"
 
 [extras]
-Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
-Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
-Gaston = "4b11ee91-296f-5714-9832-002c20994614"
-Gtk = "4c0ca9eb-093a-5379-98c5-f87ac0bbbf44"
-HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
 ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
 Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
-InspectDR = "d0351b0e-4b05-5898-87b3-e2a8edfddd1d"
+LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
-LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
-OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
-PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925"
-PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5"
-PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
-PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
 RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b"
-StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-TestImages = "5e47fb64-e119-507b-a336-dd2b206d9990"
 UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
 VisualRegressionTests = "34922c18-7c2a-561c-bac1-01e79b2c4c92"
+BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
 
 [targets]
-test = ["Colors", "Distributions", "FileIO", "Gaston", "Gtk", "ImageMagick", "Images", "InspectDR", "LibGit2", "OffsetArrays", "PGFPlotsX", "PlotlyJS", "PlotlyBase", "PyPlot", "HDF5", "RDatasets", "StableRNGs", "StaticArrays", "StatsPlots", "Test", "TestImages", "UnicodePlots", "VisualRegressionTests"]
+test = ["BinaryProvider", "Pkg", "Test", "Random", "StatsPlots", "VisualRegressionTests", "LaTeXStrings", "Images", "ImageMagick", "RDatasets", "FileIO", "UnicodePlots"]

README.md

@@ -1,26 +1,13 @@
 # Plots
 
-[gh-ci-img]: https://github.com/JuliaPlots/Plots.jl/workflows/ci/badge.svg?branch=master
+[![Build Status](https://travis-ci.org/JuliaPlots/Plots.jl.svg?branch=master)](https://travis-ci.org/JuliaPlots/Plots.jl)
-[gh-ci-url]: https://github.com/JuliaPlots/Plots.jl/actions?query=workflow%3Aci
+[![Build status](https://ci.appveyor.com/api/projects/status/github/juliaplots/plots.jl?branch=master&svg=true)](https://ci.appveyor.com/project/mkborregaard/plots-jl)
-
+[![Join the chat at https://gitter.im/tbreloff/Plots.jl](https://badges.gitter.im/tbreloff/Plots.jl.svg)](https://gitter.im/tbreloff/Plots.jl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[pkgeval-img]: https://juliaci.github.io/NanosoldierReports/pkgeval_badges/P/Plots.svg
+<a href="http://docs.juliaplots.org/latest/" target="_blank"><img src="https://img.shields.io/badge/docs-latest-blue.svg" alt="Latest documentation"></a>
-[pkgeval-url]: https://juliaci.github.io/NanosoldierReports/pkgeval_badges/report.html
+<!-- [![Plots](http://pkg.julialang.org/badges/Plots_0.3.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.3) -->
-
+<!-- [![Plots](http://pkg.julialang.org/badges/Plots_0.4.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.4) -->
-[gitter-img]: https://badges.gitter.im/tbreloff/Plots.jl.svg
+<!-- [![Coverage Status](https://coveralls.io/repos/tbreloff/Plots.jl/badge.svg?branch=master)](https://coveralls.io/r/tbreloff/Plots.jl?branch=master) -->
-[gitter-url]: https://gitter.im/tbreloff/Plots.jl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+<!-- [![codecov.io](http://codecov.io/github/tbreloff/Plots.jl/coverage.svg?branch=master)](http://codecov.io/github/tbreloff/Plots.jl?branch=master) -->
-
-[docs-img]: https://img.shields.io/badge/docs-stable-blue.svg
-[docs-url]: https://docs.juliaplots.org/stable/
-
-[![][gh-ci-img]][gh-ci-url]
-[![][pkgeval-img]][pkgeval-url]
-[![project chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://julialang.zulipchat.com/#narrow/stream/236493-plots)
-[![][docs-img]][docs-url]
-[![Codecov](https://codecov.io/gh/JuliaPlots/Plots.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/JuliaPlots/Plots.jl)
-[![Plots Downloads](https://shields.io/endpoint?url=https://pkgs.genieframework.com/api/v1/badge/Plots)](https://pkgs.genieframework.com?packages=Plots)
-
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4725317.svg)](https://doi.org/10.5281/zenodo.4725317)
-This is the DOI for all Versions, please follow the link to get the DOI for a specific version.
 
 #### Created by Tom Breloff (@tbreloff)
 

appveyor.yml

@@ -0,0 +1,43 @@
+environment:
+  matrix:
+  # - julia_version: 0.7
+  - julia_version: 1
+  - julia_version: nightly
+
+platform:
+  - x86 # 32-bit
+  - x64 # 64-bit
+
+# # Uncomment the following lines to allow failures on nightly julia
+# # (tests will run but not make your overall status red)
+matrix:
+  allow_failures:
+  - julia_version: nightly
+
+branches:
+  only:
+    - master
+    - /release-.*/
+
+notifications:
+  - provider: Email
+    on_build_success: false
+    on_build_failure: false
+    on_build_status_changed: false
+
+install:
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
+
+build_script:
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
+
+test_script:
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
+
+# # Uncomment to support code coverage upload. Should only be enabled for packages
+# # which would have coverage gaps without running on Windows
+# on_success:
+#   - echo "%JL_CODECOV_SCRIPT%"
+#   - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"

benchmark/Project.toml

@@ -1,5 +0,0 @@
-[deps]
-BenchmarkCI = "20533458-34a3-403d-a444-e18f38190b5b"
-BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
-PkgBenchmark = "32113eaa-f34f-5b0d-bd6c-c81e245fc73d"
-Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"

benchmark/benchmarks.jl

@@ -1,10 +0,0 @@
-using BenchmarkTools
-using Plots
-
-const SUITE = BenchmarkGroup()
-julia_cmd = split(get(ENV, "TESTCMD", Base.JLOptions().julia_bin))
-
-SUITE["load_plot_display"] = @benchmarkable run(`$julia_cmd --startup-file=no --project -e 'using Plots; display(plot(1:0.1:10, sin.(1:0.1:10)))'`)
-SUITE["load"] = @benchmarkable run(`$julia_cmd --startup-file=no --project -e 'using Plots'`)
-SUITE["plot"] = @benchmarkable p = plot(1:0.1:10, sin.(1:0.1:10)) samples=1 evals=1
-SUITE["display"] = @benchmarkable display(p) setup=(p = plot(1:0.1:10, sin.(1:0.1:10))) samples=1 evals=1

codecov.yml

@@ -1,13 +0,0 @@
-github_checks:
-  annotations: false
-
-ignore:
-  - "src/backends/inspectdr.jl"
-  - "src/backends/orca.jl"
-  - "src/backends/pgfplots.jl"
-  - "src/backends/plotly.jl"
-  - "src/backends/plotlyjs.jl"
-  - "src/backends/pyplot.jl"
-  - "src/backends/web.jl"
-  - "src/fileio.jl"
-  - "src/ijulia.jl"

deps/SnoopCompile/precompile/1.6/precompile_Plots.jl

@@ -1,451 +0,0 @@
-# Use
-#    @warnpcfail precompile(args...)
-# if you want to be warned when a precompile directive fails
-macro warnpcfail(ex::Expr)
-    modl = __module__
-    file = __source__.file === nothing ? "?" : String(__source__.file)
-    line = __source__.line
-    quote
-        $(esc(ex)) || @warn """precompile directive
-     $($(Expr(:quote, ex)))
- failed. Please report an issue in $($modl) (after checking for duplicates) or remove this directive.""" _file=$file _line=$line
-    end
-end
-
-
-const __bodyfunction__ = Dict{Method,Any}()
-
-# Find keyword "body functions" (the function that contains the body
-# as written by the developer, called after all missing keyword-arguments
-# have been assigned values), in a manner that doesn't depend on
-# gensymmed names.
-# `mnokw` is the method that gets called when you invoke it without
-# supplying any keywords.
-function __lookup_kwbody__(mnokw::Method)
-    function getsym(arg)
-        isa(arg, Symbol) && return arg
-        @assert isa(arg, GlobalRef)
-        return arg.name
-    end
-
-    f = get(__bodyfunction__, mnokw, nothing)
-    if f === nothing
-        fmod = mnokw.module
-        # The lowered code for `mnokw` should look like
-        #   %1 = mkw(kwvalues..., #self#, args...)
-        #        return %1
-        # where `mkw` is the name of the "active" keyword body-function.
-        ast = Base.uncompressed_ast(mnokw)
-        if isa(ast, Core.CodeInfo) && length(ast.code) >= 2
-            callexpr = ast.code[end-1]
-            if isa(callexpr, Expr) && callexpr.head == :call
-                fsym = callexpr.args[1]
-                if isa(fsym, Symbol)
-                    f = getfield(fmod, fsym)
-                elseif isa(fsym, GlobalRef)
-                    if fsym.mod === Core && fsym.name === :_apply
-                        f = getfield(mnokw.module, getsym(callexpr.args[2]))
-                    elseif fsym.mod === Core && fsym.name === :_apply_iterate
-                        f = getfield(mnokw.module, getsym(callexpr.args[3]))
-                    else
-                        f = getfield(fsym.mod, fsym.name)
-                    end
-                else
-                    f = missing
-                end
-            else
-                f = missing
-            end
-        else
-            f = missing
-        end
-        __bodyfunction__[mnokw] = f
-    end
-    return f
-end
-
-function _precompile_()
-    ccall(:jl_generating_output, Cint, ()) == 1 || return nothing
-    Base.precompile(Tuple{Core.kwftype(typeof(Type)),NamedTuple{(:parent,), Tuple{Subplot{GRBackend}}},Type{Subplot},GRBackend})
-    Base.precompile(Tuple{Core.kwftype(typeof(_make_hist)),NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}},typeof(_make_hist),Tuple{Vector{Float64}, Vector{Float64}},Int64})
-    Base.precompile(Tuple{Core.kwftype(typeof(_make_hist)),NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}},typeof(_make_hist),Tuple{Vector{Float64}, Vector{Float64}},Tuple{Int64, Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(_make_hist)),NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}},typeof(_make_hist),Tuple{Vector{Float64}},Symbol})
-    Base.precompile(Tuple{Core.kwftype(typeof(_make_hist)),NamedTuple{(:normed, :weights), Tuple{Bool, Vector{Int64}}},typeof(_make_hist),Tuple{Vector{Float64}},Symbol})
-    Base.precompile(Tuple{Core.kwftype(typeof(areaplot)),Any,typeof(areaplot),Any,Vararg{Any, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:foreground_color_grid, :grid, :gridalpha, :gridstyle, :gridlinewidth), Tuple{RGBA{Float64}, Bool, Float64, Symbol, Int64}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:formatter,), Tuple{typeof(datetimeformatter)}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:grid, :flip, :minorgrid, :guide), Tuple{Bool, Bool, Bool, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:grid, :lims), Tuple{Bool, Tuple{Float64, Float64}}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:grid, :lims, :flip), Tuple{Bool, Tuple{Float64, Float64}, Bool}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:grid, :minorgrid, :guide), Tuple{Bool, Bool, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:grid, :minorgrid, :mirror, :guide), Tuple{Bool, Bool, Bool, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:guide,), Tuple{String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:guide_position, :guidefontvalign, :mirror, :guide), Tuple{Symbol, Symbol, Bool, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:guidefonthalign, :guide_position, :mirror, :guide), Tuple{Symbol, Symbol, Bool, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:lims, :flip, :ticks, :guide), Tuple{Tuple{Int64, Int64}, Bool, StepRange{Int64, Int64}, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:lims,), Tuple{Tuple{Float64, Float64}}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:lims,), Tuple{Tuple{Int64, Float64}}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:lims,), Tuple{Tuple{Int64, Int64}}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:minorgrid, :scale, :guide), Tuple{Bool, Symbol, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:ticks,), Tuple{Nothing}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:ticks,), Tuple{UnitRange{Int64}}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(default)),NamedTuple{(:shape,), Tuple{Symbol}},typeof(default)})
-    Base.precompile(Tuple{Core.kwftype(typeof(default)),NamedTuple{(:titlefont, :legendfontsize, :guidefont, :tickfont, :guide, :framestyle, :yminorgrid), Tuple{Tuple{Int64, String}, Int64, Tuple{Int64, Symbol}, Tuple{Int64, Symbol}, String, Symbol, Bool}},typeof(default)})
-    Base.precompile(Tuple{Core.kwftype(typeof(font)),NamedTuple{(:family, :pointsize, :halign, :valign, :rotation, :color), Tuple{String, Int64, Symbol, Symbol, Float64, RGBA{Float64}}},typeof(font)})
-    Base.precompile(Tuple{Core.kwftype(typeof(font)),NamedTuple{(:family, :pointsize, :valign, :halign, :rotation, :color), Tuple{String, Int64, Symbol, Symbol, Float64, RGBA{Float64}}},typeof(font)})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),StepRange{Int64, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),UnitRange{Int64},UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),UnitRange{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),Vector{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_set_font)),NamedTuple{(:halign, :valign, :rotation), Tuple{Symbol, Symbol, Int64}},typeof(gr_set_font),Font,Subplot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_set_font)),NamedTuple{(:rotation, :color), Tuple{Int64, RGBA{Float64}}},typeof(gr_set_font),Font,Subplot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :label, :seriestype), Tuple{Float64, String, Symbol}},typeof(plot!),Plot{GRBackend},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :label, :seriestype), Tuple{Float64, String, Symbol}},typeof(plot!),Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :seriestype), Tuple{Float64, Symbol}},typeof(plot!),Plot{GRBackend},Vector{GeometryBasics.Point2{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :seriestype), Tuple{Float64, Symbol}},typeof(plot!),Plot{PlotlyBackend},Vector{GeometryBasics.Point2{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :seriestype), Tuple{Float64, Symbol}},typeof(plot!),Vector{GeometryBasics.Point2{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:annotation,), Tuple{Vector{Tuple{Int64, Float64, Tuple{String, Any, Any, Any}}}}},typeof(plot!)})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:c, :lw, :label), Tuple{Symbol, Int64, String}},typeof(plot!),Plot{GRBackend},Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:c, :lw, :label), Tuple{Symbol, Int64, String}},typeof(plot!),Plot{PlotlyBackend},Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:c, :lw, :label), Tuple{Symbol, Int64, String}},typeof(plot!),Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:layout, :margin), Tuple{Matrix{Any}, AbsoluteLength}},typeof(plot!),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:legend,), Tuple{Bool}},typeof(plot!),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:legend,), Tuple{Bool}},typeof(plot!),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend},Vararg{Plot{PlotlyBackend}, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:legend,), Tuple{Symbol}},typeof(plot!),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:legend,), Tuple{Symbol}},typeof(plot!),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend},Vararg{Plot{PlotlyBackend}, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:line, :seriestype), Tuple{Tuple{Int64, Symbol, Float64, Matrix{Symbol}}, Symbol}},typeof(plot!),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:line, :seriestype), Tuple{Tuple{Int64, Symbol, Float64, Matrix{Symbol}}, Symbol}},typeof(plot!),Plot{GRBackend},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:line, :seriestype), Tuple{Tuple{Int64, Symbol, Float64, Matrix{Symbol}}, Symbol}},typeof(plot!),Plot{PlotlyBackend},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:lw, :color), Tuple{Int64, Symbol}},typeof(plot!),Function,Float64,Irrational{:π}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:lw, :color), Tuple{Int64, Symbol}},typeof(plot!),Plot{GRBackend},Function,Float64,Vararg{Any, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:marker, :series_annotations, :seriestype), Tuple{Tuple{Int64, Float64, Symbol}, Vector{Any}, Symbol}},typeof(plot!),Plot{GRBackend},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:marker, :series_annotations, :seriestype), Tuple{Tuple{Int64, Float64, Symbol}, Vector{Any}, Symbol}},typeof(plot!),Plot{PlotlyBackend},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:marker, :series_annotations, :seriestype), Tuple{Tuple{Int64, Float64, Symbol}, Vector{Any}, Symbol}},typeof(plot!),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:markersize, :c, :seriestype), Tuple{Int64, Symbol, Symbol}},typeof(plot!),Plot{GRBackend},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:markersize, :c, :seriestype), Tuple{Int64, Symbol, Symbol}},typeof(plot!),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype, :inset), Tuple{Symbol, Tuple{Int64, BoundingBox{Tuple{Length{:w, Float64}, Length{:h, Float64}}, Tuple{Length{:w, Float64}, Length{:h, Float64}}}}}},typeof(plot!),Plot{GRBackend},Vector{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype, :inset), Tuple{Symbol, Tuple{Int64, BoundingBox{Tuple{Length{:w, Float64}, Length{:h, Float64}}, Tuple{Length{:w, Float64}, Length{:h, Float64}}}}}},typeof(plot!),Plot{PlotlyBackend},Vector{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype, :inset), Tuple{Symbol, Tuple{Int64, BoundingBox{Tuple{Length{:w, Float64}, Length{:h, Float64}}, Tuple{Length{:w, Float64}, Length{:h, Float64}}}}}},typeof(plot!),Vector{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot!),Plot{GRBackend},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot!),Plot{PlotlyBackend},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot!),Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:title,), Tuple{String}},typeof(plot!),Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:title,), Tuple{String}},typeof(plot!),Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:title,), Tuple{String}},typeof(plot!)})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:w,), Tuple{Int64}},typeof(plot!),Plot{GRBackend},Vector{Float64},Vector{Float64},Vararg{Any, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:xgrid,), Tuple{Tuple{Symbol, Symbol, Int64, Symbol, Float64}}},typeof(plot!),Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:yaxis, :minorgrid), Tuple{Tuple{String, Symbol}, Bool}},typeof(plot!),Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:yaxis, :minorgrid), Tuple{Tuple{String, Symbol}, Bool}},typeof(plot!)})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:zcolor, :m, :ms, :lab, :seriestype), Tuple{Vector{Float64}, Tuple{Symbol, Float64, Stroke}, Vector{Float64}, String, Symbol}},typeof(plot!),Plot{GRBackend},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:zcolor, :m, :ms, :lab, :seriestype), Tuple{Vector{Float64}, Tuple{Symbol, Float64, Stroke}, Vector{Float64}, String, Symbol}},typeof(plot!),Plot{PlotlyBackend},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:zcolor, :m, :ms, :lab, :seriestype), Tuple{Vector{Float64}, Tuple{Symbol, Float64, Stroke}, Vector{Float64}, String, Symbol}},typeof(plot!),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:annotations, :leg), Tuple{Tuple{Int64, Float64, PlotText}, Bool}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:aspect_ratio, :seriestype), Tuple{Int64, Symbol}},typeof(plot),Vector{String},Vector{String},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:bar_width, :alpha, :color, :fillto, :label, :seriestype), Tuple{Float64, Float64, Vector{Symbol}, StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, String, Symbol}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:bins, :weights, :seriestype), Tuple{Symbol, Vector{Int64}, Symbol}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:color, :line, :marker), Tuple{Matrix{Symbol}, Tuple{Symbol, Int64}, Tuple{Matrix{Symbol}, Int64, Float64, Stroke}}},typeof(plot),Vector{Vector{T} where T}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:connections, :title, :xlabel, :ylabel, :zlabel, :legend, :margin, :seriestype), Tuple{Tuple{Vector{Int64}, Vector{Int64}, Vector{Int64}}, String, String, String, String, Symbol, AbsoluteLength, Symbol}},typeof(plot),Vector{Int64},Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:fill, :seriestype), Tuple{Bool, Symbol}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},Function})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:fill_z, :alpha, :label, :bar_width, :seriestype), Tuple{StepRange{Int64, Int64}, Vector{Float64}, String, UnitRange{Int64}, Symbol}},typeof(plot),Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:framestyle, :title, :color, :layout, :label, :markerstrokewidth, :ticks, :seriestype), Tuple{Matrix{Symbol}, Matrix{String}, Base.ReshapedArray{Int64, 2, UnitRange{Int64}, Tuple{}}, Int64, String, Int64, UnitRange{Int64}, Symbol}},typeof(plot),Vector{Vector{Float64}},Vector{Vector{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:grid, :title), Tuple{Tuple{Symbol, Symbol, Symbol, Int64, Float64}, String}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:lab, :w, :palette, :fill, :α), Tuple{String, Int64, PlotUtils.ContinuousColorGradient, Int64, Float64}},typeof(plot),StepRange{Int64, Int64},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:label, :legend, :seriestype), Tuple{String, Symbol, Symbol}},typeof(plot),Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:label, :title, :xlabel, :linewidth, :legend), Tuple{Matrix{String}, String, String, Int64, Symbol}},typeof(plot),Vector{Function},Float64,Float64})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:label,), Tuple{Matrix{String}}},typeof(plot),Vector{AbstractVector{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :group, :linetype, :linecolor), Tuple{Matrix{Any}, Vector{String}, Matrix{Symbol}, Symbol}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :label, :fillrange, :fillalpha), Tuple{Tuple{Int64, Int64}, String, Int64, Float64}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :label, :fillrange, :fillalpha), Tuple{Tuple{Int64, Int64}, String, Int64, Float64}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :link), Tuple{Int64, Symbol}},typeof(plot),Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :link), Tuple{Int64, Symbol}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :margin), Tuple{Matrix{Any}, AbsoluteLength}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :palette, :bg_inside), Tuple{Int64, Matrix{PlotUtils.ContinuousColorGradient}, Matrix{Symbol}}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :t, :leg, :ticks, :border), Tuple{Matrix{Any}, Matrix{Symbol}, Bool, Nothing, Symbol}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :title, :titlelocation, :left_margin, :bottom_margin, :xrotation), Tuple{Matrix{Any}, Matrix{String}, Symbol, Matrix{AbsoluteLength}, AbsoluteLength, Int64}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :xguide, :yguide, :xguidefonthalign, :yguidefontvalign, :xguideposition, :yguideposition, :ymirror, :xmirror, :legend, :seriestype), Tuple{Int64, String, String, Matrix{Symbol}, Matrix{Symbol}, Symbol, Matrix{Symbol}, Matrix{Bool}, Matrix{Bool}, Bool, Matrix{Symbol}}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :xlims), Tuple{Matrix{Any}, Tuple{Int64, Float64}}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout,), Tuple{Tuple{Int64, Int64}}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout,), Tuple{Tuple{Int64, Int64}}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:legend,), Tuple{Bool}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:legend,), Tuple{Bool}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend},Vararg{Plot{PlotlyBackend}, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:legend,), Tuple{Symbol}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:legend,), Tuple{Symbol}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend},Vararg{Plot{PlotlyBackend}, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:legend,), Tuple{Symbol}},typeof(plot),Vector{Tuple{Int64, Real}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line, :lab, :ms), Tuple{Tuple{Matrix{Symbol}, Int64}, Matrix{String}, Int64}},typeof(plot),Vector{Vector{T} where T},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line, :label, :legendtitle), Tuple{Tuple{Int64, Matrix{Symbol}}, Matrix{String}, String}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line, :leg, :fill), Tuple{Int64, Bool, Tuple{Int64, Symbol}}},typeof(plot),Function,Function,Int64,Vararg{Any, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line, :marker, :bg, :fg, :xlim, :ylim, :leg), Tuple{Tuple{Int64, Symbol, Symbol}, Tuple{Shape{Float64, Float64}, Int64, RGBA{Float64}}, Symbol, Symbol, Tuple{Int64, Int64}, Tuple{Int64, Int64}, Bool}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line_z, :linewidth, :legend), Tuple{StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int64, Bool}},typeof(plot),Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:m, :markersize, :lab, :bg, :xlim, :ylim, :seriestype), Tuple{Matrix{Symbol}, Int64, Matrix{String}, Symbol, Tuple{Int64, Int64}, Tuple{Int64, Int64}, Symbol}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:marker,), Tuple{Bool}},typeof(plot),Vector{Union{Missing, Int64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:marker_z, :color, :legend, :seriestype), Tuple{typeof(+), Symbol, Bool, Symbol}},typeof(plot),Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:markershape, :markersize, :marker_z, :line_z, :linewidth), Tuple{Matrix{Symbol}, Matrix{Int64}, Matrix{Int64}, Matrix{Int64}, Matrix{Int64}}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:markershape, :seriestype, :label), Tuple{Symbol, Symbol, String}},typeof(plot),UnitRange{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:nbins, :seriestype), Tuple{Int64, Symbol}},typeof(plot),Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:nbins, :show_empty_bins, :normed, :aspect_ratio, :seriestype), Tuple{Tuple{Int64, Int64}, Bool, Bool, Int64, Symbol}},typeof(plot),Vector{ComplexF64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:proj, :m), Tuple{Symbol, Int64}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:projection, :seriestype), Tuple{Symbol, Symbol}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},UnitRange{Int64},Matrix{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:quiver, :seriestype), Tuple{Tuple{Vector{Float64}, Vector{Float64}, Vector{Float64}}, Symbol}},typeof(plot),Vector{Float64},Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:reg, :fill), Tuple{Bool, Tuple{Int64, Symbol}}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:ribbon,), Tuple{Int64}},typeof(plot),UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:ribbon,), Tuple{StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}}},typeof(plot),UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:ribbon,), Tuple{Tuple{LinRange{Float64}, LinRange{Float64}}}},typeof(plot),UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:ribbon,), Tuple{typeof(sqrt)}},typeof(plot),UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:seriescolor, :fillalpha), Tuple{Matrix{Symbol}, Matrix{Float64}}},typeof(plot),AreaPlot})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:seriestype, :markershape, :markersize, :color), Tuple{Matrix{Symbol}, Vector{Symbol}, Int64, Vector{Symbol}}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot),Vector{DateTime},UnitRange{Int64},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot),Vector{OHLC}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:st, :xlabel, :ylabel, :zlabel), Tuple{Symbol, String, String, String}},typeof(plot),Vector{Float64},Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title, :l, :seriestype), Tuple{String, Float64, Symbol}},typeof(plot),Vector{String},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title, :xflip, :yflip, :zflip, :zlabel, :grid, :ylabel, :minorgrid, :xlabel, :seriestype), Tuple{String, Bool, Bool, Bool, String, Bool, String, Bool, String, Symbol}},typeof(plot),Vector{Float64},Vector{Float64},Function})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title, :xmirror, :ymirror, :zmirror, :zlabel, :grid, :ylabel, :minorgrid, :xlabel, :seriestype), Tuple{String, Bool, Bool, Bool, String, Bool, String, Bool, String, Symbol}},typeof(plot),Vector{Float64},Vector{Float64},Function})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title, :zlabel, :grid, :ylabel, :minorgrid, :xlabel, :seriestype), Tuple{String, String, Bool, String, Bool, String, Symbol}},typeof(plot),Vector{Float64},Vector{Float64},Function})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title,), Tuple{Matrix{String}}},typeof(plot),Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title,), Tuple{Matrix{String}}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:w,), Tuple{Int64}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:xaxis, :background_color, :leg), Tuple{Tuple{String, Tuple{Int64, Int64}, StepRange{Int64, Int64}, Symbol}, RGB{Float64}, Bool}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:zcolor, :m, :leg, :cbar, :w), Tuple{StepRange{Int64, Int64}, Tuple{Int64, Float64, Symbol, Stroke}, Bool, Bool, Int64}},typeof(plot),Vector{Float64},Vector{Float64},UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(portfoliocomposition)),Any,typeof(portfoliocomposition),Any,Vararg{Any, N} where N})
-    Base.precompile(Tuple{Core.kwftype(typeof(scatter!)),Any,typeof(scatter!),Any})
-    Base.precompile(Tuple{Core.kwftype(typeof(test_examples)),NamedTuple{(:skip, :disp), Tuple{Vector{Int64}, Bool}},typeof(test_examples),Symbol})
-    Base.precompile(Tuple{Core.kwftype(typeof(test_examples)),NamedTuple{(:skip,), Tuple{Vector{Int64}}},typeof(test_examples),Symbol})
-    Base.precompile(Tuple{Type{GridLayout},Int64,Vararg{Int64, N} where N})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},AbstractVector{OHLC}})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},PortfolioComposition})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:barbins}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:barhist}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:bar}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:bins2d}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:histogram2d}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:hline}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:hspan}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:lens}},AbstractPlot})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:pie}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:quiver}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:steppre}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:sticks}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:vline}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:vspan}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:xerror}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Vector{ComplexF64}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.add_series!),Plot{GRBackend},DefaultsDict})
-    Base.precompile(Tuple{typeof(RecipesPipeline.add_series!),Plot{PlotlyBackend},DefaultsDict})
-    Base.precompile(Tuple{typeof(RecipesPipeline.plot_setup!),Plot{GRBackend},Dict{Symbol, Any},Vector{Dict{Symbol, Any}}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.plot_setup!),Plot{PlotlyBackend},Dict{Symbol, Any},Vector{Dict{Symbol, Any}}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.preprocess_attributes!),Plot{GRBackend},DefaultsDict})
-    Base.precompile(Tuple{typeof(RecipesPipeline.process_sliced_series_attributes!),Plot{GRBackend},Vector{Dict{Symbol, Any}}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.process_sliced_series_attributes!),Plot{PlotlyBackend},Vector{Dict{Symbol, Any}}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.process_userrecipe!),Plot{GRBackend},Vector{Dict{Symbol, Any}},Dict{Symbol, Any}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.process_userrecipe!),Plot{PlotlyBackend},Vector{Dict{Symbol, Any}},Dict{Symbol, Any}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.unzip),Vector{GeometryBasics.Point2{Float64}}})
-    Base.precompile(Tuple{typeof(_bin_centers),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}})
-    Base.precompile(Tuple{typeof(_bin_centers),Vector{Float64}})
-    Base.precompile(Tuple{typeof(_cbar_unique),Vector{Float64},String})
-    Base.precompile(Tuple{typeof(_cbar_unique),Vector{Int64},String})
-    Base.precompile(Tuple{typeof(_cbar_unique),Vector{Nothing},String})
-    Base.precompile(Tuple{typeof(_cbar_unique),Vector{PlotUtils.ContinuousColorGradient},String})
-    Base.precompile(Tuple{typeof(_cbar_unique),Vector{StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}},String})
-    Base.precompile(Tuple{typeof(_cbar_unique),Vector{Symbol},String})
-    Base.precompile(Tuple{typeof(_cycle),UnitRange{Int64},Vector{Int64}})
-    Base.precompile(Tuple{typeof(_cycle),Vector{Float64},StepRange{Int64, Int64}})
-    Base.precompile(Tuple{typeof(_cycle),Vector{Int64},StepRange{Int64, Int64}})
-    Base.precompile(Tuple{typeof(_cycle),Vector{Int64},UnitRange{Int64}})
-    Base.precompile(Tuple{typeof(_do_plot_show),Plot{GRBackend},Bool})
-    Base.precompile(Tuple{typeof(_do_plot_show),Plot{PlotlyBackend},Bool})
-    Base.precompile(Tuple{typeof(_heatmap_edges),Vector{Float64},Bool,Bool})
-    Base.precompile(Tuple{typeof(_plot!),Plot,Any,Any})
-    Base.precompile(Tuple{typeof(_preprocess_barlike),DefaultsDict,Base.OneTo{Int64},Vector{Float64}})
-    Base.precompile(Tuple{typeof(_preprocess_binlike),DefaultsDict,StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},Vector{Float64}})
-    Base.precompile(Tuple{typeof(_update_min_padding!),GridLayout})
-    Base.precompile(Tuple{typeof(_update_subplot_args),Plot{GRBackend},Subplot{GRBackend},Dict{Symbol, Any},Int64,Bool})
-    Base.precompile(Tuple{typeof(_update_subplot_args),Plot{PlotlyBackend},Subplot{PlotlyBackend},Dict{Symbol, Any},Int64,Bool})
-    Base.precompile(Tuple{typeof(_update_subplot_periphery),Subplot{GRBackend},Vector{Any}})
-    Base.precompile(Tuple{typeof(_update_subplot_periphery),Subplot{PlotlyBackend},Vector{Any}})
-    Base.precompile(Tuple{typeof(axis_limits),Subplot{GRBackend},Symbol,Bool,Bool})
-    Base.precompile(Tuple{typeof(axis_limits),Subplot{PlotlyBackend},Symbol,Bool,Bool})
-    Base.precompile(Tuple{typeof(backend),PlotlyBackend})
-    Base.precompile(Tuple{typeof(bbox),AbsoluteLength,AbsoluteLength,AbsoluteLength,AbsoluteLength})
-    Base.precompile(Tuple{typeof(bbox),Float64,Float64,Float64,Float64})
-    Base.precompile(Tuple{typeof(build_layout),GridLayout,Int64,Vector{Plot}})
-    Base.precompile(Tuple{typeof(convert_to_polar),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},Vector{Float64},Tuple{Int64, Float64}})
-    Base.precompile(Tuple{typeof(default),Symbol,Bool})
-    Base.precompile(Tuple{typeof(error_coords),Vector{Float64},Vector{Float64},Vector{Float64},Vararg{Vector{Float64}, N} where N})
-    Base.precompile(Tuple{typeof(error_coords),Vector{Float64},Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{typeof(error_zipit),Tuple{Vector{Float64}, Vector{Float64}, Vector{Float64}}})
-    Base.precompile(Tuple{typeof(fakedata),Int64,Int64})
-    Base.precompile(Tuple{typeof(fakedata),MersenneTwister,Int64,Vararg{Int64, N} where N})
-    Base.precompile(Tuple{typeof(get_minor_ticks),Subplot{GRBackend},Axis,Tuple{Vector{Float64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(get_minor_ticks),Subplot{GRBackend},Axis,Tuple{Vector{Int64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(get_series_color),SubArray{Symbol, 1, Vector{Symbol}, Tuple{UnitRange{Int64}}, true},Subplot{GRBackend},Int64,Symbol})
-    Base.precompile(Tuple{typeof(get_series_color),Vector{Symbol},Subplot{GRBackend},Int64,Symbol})
-    Base.precompile(Tuple{typeof(get_series_color),Vector{Symbol},Subplot{PlotlyBackend},Int64,Symbol})
-    Base.precompile(Tuple{typeof(get_ticks),StepRange{Int64, Int64},Vector{Float64},Vector{Any},Tuple{Int64, Int64},Vararg{Any, N} where N})
-    Base.precompile(Tuple{typeof(get_ticks),Symbol,Vector{Float64},Vector{Any},Tuple{Float64, Float64},Vararg{Any, N} where N})
-    Base.precompile(Tuple{typeof(get_ticks),Symbol,Vector{Float64},Vector{Any},Tuple{Int64, Float64},Vararg{Any, N} where N})
-    Base.precompile(Tuple{typeof(get_ticks),Symbol,Vector{Float64},Vector{Any},Tuple{Int64, Int64},Vararg{Any, N} where N})
-    Base.precompile(Tuple{typeof(get_ticks),UnitRange{Int64},Vector{Float64},Vector{Any},Tuple{Float64, Float64},Vararg{Any, N} where N})
-    Base.precompile(Tuple{typeof(get_xy),Vector{OHLC}})
-    Base.precompile(Tuple{typeof(gr_add_legend),Subplot{GRBackend},NamedTuple{(:w, :h, :dy, :leftw, :textw, :rightw, :xoffset, :yoffset, :width_factor), NTuple{9, Float64}},Vector{Float64}})
-    Base.precompile(Tuple{typeof(gr_add_legend),Subplot{GRBackend},NamedTuple{(:w, :h, :dy, :leftw, :textw, :rightw, :xoffset, :yoffset, :width_factor), Tuple{Int64, Int64, Int64, Float64, Int64, Float64, Float64, Float64, Float64}},Vector{Float64}})
-    Base.precompile(Tuple{typeof(gr_display),Subplot{GRBackend},AbsoluteLength,AbsoluteLength,Vector{Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_contour),Series,StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},Matrix{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_heatmap),Series,Vector{Float64},Vector{Float64},Matrix{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Float64,Float64,Tuple{Float64, Float64},Int64,Float64,Float64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Float64,Float64,Tuple{Float64, Float64},Int64,Int64,Int64,Shape{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Float64,Float64,Tuple{Float64, Float64},Int64,Int64,Int64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Int64,Float64,Tuple{Float64, Float64},Int64,Float64,Int64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Int64,Float64,Tuple{Float64, Float64},Int64,Int64,Int64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Int64,Int64,Tuple{Float64, Float64},Int64,Int64,Int64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_markers),Series,Base.OneTo{Int64},Vector{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_markers),Series,StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},Vector{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,Base.OneTo{Int64},UnitRange{Int64},Tuple{Vector{Float64}, Vector{Float64}},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,Base.OneTo{Int64},Vector{Float64},Int64,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,StepRange{Int64, Int64},Vector{Float64},Int64,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,UnitRange{Int64},Vector{Float64},Int64,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,UnitRange{Int64},Vector{Float64},Vector{Int64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,Vector{Float64},Vector{Float64},Int64,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_surface),Series,Vector{Float64},Vector{Float64},Matrix{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_surface),Series,Vector{Float64},Vector{Float64},Vector{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_fill_viewport),Vector{Float64},RGBA{Float64}})
-    Base.precompile(Tuple{typeof(gr_get_3d_axis_angle),Vector{Float64},Float64,Float64,Symbol})
-    Base.precompile(Tuple{typeof(gr_get_ticks_size),Tuple{Vector{Float64}, Vector{String}},Int64})
-    Base.precompile(Tuple{typeof(gr_label_ticks),Subplot{GRBackend},Symbol,Tuple{Vector{Float64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(gr_label_ticks),Subplot{GRBackend},Symbol,Tuple{Vector{Int64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(gr_label_ticks_3d),Subplot{GRBackend},Symbol,Tuple{Vector{Float64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(gr_polaraxes),Int64,Float64,Subplot{GRBackend}})
-    Base.precompile(Tuple{typeof(gr_polyline),Vector{Float64},Vector{Float64},Function})
-    Base.precompile(Tuple{typeof(gr_set_gradient),PlotUtils.ContinuousColorGradient})
-    Base.precompile(Tuple{typeof(gr_text),Float64,Float64,String})
-    Base.precompile(Tuple{typeof(gr_text_size),String})
-    Base.precompile(Tuple{typeof(gr_update_viewport_legend!),Vector{Float64},Subplot{GRBackend},NamedTuple{(:w, :h, :dy, :leftw, :textw, :rightw, :xoffset, :yoffset, :width_factor), NTuple{9, Float64}}})
-    Base.precompile(Tuple{typeof(gr_update_viewport_legend!),Vector{Float64},Subplot{GRBackend},NamedTuple{(:w, :h, :dy, :leftw, :textw, :rightw, :xoffset, :yoffset, :width_factor), Tuple{Int64, Int64, Int64, Float64, Int64, Float64, Float64, Float64, Float64}}})
-    Base.precompile(Tuple{typeof(gr_viewport_from_bbox),Subplot{GRBackend},BoundingBox{Tuple{AbsoluteLength, AbsoluteLength}, Tuple{AbsoluteLength, AbsoluteLength}},AbsoluteLength,AbsoluteLength,Vector{Float64}})
-    Base.precompile(Tuple{typeof(heatmap_edges),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}},Symbol})
-    Base.precompile(Tuple{typeof(heatmap_edges),UnitRange{Int64},Symbol})
-    Base.precompile(Tuple{typeof(heatmap_edges),Vector{Float64},Symbol})
-    Base.precompile(Tuple{typeof(ignorenan_minimum),Vector{Int64}})
-    Base.precompile(Tuple{typeof(layout_args),NamedTuple{(:label, :blank), Tuple{Symbol, Bool}}})
-    Base.precompile(Tuple{typeof(layout_args),NamedTuple{(:label, :width, :height), Tuple{Symbol, Symbol, Float64}}})
-    Base.precompile(Tuple{typeof(make_fillrange_side),UnitRange{Int64},LinRange{Float64}})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),Nothing,Tuple{Float64, Float64},Symbol,Function})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),Nothing,Tuple{Float64, Float64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),Nothing,Tuple{Int64, Float64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),Nothing,Tuple{Int64, Int64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),StepRange{Int64, Int64},Tuple{Int64, Int64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),UnitRange{Int64},Tuple{Float64, Float64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(partialcircle),Int64,Float64,Int64})
-    Base.precompile(Tuple{typeof(plot!),Any})
-    Base.precompile(Tuple{typeof(plot!),Plot,Plot,Plot,Vararg{Plot, N} where N})
-    Base.precompile(Tuple{typeof(plot),Any,Any})
-    Base.precompile(Tuple{typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}, N} where N})
-    Base.precompile(Tuple{typeof(plot),Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{typeof(plot),Plot{GRBackend}})
-    Base.precompile(Tuple{typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend},Vararg{Plot{PlotlyBackend}, N} where N})
-    Base.precompile(Tuple{typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{typeof(processGridArg!),Dict{Symbol, Any},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(processLineArg),Dict{Symbol, Any},Matrix{Symbol}})
-    Base.precompile(Tuple{typeof(processLineArg),Dict{Symbol, Any},Symbol})
-    Base.precompile(Tuple{typeof(processMarkerArg),Dict{Symbol, Any},Matrix{Symbol}})
-    Base.precompile(Tuple{typeof(processMarkerArg),Dict{Symbol, Any},RGBA{Float64}})
-    Base.precompile(Tuple{typeof(processMarkerArg),Dict{Symbol, Any},Shape{Float64, Float64}})
-    Base.precompile(Tuple{typeof(processMarkerArg),Dict{Symbol, Any},Symbol})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{GRBackend},Int64,Float64,PlotText})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{GRBackend},Int64,Float64,Tuple{String, Int64, Symbol, Symbol}})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{GRBackend},Int64,Float64,Tuple{String, Symbol, Int64, String}})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{PlotlyBackend},Int64,Float64,PlotText})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{PlotlyBackend},Int64,Float64,Tuple{String, Int64, Symbol, Symbol}})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{PlotlyBackend},Int64,Float64,Tuple{String, Symbol, Int64, String}})
-    Base.precompile(Tuple{typeof(process_axis_arg!),Dict{Symbol, Any},StepRange{Int64, Int64},Symbol})
-    Base.precompile(Tuple{typeof(process_axis_arg!),Dict{Symbol, Any},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(push!),Plot{GRBackend},Float64,Vector{Float64}})
-    Base.precompile(Tuple{typeof(push!),Segments{Tuple{Float64, Float64, Float64}},Tuple{Int64, Int64, Float64},Tuple{Int64, Int64, Float64}})
-    Base.precompile(Tuple{typeof(resetfontsizes)})
-    Base.precompile(Tuple{typeof(scalefontsizes),Float64})
-    Base.precompile(Tuple{typeof(series_annotations),Vector{Any}})
-    Base.precompile(Tuple{typeof(slice_arg),Base.ReshapedArray{Int64, 2, UnitRange{Int64}, Tuple{}},Int64})
-    Base.precompile(Tuple{typeof(slice_arg),Matrix{AbsoluteLength},Int64})
-    Base.precompile(Tuple{typeof(slice_arg),Matrix{Bool},Int64})
-    Base.precompile(Tuple{typeof(slice_arg),Matrix{Int64},Int64})
-    Base.precompile(Tuple{typeof(slice_arg),Matrix{RGBA{Float64}},Int64})
-    Base.precompile(Tuple{typeof(spy),Any})
-    Base.precompile(Tuple{typeof(straightline_data),Tuple{Float64, Float64},Tuple{Float64, Float64},Vector{Float64},Vector{Float64},Int64})
-    Base.precompile(Tuple{typeof(stroke),Int64,Vararg{Any, N} where N})
-    Base.precompile(Tuple{typeof(title!),AbstractString})
-    Base.precompile(Tuple{typeof(vline!),Any})
-    Base.precompile(Tuple{typeof(warn_on_attr_dim_mismatch),Series,Vector{Float64},Vector{Float64},Nothing,Base.Iterators.Flatten{Vector{Tuple{SeriesSegment}}}})
-    Base.precompile(Tuple{typeof(xgrid!),Plot{GRBackend},Symbol,Vararg{Any, N} where N})
-    Base.precompile(Tuple{typeof(xlims),Subplot{PlotlyBackend}})
-    isdefined(Plots, Symbol("#166#167")) && Base.precompile(Tuple{getfield(Plots, Symbol("#166#167")),Any})
-    isdefined(Plots, Symbol("#2#6")) && Base.precompile(Tuple{getfield(Plots, Symbol("#2#6")),UnitRange{Int64}})
-    isdefined(Plots, Symbol("#295#331")) && Base.precompile(Tuple{getfield(Plots, Symbol("#295#331"))})
-    isdefined(Plots, Symbol("#316#352")) && Base.precompile(Tuple{getfield(Plots, Symbol("#316#352"))})
-    isdefined(Plots, Symbol("#add_major_or_minor_segments#100")) && Base.precompile(Tuple{getfield(Plots, Symbol("#add_major_or_minor_segments#100")),Vector{Float64},Bool,Segments{Tuple{Float64, Float64}},Float64,Bool})
-    isdefined(Plots, Symbol("#add_major_or_minor_segments#101")) && Base.precompile(Tuple{getfield(Plots, Symbol("#add_major_or_minor_segments#101")),Vector{Float64},Bool,Segments{Tuple{Float64, Float64, Float64}},Float64,Bool})
-    let fbody = try __lookup_kwbody__(which(font, (Font,Vararg{Any, N} where N,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Base.Iterators.Pairs{Union{}, Union{}, Tuple{}, NamedTuple{(), Tuple{}}},typeof(font),Font,Vararg{Any, N} where N,))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(gr_polyline, (Vector{Float64},Vector{Float64},typeof(GR.fillarea),))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Symbol,Symbol,typeof(gr_polyline),Vector{Float64},Vector{Float64},typeof(GR.fillarea),))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(gr_set_font, (Font,Subplot{GRBackend},))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Symbol,Symbol,RGBA{Float64},Float64,typeof(gr_set_font),Font,Subplot{GRBackend},))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(plot!, (Any,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Any,typeof(plot!),Any,))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(plot!, (Any,Vararg{Any, N} where N,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Any,typeof(plot!),Any,Vararg{Any, N} where N,))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(plot!, (Plot,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Any,typeof(plot!),Plot,))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(plot!, (Plot,Plot,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Any,typeof(plot!),Plot,Plot,))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(plot!, (Plot,Plot,Plot,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Any,typeof(plot!),Plot,Plot,Plot,))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(plot!, (Plot,Plot,Plot,Vararg{Plot, N} where N,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Any,typeof(plot!),Plot,Plot,Plot,Vararg{Plot, N} where N,))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(plot, (Any,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Any,typeof(plot),Any,))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(plot, (Any,Vararg{Any, N} where N,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Any,typeof(plot),Any,Vararg{Any, N} where N,))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(scatter, (Any,Vararg{Any, N} where N,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Any,typeof(scatter),Any,Vararg{Any, N} where N,))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(title!, (AbstractString,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Any,typeof(title!),AbstractString,))
-    end
-end
-end

deps/SnoopCompile/precompile/1.7/precompile_Plots.jl

@@ -1,487 +0,0 @@
-# Use
-#    @warnpcfail precompile(args...)
-# if you want to be warned when a precompile directive fails
-macro warnpcfail(ex::Expr)
-    modl = __module__
-    file = __source__.file === nothing ? "?" : String(__source__.file)
-    line = __source__.line
-    quote
-        $(esc(ex)) || @warn """precompile directive
-     $($(Expr(:quote, ex)))
- failed. Please report an issue in $($modl) (after checking for duplicates) or remove this directive.""" _file=$file _line=$line
-    end
-end
-
-
-const __bodyfunction__ = Dict{Method,Any}()
-
-# Find keyword "body functions" (the function that contains the body
-# as written by the developer, called after all missing keyword-arguments
-# have been assigned values), in a manner that doesn't depend on
-# gensymmed names.
-# `mnokw` is the method that gets called when you invoke it without
-# supplying any keywords.
-function __lookup_kwbody__(mnokw::Method)
-    function getsym(arg)
-        isa(arg, Symbol) && return arg
-        @assert isa(arg, GlobalRef)
-        return arg.name
-    end
-
-    f = get(__bodyfunction__, mnokw, nothing)
-    if f === nothing
-        fmod = mnokw.module
-        # The lowered code for `mnokw` should look like
-        #   %1 = mkw(kwvalues..., #self#, args...)
-        #        return %1
-        # where `mkw` is the name of the "active" keyword body-function.
-        ast = Base.uncompressed_ast(mnokw)
-        if isa(ast, Core.CodeInfo) && length(ast.code) >= 2
-            callexpr = ast.code[end-1]
-            if isa(callexpr, Expr) && callexpr.head == :call
-                fsym = callexpr.args[1]
-                if isa(fsym, Symbol)
-                    f = getfield(fmod, fsym)
-                elseif isa(fsym, GlobalRef)
-                    if fsym.mod === Core && fsym.name === :_apply
-                        f = getfield(mnokw.module, getsym(callexpr.args[2]))
-                    elseif fsym.mod === Core && fsym.name === :_apply_iterate
-                        f = getfield(mnokw.module, getsym(callexpr.args[3]))
-                    else
-                        f = getfield(fsym.mod, fsym.name)
-                    end
-                else
-                    f = missing
-                end
-            else
-                f = missing
-            end
-        else
-            f = missing
-        end
-        __bodyfunction__[mnokw] = f
-    end
-    return f
-end
-
-function _precompile_()
-    ccall(:jl_generating_output, Cint, ()) == 1 || return nothing
-    Base.precompile(Tuple{Core.kwftype(typeof(Type)),NamedTuple{(:parent,), Tuple{GridLayout}},Type{Subplot},GRBackend})
-    Base.precompile(Tuple{Core.kwftype(typeof(Type)),NamedTuple{(:parent,), Tuple{GridLayout}},Type{Subplot},PlotlyBackend})
-    Base.precompile(Tuple{Core.kwftype(typeof(Type)),NamedTuple{(:parent,), Tuple{Subplot{GRBackend}}},Type{Subplot},GRBackend})
-    Base.precompile(Tuple{Core.kwftype(typeof(Type)),NamedTuple{(:parent,), Tuple{Subplot{PlotlyBackend}}},Type{Subplot},PlotlyBackend})
-    Base.precompile(Tuple{Core.kwftype(typeof(_make_hist)),NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}},typeof(_make_hist),Tuple{Vector{Float64}, Vector{Float64}},Int64})
-    Base.precompile(Tuple{Core.kwftype(typeof(_make_hist)),NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}},typeof(_make_hist),Tuple{Vector{Float64}, Vector{Float64}},Tuple{Int64, Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(_make_hist)),NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}},typeof(_make_hist),Tuple{Vector{Float64}},Symbol})
-    Base.precompile(Tuple{Core.kwftype(typeof(_make_hist)),NamedTuple{(:normed, :weights), Tuple{Bool, Vector{Int64}}},typeof(_make_hist),Tuple{Vector{Float64}},Symbol})
-    Base.precompile(Tuple{Core.kwftype(typeof(areaplot)),Any,typeof(areaplot),Any,Vararg{Any}})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:flip,), Tuple{Bool}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:foreground_color_grid, :grid, :gridalpha, :gridstyle, :gridlinewidth), Tuple{RGBA{Float64}, Bool, Float64, Symbol, Int64}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:formatter,), Tuple{Symbol}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:formatter,), Tuple{typeof(datetimeformatter)}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:grid, :flip, :minorgrid, :guide), Tuple{Bool, Bool, Bool, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:grid, :lims), Tuple{Bool, Tuple{Float64, Float64}}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:grid, :lims, :flip), Tuple{Bool, Tuple{Float64, Float64}, Bool}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:grid, :minorgrid, :guide), Tuple{Bool, Bool, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:grid, :minorgrid, :mirror, :guide), Tuple{Bool, Bool, Bool, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:grid,), Tuple{Bool}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:guide,), Tuple{String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:guide_position, :guidefontvalign, :mirror, :guide), Tuple{Symbol, Symbol, Bool, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:guidefonthalign, :guide_position, :mirror, :guide), Tuple{Symbol, Symbol, Bool, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:lims, :flip, :ticks, :guide), Tuple{Tuple{Int64, Int64}, Bool, StepRange{Int64, Int64}, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:lims,), Tuple{Tuple{Float64, Float64}}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:lims,), Tuple{Tuple{Int64, Float64}}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:lims,), Tuple{Tuple{Int64, Int64}}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:minorgrid, :scale, :guide), Tuple{Bool, Symbol, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:minorgrid,), Tuple{Bool}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:rotation,), Tuple{Int64}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:ticks,), Tuple{Nothing}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:ticks,), Tuple{UnitRange{Int64}}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(default)),NamedTuple{(:shape,), Tuple{Symbol}},typeof(default)})
-    Base.precompile(Tuple{Core.kwftype(typeof(default)),NamedTuple{(:titlefont, :legendfontsize, :guidefont, :tickfont, :guide, :framestyle, :yminorgrid), Tuple{Tuple{Int64, String}, Int64, Tuple{Int64, Symbol}, Tuple{Int64, Symbol}, String, Symbol, Bool}},typeof(default)})
-    Base.precompile(Tuple{Core.kwftype(typeof(font)),NamedTuple{(:family, :pointsize, :halign, :valign, :rotation, :color), Tuple{String, Int64, Symbol, Symbol, Float64, RGBA{Float64}}},typeof(font)})
-    Base.precompile(Tuple{Core.kwftype(typeof(font)),NamedTuple{(:family, :pointsize, :valign, :halign, :rotation, :color), Tuple{String, Int64, Symbol, Symbol, Float64, RGBA{Float64}}},typeof(font)})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),StepRange{Int64, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),UnitRange{Int64},UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),UnitRange{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),Vector{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_set_font)),NamedTuple{(:halign, :valign, :rotation), Tuple{Symbol, Symbol, Int64}},typeof(gr_set_font),Font,Subplot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_set_font)),NamedTuple{(:rotation, :color), Tuple{Int64, RGBA{Float64}}},typeof(gr_set_font),Font,Subplot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(lens!)),Any,typeof(lens!),Any,Vararg{Any}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :label, :seriestype), Tuple{Float64, String, Symbol}},typeof(plot!),Plot{GRBackend},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :label, :seriestype), Tuple{Float64, String, Symbol}},typeof(plot!),Plot{PlotlyBackend},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :label, :seriestype), Tuple{Float64, String, Symbol}},typeof(plot!),Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :seriestype), Tuple{Float64, Symbol}},typeof(plot!),Plot{GRBackend},Vector{GeometryBasics.Point2{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :seriestype), Tuple{Float64, Symbol}},typeof(plot!),Plot{PlotlyBackend},Vector{GeometryBasics.Point2{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :seriestype), Tuple{Float64, Symbol}},typeof(plot!),Vector{GeometryBasics.Point2{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:annotation,), Tuple{Vector{Tuple{Int64, Float64, Tuple{String, Any, Any, Any}}}}},typeof(plot!)})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:c, :lw, :label), Tuple{Symbol, Int64, String}},typeof(plot!),Plot{GRBackend},Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:c, :lw, :label), Tuple{Symbol, Int64, String}},typeof(plot!),Plot{PlotlyBackend},Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:c, :lw, :label), Tuple{Symbol, Int64, String}},typeof(plot!),Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:layout, :margin), Tuple{Matrix{Any}, AbsoluteLength}},typeof(plot!),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:legend,), Tuple{Bool}},typeof(plot!),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:legend,), Tuple{Bool}},typeof(plot!),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend},Vararg{Plot{PlotlyBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:legend,), Tuple{Symbol}},typeof(plot!),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:legend,), Tuple{Symbol}},typeof(plot!),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend},Vararg{Plot{PlotlyBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:line, :seriestype), Tuple{Tuple{Int64, Symbol, Float64, Matrix{Symbol}}, Symbol}},typeof(plot!),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:line, :seriestype), Tuple{Tuple{Int64, Symbol, Float64, Matrix{Symbol}}, Symbol}},typeof(plot!),Plot{GRBackend},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:line, :seriestype), Tuple{Tuple{Int64, Symbol, Float64, Matrix{Symbol}}, Symbol}},typeof(plot!),Plot{PlotlyBackend},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:lw, :color), Tuple{Int64, Symbol}},typeof(plot!),Function,Float64,Irrational{:π}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:lw, :color), Tuple{Int64, Symbol}},typeof(plot!),Plot{GRBackend},Function,Float64,Vararg{Any}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:marker, :series_annotations, :seriestype), Tuple{Tuple{Int64, Float64, Symbol}, Vector{Any}, Symbol}},typeof(plot!),Plot{GRBackend},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:marker, :series_annotations, :seriestype), Tuple{Tuple{Int64, Float64, Symbol}, Vector{Any}, Symbol}},typeof(plot!),Plot{PlotlyBackend},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:marker, :series_annotations, :seriestype), Tuple{Tuple{Int64, Float64, Symbol}, Vector{Any}, Symbol}},typeof(plot!),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:markersize, :c, :seriestype), Tuple{Int64, Symbol, Symbol}},typeof(plot!),Plot{GRBackend},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:markersize, :c, :seriestype), Tuple{Int64, Symbol, Symbol}},typeof(plot!),Plot{PlotlyBackend},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:markersize, :c, :seriestype), Tuple{Int64, Symbol, Symbol}},typeof(plot!),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype, :inset), Tuple{Symbol, Tuple{Int64, BoundingBox{Tuple{Length{:w, Float64}, Length{:h, Float64}}, Tuple{Length{:w, Float64}, Length{:h, Float64}}}}}},typeof(plot!),Plot{GRBackend},Vector{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype, :inset), Tuple{Symbol, Tuple{Int64, BoundingBox{Tuple{Length{:w, Float64}, Length{:h, Float64}}, Tuple{Length{:w, Float64}, Length{:h, Float64}}}}}},typeof(plot!),Plot{PlotlyBackend},Vector{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype, :inset), Tuple{Symbol, Tuple{Int64, BoundingBox{Tuple{Length{:w, Float64}, Length{:h, Float64}}, Tuple{Length{:w, Float64}, Length{:h, Float64}}}}}},typeof(plot!),Vector{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot!),Plot{GRBackend},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot!),Plot{PlotlyBackend},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot!),Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:title,), Tuple{String}},typeof(plot!),Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:title,), Tuple{String}},typeof(plot!),Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:title,), Tuple{String}},typeof(plot!)})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:w,), Tuple{Int64}},typeof(plot!),Plot{GRBackend},Vector{Float64},Vector{Float64},Vararg{Any}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:xgrid,), Tuple{Tuple{Symbol, Symbol, Int64, Symbol, Float64}}},typeof(plot!),Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:yaxis, :minorgrid), Tuple{Tuple{String, Symbol}, Bool}},typeof(plot!),Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:yaxis, :minorgrid), Tuple{Tuple{String, Symbol}, Bool}},typeof(plot!)})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:zcolor, :m, :ms, :lab, :seriestype), Tuple{Vector{Float64}, Tuple{Symbol, Float64, Stroke}, Vector{Float64}, String, Symbol}},typeof(plot!),Plot{GRBackend},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:zcolor, :m, :ms, :lab, :seriestype), Tuple{Vector{Float64}, Tuple{Symbol, Float64, Stroke}, Vector{Float64}, String, Symbol}},typeof(plot!),Plot{PlotlyBackend},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:zcolor, :m, :ms, :lab, :seriestype), Tuple{Vector{Float64}, Tuple{Symbol, Float64, Stroke}, Vector{Float64}, String, Symbol}},typeof(plot!),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:annotations, :leg), Tuple{Tuple{Int64, Float64, PlotText}, Bool}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:arrow,), Tuple{Int64}},typeof(plot),Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:aspect_ratio, :seriestype), Tuple{Int64, Symbol}},typeof(plot),Vector{String},Vector{String},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:bar_width, :alpha, :color, :fillto, :label, :seriestype), Tuple{Float64, Float64, Vector{Symbol}, StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64}, String, Symbol}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:bins, :weights, :seriestype), Tuple{Symbol, Vector{Int64}, Symbol}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:color, :line, :marker), Tuple{Matrix{Symbol}, Tuple{Symbol, Int64}, Tuple{Matrix{Symbol}, Int64, Float64, Stroke}}},typeof(plot),Vector{Vector}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:connections, :title, :xlabel, :ylabel, :zlabel, :legend, :margin, :seriestype), Tuple{Tuple{Vector{Int64}, Vector{Int64}, Vector{Int64}}, String, String, String, String, Symbol, AbsoluteLength, Symbol}},typeof(plot),Vector{Int64},Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:fill, :seriestype), Tuple{Bool, Symbol}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Function})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:fill_z, :alpha, :label, :bar_width, :seriestype), Tuple{StepRange{Int64, Int64}, Vector{Float64}, String, UnitRange{Int64}, Symbol}},typeof(plot),Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:framestyle, :title, :color, :layout, :label, :markerstrokewidth, :ticks, :seriestype), Tuple{Matrix{Symbol}, Matrix{String}, Base.ReshapedArray{Int64, 2, UnitRange{Int64}, Tuple{}}, Int64, String, Int64, UnitRange{Int64}, Symbol}},typeof(plot),Vector{Vector{Float64}},Vector{Vector{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:grid, :title), Tuple{Tuple{Symbol, Symbol, Symbol, Int64, Float64}, String}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:lab, :w, :palette, :fill, :α), Tuple{String, Int64, PlotUtils.ContinuousColorGradient, Int64, Float64}},typeof(plot),StepRange{Int64, Int64},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:label, :legend, :seriestype), Tuple{String, Symbol, Symbol}},typeof(plot),Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:label, :title, :xlabel, :linewidth, :legend), Tuple{Matrix{String}, String, String, Int64, Symbol}},typeof(plot),Vector{Function},Float64,Float64})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:label,), Tuple{Matrix{String}}},typeof(plot),Vector{AbstractVector{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:labels,), Tuple{Matrix{String}}},typeof(plot),PortfolioComposition})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :group, :linetype, :linecolor), Tuple{Matrix{Any}, Vector{String}, Matrix{Symbol}, Symbol}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :label, :fillrange, :fillalpha), Tuple{Tuple{Int64, Int64}, String, Int64, Float64}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :label, :fillrange, :fillalpha), Tuple{Tuple{Int64, Int64}, String, Int64, Float64}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :link), Tuple{Int64, Symbol}},typeof(plot),Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :link), Tuple{Int64, Symbol}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :margin), Tuple{Matrix{Any}, AbsoluteLength}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :palette, :bg_inside), Tuple{Int64, Matrix{PlotUtils.ContinuousColorGradient}, Matrix{Symbol}}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :t, :leg, :ticks, :border), Tuple{Matrix{Any}, Matrix{Symbol}, Bool, Nothing, Symbol}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :title, :titlelocation, :left_margin, :bottom_margin, :xrotation), Tuple{Matrix{Any}, Matrix{String}, Symbol, Matrix{AbsoluteLength}, AbsoluteLength, Int64}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :xguide, :yguide, :xguidefonthalign, :yguidefontvalign, :xguideposition, :yguideposition, :ymirror, :xmirror, :legend, :seriestype), Tuple{Int64, String, String, Matrix{Symbol}, Matrix{Symbol}, Symbol, Matrix{Symbol}, Matrix{Bool}, Matrix{Bool}, Bool, Matrix{Symbol}}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :xlims), Tuple{Matrix{Any}, Tuple{Int64, Float64}}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout,), Tuple{Tuple{Int64, Int64}}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout,), Tuple{Tuple{Int64, Int64}}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:legend,), Tuple{Bool}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:legend,), Tuple{Bool}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend},Vararg{Plot{PlotlyBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:legend,), Tuple{Symbol}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:legend,), Tuple{Symbol}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend},Vararg{Plot{PlotlyBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:legend,), Tuple{Symbol}},typeof(plot),Vector{Tuple{Int64, Real}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line, :lab, :ms), Tuple{Tuple{Matrix{Symbol}, Int64}, Matrix{String}, Int64}},typeof(plot),Vector{Vector},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line, :label, :legendtitle), Tuple{Tuple{Int64, Matrix{Symbol}}, Matrix{String}, String}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line, :leg, :fill), Tuple{Int64, Bool, Tuple{Int64, Symbol}}},typeof(plot),Function,Function,Int64,Vararg{Any}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line, :marker, :bg, :fg, :xlim, :ylim, :leg), Tuple{Tuple{Int64, Symbol, Symbol}, Tuple{Shape{Float64, Float64}, Int64, RGBA{Float64}}, Symbol, Symbol, Tuple{Int64, Int64}, Tuple{Int64, Int64}, Bool}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line_z, :linewidth, :legend), Tuple{StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64}, Int64, Bool}},typeof(plot),Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:m, :markersize, :lab, :bg, :xlim, :ylim, :seriestype), Tuple{Matrix{Symbol}, Int64, Matrix{String}, Symbol, Tuple{Int64, Int64}, Tuple{Int64, Int64}, Symbol}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:marker,), Tuple{Bool}},typeof(plot),Vector{Union{Missing, Int64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:marker_z, :color, :legend, :seriestype), Tuple{typeof(+), Symbol, Bool, Symbol}},typeof(plot),Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:markershape, :markersize, :marker_z, :line_z, :linewidth), Tuple{Matrix{Symbol}, Matrix{Int64}, Matrix{Int64}, Matrix{Int64}, Matrix{Int64}}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:markershape, :seriestype, :label), Tuple{Symbol, Symbol, String}},typeof(plot),UnitRange{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:nbins, :seriestype), Tuple{Int64, Symbol}},typeof(plot),Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:nbins, :show_empty_bins, :normed, :aspect_ratio, :seriestype), Tuple{Tuple{Int64, Int64}, Bool, Bool, Int64, Symbol}},typeof(plot),Vector{ComplexF64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:proj, :m), Tuple{Symbol, Int64}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:projection, :seriestype), Tuple{Symbol, Symbol}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},UnitRange{Int64},Matrix{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:quiver, :seriestype), Tuple{Tuple{Vector{Float64}, Vector{Float64}, Vector{Float64}}, Symbol}},typeof(plot),Vector{Float64},Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:reg, :fill), Tuple{Bool, Tuple{Int64, Symbol}}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:ribbon,), Tuple{Int64}},typeof(plot),UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:ribbon,), Tuple{StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64}}},typeof(plot),UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:ribbon,), Tuple{Tuple{LinRange{Float64, Int64}, LinRange{Float64, Int64}}}},typeof(plot),UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:ribbon,), Tuple{typeof(sqrt)}},typeof(plot),UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:seriescolor, :fillalpha), Tuple{Matrix{Symbol}, Matrix{Float64}}},typeof(plot),AreaPlot})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:seriestype, :markershape, :markersize, :color), Tuple{Matrix{Symbol}, Vector{Symbol}, Int64, Vector{Symbol}}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot),Vector{DateTime},UnitRange{Int64},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot),Vector{OHLC}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:st, :xlabel, :ylabel, :zlabel), Tuple{Symbol, String, String, String}},typeof(plot),Vector{Float64},Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title, :l, :seriestype), Tuple{String, Float64, Symbol}},typeof(plot),Vector{String},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title, :xflip, :yflip, :zflip, :zlabel, :grid, :ylabel, :minorgrid, :xlabel, :seriestype), Tuple{String, Bool, Bool, Bool, String, Bool, String, Bool, String, Symbol}},typeof(plot),Vector{Float64},Vector{Float64},Function})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title, :xmirror, :ymirror, :zmirror, :zlabel, :grid, :ylabel, :minorgrid, :xlabel, :seriestype), Tuple{String, Bool, Bool, Bool, String, Bool, String, Bool, String, Symbol}},typeof(plot),Vector{Float64},Vector{Float64},Function})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title, :zlabel, :grid, :ylabel, :minorgrid, :xlabel, :seriestype), Tuple{String, String, Bool, String, Bool, String, Symbol}},typeof(plot),Vector{Float64},Vector{Float64},Function})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title,), Tuple{Matrix{String}}},typeof(plot),Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title,), Tuple{Matrix{String}}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:w,), Tuple{Int64}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:xaxis, :background_color, :leg), Tuple{Tuple{String, Tuple{Int64, Int64}, StepRange{Int64, Int64}, Symbol}, RGB{Float64}, Bool}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:zcolor, :m, :leg, :cbar, :w), Tuple{StepRange{Int64, Int64}, Tuple{Int64, Float64, Symbol, Stroke}, Bool, Bool, Int64}},typeof(plot),Vector{Float64},Vector{Float64},UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(portfoliocomposition)),Any,typeof(portfoliocomposition),Any,Vararg{Any}})
-    Base.precompile(Tuple{Core.kwftype(typeof(scatter!)),Any,typeof(scatter!),Any})
-    Base.precompile(Tuple{Core.kwftype(typeof(test_examples)),NamedTuple{(:skip, :disp), Tuple{Vector{Int64}, Bool}},typeof(test_examples),Symbol})
-    Base.precompile(Tuple{Core.kwftype(typeof(test_examples)),NamedTuple{(:skip,), Tuple{Vector{Int64}}},typeof(test_examples),Symbol})
-    Base.precompile(Tuple{Core.kwftype(typeof(yaxis!)),Any,typeof(yaxis!),Any,Any})
-    Base.precompile(Tuple{Type{GridLayout},Int64,Vararg{Int64}})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},AbstractVector{<:GeometryBasics.Point}})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},AbstractVector{OHLC}})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},PortfolioComposition})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:barbins}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:barhist}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:bar}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:bins2d}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:histogram2d}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:hline}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:hspan}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:lens}},AbstractPlot})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:pie}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:quiver}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:spy}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:steppre}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:sticks}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:vline}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:vspan}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:xerror}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Vector{ComplexF64}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.add_series!),Plot{GRBackend},DefaultsDict})
-    Base.precompile(Tuple{typeof(RecipesPipeline.add_series!),Plot{PlotlyBackend},DefaultsDict})
-    Base.precompile(Tuple{typeof(RecipesPipeline.plot_setup!),Plot{GRBackend},Dict{Symbol, Any},Vector{Dict{Symbol, Any}}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.plot_setup!),Plot{PlotlyBackend},Dict{Symbol, Any},Vector{Dict{Symbol, Any}}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.preprocess_attributes!),Plot{GRBackend},DefaultsDict})
-    Base.precompile(Tuple{typeof(RecipesPipeline.preprocess_axis_args!),Plot{GRBackend},Dict{Symbol, Any},Symbol})
-    Base.precompile(Tuple{typeof(RecipesPipeline.preprocess_axis_args!),Plot{PlotlyBackend},Dict{Symbol, Any},Symbol})
-    Base.precompile(Tuple{typeof(RecipesPipeline.process_sliced_series_attributes!),Plot{GRBackend},Vector{Dict{Symbol, Any}}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.process_sliced_series_attributes!),Plot{PlotlyBackend},Vector{Dict{Symbol, Any}}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.process_userrecipe!),Plot{GRBackend},Vector{Dict{Symbol, Any}},Dict{Symbol, Any}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.process_userrecipe!),Plot{PlotlyBackend},Vector{Dict{Symbol, Any}},Dict{Symbol, Any}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.unzip),Vector{GeometryBasics.Point2{Float64}}})
-    Base.precompile(Tuple{typeof(_bin_centers),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64}})
-    Base.precompile(Tuple{typeof(_cbar_unique),Vector{Float64},String})
-    Base.precompile(Tuple{typeof(_cbar_unique),Vector{Int64},String})
-    Base.precompile(Tuple{typeof(_cbar_unique),Vector{Nothing},String})
-    Base.precompile(Tuple{typeof(_cbar_unique),Vector{PlotUtils.ContinuousColorGradient},String})
-    Base.precompile(Tuple{typeof(_cbar_unique),Vector{StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64}},String})
-    Base.precompile(Tuple{typeof(_cbar_unique),Vector{Symbol},String})
-    Base.precompile(Tuple{typeof(_cycle),Base.OneTo{Int64},Vector{Int64}})
-    Base.precompile(Tuple{typeof(_cycle),StepRange{Int64, Int64},Vector{Int64}})
-    Base.precompile(Tuple{typeof(_cycle),UnitRange{Int64},Vector{Int64}})
-    Base.precompile(Tuple{typeof(_cycle),Vector{Float64},StepRange{Int64, Int64}})
-    Base.precompile(Tuple{typeof(_cycle),Vector{Float64},UnitRange{Int64}})
-    Base.precompile(Tuple{typeof(_cycle),Vector{Float64},Vector{Int64}})
-    Base.precompile(Tuple{typeof(_cycle),Vector{Int64},StepRange{Int64, Int64}})
-    Base.precompile(Tuple{typeof(_cycle),Vector{Int64},UnitRange{Int64}})
-    Base.precompile(Tuple{typeof(_do_plot_show),Plot{GRBackend},Bool})
-    Base.precompile(Tuple{typeof(_do_plot_show),Plot{PlotlyBackend},Bool})
-    Base.precompile(Tuple{typeof(_heatmap_edges),Vector{Float64},Bool,Bool})
-    Base.precompile(Tuple{typeof(_plot!),Plot,Any,Any})
-    Base.precompile(Tuple{typeof(_preprocess_barlike),DefaultsDict,Base.OneTo{Int64},Vector{Float64}})
-    Base.precompile(Tuple{typeof(_preprocess_binlike),DefaultsDict,StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64}})
-    Base.precompile(Tuple{typeof(_replace_markershape),Vector{Symbol}})
-    Base.precompile(Tuple{typeof(_update_min_padding!),GridLayout})
-    Base.precompile(Tuple{typeof(_update_subplot_args),Plot{GRBackend},Subplot{GRBackend},Dict{Symbol, Any},Int64,Bool})
-    Base.precompile(Tuple{typeof(_update_subplot_args),Plot{PlotlyBackend},Subplot{PlotlyBackend},Dict{Symbol, Any},Int64,Bool})
-    Base.precompile(Tuple{typeof(_update_subplot_periphery),Subplot{GRBackend},Vector{Any}})
-    Base.precompile(Tuple{typeof(_update_subplot_periphery),Subplot{PlotlyBackend},Vector{Any}})
-    Base.precompile(Tuple{typeof(annotate!),AbstractVector{<:Tuple}})
-    Base.precompile(Tuple{typeof(axis_limits),Subplot{GRBackend},Symbol,Bool,Bool})
-    Base.precompile(Tuple{typeof(axis_limits),Subplot{PlotlyBackend},Symbol,Bool,Bool})
-    Base.precompile(Tuple{typeof(backend),PlotlyBackend})
-    Base.precompile(Tuple{typeof(bbox),AbsoluteLength,AbsoluteLength,AbsoluteLength,AbsoluteLength})
-    Base.precompile(Tuple{typeof(bbox),Float64,Float64,Float64,Float64})
-    Base.precompile(Tuple{typeof(build_layout),GridLayout,Int64,Vector{Plot}})
-    Base.precompile(Tuple{typeof(convert_to_polar),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64},Tuple{Int64, Float64}})
-    Base.precompile(Tuple{typeof(discrete_value!),Axis,Vector{Union{Missing, Float64}}})
-    Base.precompile(Tuple{typeof(error_coords),Vector{Float64},Vector{Float64},Vector{Float64},Vararg{Vector{Float64}}})
-    Base.precompile(Tuple{typeof(error_coords),Vector{Float64},Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{typeof(error_zipit),Tuple{Vector{Float64}, Vector{Float64}, Vector{Float64}}})
-    Base.precompile(Tuple{typeof(fakedata),Int64,Int64})
-    Base.precompile(Tuple{typeof(fakedata),TaskLocalRNG,Int64,Vararg{Int64}})
-    Base.precompile(Tuple{typeof(get_minor_ticks),Subplot{GRBackend},Axis,Tuple{Vector{Float64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(get_minor_ticks),Subplot{GRBackend},Axis,Tuple{Vector{Int64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(get_series_color),SubArray{Symbol, 1, Vector{Symbol}, Tuple{UnitRange{Int64}}, true},Subplot{GRBackend},Int64,Symbol})
-    Base.precompile(Tuple{typeof(get_series_color),Vector{Symbol},Subplot{GRBackend},Int64,Symbol})
-    Base.precompile(Tuple{typeof(get_series_color),Vector{Symbol},Subplot{PlotlyBackend},Int64,Symbol})
-    Base.precompile(Tuple{typeof(get_ticks),StepRange{Int64, Int64},Vector{Float64},Vector{Any},Tuple{Int64, Int64},Vararg{Any}})
-    Base.precompile(Tuple{typeof(get_ticks),Symbol,Vector{Float64},Vector{Any},Tuple{Float64, Float64},Vararg{Any}})
-    Base.precompile(Tuple{typeof(get_ticks),Symbol,Vector{Float64},Vector{Any},Tuple{Int64, Float64},Vararg{Any}})
-    Base.precompile(Tuple{typeof(get_ticks),Symbol,Vector{Float64},Vector{Any},Tuple{Int64, Int64},Vararg{Any}})
-    Base.precompile(Tuple{typeof(get_ticks),UnitRange{Int64},Vector{Float64},Vector{Any},Tuple{Float64, Float64},Vararg{Any}})
-    Base.precompile(Tuple{typeof(get_xy),Vector{OHLC}})
-    Base.precompile(Tuple{typeof(gr_add_legend),Subplot{GRBackend},NamedTuple{(:w, :h, :dy, :leftw, :textw, :rightw, :xoffset, :yoffset, :width_factor), NTuple{9, Float64}},Vector{Float64}})
-    Base.precompile(Tuple{typeof(gr_add_legend),Subplot{GRBackend},NamedTuple{(:w, :h, :dy, :leftw, :textw, :rightw, :xoffset, :yoffset, :width_factor), Tuple{Int64, Int64, Int64, Float64, Int64, Float64, Float64, Float64, Float64}},Vector{Float64}})
-    Base.precompile(Tuple{typeof(gr_display),Subplot{GRBackend},AbsoluteLength,AbsoluteLength,Vector{Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_contour),Series,StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Matrix{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_heatmap),Series,Vector{Float64},Vector{Float64},Matrix{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Float64,Float64,Tuple{Float64, Float64},Int64,Float64,Float64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Float64,Float64,Tuple{Float64, Float64},Int64,Int64,Int64,Shape{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Float64,Float64,Tuple{Float64, Float64},Int64,Int64,Int64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Int64,Float64,Tuple{Float64, Float64},Int64,Float64,Int64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Int64,Float64,Tuple{Float64, Float64},Int64,Int64,Int64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Int64,Int64,Tuple{Float64, Float64},Int64,Int64,Int64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_markers),Series,Base.OneTo{Int64},Vector{Float64},Tuple{Float64, Float64},Int64,Int64})
-    Base.precompile(Tuple{typeof(gr_draw_markers),Series,Base.OneTo{Int64},Vector{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_markers),Series,StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_markers),Series,UnitRange{Int64},Vector{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,Base.OneTo{Int64},UnitRange{Int64},Tuple{Vector{Float64}, Vector{Float64}},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,Base.OneTo{Int64},Vector{Float64},Int64,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,Base.OneTo{Int64},Vector{Float64},Nothing,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64},Nothing,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,StepRange{Int64, Int64},Vector{Float64},Int64,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,UnitRange{Int64},Vector{Float64},Int64,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,UnitRange{Int64},Vector{Float64},Nothing,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,UnitRange{Int64},Vector{Float64},Vector{Int64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,Vector{Float64},Vector{Float64},Int64,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,Vector{Float64},Vector{Float64},Nothing,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,Vector{Int64},Vector{Int64},Nothing,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_surface),Series,Vector{Float64},Vector{Float64},Matrix{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_surface),Series,Vector{Float64},Vector{Float64},Vector{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_fill_viewport),Vector{Float64},RGBA{Float64}})
-    Base.precompile(Tuple{typeof(gr_get_3d_axis_angle),Vector{Float64},Float64,Float64,Symbol})
-    Base.precompile(Tuple{typeof(gr_get_ticks_size),Tuple{Vector{Float64}, Vector{String}},Int64})
-    Base.precompile(Tuple{typeof(gr_get_ticks_size),Tuple{Vector{Int64}, Vector{String}},Int64})
-    Base.precompile(Tuple{typeof(gr_label_ticks),Subplot{GRBackend},Symbol,Tuple{Vector{Float64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(gr_label_ticks),Subplot{GRBackend},Symbol,Tuple{Vector{Int64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(gr_label_ticks_3d),Subplot{GRBackend},Symbol,Tuple{Vector{Float64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(gr_polaraxes),Int64,Float64,Subplot{GRBackend}})
-    Base.precompile(Tuple{typeof(gr_polyline),Vector{Float64},Vector{Float64},Function})
-    Base.precompile(Tuple{typeof(gr_set_gradient),PlotUtils.ContinuousColorGradient})
-    Base.precompile(Tuple{typeof(gr_text),Float64,Float64,String})
-    Base.precompile(Tuple{typeof(gr_text_size),String})
-    Base.precompile(Tuple{typeof(gr_update_viewport_legend!),Vector{Float64},Subplot{GRBackend},NamedTuple{(:w, :h, :dy, :leftw, :textw, :rightw, :xoffset, :yoffset, :width_factor), NTuple{9, Float64}}})
-    Base.precompile(Tuple{typeof(gr_update_viewport_legend!),Vector{Float64},Subplot{GRBackend},NamedTuple{(:w, :h, :dy, :leftw, :textw, :rightw, :xoffset, :yoffset, :width_factor), Tuple{Int64, Int64, Int64, Float64, Int64, Float64, Float64, Float64, Float64}}})
-    Base.precompile(Tuple{typeof(gr_viewport_from_bbox),Subplot{GRBackend},BoundingBox{Tuple{AbsoluteLength, AbsoluteLength}, Tuple{AbsoluteLength, AbsoluteLength}},AbsoluteLength,AbsoluteLength,Vector{Float64}})
-    Base.precompile(Tuple{typeof(heatmap_edges),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Symbol})
-    Base.precompile(Tuple{typeof(heatmap_edges),UnitRange{Int64},Symbol})
-    Base.precompile(Tuple{typeof(heatmap_edges),Vector{Float64},Symbol})
-    Base.precompile(Tuple{typeof(ignorenan_minimum),Vector{Int64}})
-    Base.precompile(Tuple{typeof(layout_args),Matrix{Any}})
-    Base.precompile(Tuple{typeof(layout_args),NamedTuple{(:label, :blank), Tuple{Symbol, Bool}}})
-    Base.precompile(Tuple{typeof(layout_args),NamedTuple{(:label, :width, :height), Tuple{Symbol, Symbol, Float64}}})
-    Base.precompile(Tuple{typeof(make_fillrange_side),UnitRange{Int64},LinRange{Float64, Int64}})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),Nothing,Tuple{Float64, Float64},Symbol,Function})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),Nothing,Tuple{Float64, Float64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),Nothing,Tuple{Int64, Float64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),Nothing,Tuple{Int64, Int64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),StepRange{Int64, Int64},Tuple{Int64, Int64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),UnitRange{Int64},Tuple{Float64, Float64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(partialcircle),Float64,Float64,Int64})
-    Base.precompile(Tuple{typeof(partialcircle),Int64,Float64,Int64})
-    Base.precompile(Tuple{typeof(plot!),Any})
-    Base.precompile(Tuple{typeof(plot!),Plot,Plot,Plot,Vararg{Plot}})
-    Base.precompile(Tuple{typeof(plot),Any,Any})
-    Base.precompile(Tuple{typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}}})
-    Base.precompile(Tuple{typeof(plot),Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{typeof(plot),Plot{GRBackend}})
-    Base.precompile(Tuple{typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend},Vararg{Plot{PlotlyBackend}}})
-    Base.precompile(Tuple{typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{typeof(processGridArg!),Dict{Symbol, Any},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(processLineArg),Dict{Symbol, Any},Matrix{Symbol}})
-    Base.precompile(Tuple{typeof(processLineArg),Dict{Symbol, Any},Symbol})
-    Base.precompile(Tuple{typeof(processMarkerArg),Dict{Symbol, Any},Bool})
-    Base.precompile(Tuple{typeof(processMarkerArg),Dict{Symbol, Any},Matrix{Symbol}})
-    Base.precompile(Tuple{typeof(processMarkerArg),Dict{Symbol, Any},RGBA{Float64}})
-    Base.precompile(Tuple{typeof(processMarkerArg),Dict{Symbol, Any},Shape{Float64, Float64}})
-    Base.precompile(Tuple{typeof(processMarkerArg),Dict{Symbol, Any},Stroke})
-    Base.precompile(Tuple{typeof(processMarkerArg),Dict{Symbol, Any},Symbol})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{GRBackend},Int64,Float64,PlotText})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{GRBackend},Int64,Float64,Tuple{String, Int64, Symbol, Symbol}})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{GRBackend},Int64,Float64,Tuple{String, Symbol, Int64, String}})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{PlotlyBackend},Int64,Float64,PlotText})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{PlotlyBackend},Int64,Float64,Tuple{String, Int64, Symbol, Symbol}})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{PlotlyBackend},Int64,Float64,Tuple{String, Symbol, Int64, String}})
-    Base.precompile(Tuple{typeof(process_axis_arg!),Dict{Symbol, Any},StepRange{Int64, Int64},Symbol})
-    Base.precompile(Tuple{typeof(process_axis_arg!),Dict{Symbol, Any},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(push!),Plot{GRBackend},Float64,Vector{Float64}})
-    Base.precompile(Tuple{typeof(quiver_using_arrows),DefaultsDict})
-    Base.precompile(Tuple{typeof(resetfontsizes)})
-    Base.precompile(Tuple{typeof(scalefontsizes),Float64})
-    Base.precompile(Tuple{typeof(series_annotations),Vector{Any}})
-    Base.precompile(Tuple{typeof(slice_arg),Base.ReshapedArray{Int64, 2, UnitRange{Int64}, Tuple{}},Int64})
-    Base.precompile(Tuple{typeof(slice_arg),Matrix{AbsoluteLength},Int64})
-    Base.precompile(Tuple{typeof(slice_arg),Matrix{Bool},Int64})
-    Base.precompile(Tuple{typeof(slice_arg),Matrix{Int64},Int64})
-    Base.precompile(Tuple{typeof(slice_arg),Matrix{PlotUtils.ContinuousColorGradient},Int64})
-    Base.precompile(Tuple{typeof(slice_arg),Matrix{RGBA{Float64}},Int64})
-    Base.precompile(Tuple{typeof(slice_arg),Matrix{String},Int64})
-    Base.precompile(Tuple{typeof(slice_arg),Matrix{Symbol},Int64})
-    Base.precompile(Tuple{typeof(spy),Any})
-    Base.precompile(Tuple{typeof(straightline_data),Tuple{Float64, Float64},Tuple{Float64, Float64},Vector{Float64},Vector{Float64},Int64})
-    Base.precompile(Tuple{typeof(stroke),Int64,Vararg{Any}})
-    Base.precompile(Tuple{typeof(text),String,Symbol})
-    Base.precompile(Tuple{typeof(title!),AbstractString})
-    Base.precompile(Tuple{typeof(vline!),Any})
-    Base.precompile(Tuple{typeof(warn_on_attr_dim_mismatch),Series,Vector{Float64},Vector{Float64},Nothing,Base.Iterators.Flatten{Vector{Tuple{SeriesSegment}}}})
-    Base.precompile(Tuple{typeof(xgrid!),Plot{GRBackend},Symbol,Vararg{Any}})
-    Base.precompile(Tuple{typeof(xgrid!),Plot{PlotlyBackend},Symbol,Vararg{Any}})
-    Base.precompile(Tuple{typeof(xlims),Subplot{PlotlyBackend}})
-    isdefined(Plots, Symbol("#168#169")) && Base.precompile(Tuple{getfield(Plots, Symbol("#168#169")),Any})
-    isdefined(Plots, Symbol("#170#171")) && Base.precompile(Tuple{getfield(Plots, Symbol("#170#171")),Any})
-    isdefined(Plots, Symbol("#2#6")) && Base.precompile(Tuple{getfield(Plots, Symbol("#2#6")),UnitRange{Int64}})
-    isdefined(Plots, Symbol("#301#337")) && Base.precompile(Tuple{getfield(Plots, Symbol("#301#337"))})
-    isdefined(Plots, Symbol("#322#358")) && Base.precompile(Tuple{getfield(Plots, Symbol("#322#358"))})
-    isdefined(Plots, Symbol("#add_major_or_minor_segments#102")) && Base.precompile(Tuple{getfield(Plots, Symbol("#add_major_or_minor_segments#102")),Vector{Float64},Bool,Segments{Tuple{Float64, Float64}},Float64,Bool})
-    isdefined(Plots, Symbol("#add_major_or_minor_segments#103")) && Base.precompile(Tuple{getfield(Plots, Symbol("#add_major_or_minor_segments#103")),Vector{Float64},Bool,Segments{Tuple{Float64, Float64, Float64}},Float64,Bool})
-    let fbody = try __lookup_kwbody__(which(annotate!, (AbstractVector{<:Tuple},))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Base.Pairs{Symbol, V, Tuple{Vararg{Symbol, N}}, NamedTuple{names, T}} where {V, N, names, T<:Tuple{Vararg{Any, N}}},typeof(annotate!),AbstractVector{<:Tuple},))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(font, (Font,Vararg{Any},))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Base.Pairs{Symbol, Union{}, Tuple{}, NamedTuple{(), Tuple{}}},typeof(font),Font,Vararg{Any},))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(gr_polyline, (Vector{Float64},Vector{Float64},typeof(GR.fillarea),))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Symbol,Symbol,typeof(gr_polyline),Vector{Float64},Vector{Float64},typeof(GR.fillarea),))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(gr_set_font, (Font,Subplot{GRBackend},))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Symbol,Symbol,RGBA{Float64},Float64,typeof(gr_set_font),Font,Subplot{GRBackend},))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(plot!, (Any,Vararg{Any},))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Base.Pairs{Symbol, V, Tuple{Vararg{Symbol, N}}, NamedTuple{names, T}} where {V, N, names, T<:Tuple{Vararg{Any, N}}},typeof(plot!),Any,Vararg{Any},))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(plot!, (Plot,Plot,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Base.Pairs{Symbol, V, Tuple{Vararg{Symbol, N}}, NamedTuple{names, T}} where {V, N, names, T<:Tuple{Vararg{Any, N}}},typeof(plot!),Plot,Plot,))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(plot!, (Plot,Plot,Plot,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Base.Pairs{Symbol, V, Tuple{Vararg{Symbol, N}}, NamedTuple{names, T}} where {V, N, names, T<:Tuple{Vararg{Any, N}}},typeof(plot!),Plot,Plot,Plot,))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(plot!, (Plot,Plot,Plot,Vararg{Plot},))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Base.Pairs{Symbol, V, Tuple{Vararg{Symbol, N}}, NamedTuple{names, T}} where {V, N, names, T<:Tuple{Vararg{Any, N}}},typeof(plot!),Plot,Plot,Plot,Vararg{Plot},))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(plot, (Any,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Base.Pairs{Symbol, V, Tuple{Vararg{Symbol, N}}, NamedTuple{names, T}} where {V, N, names, T<:Tuple{Vararg{Any, N}}},typeof(plot),Any,))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(plot, (Any,Vararg{Any},))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Base.Pairs{Symbol, V, Tuple{Vararg{Symbol, N}}, NamedTuple{names, T}} where {V, N, names, T<:Tuple{Vararg{Any, N}}},typeof(plot),Any,Vararg{Any},))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(title!, (AbstractString,))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Base.Pairs{Symbol, V, Tuple{Vararg{Symbol, N}}, NamedTuple{names, T}} where {V, N, names, T<:Tuple{Vararg{Any, N}}},typeof(title!),AbstractString,))
-    end
-end
-    let fbody = try __lookup_kwbody__(which(yaxis!, (Any,Vararg{Any},))) catch missing end
-    if !ismissing(fbody)
-        precompile(fbody, (Base.Pairs{Symbol, V, Tuple{Vararg{Symbol, N}}, NamedTuple{names, T}} where {V, N, names, T<:Tuple{Vararg{Any, N}}},typeof(yaxis!),Any,Vararg{Any},))
-    end
-end
-end

deps/SnoopCompile/precompile/1.8/precompile_Plots.jl

@@ -1,282 +0,0 @@
-# Use
-#    @warnpcfail precompile(args...)
-# if you want to be warned when a precompile directive fails
-macro warnpcfail(ex::Expr)
-    modl = __module__
-    file = __source__.file === nothing ? "?" : String(__source__.file)
-    line = __source__.line
-    quote
-        $(esc(ex)) || @warn """precompile directive
-     $($(Expr(:quote, ex)))
- failed. Please report an issue in $($modl) (after checking for duplicates) or remove this directive.""" _file=$file _line=$line
-    end
-end
-
-
-function _precompile_()
-    ccall(:jl_generating_output, Cint, ()) == 1 || return nothing
-    Base.precompile(Tuple{Core.kwftype(typeof(_make_hist)),NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}},typeof(_make_hist),Tuple{Vector{Float64}, Vector{Float64}},Int64})
-    Base.precompile(Tuple{Core.kwftype(typeof(_make_hist)),NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}},typeof(_make_hist),Tuple{Vector{Float64}},Symbol})
-    Base.precompile(Tuple{Core.kwftype(typeof(_make_hist)),NamedTuple{(:normed, :weights), Tuple{Bool, Vector{Int64}}},typeof(_make_hist),Tuple{Vector{Float64}},Symbol})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:formatter,), Tuple{typeof(datetimeformatter)}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:guide,), Tuple{String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:guide_position, :guidefontvalign, :mirror, :guide), Tuple{Symbol, Symbol, Bool, String}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:lims,), Tuple{Tuple{Int64, Float64}}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(attr!)),NamedTuple{(:ticks,), Tuple{Nothing}},typeof(attr!),Axis})
-    Base.precompile(Tuple{Core.kwftype(typeof(default)),NamedTuple{(:titlefont, :legendfontsize, :guidefont, :tickfont, :guide, :framestyle, :yminorgrid), Tuple{Tuple{Int64, String}, Int64, Tuple{Int64, Symbol}, Tuple{Int64, Symbol}, String, Symbol, Bool}},typeof(default)})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),StepRange{Int64, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),UnitRange{Int64},UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),UnitRange{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_polyline)),NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}},typeof(gr_polyline),Vector{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_set_font)),NamedTuple{(:halign, :valign, :rotation), Tuple{Symbol, Symbol, Int64}},typeof(gr_set_font),Font,Subplot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(gr_set_font)),NamedTuple{(:rotation, :color), Tuple{Int64, RGBA{Float64}}},typeof(gr_set_font),Font,Subplot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :label, :seriestype), Tuple{Float64, String, Symbol}},typeof(plot!),Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :seriestype), Tuple{Float64, Symbol}},typeof(plot!),Plot{GRBackend},Vector{GeometryBasics.Point2{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :seriestype), Tuple{Float64, Symbol}},typeof(plot!),Plot{PlotlyBackend},Vector{GeometryBasics.Point2{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:alpha, :seriestype), Tuple{Float64, Symbol}},typeof(plot!),Vector{GeometryBasics.Point2{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:annotation,), Tuple{Vector{Tuple{Int64, Float64, Tuple{String, Any, Any, Any}}}}},typeof(plot!)})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:c, :lw, :label), Tuple{Symbol, Int64, String}},typeof(plot!),Plot{GRBackend},Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:c, :lw, :label), Tuple{Symbol, Int64, String}},typeof(plot!),Plot{PlotlyBackend},Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:c, :lw, :label), Tuple{Symbol, Int64, String}},typeof(plot!),Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:layout, :margin), Tuple{Matrix{Any}, AbsoluteLength}},typeof(plot!),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:legend,), Tuple{Bool}},typeof(plot!),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:legend,), Tuple{Bool}},typeof(plot!),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend},Vararg{Plot{PlotlyBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:legend,), Tuple{Symbol}},typeof(plot!),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:legend,), Tuple{Symbol}},typeof(plot!),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend},Vararg{Plot{PlotlyBackend}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:line, :seriestype), Tuple{Tuple{Int64, Symbol, Float64, Matrix{Symbol}}, Symbol}},typeof(plot!),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:line, :seriestype), Tuple{Tuple{Int64, Symbol, Float64, Matrix{Symbol}}, Symbol}},typeof(plot!),Plot{GRBackend},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:line, :seriestype), Tuple{Tuple{Int64, Symbol, Float64, Matrix{Symbol}}, Symbol}},typeof(plot!),Plot{PlotlyBackend},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:lw, :color), Tuple{Int64, Symbol}},typeof(plot!),Function,Float64,Irrational{:π}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:lw, :color), Tuple{Int64, Symbol}},typeof(plot!),Plot{GRBackend},Function,Float64,Vararg{Any}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:marker, :series_annotations, :seriestype), Tuple{Tuple{Int64, Float64, Symbol}, Vector{Any}, Symbol}},typeof(plot!),Plot{GRBackend},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:marker, :series_annotations, :seriestype), Tuple{Tuple{Int64, Float64, Symbol}, Vector{Any}, Symbol}},typeof(plot!),Plot{PlotlyBackend},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:marker, :series_annotations, :seriestype), Tuple{Tuple{Int64, Float64, Symbol}, Vector{Any}, Symbol}},typeof(plot!),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:markersize, :c, :seriestype), Tuple{Int64, Symbol, Symbol}},typeof(plot!),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype, :inset), Tuple{Symbol, Tuple{Int64, BoundingBox{Tuple{Length{:w, Float64}, Length{:h, Float64}}, Tuple{Length{:w, Float64}, Length{:h, Float64}}}}}},typeof(plot!),Plot{GRBackend},Vector{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype, :inset), Tuple{Symbol, Tuple{Int64, BoundingBox{Tuple{Length{:w, Float64}, Length{:h, Float64}}, Tuple{Length{:w, Float64}, Length{:h, Float64}}}}}},typeof(plot!),Plot{PlotlyBackend},Vector{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype, :inset), Tuple{Symbol, Tuple{Int64, BoundingBox{Tuple{Length{:w, Float64}, Length{:h, Float64}}, Tuple{Length{:w, Float64}, Length{:h, Float64}}}}}},typeof(plot!),Vector{Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot!),Plot{PlotlyBackend},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot!),Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:title,), Tuple{String}},typeof(plot!),Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:title,), Tuple{String}},typeof(plot!),Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:title,), Tuple{String}},typeof(plot!)})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:w,), Tuple{Int64}},typeof(plot!),Plot{GRBackend},Vector{Float64},Vector{Float64},Vararg{Any}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:yaxis, :minorgrid), Tuple{Tuple{String, Symbol}, Bool}},typeof(plot!)})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:zcolor, :m, :ms, :lab, :seriestype), Tuple{Vector{Float64}, Tuple{Symbol, Float64, Stroke}, Vector{Float64}, String, Symbol}},typeof(plot!),Plot{GRBackend},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:zcolor, :m, :ms, :lab, :seriestype), Tuple{Vector{Float64}, Tuple{Symbol, Float64, Stroke}, Vector{Float64}, String, Symbol}},typeof(plot!),Plot{PlotlyBackend},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot!)),NamedTuple{(:zcolor, :m, :ms, :lab, :seriestype), Tuple{Vector{Float64}, Tuple{Symbol, Float64, Stroke}, Vector{Float64}, String, Symbol}},typeof(plot!),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:annotations, :leg), Tuple{Tuple{Int64, Float64, PlotText}, Bool}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:aspect_ratio, :seriestype), Tuple{Int64, Symbol}},typeof(plot),Vector{String},Vector{String},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:bar_width, :alpha, :color, :fillto, :label, :seriestype), Tuple{Float64, Float64, Vector{Symbol}, StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64}, String, Symbol}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:bins, :weights, :seriestype), Tuple{Symbol, Vector{Int64}, Symbol}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:color, :line, :marker), Tuple{Matrix{Symbol}, Tuple{Symbol, Int64}, Tuple{Matrix{Symbol}, Int64, Float64, Stroke}}},typeof(plot),Vector{Vector}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:connections, :title, :xlabel, :ylabel, :zlabel, :legend, :margin, :seriestype), Tuple{Tuple{Vector{Int64}, Vector{Int64}, Vector{Int64}}, String, String, String, String, Symbol, AbsoluteLength, Symbol}},typeof(plot),Vector{Int64},Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:fill, :seriestype), Tuple{Bool, Symbol}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Function})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:fill_z, :alpha, :label, :bar_width, :seriestype), Tuple{StepRange{Int64, Int64}, Vector{Float64}, String, UnitRange{Int64}, Symbol}},typeof(plot),Vector{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:framestyle, :title, :color, :layout, :label, :markerstrokewidth, :ticks, :seriestype), Tuple{Matrix{Symbol}, Matrix{String}, Base.ReshapedArray{Int64, 2, UnitRange{Int64}, Tuple{}}, Int64, String, Int64, UnitRange{Int64}, Symbol}},typeof(plot),Vector{Vector{Float64}},Vector{Vector{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:grid, :title), Tuple{Tuple{Symbol, Symbol, Symbol, Int64, Float64}, String}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:lab, :w, :palette, :fill, :α), Tuple{String, Int64, PlotUtils.ContinuousColorGradient, Int64, Float64}},typeof(plot),StepRange{Int64, Int64},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:label, :legend, :seriestype), Tuple{String, Symbol, Symbol}},typeof(plot),Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:label, :title, :xlabel, :linewidth, :legend), Tuple{Matrix{String}, String, String, Int64, Symbol}},typeof(plot),Vector{Function},Float64,Float64})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:label,), Tuple{Matrix{String}}},typeof(plot),Vector{AbstractVector{Float64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :group, :linetype, :linecolor), Tuple{Matrix{Any}, Vector{String}, Matrix{Symbol}, Symbol}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :label, :fillrange, :fillalpha), Tuple{Tuple{Int64, Int64}, String, Int64, Float64}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :label, :fillrange, :fillalpha), Tuple{Tuple{Int64, Int64}, String, Int64, Float64}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :link), Tuple{Int64, Symbol}},typeof(plot),Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :link), Tuple{Int64, Symbol}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :palette, :bg_inside), Tuple{Int64, Matrix{PlotUtils.ContinuousColorGradient}, Matrix{Symbol}}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :t, :leg, :ticks, :border), Tuple{Matrix{Any}, Matrix{Symbol}, Bool, Nothing, Symbol}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :title, :titlelocation, :left_margin, :bottom_margin, :xrotation), Tuple{Matrix{Any}, Matrix{String}, Symbol, Matrix{AbsoluteLength}, AbsoluteLength, Int64}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :xguide, :yguide, :xguidefonthalign, :yguidefontvalign, :xguideposition, :yguideposition, :ymirror, :xmirror, :legend, :seriestype), Tuple{Int64, String, String, Matrix{Symbol}, Matrix{Symbol}, Symbol, Matrix{Symbol}, Matrix{Bool}, Matrix{Bool}, Bool, Matrix{Symbol}}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout, :xlims), Tuple{Matrix{Any}, Tuple{Int64, Float64}}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout,), Tuple{Tuple{Int64, Int64}}},typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:layout,), Tuple{Tuple{Int64, Int64}}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:legend,), Tuple{Symbol}},typeof(plot),Vector{Tuple{Int64, Real}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line, :lab, :ms), Tuple{Tuple{Matrix{Symbol}, Int64}, Matrix{String}, Int64}},typeof(plot),Vector{Vector},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line, :label, :legendtitle), Tuple{Tuple{Int64, Matrix{Symbol}}, Matrix{String}, String}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line, :leg, :fill), Tuple{Int64, Bool, Tuple{Int64, Symbol}}},typeof(plot),Function,Function,Int64,Vararg{Any}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line, :marker, :bg, :fg, :xlim, :ylim, :leg), Tuple{Tuple{Int64, Symbol, Symbol}, Tuple{Shape{Float64, Float64}, Int64, RGBA{Float64}}, Symbol, Symbol, Tuple{Int64, Int64}, Tuple{Int64, Int64}, Bool}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:line_z, :linewidth, :legend), Tuple{StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64}, Int64, Bool}},typeof(plot),Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:m, :markersize, :lab, :bg, :xlim, :ylim, :seriestype), Tuple{Matrix{Symbol}, Int64, Matrix{String}, Symbol, Tuple{Int64, Int64}, Tuple{Int64, Int64}, Symbol}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:marker,), Tuple{Bool}},typeof(plot),Vector{Union{Missing, Int64}}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:marker_z, :color, :legend, :seriestype), Tuple{typeof(+), Symbol, Bool, Symbol}},typeof(plot),Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:markershape, :markersize, :marker_z, :line_z, :linewidth), Tuple{Matrix{Symbol}, Matrix{Int64}, Matrix{Int64}, Matrix{Int64}, Matrix{Int64}}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:markershape, :seriestype, :label), Tuple{Symbol, Symbol, String}},typeof(plot),UnitRange{Int64},Vector{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:nbins, :seriestype), Tuple{Int64, Symbol}},typeof(plot),Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:nbins, :show_empty_bins, :normed, :aspect_ratio, :seriestype), Tuple{Tuple{Int64, Int64}, Bool, Bool, Int64, Symbol}},typeof(plot),Vector{ComplexF64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:proj, :m), Tuple{Symbol, Int64}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:projection, :seriestype), Tuple{Symbol, Symbol}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},UnitRange{Int64},Matrix{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:quiver, :seriestype), Tuple{Tuple{Vector{Float64}, Vector{Float64}, Vector{Float64}}, Symbol}},typeof(plot),Vector{Float64},Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:reg, :fill), Tuple{Bool, Tuple{Int64, Symbol}}},typeof(plot),Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:ribbon,), Tuple{Tuple{LinRange{Float64, Int64}, LinRange{Float64, Int64}}}},typeof(plot),UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:ribbon,), Tuple{typeof(sqrt)}},typeof(plot),UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:seriestype, :markershape, :markersize, :color), Tuple{Matrix{Symbol}, Vector{Symbol}, Int64, Vector{Symbol}}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot),Vector{DateTime},UnitRange{Int64},Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:seriestype,), Tuple{Symbol}},typeof(plot),Vector{OHLC}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:st, :xlabel, :ylabel, :zlabel), Tuple{Symbol, String, String, String}},typeof(plot),Vector{Float64},Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title, :l, :seriestype), Tuple{String, Float64, Symbol}},typeof(plot),Vector{String},Vector{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title, :xflip, :yflip, :zflip, :zlabel, :grid, :ylabel, :minorgrid, :xlabel, :seriestype), Tuple{String, Bool, Bool, Bool, String, Bool, String, Bool, String, Symbol}},typeof(plot),Vector{Float64},Vector{Float64},Function})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title, :xmirror, :ymirror, :zmirror, :zlabel, :grid, :ylabel, :minorgrid, :xlabel, :seriestype), Tuple{String, Bool, Bool, Bool, String, Bool, String, Bool, String, Symbol}},typeof(plot),Vector{Float64},Vector{Float64},Function})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title, :zlabel, :grid, :ylabel, :minorgrid, :xlabel, :seriestype), Tuple{String, String, Bool, String, Bool, String, Symbol}},typeof(plot),Vector{Float64},Vector{Float64},Function})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title,), Tuple{Matrix{String}}},typeof(plot),Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:title,), Tuple{Matrix{String}}},typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:w,), Tuple{Int64}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:xaxis, :background_color, :leg), Tuple{Tuple{String, Tuple{Int64, Int64}, StepRange{Int64, Int64}, Symbol}, RGB{Float64}, Bool}},typeof(plot),Matrix{Float64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(plot)),NamedTuple{(:zcolor, :m, :leg, :cbar, :w), Tuple{StepRange{Int64, Int64}, Tuple{Int64, Float64, Symbol, Stroke}, Bool, Bool, Int64}},typeof(plot),Vector{Float64},Vector{Float64},UnitRange{Int64}})
-    Base.precompile(Tuple{Core.kwftype(typeof(portfoliocomposition)),Any,typeof(portfoliocomposition),Any,Vararg{Any}})
-    Base.precompile(Tuple{Core.kwftype(typeof(test_examples)),NamedTuple{(:skip, :disp), Tuple{Vector{Int64}, Bool}},typeof(test_examples),Symbol})
-    Base.precompile(Tuple{Core.kwftype(typeof(test_examples)),NamedTuple{(:skip,), Tuple{Vector{Int64}}},typeof(test_examples),Symbol})
-    Base.precompile(Tuple{Core.kwftype(typeof(yaxis!)),Any,typeof(yaxis!),Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},AbstractVector{OHLC}})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},PortfolioComposition})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:barhist}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:bar}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:bins2d}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:histogram2d}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:hline}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:hspan}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:lens}},AbstractPlot})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:pie}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:quiver}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:sticks}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:vline}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:vspan}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Type{Val{:xerror}},Any,Any,Any})
-    Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),AbstractDict{Symbol, Any},Vector{ComplexF64}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.add_series!),Plot{GRBackend},DefaultsDict})
-    Base.precompile(Tuple{typeof(RecipesPipeline.add_series!),Plot{PlotlyBackend},DefaultsDict})
-    Base.precompile(Tuple{typeof(RecipesPipeline.plot_setup!),Plot{GRBackend},Dict{Symbol, Any},Vector{Dict{Symbol, Any}}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.plot_setup!),Plot{PlotlyBackend},Dict{Symbol, Any},Vector{Dict{Symbol, Any}}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.preprocess_attributes!),Plot{GRBackend},DefaultsDict})
-    Base.precompile(Tuple{typeof(RecipesPipeline.process_sliced_series_attributes!),Plot{GRBackend},Vector{Dict{Symbol, Any}}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.process_sliced_series_attributes!),Plot{PlotlyBackend},Vector{Dict{Symbol, Any}}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.process_userrecipe!),Plot{GRBackend},Vector{Dict{Symbol, Any}},Dict{Symbol, Any}})
-    Base.precompile(Tuple{typeof(RecipesPipeline.unzip),Vector{GeometryBasics.Point2{Float64}}})
-    Base.precompile(Tuple{typeof(_bin_centers),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64}})
-    Base.precompile(Tuple{typeof(_cbar_unique),Vector{PlotUtils.ContinuousColorGradient},String})
-    Base.precompile(Tuple{typeof(_cycle),StepRange{Int64, Int64},Vector{Int64}})
-    Base.precompile(Tuple{typeof(_cycle),Vector{Float64},StepRange{Int64, Int64}})
-    Base.precompile(Tuple{typeof(_cycle),Vector{Float64},Vector{Int64}})
-    Base.precompile(Tuple{typeof(_do_plot_show),Plot{GRBackend},Bool})
-    Base.precompile(Tuple{typeof(_do_plot_show),Plot{PlotlyBackend},Bool})
-    Base.precompile(Tuple{typeof(_preprocess_barlike),DefaultsDict,Base.OneTo{Int64},Vector{Float64}})
-    Base.precompile(Tuple{typeof(_preprocess_binlike),DefaultsDict,StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64}})
-    Base.precompile(Tuple{typeof(_update_min_padding!),GridLayout})
-    Base.precompile(Tuple{typeof(_update_subplot_args),Plot{GRBackend},Subplot{GRBackend},Dict{Symbol, Any},Int64,Bool})
-    Base.precompile(Tuple{typeof(_update_subplot_args),Plot{PlotlyBackend},Subplot{PlotlyBackend},Dict{Symbol, Any},Int64,Bool})
-    Base.precompile(Tuple{typeof(_update_subplot_periphery),Subplot{GRBackend},Vector{Any}})
-    Base.precompile(Tuple{typeof(_update_subplot_periphery),Subplot{PlotlyBackend},Vector{Any}})
-    Base.precompile(Tuple{typeof(annotate!),AbstractVector{<:Tuple}})
-    Base.precompile(Tuple{typeof(axis_limits),Subplot{GRBackend},Symbol,Bool,Bool})
-    Base.precompile(Tuple{typeof(axis_limits),Subplot{PlotlyBackend},Symbol,Bool,Bool})
-    Base.precompile(Tuple{typeof(backend),PlotlyBackend})
-    Base.precompile(Tuple{typeof(bbox),AbsoluteLength,AbsoluteLength,AbsoluteLength,AbsoluteLength})
-    Base.precompile(Tuple{typeof(bbox),Float64,Float64,Float64,Float64})
-    Base.precompile(Tuple{typeof(build_layout),GridLayout,Int64,Vector{Plot}})
-    Base.precompile(Tuple{typeof(convert_to_polar),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Vector{Float64},Tuple{Int64, Float64}})
-    Base.precompile(Tuple{typeof(error_coords),Vector{Float64},Vector{Float64},Vector{Float64},Vararg{Vector{Float64}}})
-    Base.precompile(Tuple{typeof(error_coords),Vector{Float64},Vector{Float64},Vector{Float64}})
-    Base.precompile(Tuple{typeof(error_zipit),Tuple{Vector{Float64}, Vector{Float64}, Vector{Float64}}})
-    Base.precompile(Tuple{typeof(fakedata),Int64,Int64})
-    Base.precompile(Tuple{typeof(get_minor_ticks),Subplot{GRBackend},Axis,Tuple{Vector{Float64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(get_minor_ticks),Subplot{GRBackend},Axis,Tuple{Vector{Int64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(get_series_color),SubArray{Symbol, 1, Vector{Symbol}, Tuple{UnitRange{Int64}}, true},Subplot{GRBackend},Int64,Symbol})
-    Base.precompile(Tuple{typeof(get_series_color),Vector{Symbol},Subplot{GRBackend},Int64,Symbol})
-    Base.precompile(Tuple{typeof(get_series_color),Vector{Symbol},Subplot{PlotlyBackend},Int64,Symbol})
-    Base.precompile(Tuple{typeof(get_ticks),StepRange{Int64, Int64},Vector{Float64},Vector{Any},Tuple{Int64, Int64},Vararg{Any}})
-    Base.precompile(Tuple{typeof(get_ticks),Symbol,Vector{Float64},Vector{Any},Tuple{Float64, Float64},Vararg{Any}})
-    Base.precompile(Tuple{typeof(get_ticks),Symbol,Vector{Float64},Vector{Any},Tuple{Int64, Float64},Vararg{Any}})
-    Base.precompile(Tuple{typeof(get_ticks),Symbol,Vector{Float64},Vector{Any},Tuple{Int64, Int64},Vararg{Any}})
-    Base.precompile(Tuple{typeof(get_ticks),UnitRange{Int64},Vector{Float64},Vector{Any},Tuple{Float64, Float64},Vararg{Any}})
-    Base.precompile(Tuple{typeof(get_xy),Vector{OHLC}})
-    Base.precompile(Tuple{typeof(gr_add_legend),Subplot{GRBackend},NamedTuple{(:w, :h, :dy, :leftw, :textw, :rightw, :xoffset, :yoffset, :width_factor), NTuple{9, Float64}},Vector{Float64}})
-    Base.precompile(Tuple{typeof(gr_add_legend),Subplot{GRBackend},NamedTuple{(:w, :h, :dy, :leftw, :textw, :rightw, :xoffset, :yoffset, :width_factor), Tuple{Int64, Int64, Int64, Float64, Int64, Float64, Float64, Float64, Float64}},Vector{Float64}})
-    Base.precompile(Tuple{typeof(gr_display),Subplot{GRBackend},AbsoluteLength,AbsoluteLength,Vector{Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_contour),Series,StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Matrix{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_heatmap),Series,Vector{Float64},Vector{Float64},Matrix{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Float64,Float64,Tuple{Float64, Float64},Int64,Float64,Float64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Float64,Float64,Tuple{Float64, Float64},Int64,Int64,Int64,Shape{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Float64,Float64,Tuple{Float64, Float64},Int64,Int64,Int64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Int64,Float64,Tuple{Float64, Float64},Int64,Float64,Int64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Int64,Float64,Tuple{Float64, Float64},Int64,Int64,Int64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_marker),Series,Int64,Int64,Tuple{Float64, Float64},Int64,Int64,Int64,Symbol})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,Base.OneTo{Int64},UnitRange{Int64},Tuple{Vector{Float64}, Vector{Float64}},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,Base.OneTo{Int64},Vector{Float64},Int64,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,StepRange{Int64, Int64},Vector{Float64},Int64,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_segments),Series,Vector{Float64},Vector{Float64},Int64,Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_surface),Series,Vector{Float64},Vector{Float64},Matrix{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_draw_surface),Series,Vector{Float64},Vector{Float64},Vector{Float64},Tuple{Float64, Float64}})
-    Base.precompile(Tuple{typeof(gr_fill_viewport),Vector{Float64},RGBA{Float64}})
-    Base.precompile(Tuple{typeof(gr_get_ticks_size),Tuple{Vector{Float64}, Vector{String}},Int64})
-    Base.precompile(Tuple{typeof(gr_label_ticks),Subplot{GRBackend},Symbol,Tuple{Vector{Float64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(gr_label_ticks),Subplot{GRBackend},Symbol,Tuple{Vector{Int64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(gr_label_ticks_3d),Subplot{GRBackend},Symbol,Tuple{Vector{Float64}, Vector{String}}})
-    Base.precompile(Tuple{typeof(gr_polaraxes),Int64,Float64,Subplot{GRBackend}})
-    Base.precompile(Tuple{typeof(gr_set_gradient),PlotUtils.ContinuousColorGradient})
-    Base.precompile(Tuple{typeof(gr_text),Float64,Float64,String})
-    Base.precompile(Tuple{typeof(gr_text_size),String})
-    Base.precompile(Tuple{typeof(gr_update_viewport_legend!),Vector{Float64},Subplot{GRBackend},NamedTuple{(:w, :h, :dy, :leftw, :textw, :rightw, :xoffset, :yoffset, :width_factor), NTuple{9, Float64}}})
-    Base.precompile(Tuple{typeof(gr_update_viewport_legend!),Vector{Float64},Subplot{GRBackend},NamedTuple{(:w, :h, :dy, :leftw, :textw, :rightw, :xoffset, :yoffset, :width_factor), Tuple{Int64, Int64, Int64, Float64, Int64, Float64, Float64, Float64, Float64}}})
-    Base.precompile(Tuple{typeof(gr_viewport_from_bbox),Subplot{GRBackend},BoundingBox{Tuple{AbsoluteLength, AbsoluteLength}, Tuple{AbsoluteLength, AbsoluteLength}},AbsoluteLength,AbsoluteLength,Vector{Float64}})
-    Base.precompile(Tuple{typeof(heatmap_edges),StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}, Int64},Symbol})
-    Base.precompile(Tuple{typeof(heatmap_edges),UnitRange{Int64},Symbol})
-    Base.precompile(Tuple{typeof(heatmap_edges),Vector{Float64},Symbol})
-    Base.precompile(Tuple{typeof(ignorenan_minimum),Vector{Int64}})
-    Base.precompile(Tuple{typeof(is_marker_supported),GRBackend,Vector{Symbol}})
-    Base.precompile(Tuple{typeof(layout_args),Matrix{Any}})
-    Base.precompile(Tuple{typeof(link_axes!),GridLayout,Symbol})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),Nothing,Tuple{Float64, Float64},Symbol,Function})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),Nothing,Tuple{Float64, Float64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),Nothing,Tuple{Int64, Float64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),Nothing,Tuple{Int64, Int64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),StepRange{Int64, Int64},Tuple{Int64, Int64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(optimal_ticks_and_labels),UnitRange{Int64},Tuple{Float64, Float64},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(partialcircle),Int64,Float64,Int64})
-    Base.precompile(Tuple{typeof(plot!),Plot,Plot,Plot,Vararg{Plot}})
-    Base.precompile(Tuple{typeof(plot),Any,Any})
-    Base.precompile(Tuple{typeof(plot),Plot{GRBackend},Plot{GRBackend},Plot{GRBackend},Vararg{Plot{GRBackend}}})
-    Base.precompile(Tuple{typeof(plot),Plot{GRBackend},Plot{GRBackend}})
-    Base.precompile(Tuple{typeof(plot),Plot{GRBackend}})
-    Base.precompile(Tuple{typeof(plot),Plot{PlotlyBackend},Plot{PlotlyBackend}})
-    Base.precompile(Tuple{typeof(processLineArg),Dict{Symbol, Any},Matrix{Symbol}})
-    Base.precompile(Tuple{typeof(processMarkerArg),Dict{Symbol, Any},Matrix{Symbol}})
-    Base.precompile(Tuple{typeof(processMarkerArg),Dict{Symbol, Any},RGBA{Float64}})
-    Base.precompile(Tuple{typeof(processMarkerArg),Dict{Symbol, Any},Shape{Float64, Float64}})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{GRBackend},Int64,Float64,PlotText,Font})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{GRBackend},Int64,Float64,PlotText})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{GRBackend},Int64,Float64,Tuple{String, Int64, Symbol, Symbol},Font})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{GRBackend},Int64,Float64,Tuple{String, Int64, Symbol, Symbol}})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{GRBackend},Int64,Float64,Tuple{String, Symbol, Int64, String},Font})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{GRBackend},Int64,Float64,Tuple{String, Symbol, Int64, String}})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{PlotlyBackend},Int64,Float64,PlotText,Font})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{PlotlyBackend},Int64,Float64,PlotText})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{PlotlyBackend},Int64,Float64,Tuple{String, Int64, Symbol, Symbol},Font})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{PlotlyBackend},Int64,Float64,Tuple{String, Int64, Symbol, Symbol}})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{PlotlyBackend},Int64,Float64,Tuple{String, Symbol, Int64, String},Font})
-    Base.precompile(Tuple{typeof(process_annotation),Subplot{PlotlyBackend},Int64,Float64,Tuple{String, Symbol, Int64, String}})
-    Base.precompile(Tuple{typeof(process_axis_arg!),Dict{Symbol, Any},StepRange{Int64, Int64},Symbol})
-    Base.precompile(Tuple{typeof(process_axis_arg!),Dict{Symbol, Any},Symbol,Symbol})
-    Base.precompile(Tuple{typeof(push!),Plot{GRBackend},Float64,Vector{Float64}})
-    Base.precompile(Tuple{typeof(push!),Segments{Tuple{Float64, Float64, Float64}},Tuple{Float64, Int64, Int64},Tuple{Float64, Int64, Int64}})
-    Base.precompile(Tuple{typeof(resetfontsizes)})
-    Base.precompile(Tuple{typeof(scalefontsizes),Float64})
-    Base.precompile(Tuple{typeof(series_annotations),Vector{Any}})
-    Base.precompile(Tuple{typeof(slice_arg),Matrix{AbsoluteLength},Int64})
-    Base.precompile(Tuple{typeof(slice_arg),Matrix{Bool},Int64})
-    Base.precompile(Tuple{typeof(slice_arg),Matrix{Int64},Int64})
-    Base.precompile(Tuple{typeof(spy),Any})
-    Base.precompile(Tuple{typeof(straightline_data),Tuple{Float64, Float64},Tuple{Float64, Float64},Vector{Float64},Vector{Float64},Int64})
-    Base.precompile(Tuple{typeof(title!),AbstractString})
-    Base.precompile(Tuple{typeof(update_child_bboxes!),GridLayout})
-    Base.precompile(Tuple{typeof(update_clims),Float64,Float64,SubArray{Int64, 1, Vector{Int64}, Tuple{UnitRange{Int64}}, true},typeof(ignorenan_extrema)})
-    Base.precompile(Tuple{typeof(warn_on_attr_dim_mismatch),Series,Vector{Float64},Vector{Float64},Nothing,Base.Iterators.Flatten{Vector{Tuple{SeriesSegment}}}})
-    Base.precompile(Tuple{typeof(xgrid!),Plot{GRBackend},Symbol,Vararg{Any}})
-    Base.precompile(Tuple{typeof(xgrid!),Plot{PlotlyBackend},Symbol,Vararg{Any}})
-    Base.precompile(Tuple{typeof(xlims),Subplot{PlotlyBackend}})
-    isdefined(Plots, Symbol("#2#6")) && Base.precompile(Tuple{getfield(Plots, Symbol("#2#6")),UnitRange{Int64}})
-    isdefined(Plots, Symbol("#322#358")) && Base.precompile(Tuple{getfield(Plots, Symbol("#322#358"))})
-    isdefined(Plots, Symbol("#add_major_or_minor_segments#102")) && Base.precompile(Tuple{getfield(Plots, Symbol("#add_major_or_minor_segments#102")),Vector{Float64},Bool,Segments{Tuple{Float64, Float64}},Float64,Bool})
-    isdefined(Plots, Symbol("#add_major_or_minor_segments#103")) && Base.precompile(Tuple{getfield(Plots, Symbol("#add_major_or_minor_segments#103")),Vector{Float64},Bool,Segments{Tuple{Float64, Float64, Float64}},Float64,Bool})
-end

deps/SnoopCompile/precompile_script.jl

@@ -1,4 +0,0 @@
-using Plots
-
-Plots.test_examples(:gr, skip = Plots._backend_skips[:gr])
-Plots.test_examples(:plotly, skip = Plots._backend_skips[:plotly], disp = false)

deps/SnoopCompile/snoop_bench.jl

@@ -1,6 +0,0 @@
-include("snoop_bot_config.jl")
-
-snoop_bench(
-    botconfig,
-    joinpath(@__DIR__, "precompile_script.jl"),
-)

deps/SnoopCompile/snoop_bot.jl

@@ -1,6 +0,0 @@
-include("snoop_bot_config.jl")
-
-snoop_bot(
-    botconfig,
-    joinpath(@__DIR__, "precompile_script.jl"),
-)

deps/SnoopCompile/snoop_bot_config.jl

@@ -1,7 +0,0 @@
-using CompileBot
-
-botconfig = BotConfig(
-    "Plots",
-    version = ["1.6", "1.7", "1.8", "nightly"],  # <<< keep these versions in sync with .github/workflows/SnoopCompile.yml
-    # else_version = "nightly",
-)

deps/build.jl

@@ -0,0 +1,18 @@
+
+#TODO: download https://cdn.plot.ly/plotly-latest.min.js to deps/ if it doesn't exist
+file_path = ""
+if get(ENV, "PLOTS_HOST_DEPENDENCY_LOCAL", "false") == "true"
+    global file_path
+    local_fn = joinpath(dirname(@__FILE__), "plotly-latest.min.js")
+    if !isfile(local_fn)
+        @info("Cannot find deps/plotly-latest.min.js... downloading latest version.")
+        download("https://cdn.plot.ly/plotly-latest.min.js", local_fn)
+        isfile(local_fn) && (file_path = local_fn)
+    else
+        file_path = local_fn
+    end
+end
+
+open("deps.jl", "w") do io
+    println(io, "const plotly_local_file_path = $(repr(file_path))")
+end

pushtomaster.sh

@@ -0,0 +1,4 @@
+git checkout master
+git merge --ff-only dev
+git push origin master
+git checkout dev

src/Plots.jl

@@ -1,61 +1,42 @@
 module Plots
 
-using Pkg
+_current_plots_version = v"0.26.1"
-
-if isdefined(Base, :Experimental) && isdefined(Base.Experimental, Symbol("@optlevel"))
-    @eval Base.Experimental.@optlevel 1
-end
-if isdefined(Base, :Experimental) && isdefined(Base.Experimental, Symbol("@max_methods"))
-    @eval Base.Experimental.@max_methods 1
-end
-
-const _plots_project = Pkg.Types.read_project(normpath(@__DIR__, "..", "Project.toml"))
-const _current_plots_version = _plots_project.version
-const _plots_compats = _plots_project.compat
-function _check_compat(sim::Module)
-    sim_str = string(sim)
-    if !haskey(_plots_compats, sim_str)
-        return nothing
-    end
-    be_v = Pkg.Types.read_project(joinpath(Base.pkgdir(sim), "Project.toml")).version
-    be_c = _plots_compats[sim_str]
-    if be_c isa String # julia 1.6
-        if !(be_v in Pkg.Types.semver_spec(be_c))
-            @warn "$sim $be_v is not compatible with this version of Plots. The declared compatibility is $(be_c)."
-        end
-    else
-        if isempty(intersect(be_v, be_c.val))
-            @warn "$sim $be_v is not compatible with this version of Plots. The declared compatibility is $(be_c.str)."
-        end
-    end
-end
 
 using Reexport
 
-import GeometryBasics
+import GeometryTypes
-using Dates, Printf, Statistics, Base64, LinearAlgebra, Random, Unzip
+using Dates, Printf, Statistics, Base64, LinearAlgebra, Random
-using SparseArrays
+import SparseArrays: findnz
 
 using FFMPEG
 
 @reexport using RecipesBase
-import RecipesBase: plot, plot!, animate, is_explicit, grid
+import RecipesBase: plot, plot!, animate
 using Base.Meta
 @reexport using PlotUtils
 @reexport using PlotThemes
-import UnicodeFun
-import StatsBase
-import Downloads
 import Showoff
+import StatsBase
 import JSON
 
 using Requires
 
-#! format: off
+if isfile(joinpath(@__DIR__, "..", "deps", "deps.jl"))
+    include(joinpath(@__DIR__, "..", "deps", "deps.jl"))
+else
+    # This is a bit dirty, but I don't really see why anyone should be forced
+    # to build Plots, while it will just include exactly the below line
+    # as long as `ENV["PLOTS_HOST_DEPENDENCY_LOCAL"] = "true"` is not set.
+    # If the above env is set + `plotly_local_file_path == ""``,
+    # it will warn in the __init__ function to run build
+    const plotly_local_file_path = ""
+end
+
 export
     grid,
     bbox,
     plotarea,
+    @layout,
     KW,
 
     wrap,
@@ -123,7 +104,6 @@ export
     gif,
     mov,
     mp4,
-    webm,
     animate,
     @animate,
     @gif,
@@ -139,11 +119,8 @@ export
     center,
     BezierCurve,
 
-    plotattr,
+    plotattr
-    scalefontsize,
+
-    scalefontsizes,
-    resetfontsizes
-#! format: on
 # ---------------------------------------------------------
 
 import NaNMath # define functions that ignores NaNs. To overcome the destructive effects of https://github.com/JuliaLang/julia/pull/12563
@@ -162,6 +139,7 @@ ignorenan_extrema(x) = Base.extrema(x)
 # This makes it impossible to create row vectors of String and Symbol with the transpose operator.
 # This solves this issue, internally in Plots at least.
 
+
 # commented out on the insistence of the METADATA maintainers
 
 #Base.transpose(x::Symbol) = x
@@ -172,21 +150,12 @@ ignorenan_extrema(x) = Base.extrema(x)
 import Measures
 module PlotMeasures
 import Measures
-import Measures:
+import Measures: Length, AbsoluteLength, Measure, BoundingBox, mm, cm, inch, pt, width, height, w, h
-    Length, AbsoluteLength, Measure, BoundingBox, mm, cm, inch, pt, width, height, w, h
 const BBox = Measures.Absolute2DBox
 
 # allow pixels and percentages
 const px = AbsoluteLength(0.254)
-const pct = Length{:pct,Float64}(1.0)
+const pct = Length{:pct, Float64}(1.0)
-
-Base.convert(::Type{<:Measure}, x::Float64) = x * pct
-
-Base.:*(m1::AbsoluteLength, m2::Length{:pct}) = AbsoluteLength(m1.value * m2.value)
-Base.:*(m1::Length{:pct}, m2::AbsoluteLength) = AbsoluteLength(m2.value * m1.value)
-Base.:/(m1::AbsoluteLength, m2::Length{:pct}) = AbsoluteLength(m1.value / m2.value)
-Base.:/(m1::Length{:pct}, m2::AbsoluteLength) = AbsoluteLength(m2.value / m1.value)
-
 export BBox, BoundingBox, mm, cm, inch, px, pct, pt, w, h
 end
 
@@ -194,40 +163,15 @@ using .PlotMeasures
 import .PlotMeasures: Length, AbsoluteLength, Measure, width, height
 # ---------------------------------------------------------
 
-import RecipesPipeline
-import RecipesPipeline:
-    SliceIt,
-    DefaultsDict,
-    Formatted,
-    AbstractSurface,
-    Surface,
-    Volume,
-    is3d,
-    is_surface,
-    needs_3d_axes,
-    group_as_matrix, # for StatsPlots
-    reset_kw!,
-    pop_kw!,
-    scale_func,
-    inverse_scale_func,
-    dateformatter,
-    datetimeformatter,
-    timeformatter
-
-# Use fixed version of Plotly instead of the latest one for stable dependency
-# Ref: https://github.com/JuliaPlots/Plots.jl/pull/2779
-const _plotly_min_js_filename = "plotly-2.6.3.min.js"
-
 include("types.jl")
 include("utils.jl")
-include("colorbars.jl")
+include("components.jl")
 include("axes.jl")
 include("args.jl")
-include("components.jl")
-include("consts.jl")
 include("themes.jl")
 include("plot.jl")
 include("pipeline.jl")
+include("series.jl")
 include("layouts.jl")
 include("subplots.jl")
 include("recipes.jl")
@@ -240,7 +184,6 @@ include("output.jl")
 include("ijulia.jl")
 include("fileio.jl")
 include("init.jl")
-include("legend.jl")
 
 include("backends/plotly.jl")
 include("backends/gr.jl")
@@ -248,35 +191,36 @@ include("backends/web.jl")
 
 include("shorthands.jl")
 
-let PlotOrSubplot = Union{Plot,Subplot}
+let PlotOrSubplot = Union{Plot, Subplot}
-    global title!(plt::PlotOrSubplot, s::AbstractString; kw...)                                                  = plot!(plt; title = s, kw...)
+    global title!(plt::PlotOrSubplot, s::AbstractString; kw...)                  = plot!(plt; title = s, kw...)
-    global xlabel!(plt::PlotOrSubplot, s::AbstractString; kw...)                                                 = plot!(plt; xlabel = s, kw...)
+    global xlabel!(plt::PlotOrSubplot, s::AbstractString; kw...)                 = plot!(plt; xlabel = s, kw...)
-    global ylabel!(plt::PlotOrSubplot, s::AbstractString; kw...)                                                 = plot!(plt; ylabel = s, kw...)
+    global ylabel!(plt::PlotOrSubplot, s::AbstractString; kw...)                 = plot!(plt; ylabel = s, kw...)
-    global xlims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}                           = plot!(plt; xlims = lims, kw...)
+    global xlims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}  = plot!(plt; xlims = lims, kw...)
-    global ylims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}                           = plot!(plt; ylims = lims, kw...)
+    global ylims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}  = plot!(plt; ylims = lims, kw...)
-    global zlims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}                           = plot!(plt; zlims = lims, kw...)
+    global zlims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}  = plot!(plt; zlims = lims, kw...)
-    global xlims!(plt::PlotOrSubplot, xmin::Real, xmax::Real; kw...)                                             = plot!(plt; xlims = (xmin, xmax), kw...)
+    global xlims!(plt::PlotOrSubplot, xmin::Real, xmax::Real; kw...)             = plot!(plt; xlims = (xmin,xmax), kw...)
-    global ylims!(plt::PlotOrSubplot, ymin::Real, ymax::Real; kw...)                                             = plot!(plt; ylims = (ymin, ymax), kw...)
+    global ylims!(plt::PlotOrSubplot, ymin::Real, ymax::Real; kw...)             = plot!(plt; ylims = (ymin,ymax), kw...)
-    global zlims!(plt::PlotOrSubplot, zmin::Real, zmax::Real; kw...)                                             = plot!(plt; zlims = (zmin, zmax), kw...)
+    global zlims!(plt::PlotOrSubplot, zmin::Real, zmax::Real; kw...)             = plot!(plt; zlims = (zmin,zmax), kw...)
-    global xticks!(plt::PlotOrSubplot, ticks::TicksArgs; kw...)                                                  = plot!(plt; xticks = ticks, kw...)
+    global xticks!(plt::PlotOrSubplot, ticks::TicksArgs; kw...) where {T<:Real}           = plot!(plt; xticks = ticks, kw...)
-    global yticks!(plt::PlotOrSubplot, ticks::TicksArgs; kw...)                                                  = plot!(plt; yticks = ticks, kw...)
+    global yticks!(plt::PlotOrSubplot, ticks::TicksArgs; kw...) where {T<:Real}           = plot!(plt; yticks = ticks, kw...)
-    global xticks!(plt::PlotOrSubplot, ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString} = plot!(plt; xticks = (ticks, labels), kw...)
+    global xticks!(plt::PlotOrSubplot,
-    global yticks!(plt::PlotOrSubplot, ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString} = plot!(plt; yticks = (ticks, labels), kw...)
+   ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString}     = plot!(plt; xticks = (ticks,labels), kw...)
-    global xgrid!(plt::PlotOrSubplot, args...; kw...)                                                            = plot!(plt; xgrid = args, kw...)
+    global yticks!(plt::PlotOrSubplot,
-    global ygrid!(plt::PlotOrSubplot, args...; kw...)                                                            = plot!(plt; ygrid = args, kw...)
+   ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString}     = plot!(plt; yticks = (ticks,labels), kw...)
-    global annotate!(plt::PlotOrSubplot, anns...; kw...)                                                         = plot!(plt; annotation = anns, kw...)
+    global xgrid!(plt::PlotOrSubplot, args...; kw...)                  = plot!(plt; xgrid = args, kw...)
-    global annotate!(plt::PlotOrSubplot, anns::AVec{T}; kw...) where {T<:Tuple}                                  = plot!(plt; annotation = anns, kw...)
+    global ygrid!(plt::PlotOrSubplot, args...; kw...)                  = plot!(plt; ygrid = args, kw...)
-    global xflip!(plt::PlotOrSubplot, flip::Bool = true; kw...)                                                  = plot!(plt; xflip = flip, kw...)
+    global annotate!(plt::PlotOrSubplot, anns...; kw...)                         = plot!(plt; annotation = anns, kw...)
-    global yflip!(plt::PlotOrSubplot, flip::Bool = true; kw...)                                                  = plot!(plt; yflip = flip, kw...)
+    global annotate!(plt::PlotOrSubplot, anns::AVec{T}; kw...) where {T<:Tuple}         = plot!(plt; annotation = anns, kw...)
-    global xaxis!(plt::PlotOrSubplot, args...; kw...)                                                            = plot!(plt; xaxis = args, kw...)
+    global xflip!(plt::PlotOrSubplot, flip::Bool = true; kw...)                  = plot!(plt; xflip = flip, kw...)
-    global yaxis!(plt::PlotOrSubplot, args...; kw...)                                                            = plot!(plt; yaxis = args, kw...)
+    global yflip!(plt::PlotOrSubplot, flip::Bool = true; kw...)                  = plot!(plt; yflip = flip, kw...)
+    global xaxis!(plt::PlotOrSubplot, args...; kw...)                            = plot!(plt; xaxis = args, kw...)
+    global yaxis!(plt::PlotOrSubplot, args...; kw...)                            = plot!(plt; yaxis = args, kw...)
 end
 
+
 # ---------------------------------------------------------
 
-const CURRENT_BACKEND = CurrentBackend(:none)
+const CURRENT_BACKEND = Plots.CurrentBackend(:gr)
-const PLOTS_SEED = 1234
+gr()
-
-include("precompile_includer.jl")
 
 end # module

src/animation.jl

@@ -14,24 +14,23 @@ end
 
 Add a plot (the current plot if not specified) to an existing animation
 """
-function frame(anim::Animation, plt::P = current()) where {P<:AbstractPlot}
+function frame(anim::Animation, plt::P=current()) where P<:AbstractPlot
     i = length(anim.frames) + 1
     filename = @sprintf("%06d.png", i)
     png(plt, joinpath(anim.dir, filename))
     push!(anim.frames, filename)
 end
 
-giffn() = (isijulia() ? "tmp.gif" : tempname() * ".gif")
+giffn() = (isijulia() ? "tmp.gif" : tempname()*".gif")
-movfn() = (isijulia() ? "tmp.mov" : tempname() * ".mov")
+movfn() = (isijulia() ? "tmp.mov" : tempname()*".mov")
-mp4fn() = (isijulia() ? "tmp.mp4" : tempname() * ".mp4")
+mp4fn() = (isijulia() ? "tmp.mp4" : tempname()*".mp4")
-webmfn() = (isijulia() ? "tmp.webm" : tempname() * ".webm")
 
 mutable struct FrameIterator
     itr
     every::Int
     kw
 end
-FrameIterator(itr; every = 1, kw...) = FrameIterator(itr, every, kw)
+FrameIterator(itr; every=1, kw...) = FrameIterator(itr, every, kw)
 
 """
 Animate from an iterator which returns the plot args each iteration.
@@ -48,8 +47,8 @@ function animate(fitr::FrameIterator, fn = giffn(); kw...)
 end
 
 # most things will implement this
-function animate(obj, fn = giffn(); every = 1, fps = 20, loop = 0, kw...)
+function animate(obj, fn = giffn(); every=1, fps=20, loop=0, kw...)
-    animate(FrameIterator(obj, every, kw), fn; fps = fps, loop = loop)
+    animate(FrameIterator(obj, every, kw), fn; fps=fps, loop=loop)
 end
 
 # -----------------------------------------------
@@ -64,140 +63,112 @@ file_extension(fn) = Base.Filesystem.splitext(fn)[2][2:end]
 gif(anim::Animation, fn = giffn(); kw...) = buildanimation(anim, fn; kw...)
 mov(anim::Animation, fn = movfn(); kw...) = buildanimation(anim, fn, false; kw...)
 mp4(anim::Animation, fn = mp4fn(); kw...) = buildanimation(anim, fn, false; kw...)
-webm(anim::Animation, fn = webmfn(); kw...) = buildanimation(anim, fn, false; kw...)
 
-ffmpeg_framerate(fps) = "$fps"
-ffmpeg_framerate(fps::Rational) = "$(fps.num)/$(fps.den)"
 
-function buildanimation(
+function buildanimation(anim::Animation, fn::AbstractString,
-    anim::Animation,
+                        is_animated_gif::Bool=true;
-    fn::AbstractString,
+                        fps::Integer = 20, loop::Integer = 0,
-    is_animated_gif::Bool = true;
+                        variable_palette::Bool=false,
-    fps::Real = 20,
+                        show_msg::Bool=true)
-    loop::Integer = 0,
-    variable_palette::Bool = false,
-    verbose = false,
-    show_msg::Bool = true,
-)
     if length(anim.frames) == 0
         throw(ArgumentError("Cannot build empty animations"))
     end
 
     fn = abspath(expanduser(fn))
     animdir = anim.dir
-    framerate = ffmpeg_framerate(fps)
-    verbose_level = (verbose isa Int ? verbose : verbose ? 32 : 16) # "error"
 
     if is_animated_gif
         if variable_palette
             # generate a colorpalette for each frame for highest quality, but larger filesize
-            palette = "palettegen=stats_mode=single[pal],[0:v][pal]paletteuse=new=1"
+            palette="palettegen=stats_mode=single[pal],[0:v][pal]paletteuse=new=1"
-            ffmpeg_exe(
+            ffmpeg_exe(`-v 0 -framerate $fps -loop $loop -i $(animdir)/%06d.png -lavfi "$palette" -y $fn`)
-                `-v $verbose_level -framerate $framerate -i $(animdir)/%06d.png -lavfi "$palette" -loop $loop -y $fn`,
-            )
         else
             # generate a colorpalette first so ffmpeg does not have to guess it
-            ffmpeg_exe(
+            ffmpeg_exe(`-v 0 -i $(animdir)/%06d.png -vf "palettegen=stats_mode=diff" -y "$(animdir)/palette.bmp"`)
-                `-v $verbose_level -i $(animdir)/%06d.png -vf "palettegen=stats_mode=diff" -y "$(animdir)/palette.bmp"`,
-            )
             # then apply the palette to get better results
-            ffmpeg_exe(
+            ffmpeg_exe(` -v 0 -framerate $fps -loop $loop -i $(animdir)/%06d.png -i "$(animdir)/palette.bmp" -lavfi "paletteuse=dither=sierra2_4a" -y $fn`)
-                `-v $verbose_level -framerate $framerate -i $(animdir)/%06d.png -i "$(animdir)/palette.bmp" -lavfi "paletteuse=dither=sierra2_4a" -loop $loop -y $fn`,
-            )
         end
     else
-        ffmpeg_exe(
+        ffmpeg_exe(`-v 0 -framerate $fps -loop $loop -i $(animdir)/%06d.png -pix_fmt yuv420p -y $fn`)
-            `-v $verbose_level -framerate $framerate -i $(animdir)/%06d.png -vf format=yuv420p -loop $loop -y $fn`,
-        )
     end
 
     show_msg && @info("Saved animation to ", fn)
     AnimatedGif(fn)
 end
 
+
+
 # write out html to view the gif
 function Base.show(io::IO, ::MIME"text/html", agif::AnimatedGif)
     ext = file_extension(agif.filename)
-    if ext == "gif"
+    write(io, if ext == "gif"
-        html =
+        "<img src=\"$(relpath(agif.filename))\" />"
-            "<img src=\"data:image/gif;base64," *
+    elseif ext in ("mov", "mp4")
-            base64encode(read(agif.filename)) *
+        "<video controls><source src=\"$(relpath(agif.filename)) type=\"video/$ext\"></video>"
-            "\" />"
-    elseif ext in ("mov", "mp4", "webm")
-        mimetype = ext == "mov" ? "video/quicktime" : "video/$ext"
-        html =
-            "<video controls><source src=\"data:$mimetype;base64," *
-            base64encode(read(agif.filename)) *
-            "\" type = \"$mimetype\"></video>"
     else
         error("Cannot show animation with extension $ext: $agif")
-    end
+    end)
-
-    write(io, html)
     return nothing
 end
 
+
 # Only gifs can be shown via image/gif
 Base.showable(::MIME"image/gif", agif::AnimatedGif) = file_extension(agif.filename) == "gif"
 
 function Base.show(io::IO, ::MIME"image/gif", agif::AnimatedGif)
-    open(fio -> write(io, fio), agif.filename)
+    open(fio-> write(io, fio), agif.filename)
 end
 
+
 # -----------------------------------------------
 
 function _animate(forloop::Expr, args...; callgif = false)
-    if forloop.head ∉ (:for, :while)
+  if forloop.head != :for
-        error("@animate macro expects a for- or while-block. got: $(forloop.head)")
+    error("@animate macro expects a for-block. got: $(forloop.head)")
-    end
+  end
 
-    # add the call to frame to the end of each iteration
+  # add the call to frame to the end of each iteration
-    animsym = gensym("anim")
+  animsym = gensym("anim")
-    countersym = gensym("counter")
+  countersym = gensym("counter")
-    freqassert = :()
+  freqassert = :()
-    block = forloop.args[2]
+  block = forloop.args[2]
 
-    # create filter
+  # create filter
-    n = length(args)
+  n = length(args)
-    filterexpr = if n == 0
+  filterexpr = if n == 0
-        # no filter... every iteration gets a frame
+    # no filter... every iteration gets a frame
-        true
+    true
 
-    elseif args[1] == :every
+  elseif args[1] == :every
-        # filter every `freq` frames (starting with the first frame)
+    # filter every `freq` frames (starting with the first frame)
-        @assert n == 2
+    @assert n == 2
-        freq = args[2]
+    freq = args[2]
-        freqassert = :(@assert isa($freq, Integer) && $freq > 0)
+    freqassert = :(@assert isa($freq, Integer) && $freq > 0)
-        :(mod1($countersym, $freq) == 1)
+    :(mod1($countersym, $freq) == 1)
 
-    elseif args[1] == :when
+  elseif args[1] == :when
-        # filter on custom expression
+    # filter on custom expression
-        @assert n == 2
+    @assert n == 2
-        args[2]
+    args[2]
 
-    else
+  else
-        error("Unsupported animate filter: $args")
+    error("Unsupported animate filter: $args")
-    end
+  end
 
-    push!(block.args, :(
+  push!(block.args, :(if $filterexpr; frame($animsym); end))
-        if $filterexpr
+  push!(block.args, :(global $countersym += 1))
-            Plots.frame($animsym)
-        end
-    ))
-    push!(block.args, :($countersym += 1))
 
-    # add a final call to `gif(anim)`?
+  # add a final call to `gif(anim)`?
-    retval = callgif ? :(Plots.gif($animsym)) : animsym
+  retval = callgif ? :(gif($animsym)) : animsym
 
-    # full expression:
+  # full expression:
-    esc(quote
+  esc(quote
-        $freqassert                     # if filtering, check frequency is an Integer > 0
+    $freqassert             # if filtering, check frequency is an Integer > 0
-        $animsym = Plots.Animation()    # init animation object
+    $animsym = Animation()  # init animation object
-        let $countersym = 1             # init iteration counter
+    global $countersym = 1         # init iteration counter
-            $forloop                      # for loop, saving a frame after each iteration
+    $forloop                # for loop, saving a frame after each iteration
-        end
+    $retval                 # return the animation object, or the gif
-        $retval                         # return the animation object, or the gif
+  end)
-    end)
 end
 
 """

src/arg_desc.jl

@@ -1,192 +1,155 @@
 
-const _arg_desc = KW(
+const _arg_desc = Dict{Symbol,String}(
 
-    # series args
+# series args
-    :label              => "String type. The label for a series, which appears in a legend.  If empty, no legend entry is added.",
+:label 			=> "String type. The label for a series, which appears in a legend.  If empty, no legend entry is added.",
-    :seriescolor        => "Color Type. The base color for this series.  `:auto` (the default) will select a color from the subplot's `color_palette`, based on the order it was added to the subplot",
+:seriescolor 		=> "Color Type. The base color for this series.  `:auto` (the default) will select a color from the subplot's `color_palette`, based on the order it was added to the subplot",
-    :seriesalpha        => "Number in [0,1]. The alpha/opacity override for the series.  `nothing` (the default) means it will take the alpha value of the color.",
+:seriesalpha 		=> "Number in [0,1]. The alpha/opacity override for the series.  `nothing` (the default) means it will take the alpha value of the color.",
-    :seriestype         => "Symbol. This is the identifier of the type of visualization for this series. Choose from $(_allTypes) or any series recipes which are defined.",
+:seriestype 		=> "Symbol. This is the identifier of the type of visualization for this series. Choose from $(_allTypes) or any series recipes which are defined.",
-    :linestyle          => "Symbol. Style of the line (for path and bar stroke).  Choose from $(_allStyles)",
+:linestyle 			=> "Symbol. Style of the line (for path and bar stroke).  Choose from $(_allStyles)",
-    :linewidth          => "Number. Width of the line (in pixels)",
+:linewidth         	=> "Number. Width of the line (in pixels)",
-    :linecolor          => "Color Type. Color of the line (for path and bar stroke).  `:match` will take the value from `:seriescolor`, (though histogram/bar types use `:black` as a default).",
+:linecolor         	=> "Color Type. Color of the line (for path and bar stroke).  `:match` will take the value from `:seriescolor`, (though histogram/bar types use `:black` as a default).",
-    :linealpha          => "Number in [0,1]. The alpha/opacity override for the line.  `nothing` (the default) means it will take the alpha value of linecolor.",
+:linealpha         	=> "Number in [0,1]. The alpha/opacity override for the line.  `nothing` (the default) means it will take the alpha value of linecolor.",
-    :fillrange          => "Number or AbstractVector.  Fills area between fillrange and y for line-types, sets the base for bar/stick types, and similar for other types.",
+:fillrange         	=> "Number or AbstractVector.  Fills area between fillrange and y for line-types, sets the base for bar/stick types, and similar for other types.",
-    :fillcolor          => "Color Type. Color of the filled area of path or bar types.  `:match` will take the value from `:seriescolor`.",
+:fillcolor         	=> "Color Type. Color of the filled area of path or bar types.  `:match` will take the value from `:seriescolor`.",
-    :fillalpha          => "Number in [0,1]. The alpha/opacity override for the fill area.  `nothing` (the default) means it will take the alpha value of fillcolor.",
+:fillalpha         	=> "Number in [0,1]. The alpha/opacity override for the fill area.  `nothing` (the default) means it will take the alpha value of fillcolor.",
-    :markershape        => "Symbol, Shape, or AbstractVector. Choose from $(_allMarkers).",
+:markershape       	=> "Symbol, Shape, or AbstractVector. Choose from $(_allMarkers).",
-    :fillstyle          => "Symbol. Style of the fill area. `nothing` (the default) means solid fill. Choose from :/, :\\, :|, :-, :+, :x",
+:markercolor       	=> "Color Type. Color of the interior of the marker or shape. `:match` will take the value from `:seriescolor`.",
-    :markercolor        => "Color Type. Color of the interior of the marker or shape. `:match` will take the value from `:seriescolor`.",
+:markeralpha       	=> "Number in [0,1]. The alpha/opacity override for the marker interior.  `nothing` (the default) means it will take the alpha value of markercolor.",
-    :markeralpha        => "Number in [0,1]. The alpha/opacity override for the marker interior.  `nothing` (the default) means it will take the alpha value of markercolor.",
+:markersize        	=> "Number or AbstractVector. Size (radius pixels) of the markers.",
-    :markersize         => "Number or AbstractVector. Size (radius pixels) of the markers",
+:markerstrokestyle 	=> "Symbol. Style of the marker stroke (border).  Choose from $(_allStyles)",
-    :markerstrokestyle  => "Symbol. Style of the marker stroke (border).  Choose from $(_allStyles)",
+:markerstrokewidth 	=> "Number. Width of the marker stroke (border. in pixels)",
-    :markerstrokewidth  => "Number. Width of the marker stroke (border) in pixels",
+:markerstrokecolor 	=> "Color Type. Color of the marker stroke (border).  `:match` will take the value from `:foreground_color_subplot`.",
-    :markerstrokecolor  => "Color Type. Color of the marker stroke (border).  `:match` will take the value from `:foreground_color_subplot`.",
+:markerstrokealpha 	=> "Number in [0,1]. The alpha/opacity override for the marker stroke (border).  `nothing` (the default) means it will take the alpha value of markerstrokecolor.",
-    :markerstrokealpha  => "Number in [0,1]. The alpha/opacity override for the marker stroke (border).  `nothing` (the default) means it will take the alpha value of markerstrokecolor.",
+:bins              	=> "Integer, NTuple{2,Integer}, AbstractVector or Symbol. Default is :auto (the Freedman-Diaconis rule). For histogram-types, defines the approximate number of bins to aim for, or the auto-binning algorithm to use (:sturges, :sqrt, :rice, :scott or :fd). For fine-grained control pass a Vector of break values, e.g. `range(minimum(x), stop = maximum(x), length = 25)`",
-    :bins               => "Integer, NTuple{2,Integer}, AbstractVector or Symbol. Default is :auto (the Freedman-Diaconis rule). For histogram-types, defines the approximate number of bins to aim for, or the auto-binning algorithm to use (:sturges, :sqrt, :rice, :scott or :fd). For fine-grained control pass a Vector of break values, e.g. `range(minimum(x), stop = maximum(x), length = 25)`",
+:smooth            	=> "Bool.  Add a regression line?",
-    :smooth             => "Bool.  Add a regression line?",
+:group             	=> "AbstractVector. Data is split into a separate series, one for each unique value in `group`.",
-    :group              => "AbstractVector. Data is split into a separate series, one for each unique value in `group`",
+:x                 	=> "Various. Input data. First Dimension",
-    :x                  => "Various. Input data. First Dimension",
+:y                 	=> "Various. Input data. Second Dimension",
-    :y                  => "Various. Input data. Second Dimension",
+:z                 	=> "Various. Input data. Third Dimension. May be wrapped by a `Surface` for surface and heatmap types.",
-    :z                  => "Various. Input data. Third Dimension. May be wrapped by a `Surface` for surface and heatmap types.",
+:marker_z          	=> "AbstractVector, Function `f(x,y,z) -> z_value`, or Function `f(x,y) -> z_value`, or nothing. z-values for each series data point, which correspond to the color to be used from a markercolor gradient.",
-    :marker_z           => "AbstractVector, Function `f(x,y,z) -> z_value`, or Function `f(x,y) -> z_value`, or nothing. z-values for each series data point, which correspond to the color to be used from a markercolor gradient.",
+:line_z          	=> "AbstractVector, Function `f(x,y,z) -> z_value`, or Function `f(x,y) -> z_value`, or nothing. z-values for each series line segment, which correspond to the color to be used from a linecolor gradient.  Note that for N points, only the first N-1 values are used (one per line-segment).",
-    :line_z             => "AbstractVector, Function `f(x,y,z) -> z_value`, or Function `f(x,y) -> z_value`, or nothing. z-values for each series line segment, which correspond to the color to be used from a linecolor gradient.  Note that for N points, only the first N-1 values are used (one per line-segment).",
+:fill_z                 => "Matrix{Float64} of the same size as z matrix, which specifies the color of the 3D surface; the default value is `nothing`.",
-    :fill_z             => "Matrix{Float64} of the same size as z matrix, which specifies the color of the 3D surface; the default value is `nothing`.",
+:levels            	=> "Integer, NTuple{2,Integer}, or AbstractVector. Levels or number of levels (or x-levels/y-levels) for a contour type.",
-    :levels             => "Integer (number of contours) or AbstractVector (contour values). Determines contour levels for a contour type.",
+:orientation       	=> "Symbol.  Horizontal or vertical orientation for bar types.  Values `:h`, `:hor`, `:horizontal` correspond to horizontal (sideways, anchored to y-axis), and `:v`, `:vert`, and `:vertical` correspond to vertical (the default).",
-    :permute            => "Tuple{Symbol,Symbol}. Permutes data and axis properties of the axes given in the tuple. E.g. (:x, :y).",
+:bar_position      	=> "Symbol.  Choose from `:overlay` (default), `:stack`.  (warning: May not be implemented fully)",
-    :orientation        => "Symbol. (deprecated) Horizontal or vertical orientation for bar types.  Values `:h`, `:hor`, `:horizontal` correspond to horizontal (sideways, anchored to y-axis), and `:v`, `:vert`, and `:vertical` correspond to vertical (the default).",
+:bar_width              => "nothing or Number. Width of bars in data coordinates. When nothing, chooses based on x (or y when `orientation = :h`).",
-    :bar_position       => "Symbol.  Choose from `:overlay` (default), `:stack`.  (warning: May not be implemented fully)",
+:bar_edges              => "Bool.  Align bars to edges (true), or centers (the default)?",
-    :bar_width          => "nothing or Number. Width of bars in data coordinates. When nothing, chooses based on x (or y when `orientation = :h`).",
+:xerror                 => "AbstractVector or 2-Tuple of Vectors. x (horizontal) error relative to x-value.  If 2-tuple of vectors, the first vector corresponds to the left error (and the second to the right)",
-    :bar_edges          => "Bool.  Align bars to edges (true), or centers (the default)?",
+:yerror            	=> "AbstractVector or 2-Tuple of Vectors. y (vertical) error relative to y-value.  If 2-tuple of vectors, the first vector corresponds to the bottom error (and the second to the top)",
-    :xerror             => "AbstractVector or 2-Tuple of Vectors. x (horizontal) error relative to x-value.  If 2-tuple of vectors, the first vector corresponds to the left error (and the second to the right)",
+:ribbon            	=> "Number or AbstractVector.  Creates a fillrange around the data points.",
-    :yerror             => "AbstractVector or 2-Tuple of Vectors. y (vertical) error relative to y-value.  If 2-tuple of vectors, the first vector corresponds to the bottom error (and the second to the top)",
+:quiver            	=> "AbstractVector or 2-Tuple of vectors.  The directional vectors U,V which specify velocity/gradient vectors for a quiver plot.",
-    :ribbon             => "Number or AbstractVector.  Creates a fillrange around the data points.",
+:arrow             	=> "nothing (no arrows), Bool (if true, default arrows), Arrow object, or arg(s) that could be style or head length/widths.  Defines arrowheads that should be displayed at the end of path line segments (just before a NaN and the last non-NaN point).  Used in quiverplot, streamplot, or similar.",
-    :quiver             => "AbstractVector or 2-Tuple of vectors.  The directional vectors U,V which specify velocity/gradient vectors for a quiver plot.",
+:normalize         	=> "Bool or Symbol. Histogram normalization mode. Possible values are: false/:none (no normalization, default), true/:pdf (normalize to a discrete Probability Density Function, where the total area of the bins is 1), :probability (bin heights sum to 1) and :density (the area of each bin, rather than the height, is equal to the counts - useful for uneven bin sizes).",
-    :arrow              => "nothing (no arrows), Bool (if true, default arrows), Arrow object, or arg(s) that could be style or head length/widths.  Defines arrowheads that should be displayed at the end of path line segments (just before a NaN and the last non-NaN point).  Used in quiverplot, streamplot, or similar.",
+:weights           	=> "AbstractVector. Used in histogram types for weighted counts.",
-    :normalize          => "Bool or Symbol. Histogram normalization mode. Possible values are: false/:none (no normalization, default), true/:pdf (normalize to a discrete Probability Density Function, where the total area of the bins is 1), :probability (bin heights sum to 1) and :density (the area of each bin, rather than the height, is equal to the counts - useful for uneven bin sizes).",
+:contours          	=> "Bool. Add contours to the side-grids of 3D plots?  Used in surface/wireframe.",
-    :weights            => "AbstractVector. Used in histogram types for weighted counts.",
+:contour_labels         => "Bool. Show labels at the contour lines?",
-    :show_empty_bins    => "Bool. Whether empty bins in a 2D histogram are colored as 0 (true), or transparent (the default)",
+:match_dimensions  	=> "Bool. For heatmap types... should the first dimension of a matrix (rows) correspond to the first dimension of the plot (x-axis)?  The default is false, which matches the behavior of Matplotlib, Plotly, and others.  Note: when passing a function for z, the function should still map `(x,y) -> z`.",
-    :contours           => "Bool. Add contours to the side-grids of 3D plots?  Used in surface/wireframe.",
+:subplot           	=> "Integer (subplot index) or Subplot object.  The subplot that this series belongs to.",
-    :contour_labels     => "Bool. Show labels at the contour lines?",
+:series_annotations     => "AbstractVector of String or PlotText.  These are annotations which are mapped to data points/positions.",
-    :match_dimensions   => "Bool. For heatmap types... should the first dimension of a matrix (rows) correspond to the first dimension of the plot (x-axis)?  The default is false, which matches the behavior of Matplotlib, Plotly, and others.  Note: when passing a function for z, the function should still map `(x,y) -> z`.",
+:primary                => "Bool.  Does this count as a 'real series'?  For example, you could have a path (primary), and a scatter (secondary) as 2 separate series, maybe with different data (see sticks recipe for an example).  The secondary series will get the same color, etc as the primary.",
-    :subplot            => "Integer (subplot index) or Subplot object.  The subplot that this series belongs to.",
+:hover 	        	=> "nothing or vector of strings. Text to display when hovering over each data point.",
-    :series_annotations => "AbstractVector of String or PlotText.  These are annotations which are mapped to data points/positions.",
+:colorbar_entry   => "Bool.  Include this series in the color bar?  Set to `false` to exclude.",
-    :primary            => "Bool.  Does this count as a 'real series'?  For example, you could have a path (primary), and a scatter (secondary) as 2 separate series, maybe with different data (see sticks recipe for an example).  The secondary series will get the same color, etc as the primary.",
-    :hover              => "nothing or vector of strings. Text to display when hovering over each data point.",
-    :colorbar_entry     => "Bool.  Include this series in the color bar?  Set to `false` to exclude.",
-    :z_order            => "Symbol or Integer. :front (default), :back or index of position where 1 is farest in the background.",
 
-    # plot args
+# plot args
-    :plot_title               => "String. Title for the whole plot (not the subplots)",
+:plot_title               => "String. Title for the whole plot (not the subplots) (Note: Not currently implemented)",
-    :plot_titlevspan          => "Number in [0,1]. Vertical span of the whole plot title (fraction of the plot height)",
+:background_color         => "Color Type.  Base color for all backgrounds.",
-    :background_color         => "Color Type.  Base color for all backgrounds.",
+:background_color_outside => "Color Type or `:match` (matches `:background_color`).  Color outside the plot area(s)",
-    :background_color_outside => "Color Type or `:match` (matches `:background_color`).  Color outside the plot area(s)",
+:foreground_color         => "Color Type.  Base color for all foregrounds.",
-    :foreground_color         => "Color Type.  Base color for all foregrounds.",
+:size                     => "NTuple{2,Int}. (width_px, height_px) of the whole Plot",
-    :size                     => "NTuple{2,Int}. (width_px, height_px) of the whole Plot",
+:pos                      => "NTuple{2,Int}. (left_px, top_px) position of the GUI window (note: currently unimplemented)",
-    :pos                      => "NTuple{2,Int}. (left_px, top_px) position of the GUI window (note: currently unimplemented)",
+:window_title             => "String. Title of the window.",
-    :window_title             => "String. Title of the standalone gui-window.",
+:show                     => "Bool.  Should this command open/refresh a GUI/display?  This allows displaying in scripts or functions without explicitly calling `display`",
-    :show                     => "Bool.  Should this command open/refresh a GUI/display?  This allows displaying in scripts or functions without explicitly calling `display`",
+:layout                   => "Integer (number of subplots), NTuple{2,Integer} (grid dimensions), AbstractLayout (for example `grid(2,2)`), or the return from the `@layout` macro.  This builds the layout of subplots.",
-    :layout                   => "Integer (number of subplots), NTuple{2,Integer} (grid dimensions), AbstractLayout (for example `grid(2,2)`), or the return from the `@layout` macro.  This builds the layout of subplots.",
+:link                     => "Symbol.  How/whether to link axis limits between subplots. Values: `:none`, `:x` (x axes are linked by columns), `:y` (y axes are linked by rows), `:both` (x and y are linked), `:all` (every subplot is linked together regardless of layout position).",
-    :link                     => "Symbol.  How/whether to link axis limits between subplots. Values: `:none`, `:x` (x axes are linked by columns), `:y` (y axes are linked by rows), `:both` (x and y are linked), `:all` (every subplot is linked together regardless of layout position).",
+:overwrite_figure         => "Bool.  Should we reuse the same GUI window/figure when plotting (true) or open a new one (false).",
-    :overwrite_figure         => "Bool.  Should we reuse the same GUI window/figure when plotting (true) or open a new one (false).",
+:html_output_format       => "Symbol.  When writing html output, what is the format?  `:png` and `:svg` are currently supported.",
-    :html_output_format       => "Symbol.  When writing html output, what is the format?  `:png` and `:svg` are currently supported.",
+:tex_output_standalone    => "Bool. When writing tex output, should the source include a preamble for a standalone document class.",
-    :tex_output_standalone    => "Bool. When writing tex output, should the source include a preamble for a standalone document class.",
+:inset_subplots           => "nothing or vector of 2-tuple (parent,bbox).  optionally pass a vector of (parent,bbox) tuples which are the parent layout and the relative bounding box of inset subplots",
-    :inset_subplots           => "nothing or vector of 2-tuple (parent,bbox).  optionally pass a vector of (parent,bbox) tuples which are the parent layout and the relative bounding box of inset subplots",
+:dpi 			  => "Number.  Dots Per Inch of output figures",
-    :dpi                      => "Number.  Dots Per Inch of output figures",
+:thickness_scaling        => "Number. Scale for the thickness of all line elements like lines, borders, axes, grid lines, ... defaults to 1.",
-    :thickness_scaling        => "Number. Scale for the thickness of all line elements like lines, borders, axes, grid lines, ... defaults to 1.",
+:display_type             => "Symbol (`:auto`, `:gui`, or `:inline`).  When supported, `display` will either open a GUI window or plot inline.",
-    :display_type             => "Symbol (`:auto`, `:gui`, or `:inline`).  When supported, `display` will either open a GUI window or plot inline.",
+:extra_kwargs 	          => "KW (Dict{Symbol,Any}).  Pass a map of extra keyword args which may be specific to a backend.",
-    :extra_kwargs             => "Either one of (`:plot`, `:subplot`, `:series`) to specify for which element extra keyword args are collected or a KW (Dict{Symbol,Any}) to pass a map of extra keyword args which may be specific to a backend. Default: `:series`.\n Example: `pgfplotsx(); scatter(1:5, extra_kwargs=Dict(:subplot=>Dict(\"axis line shift\" => \"10pt\"))`",
+:fontfamily               => "String or Symbol.  Default font family for title, legend entries, tick labels and guides",
-    :fontfamily               => "String or Symbol.  Default font family for title, legend entries, tick labels and guides",
-    :warn_on_unsupported      => "Bool. Warn on unsupported attributes, series types and marker shapes",
 
-    # subplot args
+# subplot args
-    :title => "String. Subplot title.",
+:title                    => "String. Subplot title.",
-    :titlelocation => "Symbol. Position of subplot title. Values: `:left`, `:center`, `:right`",
+:title_location           => "Symbol. Position of subplot title. Values: `:left`, `:center`, `:right`",
-    :titlefontfamily => "String or Symbol. Font family of subplot title.",
+:titlefontfamily          => "String or Symbol. Font family of subplot title.",
-    :titlefontsize => "Integer. Font pointsize of subplot title.",
+:titlefontsize            => "Integer. Font pointsize of subplot title.",
-    :titlefonthalign => "Symbol. Font horizontal alignment of subplot title: :hcenter, :left, :right or :center",
+:titlefonthalign          => "Symbol. Font horizontal alignment of subplot title: :hcenter, :left, :right or :center",
-    :titlefontvalign => "Symbol. Font vertical alignment of subplot title: :vcenter, :top, :bottom or :center",
+:titlefontvalign          => "Symbol. Font vertical alignment of subplot title: :vcenter, :top, :bottom or :center",
-    :titlefontrotation => "Real. Font rotation of subplot title",
+:titlefontrotation        => "Real. Font rotation of subplot title",
-    :titlefontcolor => "Color Type. Font color of subplot title",
+:titlefontcolor           => "Color Type. Font color of subplot title",
-    :background_color_subplot => "Color Type or `:match` (matches `:background_color`).  Base background color of the subplot.",
+:background_color_subplot => "Color Type or `:match` (matches `:background_color`).  Base background color of the subplot.",
-    :legend_background_color => "Color Type or `:match` (matches `:background_color_subplot`).  Background color of the legend.",
+:background_color_legend  => "Color Type or `:match` (matches `:background_color_subplot`).  Background color of the legend.",
-    :background_color_inside => "Color Type or `:match` (matches `:background_color_subplot`).  Background color inside the plot area (under the grid).",
+:background_color_inside  => "Color Type or `:match` (matches `:background_color_subplot`).  Background color inside the plot area (under the grid).",
-    :foreground_color_subplot => "Color Type or `:match` (matches `:foreground_color`).  Base foreground color of the subplot.",
+:foreground_color_subplot => "Color Type or `:match` (matches `:foreground_color`).  Base foreground color of the subplot.",
-    :legend_foreground_color => "Color Type or `:match` (matches `:foreground_color_subplot`).  Foreground color of the legend.",
+:foreground_color_legend  => "Color Type or `:match` (matches `:foreground_color_subplot`).  Foreground color of the legend.",
-    :foreground_color_title => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of subplot title.",
+:foreground_color_title   => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of subplot title.",
-    :color_palette => "Vector of colors (cycle through) or color gradient (generate list from gradient) or `:auto` (generate a color list using `Colors.distiguishable_colors` and custom seed colors chosen to contrast with the background).  The color palette is a color list from which series colors are automatically chosen.",
+:color_palette            => "Vector of colors (cycle through) or color gradient (generate list from gradient) or `:auto` (generate a color list using `Colors.distiguishable_colors` and custom seed colors chosen to contrast with the background).  The color palette is a color list from which series colors are automatically chosen.",
-    :legend_position => "Bool (show the legend?) or (x,y) tuple or Symbol (legend position) or angle or (angle,inout) tuple. Bottom left corner of legend is placed at (x,y).  Symbol values: `:none`; `:best`; `:inline`; `:inside`; `:legend`; any valid combination of `:(outer ?)(top/bottom ?)(right/left ?)`, i.e.: `:top`, `:topright`, `:outerleft`, `:outerbottomright` ... (note: only some may be supported in each backend)",
+:legend                   => "Bool (show the legend?) or Symbol (legend position).  Symbol values: `:none`, `:best`, `:right`, `:left`, `:top`, `:bottom`, `:inside`, `:legend`, `:topright`, `:topleft`, `:bottomleft`, `:bottomright` (note: only some may be supported in each backend)",
-    :legend_column => "Integer. Number of columns in the legend. `-1` stands for maximum number of colums (horizontal legend).",
+:legendfontfamily         => "String or Symbol. Font family of legend entries.",
-    :legend_title_font => "Font. Font of the legend title.",
+:legendfontsize           => "Integer. Font pointsize of legend entries.",
-    :legend_font_family => "String or Symbol. Font family of legend entries.",
+:legendfonthalign         => "Symbol. Font horizontal alignment of legend entries: :hcenter, :left, :right or :center",
-    :legend_font_pointsize => "Integer. Font pointsize of legend entries.",
+:legendfontvalign         => "Symbol. Font vertical alignment of legend entries: :vcenter, :top, :bottom or :center",
-    :legend_font_halign => "Symbol. Font horizontal alignment of legend entries: :hcenter, :left, :right or :center",
+:legendfontrotation       => "Real. Font rotation of legend entries",
-    :legend_font_valign => "Symbol. Font vertical alignment of legend entries: :vcenter, :top, :bottom or :center",
+:legendfontcolor          => "Color Type. Font color of legend entries",
-    :legend_font_rotation => "Real. Font rotation of legend entries",
+:colorbar                 => "Bool (show the colorbar?) or Symbol (colorbar position).  Symbol values: `:none`, `:best`, `:right`, `:left`, `:top`, `:bottom`, `:legend` (matches legend value) (note: only some may be supported in each backend)",
-    :legend_font_color => "Color Type. Font color of legend entries",
+:clims 					  => "`:auto` or NTuple{2,Number}.  Fixes the limits of the colorbar.",
-    :legend_title => "String. Legend title.",
+:legendfont               => "Font. Font of legend items.",
-    :legend_title_font_family => "String or Symbol. Font family of the legend title.",
+:annotations              => "(x,y,text) tuple(s).  Can be a single tuple or a list of them.  Text can be String or PlotText (created with `text(args...)`)  Add one-off text annotations at the x,y coordinates.",
-    :legend_title_font_pointsize => "Integer. Font pointsize the legend title.",
+:projection               => "Symbol or String.  '3d' or 'polar'",
-    :legend_title_font_halign => "Symbol. Font horizontal alignment of the legend title: :hcenter, :left, :right or :center",
+:aspect_ratio             => "Symbol (:equal) or Number. Plot area is resized so that 1 y-unit is the same size as `aspect_ratio` x-units.",
-    :legend_title_font_valign => "Symbol. Font vertical alignment of the legend title: :vcenter, :top, :bottom or :center",
+:margin                   => "Measure (multiply by `mm`, `px`, etc). Base for individual margins... not directly used.  Specifies the extra padding around subplots.",
-    :legend_title_font_rotation => "Real. Font rotation of the legend title",
+:left_margin              => "Measure (multiply by `mm`, `px`, etc) or `:match` (matches `:margin`).  Specifies the extra padding to the left of the subplot.",
-    :legend_title_font_color => "Color Type. Font color of the legend title",
+:top_margin               => "Measure (multiply by `mm`, `px`, etc) or `:match` (matches `:margin`).  Specifies the extra padding on the top of the subplot.",
-    :colorbar => "Bool (show the colorbar?) or Symbol (colorbar position).  Symbol values: `:none`, `:best`, `:right`, `:left`, `:top`, `:bottom`, `:legend` (matches legend value) (note: only some may be supported in each backend)",
+:right_margin             => "Measure (multiply by `mm`, `px`, etc) or `:match` (matches `:margin`).  Specifies the extra padding to the right of the subplot.",
-    :clims => "`:auto`, NTuple{2,Number}, or a function that takes series data in and returns NTuple{2,Number}.  Fixes the limits of the colorbar.",
+:bottom_margin            => "Measure (multiply by `mm`, `px`, etc) or `:match` (matches `:margin`).  Specifies the extra padding on the bottom of the subplot.",
-    :colorbar_fontfamily => "String or Symbol. Font family of colobar entries.",
+:subplot_index            => "Integer.  Internal (not set by user).  Specifies the index of this subplot in the Plot's `plt.subplot` list.",
-    :colorbar_ticks => "Vector of numbers (set the tick values), Tuple of (tickvalues, ticklabels), or `:auto`",
+:colorbar_title           => "String.  Title of colorbar.",
-    :colorbar_tickfontfamily => "String or Symbol. Font family of colorbar tick labels.",
+:framestyle               => "Symbol.  Style of the axes frame. Choose from $(_allFramestyles)",
-    :colorbar_tickfontsize => "Integer. Font pointsize of colorbar tick entries.",
+:camera                   => "NTuple{2, Real}. Sets the view angle (azimuthal, elevation) for 3D plots",
-    :colorbar_tickfontcolor => "Color Type. Font color of colorbar tick entries",
-    :colorbar_scale => "Symbol. Scale of the colorbar axis: `:none`, `:ln`, `:log2`, `:log10`",
-    :colorbar_formatter => "Function, :scientific, :plain or :auto. A method which converts a number to a string for tick labeling.",
-    :legend_font => "Font. Font of legend items.",
-    :legend_titlefont => "Font. Font of the legend title.",
-    :annotations => "(x,y,text) tuple(s).  Can be a single tuple or a list of them.  Text can be String, PlotText (created with `text(args...)`), or a tuple of arguments to `text` (e.g., `(\"Label\", 8, :red, :top)`). Add one-off text annotations at the x,y coordinates.",
-    :annotationfontfamily => "String or Symbol. Font family of annotations.",
-    :annotationfontsize => "Integer. Font pointsize of annotations.",
-    :annotationhalign => "Symbol. horizontal alignment of annotations, :hcenter, :left, :right or :center.",
-    :annotationvalign => "Symbol. Vertical alignment of annotations, :vcenter, :top, :bottom or :center.",
-    :annotationrotation => "Float. Rotation of annotations in degrees.",
-    :annotationcolor => "Colorant or :match. Color of annotations.",
-    :projection => "Symbol or String.  '3d' or 'polar'",
-    :aspect_ratio => "Symbol (:equal or :none) or Number. Plot area is resized so that 1 y-unit is the same size as `aspect_ratio` x-units. With `:none`, images inherit aspect ratio of the plot area.",
-    :margin => "Measure (multiply by `mm`, `px`, etc). Base for individual margins... not directly used.  Specifies the extra padding around subplots.",
-    :left_margin => "Measure (multiply by `mm`, `px`, etc) or `:match` (matches `:margin`).  Specifies the extra padding to the left of the subplot.",
-    :top_margin => "Measure (multiply by `mm`, `px`, etc) or `:match` (matches `:margin`).  Specifies the extra padding on the top of the subplot.",
-    :right_margin => "Measure (multiply by `mm`, `px`, etc) or `:match` (matches `:margin`).  Specifies the extra padding to the right of the subplot.",
-    :bottom_margin => "Measure (multiply by `mm`, `px`, etc) or `:match` (matches `:margin`).  Specifies the extra padding on the bottom of the subplot.",
-    :subplot_index => "Integer.  Internal (not set by user).  Specifies the index of this subplot in the Plot's `plt.subplot` list.",
-    :colorbar_title => "String.  Title of colorbar.",
-    :framestyle => "Symbol.  Style of the axes frame. Choose from $(_allFramestyles)",
-    :camera => "NTuple{2, Real}. Sets the view angle (azimuthal, elevation) for 3D plots",
 
-    # axis args
+# axis args
-    :guide                       => "String. Axis guide (label).",
+:guide     		  => "String. Axis guide (label).",
-    :guide_position              => "Symbol. Position of axis guides: :top, :bottom, :left or :right",
+:guide_position		  => "Symbol. Position of axis guides: :top, :bottom, :left or :right",
-    :lims                        => """
+:lims      		  => "NTuple{2,Number} or Symbol. Force axis limits.  Only finite values are used (you can set only the right limit with `xlims = (-Inf, 2)` for example). `:round` widens the limit to the nearest round number ie. [0.1,3.6]=>[0.0,4.0]",
-                                    NTuple{2,Number} or Symbol. Force axis limits. Only finite values are used (you can set only the right limit with `xlims = (-Inf, 2)` for example).
+:ticks     		  => "Vector of numbers (set the tick values), Tuple of (tickvalues, ticklabels), or `:auto`",
-                                    `:round` widens the limit to the nearest round number ie. [0.1,3.6]=>[0.0,4.0]
+:scale     		  => "Symbol. Scale of the axis: `:none`, `:ln`, `:log2`, `:log10`",
-                                    `:symmetric` sets the limits to be symmetric around zero.
+:rotation  		  => "Number. Degrees rotation of tick labels.",
-                                    Set widen=true to widen the specified limits (as occurs when lims are not specified).
+:flip      		  => "Bool.  Should we flip (reverse) the axis?",
-                                    """,
+:formatter                => "Function, :scientific, :plain or :auto. A method which converts a number to a string for tick labeling.",
-    :ticks                       => "Vector of numbers (set the tick values), Tuple of (tickvalues, ticklabels), or `:auto`",
+:tickfontfamily           => "String or Symbol. Font family of tick labels.",
-    :scale                       => "Symbol. Scale of the axis: `:none`, `:ln`, `:log2`, `:log10`",
+:tickfontsize             => "Integer. Font pointsize of tick labels.",
-    :rotation                    => "Number. Degrees rotation of tick labels.",
+:tickfonthalign           => "Symbol. Font horizontal alignment of tick labels: :hcenter, :left, :right or :center",
-    :flip                        => "Bool.  Should we flip (reverse) the axis?",
+:tickfontvalign           => "Symbol. Font vertical alignment of tick labels: :vcenter, :top, :bottom or :center",
-    :formatter                   => "Function, :scientific, :plain or :auto. A method which converts a number to a string for tick labeling.",
+:tickfontrotation         => "Real. Font rotation of tick labels",
-    :tickfontfamily              => "String or Symbol. Font family of tick labels.",
+:tickfontcolor            => "Color Type. Font color of tick labels",
-    :tickfontsize                => "Integer. Font pointsize of tick labels.",
+:guidefontfamily          => "String or Symbol. Font family of axes guides.",
-    :tickfonthalign              => "Symbol. Font horizontal alignment of tick labels: :hcenter, :left, :right or :center",
+:guidefontsize            => "Integer. Font pointsize of axes guides.",
-    :tickfontvalign              => "Symbol. Font vertical alignment of tick labels: :vcenter, :top, :bottom or :center",
+:guidefonthalign          => "Symbol. Font horizontal alignment of axes guides: :hcenter, :left, :right or :center",
-    :tickfontrotation            => "Real. Font rotation of tick labels",
+:guidefontvalign          => "Symbol. Font vertical alignment of axes guides: :vcenter, :top, :bottom or :center",
-    :tickfontcolor               => "Color Type. Font color of tick labels",
+:guidefontrotation        => "Real. Font rotation of axes guides",
-    :guidefontfamily             => "String or Symbol. Font family of axes guides.",
+:guidefontcolor           => "Color Type. Font color of axes guides",
-    :guidefontsize               => "Integer. Font pointsize of axes guides.",
+:foreground_color_axis    => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of axis ticks.",
-    :guidefonthalign             => "Symbol. Font horizontal alignment of axes guides: :hcenter, :left, :right or :center",
+:foreground_color_border  => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of plot area border (spines).",
-    :guidefontvalign             => "Symbol. Font vertical alignment of axes guides: :vcenter, :top, :bottom or :center",
+:foreground_color_text    => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of tick labels.",
-    :guidefontrotation           => "Real. Font rotation of axes guides",
+:foreground_color_guide   => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of axis guides (axis labels).",
-    :guidefontcolor              => "Color Type. Font color of axes guides",
+:mirror                   => "Bool.  Switch the side of the tick labels (right or top).",
-    :foreground_color_axis       => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of axis ticks.",
+:grid                     => "Bool, Symbol, String or `nothing`. Show the grid lines? `true`, `false`, `:show`, `:hide`, `:yes`, `:no`, `:x`, `:y`, `:z`, `:xy`, ..., `:all`, `:none`, `:off`",
-    :foreground_color_border     => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of plot area border (spines).",
+:foreground_color_grid    => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of grid lines.",
-    :foreground_color_text       => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of tick labels.",
+:gridalpha                => "Number in [0,1]. The alpha/opacity override for the grid lines.",
-    :foreground_color_guide      => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of axis guides (axis labels).",
+:gridstyle                => "Symbol. Style of the grid lines. Choose from $(_allStyles)",
-    :mirror                      => "Bool.  Switch the side of the tick labels (right or top).",
+:gridlinewidth            => "Number. Width of the grid lines (in pixels)",
-    :grid                        => "Bool, Symbol, String or `nothing`. Show the grid lines? `true`, `false`, `:show`, `:hide`, `:yes`, `:no`, `:x`, `:y`, `:z`, `:xy`, ..., `:all`, `:none`, `:off`",
+:foreground_color_minor_grid => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of minor grid lines.",
-    :foreground_color_grid       => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of grid lines.",
+:minorgrid                => "Bool. Adds minor grid lines and ticks to the plot. Set minorticks to change number of gridlines",
-    :gridalpha                   => "Number in [0,1]. The alpha/opacity override for the grid lines.",
+:minorticks               => "Integer. Intervals to divide the gap between major ticks into",
-    :gridstyle                   => "Symbol. Style of the grid lines. Choose from $(_allStyles)",
+:minorgridalpha           => "Number in [0,1]. The alpha/opacity override for the minorgrid lines.",
-    :gridlinewidth               => "Number. Width of the grid lines (in pixels)",
+:minorgridstyle           => "Symbol. Style of the minor grid lines. Choose from $(_allStyles)",
-    :foreground_color_minor_grid => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of minor grid lines.",
+:minorgridlinewidth       => "Number. Width of the minor grid lines (in pixels)",
-    :minorgrid                   => "Bool. Adds minor grid lines and ticks to the plot. Set minorticks to change number of gridlines",
+:tick_direction           => "Symbol.  Direction of the ticks. `:in` or `:out`",
-    :minorticks                  => "Integer. Intervals to divide the gap between major ticks into",
+:showaxis                 => "Bool, Symbol or String.  Show the axis. `true`, `false`, `:show`, `:hide`, `:yes`, `:no`, `:x`, `:y`, `:z`, `:xy`, ..., `:all`, `:off`",
-    :minorgridalpha              => "Number in [0,1]. The alpha/opacity override for the minorgrid lines.",
+:widen                    => "Bool. Widen the axis limits by a small factor to avoid cut-off markers and lines at the borders. Defaults to `true`.",
-    :minorgridstyle              => "Symbol. Style of the minor grid lines. Choose from $(_allStyles)",
+:draw_arrow               => "Bool. Draw arrow at the end of the axis.",
-    :minorgridlinewidth          => "Number. Width of the minor grid lines (in pixels)",
-    :tick_direction              => "Symbol.  Direction of the ticks. `:in`, `:out` or `:none`",
-    :showaxis                    => "Bool, Symbol or String.  Show the axis. `true`, `false`, `:show`, `:hide`, `:yes`, `:no`, `:x`, `:y`, `:z`, `:xy`, ..., `:all`, `:off`",
-    :widen                       => """
-                                    Bool or :auto. Widen the axis limits by a small factor to avoid cut-off markers and lines at the borders.
-                                    Defaults to `:auto`, which widens unless limits were manually set.
-                                    """,
-    :draw_arrow                  => "Bool. Draw arrow at the end of the axis.",
 )

src/backends/gaston.jl

@@ -1,604 +0,0 @@
-# https://github.com/mbaz/Gaston.
-
-should_warn_on_unsupported(::GastonBackend) = false
-
-# Create the window/figure for this backend.
-function _create_backend_figure(plt::Plot{GastonBackend})
-    state_handle = Gaston.nexthandle() # for now all the figures will be kept
-    plt.o = Gaston.newfigure(state_handle)
-end
-
-function _before_layout_calcs(plt::Plot{GastonBackend})
-    # Initialize all the subplots first
-    plt.o.subplots = Gaston.SubPlot[]
-
-    n1 = n2 = 0
-    if length(plt.inset_subplots) > 0
-        n1, sps = gaston_get_subplots(0, plt.inset_subplots, plt.layout)
-        gaston_init_subplots(plt, sps)
-    end
-
-    if length(plt.subplots) > 0
-        n2, sps = gaston_get_subplots(0, plt.subplots, plt.layout)
-    end
-
-    if (n = n1 + n2) != length(plt.subplots)
-        @error "Gaston: $n != $(length(plt.subplots))"
-    end
-
-    plt.o.layout = gaston_init_subplots(plt, sps)
-
-    # Then add the series (curves in gaston)
-    for series in plt.series_list
-        gaston_add_series(plt, series)
-    end
-
-    for sp in plt.subplots
-        sp === nothing && continue
-        for ann in sp[:annotations]
-            x, y, val = locate_annotation(sp, ann...)
-            sp.o.axesconf *= "\nset label '$(val.str)' at $x,$y $(gaston_font(val.font))"
-        end
-    end
-    nothing
-end
-
-function _update_min_padding!(sp::Subplot{GastonBackend})
-    sp.minpad = 0mm, 0mm, 0mm, 0mm
-    nothing
-end
-
-function _update_plot_object(plt::Plot{GastonBackend})
-    # respect the layout ratio
-    dat = gaston_multiplot_pos_size(plt.layout, (0, 0, 1, 1))
-    gaston_multiplot_pos_size!(dat)
-    nothing
-end
-
-for (mime, term) in (
-    "application/eps"        => "epscairo",
-    "image/eps"              => "epslatex",
-    "application/pdf"        => "pdfcairo",
-    "application/postscript" => "postscript",
-    "image/png"              => "png",
-    "image/svg+xml"          => "svg",
-    "text/latex"             => "tikz",
-    "application/x-tex"      => "epslatex",
-    "text/plain"             => "dumb",
-)
-    @eval function _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{GastonBackend})
-        term = String($term)
-        tmpfile = "$(Gaston.tempname()).$term"
-
-        Gaston.save(
-            term = term,
-            output = tmpfile,
-            handle = plt.o.handle,
-            saveopts = gaston_saveopts(plt),
-        )
-        while !isfile(tmpfile)
-        end  # avoid race condition with read in next line
-        write(io, read(tmpfile))
-        rm(tmpfile, force = true)
-        nothing
-    end
-end
-
-_display(plt::Plot{GastonBackend}) = display(plt.o)
-
-# --------------------------------------------
-# These functions are gaston specific
-# --------------------------------------------
-
-function gaston_saveopts(plt::Plot{GastonBackend})
-    saveopts = String["size $(join(plt.attr[:size], ","))"]
-
-    push!(
-        saveopts,
-        gaston_font(
-            plottitlefont(plt),
-            rot = false,
-            align = false,
-            color = false,
-            scale = 1,
-        ),
-    )
-
-    push!(saveopts, "background $(gaston_color(plt.attr[:background_color]))")
-
-    # push!(saveopts, "title '$(plt.attr[:window_title])'")
-
-    # Scale all plot elements to match Plots.jl DPI standard
-    scaling = plt.attr[:dpi] / Plots.DPI
-    push!(saveopts, "fontscale $scaling lw $scaling dl $scaling")  #  ps $scaling
-
-    return join(saveopts, " ")
-end
-
-function gaston_get_subplots(n, plt_subplots, layout)
-    nr, nc = size(layout)
-    sps = Array{Any}(nothing, nr, nc)
-    for r in 1:nr, c in 1:nc  # NOTE: col major
-        l = layout[r, c]
-        if l isa GridLayout
-            n, sub = gaston_get_subplots(n, plt_subplots, l)
-            sps[r, c] = size(sub) == (1, 1) ? only(sub) : sub
-        else
-            sps[r, c] = get(l.attr, :blank, false) ? nothing : plt_subplots[n += 1]
-        end
-    end
-    return n, sps
-end
-
-function gaston_init_subplots(plt, sps)
-    sz = nr, nc = size(sps)
-    for c in 1:nc, r in 1:nr  # NOTE: row major
-        sp = sps[r, c]
-        if sp isa Subplot || sp === nothing
-            gaston_init_subplot(plt, sp)
-        else
-            gaston_init_subplots(plt, sp)
-            sz = max.(sz, size(sp))
-        end
-    end
-    return sz
-end
-
-function gaston_init_subplot(
-    plt::Plot{GastonBackend},
-    sp::Union{Nothing,Subplot{GastonBackend}},
-)
-    if sp === nothing
-        push!(plt.o.subplots, sp)
-    else
-        dims =
-            RecipesPipeline.is3d(sp) ||
-            sp.attr[:projection] == "3d" ||
-            needs_any_3d_axes(sp) ? 3 : 2
-        any_label = false
-        for series in series_list(sp)
-            if dims == 2 && series[:seriestype] ∈ (:heatmap, :contour)
-                dims = 3  # we need heatmap/contour to use splot, not plot
-            end
-            any_label |= should_add_to_legend(series)
-        end
-        sp.o = Gaston.Plot(
-            dims = dims,
-            curves = [],
-            axesconf = gaston_parse_axes_args(plt, sp, dims, any_label),
-        )
-        push!(plt.o.subplots, sp.o)
-    end
-    nothing
-end
-
-function gaston_multiplot_pos_size(layout, parent_xy_wh)
-    nr, nc = size(layout)
-    dat = Array{Any}(nothing, nr, nc)
-    for r in 1:nr, c in 1:nc
-        l = layout[r, c]
-        # width and height (pct) are multiplicative (parent)
-        w = layout.widths[c].value * parent_xy_wh[3]
-        h = layout.heights[r].value * parent_xy_wh[4]
-        if isa(l, EmptyLayout)
-            dat[r, c] = (c - 1) * w, (r - 1) * h, w, h, nothing
-        else
-            # previous position (origin)
-            prev_r = r > 1 ? dat[r - 1, c] : nothing
-            prev_c = c > 1 ? dat[r, c - 1] : nothing
-            prev_r isa Array && (prev_r = prev_r[end, end])
-            prev_c isa Array && (prev_c = prev_c[end, end])
-            x = prev_c !== nothing ? prev_c[1] + prev_c[3] : parent_xy_wh[1]
-            y = prev_r !== nothing ? prev_r[2] + prev_r[4] : parent_xy_wh[2]
-            if l isa GridLayout
-                sub = gaston_multiplot_pos_size(l, (x, y, w, h))
-                dat[r, c] = size(sub) == (1, 1) ? only(sub) : sub
-            else
-                dat[r, c] = x, y, w, h, l
-            end
-        end
-    end
-    return dat
-end
-
-function gaston_multiplot_pos_size!(dat)
-    nr, nc = size(dat)
-    for r in 1:nr, c in 1:nc
-        xy_wh_sp = dat[r, c]
-        if xy_wh_sp isa Array
-            gaston_multiplot_pos_size!(xy_wh_sp)
-        elseif xy_wh_sp isa Tuple
-            x, y, w, h, sp = xy_wh_sp
-            sp === nothing && continue
-            sp.o === nothing && continue
-            # gnuplot screen coordinates: bottom left at 0,0 and top right at 1,1
-            sp.o.axesconf = "set origin $x, $(1 - y - h)\nset size $w, $h\n" * sp.o.axesconf
-        end
-    end
-    nothing
-end
-
-function gaston_add_series(plt::Plot{GastonBackend}, series::Series)
-    sp = series[:subplot]
-    gsp = sp.o
-    x, y, z = series[:x], series[:y], series[:z]
-    st = series[:seriestype]
-    curves = []
-    if gsp.dims == 2 && z === nothing
-        for (n, seg) in enumerate(series_segments(series, st; check = true))
-            i, rng = seg.attr_index, seg.range
-            fr = _cycle(series[:fillrange], 1:length(x[rng]))
-            for sc in gaston_seriesconf!(sp, series, i, n == 1)
-                push!(curves, Gaston.Curve(x[rng], y[rng], nothing, fr, sc))
-            end
-        end
-    else
-        if z isa Surface
-            z = z.surf
-            if st == :image
-                z = reverse(Float32.(Gray.(z)), dims = 1)  # flip y axis
-                nr, nc = size(z)
-                if (ly = length(y)) == 2 && ly != nr
-                    y = collect(range(y[1], y[2], length = nr))
-                end
-                if (lx = length(x)) == 2 && lx != nc
-                    x = collect(range(x[1], x[2], length = nc))
-                end
-            end
-            length(x) == size(z, 2) + 1 && (x = (x[1:(end - 1)] + x[2:end]) / 2)
-            length(y) == size(z, 1) + 1 && (y = (y[1:(end - 1)] + y[2:end]) / 2)
-        end
-        if st == :mesh3d
-            x, y, z = mesh3d_triangles(x, y, z, series[:connections])
-        end
-        for sc in gaston_seriesconf!(sp, series, 1, true)
-            push!(curves, Gaston.Curve(x, y, z, nothing, sc))
-        end
-    end
-
-    for c in curves
-        append = length(gsp.curves) > 0
-        push!(gsp.curves, c)
-        Gaston.write_data(c, gsp.dims, gsp.datafile, append = append)
-    end
-    nothing
-end
-
-function gaston_seriesconf!(
-    sp::Subplot{GastonBackend},
-    series::Series,
-    i::Int,
-    add_to_legend::Bool,
-)
-    #=
-    gnuplot abbreviations (see gnuplot/src/set.c)
-    ---------------------------------------------
-    dl: dashlength
-    dt: dashtype
-    fc: fillcolor
-    fs: fillstyle
-    lc: linecolor
-    lp: linespoints
-    ls: linestyle
-    lt: linetype
-    lw: linewidth
-    pi: pointinterval
-    pn: pointnumber
-    ps: pointscale
-    pt: pointtype
-    tc: textcolor
-    w: with
-    =#
-    gsp = sp.o
-    st = series[:seriestype]
-    extra = []
-    add_to_legend &= should_add_to_legend(series)
-    curveconf = String[add_to_legend ? "title '$(series[:label])'" : "notitle"]
-
-    clims = get_clims(sp, series)
-    if st ∈ (:scatter, :scatter3d)
-        lc, dt, lw = gaston_lc_ls_lw(series, clims, i)
-        pt, ps, mc = gaston_mk_ms_mc(series, clims, i)
-        push!(curveconf, "w points pt $pt ps $ps lc $mc")
-    elseif st ∈ (:path, :straightline, :path3d)
-        fr = series[:fillrange]
-        fc = gaston_color(get_fillcolor(series, i), get_fillalpha(series, i))
-        lc, dt, lw = gaston_lc_ls_lw(series, clims, i)
-        if fr !== nothing # filled curves, but not filled curves with markers
-            push!(
-                curveconf,
-                "w filledcurves fc $fc fs solid border lc $lc lw $lw dt $dt,'' w lines lc $lc lw $lw dt $dt",
-            )
-        elseif series[:markershape] == :none  # simplepath
-            push!(curveconf, "w lines lc $lc dt $dt lw $lw")
-        else
-            pt, ps, mc = gaston_mk_ms_mc(series, clims, i)
-            push!(curveconf, "w lp lc $mc dt $dt lw $lw pt $pt ps $ps")
-        end
-    elseif st == :shape
-        fc = gaston_color(get_fillcolor(series, i), get_fillalpha(series, i))
-        lc, _ = gaston_lc_ls_lw(series, clims, i)
-        push!(curveconf, "w filledcurves fc $fc fs solid border lc $lc")
-    elseif st ∈ (:steppre, :stepmid, :steppost)
-        step = if st == :steppre
-            "fsteps"
-        elseif st == :stepmid
-            "histeps"
-        elseif st == :steppost
-            "steps"
-        end
-        push!(curveconf, "w $step")
-        lc, dt, lw = gaston_lc_ls_lw(series, clims, i)
-        push!(extra, "w points lc $lc dt $dt lw $lw notitle")
-    elseif st == :image
-        palette = gaston_palette(series[:seriescolor])
-        gsp.axesconf *= "\nset palette model RGB defined $palette"
-        push!(curveconf, "w image pixels")
-    elseif st ∈ (:contour, :contour3d)
-        push!(curveconf, "w lines")
-        st == :contour && (gsp.axesconf *= "\nset view map\nunset surface")  # 2D
-        levels = join(map(string, collect(contour_levels(series, clims))), ", ")
-        gsp.axesconf *= "\nset contour base\nset cntrparam levels discrete $levels"
-    elseif st ∈ (:surface, :heatmap)
-        push!(curveconf, "w pm3d")
-        palette = gaston_palette(series[:seriescolor])
-        gsp.axesconf *= "\nset palette model RGB defined $palette"
-        st == :heatmap && (gsp.axesconf *= "\nset view map")
-    elseif st ∈ (:wireframe, :mesh3d)
-        lc, dt, lw = gaston_lc_ls_lw(series, clims, i)
-        push!(curveconf, "w lines lc $lc dt $dt lw $lw")
-    elseif st == :quiver
-        push!(curveconf, "w vectors filled")
-    else
-        @warn "Gaston: $st is not implemented yet"
-    end
-
-    return [join(curveconf, " "), extra...]
-end
-
-function gaston_parse_axes_args(
-    plt::Plot{GastonBackend},
-    sp::Subplot{GastonBackend},
-    dims::Int,
-    any_label::Bool,
-)
-    # axesconf = String["set margins 2, 2, 2, 2"]  # left, right, bottom, top
-    axesconf = String[]
-
-    polar = ispolar(sp) && dims == 2  # cannot splot in polar coordinates
-
-    for letter in (:x, :y, :z)
-        (letter == :z && dims == 2) && continue
-        axis = sp.attr[get_attr_symbol(letter, :axis)]
-        # label names
-        push!(
-            axesconf,
-            "set $(letter)label '$(axis[:guide])' $(gaston_font(guidefont(axis)))",
-        )
-        mirror = axis[:mirror] ? "mirror" : "nomirror"
-
-        if axis[:scale] == :identity
-            logscale, base = "nologscale", ""
-        elseif axis[:scale] == :log10
-            logscale, base = "logscale", "10"
-        elseif axis[:scale] == :log2
-            logscale, base = "logscale", "2"
-        elseif axis[:scale] == :ln
-            logscale, base = "logscale", "e"
-        end
-        push!(axesconf, "set $logscale $letter $base")
-
-        # handle ticks
-        if polar
-            push!(axesconf, "set size square\nunset $(letter)tics")
-        else
-            push!(
-                axesconf,
-                "set $(letter)tics $(mirror) $(axis[:tick_direction]) $(gaston_font(tickfont(axis)))",
-            )
-
-            # major tick locations
-            if axis[:ticks] != :native
-                if axis[:flip]
-                    hi, lo = axis_limits(sp, letter)
-                else
-                    lo, hi = axis_limits(sp, letter)
-                end
-                push!(axesconf, "set $(letter)range [$lo:$hi]")
-
-                ticks = get_ticks(sp, axis)
-                gaston_set_ticks!(axesconf, ticks, letter, "", "")
-
-                if axis[:minorticks] != :native
-                    minor_ticks = get_minor_ticks(sp, axis, ticks)
-                    gaston_set_ticks!(axesconf, minor_ticks, letter, "m", "add")
-                end
-            end
-        end
-
-        if axis[:grid]
-            push!(axesconf, "set grid " * (polar ? "polar" : "$(letter)tics"))
-            axis[:minorgrid] &&
-                push!(axesconf, "set grid " * (polar ? "polar" : "m$(letter)tics"))
-        end
-
-        ratio = get_aspect_ratio(sp)
-        if ratio != :none
-            ratio == :equal && (ratio = -1)
-            push!(axesconf, "set size ratio $ratio")
-        end
-    end
-    gaston_set_legend!(axesconf, sp, any_label)
-
-    if hascolorbar(sp)
-        push!(axesconf, "set cbtics $(gaston_font(colorbartitlefont(sp)))")
-    end
-
-    if sp[:title] !== nothing
-        push!(axesconf, "set title '$(sp[:title])' $(gaston_font(titlefont(sp)))")
-    end
-
-    if polar
-        push!(axesconf, "unset border\nset polar\nset border polar")
-        tmin, tmax = axis_limits(sp, :x, false, false)
-        rmin, rmax = axis_limits(sp, :y, false, false)
-        rticks = get_ticks(sp, :y)
-        if (ttype = ticksType(rticks)) == :ticks
-            gaston_ticks = string.(rticks)
-        elseif ttype == :ticks_and_labels
-            gaston_ticks = String["'$l' $t" for (t, l) in zip(rticks...)]
-        end
-        push!(
-            axesconf,
-            "set rtics ( " *
-            join(gaston_ticks, ", ") *
-            " ) $(gaston_font(tickfont(sp.attr[:yaxis])))",
-        )
-        push!(axesconf, "set trange [$(min(0, tmin)):$(max(2π, tmax))]")
-        push!(axesconf, "set rrange [$rmin:$rmax]")
-        push!(
-            axesconf,
-            "set ttics 0,30 format \"%g\".GPVAL_DEGREE_SIGN $(gaston_font(tickfont(sp.attr[:xaxis])))",
-        )
-        push!(axesconf, "set mttics 3")
-    end
-
-    return join(axesconf, "\n")
-end
-
-function gaston_set_ticks!(axesconf, ticks, letter, maj_min, add)
-    ticks == :auto && return
-    if ticks ∈ (:none, nothing, false)
-        push!(axesconf, "unset $(maj_min)$(letter)tics")
-        return
-    end
-
-    gaston_ticks = String[]
-    if (ttype = ticksType(ticks)) == :ticks
-        tick_locs = @view ticks[:]
-        for i in eachindex(tick_locs)
-            tick = if maj_min == "m"
-                "'' $(tick_locs[i]) 1"  # see gnuplot manual 'Mxtics'
-            else
-                "$(tick_locs[i])"
-            end
-            push!(gaston_ticks, tick)
-        end
-    elseif ttype == :ticks_and_labels
-        tick_locs = @view ticks[1][:]
-        tick_labels = @view ticks[2][:]
-        for i in eachindex(tick_locs)
-            lab = gaston_enclose_tick_string(tick_labels[i])
-            push!(gaston_ticks, "'$lab' $(tick_locs[i])")
-        end
-    else
-        gaston_ticks = nothing
-        @error "Gaston: invalid input for $(maj_min)$(letter)ticks: $ticks"
-    end
-    if gaston_ticks !== nothing
-        push!(axesconf, "set $(letter)tics $add (" * join(gaston_ticks, ", ") * ")")
-    end
-    nothing
-end
-
-function gaston_set_legend!(axesconf, sp, any_label)
-    leg = sp[:legend_position]
-    if sp[:legend_position] ∉ (:none, :inline) && any_label
-        leg == :best && (leg = :topright)
-
-        push!(
-            axesconf,
-            "set key " * (occursin("outer", string(leg)) ? "outside" : "inside"),
-        )
-        for position in ("top", "bottom", "left", "right")
-            occursin(position, string(leg)) && push!(axesconf, "set key $position")
-        end
-        push!(axesconf, "set key $(gaston_font(legendfont(sp), rot=false, align=false))")
-        if sp[:legend_title] !== nothing
-            # NOTE: cannot use legendtitlefont(sp) as it will override legendfont
-            push!(axesconf, "set key title '$(sp[:legend_title])'")
-        end
-        push!(axesconf, "set key box lw 1 opaque")
-        push!(axesconf, "set border back")
-    else
-        push!(axesconf, "set key off")
-    end
-    nothing
-end
-
-# --------------------------------------------
-# Helpers
-# --------------------------------------------
-
-gaston_halign(k) = (left = :left, hcenter = :center, right = :right)[k]
-gaston_valign(k) = (top = :top, vcenter = :center, bottom = :bottom)[k]
-
-gaston_alpha(alpha) = alpha === nothing ? 0 : alpha
-
-gaston_lc_ls_lw(series::Series, clims, i::Int) = (
-    gaston_color(get_linecolor(series, clims, i), get_linealpha(series, i)),
-    gaston_linestyle(get_linestyle(series, i)),
-    get_linewidth(series, i),
-)
-
-gaston_mk_ms_mc(series::Series, clims, i::Int) = (
-    gaston_marker(_cycle(series[:markershape], i), get_markeralpha(series, i)),
-    _cycle(series[:markersize], i) * 1.3 / 5,
-    gaston_color(get_markercolor(series, clims, i), get_markeralpha(series, i)),
-)
-
-function gaston_font(f; rot = true, align = true, color = true, scale = 1)
-    font = String["font '$(f.family),$(round(Int, scale * f.pointsize))'"]
-    align && push!(font, "$(gaston_halign(f.halign))")
-    rot && push!(font, "rotate by $(f.rotation)")
-    color && push!(font, "textcolor $(gaston_color(f.color))")
-    return join(font, " ")
-end
-
-function gaston_palette(gradient)
-    palette = String[]
-    n = -1
-    for rgba in gradient  # FIXME: naive conversion, inefficient ?
-        push!(palette, "$(n += 1) $(rgba.r) $(rgba.g) $(rgba.b)")
-    end
-    return '(' * join(palette, ", ") * ')'
-end
-
-function gaston_marker(marker, alpha)
-    # NOTE: :rtriangle, :ltriangle, :hexagon, :heptagon, :octagon seems unsupported by gnuplot
-    filled = gaston_alpha(alpha) == 0
-    marker == :none && return -1
-    marker == :pixel && return 0
-    marker ∈ (:+, :cross) && return 1
-    marker ∈ (:x, :xcross) && return 2
-    marker == :star5 && return 3
-    marker == :rect && return filled ? 5 : 4
-    marker == :circle && return filled ? 7 : 6
-    marker == :utriangle && return filled ? 9 : 8
-    marker == :dtriangle && return filled ? 11 : 10
-    marker == :diamond && return filled ? 13 : 12
-    marker == :pentagon && return filled ? 15 : 14
-
-    @warn "Gaston: unsupported marker $marker"
-    return 1
-end
-
-function gaston_color(col, alpha = 0)
-    col = single_color(col)  # in case of gradients
-    col = alphacolor(col, gaston_alpha(alpha))  # add a default alpha if non existent
-    return "rgb '#$(hex(col, :aarrggbb))'"
-end
-
-function gaston_linestyle(style)
-    style == :solid && return "1"
-    style == :dash && return "2"
-    style == :dot && return "3"
-    style == :dashdot && return "4"
-    style == :dashdotdot && return "5"
-end
-
-function gaston_enclose_tick_string(tick_string)
-    findfirst("^", tick_string) === nothing && return tick_string
-    base, power = split(tick_string, "^")
-    return "$base^{$power}"
-end

src/backends/inspectdr.jl

@@ -13,10 +13,13 @@ Add in functionality to Plots.jl:
     :aspect_ratio,
 =#
 
-should_warn_on_unsupported(::InspectDRBackend) = false
+# ---------------------------------------------------------------------------
 
 is_marker_supported(::InspectDRBackend, shape::Shape) = true
 
+_inspectdr_to_pixels(bb::BoundingBox) =
+    InspectDR.BoundingBox(to_pixels(left(bb)), to_pixels(right(bb)), to_pixels(top(bb)), to_pixels(bottom(bb)))
+
 #Do we avoid Map to avoid possible pre-comile issues?
 function _inspectdr_mapglyph(s::Symbol)
     s == :rect && return :square
@@ -44,16 +47,16 @@ _inspectdr_mapcolor(v::Colorant) = v
 function _inspectdr_mapcolor(g::PlotUtils.ColorGradient)
     @warn("Color gradients are currently unsupported in InspectDR.")
     #Pick middle color:
-    _inspectdr_mapcolor(g.colors[div(1 + end, 2)])
+    _inspectdr_mapcolor(g.colors[div(1+end,2)])
 end
 function _inspectdr_mapcolor(v::AVec)
     @warn("Vectors of colors are currently unsupported in InspectDR.")
     #Pick middle color:
-    _inspectdr_mapcolor(v[div(1 + end, 2)])
+    _inspectdr_mapcolor(v[div(1+end,2)])
 end
 
 #Hack: suggested point size does not seem adequate relative to plot size, for some reason.
-_inspectdr_mapptsize(v) = 1.5 * v
+_inspectdr_mapptsize(v) = 1.5*v
 
 function _inspectdr_add_annotations(plot, x, y, val)
     #What kind of annotation is this?
@@ -61,21 +64,14 @@ end
 
 #plot::InspectDR.Plot2D
 function _inspectdr_add_annotations(plot, x, y, val::PlotText)
-    vmap = Dict{Symbol,Symbol}(:top => :t, :bottom => :b) #:vcenter
+    vmap = Dict{Symbol, Symbol}(:top=>:t, :bottom=>:b) #:vcenter
-    hmap = Dict{Symbol,Symbol}(:left => :l, :right => :r) #:hcenter
+    hmap = Dict{Symbol, Symbol}(:left=>:l, :right=>:r) #:hcenter
     align = Symbol(get(vmap, val.font.valign, :c), get(hmap, val.font.halign, :c))
-    fnt = InspectDR.Font(
+    fnt = InspectDR.Font(val.font.family, val.font.pointsize,
-        val.font.family,
+        color =_inspectdr_mapcolor(val.font.color)
-        val.font.pointsize,
-        color = _inspectdr_mapcolor(val.font.color),
     )
-    ann = InspectDR.atext(
+    ann = InspectDR.atext(val.str, x=x, y=y,
-        texmath2unicode(val.str),
+        font=fnt, angle=val.font.rotation, align=align
-        x = x,
-        y = y,
-        font = fnt,
-        angle = val.font.rotation,
-        align = align,
     )
     InspectDR.add(plot, ann)
     return
@@ -83,63 +79,9 @@ end
 
 # ---------------------------------------------------------------------------
 
-function _inspectdr_getaxisticks(ticks, gridlines, xfrm)
-    TickCustom = InspectDR.TickCustom
-    _xfrm(coord) = InspectDR.axis2aloc(Float64(coord), xfrm.spec) #Ensure Float64 - in case
-
-    ttype = ticksType(ticks)
-    if ticks == :native
-        #keep current
-    elseif ttype == :ticks_and_labels
-        pos = ticks[1]
-        labels = ticks[2]
-        nticks = length(ticks[1])
-        newticks = TickCustom[TickCustom(_xfrm(pos[i]), labels[i]) for i in 1:nticks]
-        gridlines = InspectDR.GridLinesCustom(gridlines)
-        gridlines.major = newticks
-        gridlines.minor = []
-        gridlines.displayminor = false
-    elseif ttype == :ticks
-        nticks = length(ticks)
-        gridlines.major = Float64[_xfrm(t) for t in ticks]
-        gridlines.minor = []
-        gridlines.displayminor = false
-    elseif isnothing(ticks)
-        gridlines.major = []
-        gridlines.minor = []
-    else #Assume ticks == :native
-        #keep current
-    end
-
-    return gridlines #keep current
-end
-
-function _inspectdr_setticks(sp::Subplot, plot, strip, xaxis, yaxis)
-    InputXfrm1D = InspectDR.InputXfrm1D
-    _get_ticks(axis) = :native == axis[:ticks] ? (:native) : get_ticks(sp, axis)
-    wantnative(ticks) = (:native == ticks)
-
-    xticks = _get_ticks(xaxis)
-    yticks = _get_ticks(yaxis)
-
-    if wantnative(xticks) && wantnative(yticks)
-        #Don't "eval" tick values
-        return
-    end
-
-    #TODO: Allow InspectDR to independently "eval" x or y ticks
-    ext = InspectDR.getextents_aloc(plot, 1)
-    grid = InspectDR._eval(strip.grid, plot.xscale, strip.yscale, ext)
-    grid.xlines = _inspectdr_getaxisticks(xticks, grid.xlines, InputXfrm1D(plot.xscale))
-    grid.ylines = _inspectdr_getaxisticks(yticks, grid.ylines, InputXfrm1D(strip.yscale))
-    strip.grid = grid
-end
-
-# ---------------------------------------------------------------------------
-
 function _inspectdr_getscale(s::Symbol, yaxis::Bool)
-    #TODO: Support :asinh, :sqrt
+#TODO: Support :asinh, :sqrt
-    kwargs = yaxis ? (:tgtmajor => 8, :tgtminor => 2) : () #More grid lines on y-axis
+    kwargs = yaxis ? (:tgtmajor=>8, :tgtminor=>2) : () #More grid lines on y-axis
     if :log2 == s
         return InspectDR.AxisScale(:log2; kwargs...)
     elseif :log10 == s
@@ -154,12 +96,13 @@ end
 # ---------------------------------------------------------------------------
 
 #Glyph used when plotting "Shape"s:
-INSPECTDR_GLYPH_SHAPE =
+INSPECTDR_GLYPH_SHAPE = InspectDR.GlyphPolyline(
-    InspectDR.GlyphPolyline(2 * InspectDR.GLYPH_SQUARE.x, InspectDR.GLYPH_SQUARE.y)
+    2*InspectDR.GLYPH_SQUARE.x, InspectDR.GLYPH_SQUARE.y
+)
 
 mutable struct InspecDRPlotRef
-    mplot::Union{Nothing,InspectDR.Multiplot}
+    mplot::Union{Nothing, InspectDR.Multiplot}
-    gui::Union{Nothing,InspectDR.GtkPlot}
+    gui::Union{Nothing, InspectDR.GtkPlot}
 end
 
 _inspectdr_getmplot(::Any) = nothing
@@ -208,9 +151,7 @@ end
 function _initialize_subplot(plt::Plot{InspectDRBackend}, sp::Subplot{InspectDRBackend})
     plot = sp.o
     #Don't do anything without a "subplot" object:  Will process later.
-    if nothing == plot
+    if nothing == plot; return; end
-        return
-    end
     plot.data = []
     plot.userannot = [] #Clear old markers/text annotation/polyline "annotation"
     return plot
@@ -226,12 +167,9 @@ function _series_added(plt::Plot{InspectDRBackend}, series::Series)
     st = series[:seriestype]
     sp = series[:subplot]
     plot = sp.o
-    clims = get_clims(sp, series)
 
     #Don't do anything without a "subplot" object:  Will process later.
-    if nothing == plot
+    if nothing == plot; return; end
-        return
-    end
 
     _vectorize(v) = isa(v, Vector) ? v : collect(v) #InspectDR only supports vectors
     x, y = if st == :straightline
@@ -242,33 +180,30 @@ function _series_added(plt::Plot{InspectDRBackend}, series::Series)
 
     #No support for polar grid... but can still perform polar transformation:
     if ispolar(sp)
-        Θ = x
+        Θ = x; r = y
-        r = y
+        x = r.*cos.(Θ); y = r.*sin.(Θ)
-        x = r .* cos.(Θ)
-        y = r .* sin.(Θ)
     end
 
     # doesn't handle mismatched x/y - wrap data (pyplot behaviour):
-    nx = length(x)
+    nx = length(x); ny = length(y)
-    ny = length(y)
     if nx < ny
-        series[:x] = Float64[x[mod1(i, nx)] for i in 1:ny]
+        series[:x] = Float64[x[mod1(i,nx)] for i=1:ny]
     elseif ny > nx
-        series[:y] = Float64[y[mod1(i, ny)] for i in 1:nx]
+        series[:y] = Float64[y[mod1(i,ny)] for i=1:nx]
     end
 
-    #= TODO: Eventually support
+#= TODO: Eventually support
-        series[:fillcolor] #I think this is fill under line
+    series[:fillcolor] #I think this is fill under line
-        zorder = series[:series_plotindex]
+    zorder = series[:series_plotindex]
 
-    For st in :shape:
+For st in :shape:
-        zorder = series[:series_plotindex],
+    zorder = series[:series_plotindex],
-    =#
+=#
 
     if st in (:shape,)
         x, y = shape_data(series)
         nmax = 0
-        for (i, rng) in enumerate(iter_segments(x, y))
+        for (i,rng) in enumerate(iter_segments(x, y))
             nmax = i
             if length(rng) > 1
                 linewidth = series[:linewidth]
@@ -276,12 +211,11 @@ function _series_added(plt::Plot{InspectDRBackend}, series::Series)
                 linecolor = _inspectdr_mapcolor(_cycle(c, i))
                 c = plot_color(get_fillcolor(series), get_fillalpha(series))
                 fillcolor = _inspectdr_mapcolor(_cycle(c, i))
-                line = InspectDR.line(style = :solid, width = linewidth, color = linecolor)
+                line = InspectDR.line(
+                    style=:solid, width=linewidth, color=linecolor
+                )
                 apline = InspectDR.PolylineAnnotation(
-                    x[rng],
+                    x[rng], y[rng], line=line, fillcolor=fillcolor
-                    y[rng],
-                    line = line,
-                    fillcolor = fillcolor,
                 )
                 InspectDR.add(plot, apline)
             end
@@ -294,24 +228,21 @@ function _series_added(plt::Plot{InspectDRBackend}, series::Series)
             linecolor = _inspectdr_mapcolor(_cycle(c, i))
             c = plot_color(get_fillcolor(series), get_fillalpha(series))
             fillcolor = _inspectdr_mapcolor(_cycle(c, i))
-            wfrm = InspectDR.add(plot, Float64[], Float64[], id = series[:label])
+            wfrm = InspectDR.add(plot, Float64[], Float64[], id=series[:label])
             wfrm.line = InspectDR.line(
-                style = :none,
+                style=:none, width=linewidth, #linewidth affects glyph
-                width = linewidth, #linewidth affects glyph
             )
             wfrm.glyph = InspectDR.glyph(
-                shape = INSPECTDR_GLYPH_SHAPE,
+                shape = INSPECTDR_GLYPH_SHAPE, size = 8,
-                size = 8,
+                color = linecolor, fillcolor = fillcolor
-                color = linecolor,
-                fillcolor = fillcolor,
             )
         end
-    elseif st in (:path, :scatter, :straightline) #, :steppre, :stepmid, :steppost)
+   elseif st in (:path, :scatter, :straightline) #, :steppre, :steppost)
         #NOTE: In Plots.jl, :scatter plots have 0-linewidths (I think).
         linewidth = series[:linewidth]
         #More efficient & allows some support for markerstrokewidth:
-        _style = (0 == linewidth ? :none : series[:linestyle])
+        _style = (0==linewidth ? :none : series[:linestyle])
-        wfrm = InspectDR.add(plot, x, y, id = series[:label])
+        wfrm = InspectDR.add(plot, x, y, id=series[:label])
         wfrm.line = InspectDR.line(
             style = _style,
             width = series[:linewidth],
@@ -325,18 +256,14 @@ function _series_added(plt::Plot{InspectDRBackend}, series::Series)
         wfrm.glyph = InspectDR.glyph(
             shape = _inspectdr_mapglyph(series[:markershape]),
             size = _inspectdr_mapglyphsize(series[:markersize]),
-            color = _inspectdr_mapcolor(
+            color = _inspectdr_mapcolor(plot_color(series[:markerstrokecolor], series[:markerstrokealpha])),
-                plot_color(get_markerstrokecolor(series), get_markerstrokealpha(series)),
+            fillcolor = _inspectdr_mapcolor(plot_color(series[:markercolor], series[:markeralpha])),
-            ),
-            fillcolor = _inspectdr_mapcolor(
-                plot_color(get_markercolor(series, clims), get_markeralpha(series)),
-            ),
         )
     end
 
     # this is all we need to add the series_annotations text
     anns = series[:series_annotations]
-    for (xi, yi, str, fnt) in EachAnn(anns, x, y)
+    for (xi,yi,str,fnt) in EachAnn(anns, x, y)
         _inspectdr_add_annotations(plot, xi, yi, PlotText(str, fnt))
     end
     return
@@ -356,90 +283,72 @@ function _inspectdr_setupsubplot(sp::Subplot{InspectDRBackend})
     plot = sp.o
     strip = plot.strips[1] #Only 1 strip supported with Plots.jl
 
-    xaxis = sp[:xaxis]
+    xaxis = sp[:xaxis]; yaxis = sp[:yaxis]
-    yaxis = sp[:yaxis]
     xgrid_show = xaxis[:grid]
     ygrid_show = yaxis[:grid]
 
     strip.grid = InspectDR.GridRect(
-        vmajor = xgrid_show, # vminor=xgrid_show,
+    	vmajor=xgrid_show, # vminor=xgrid_show,
-        hmajor = ygrid_show, # hminor=ygrid_show,
+    	hmajor=ygrid_show, # hminor=ygrid_show,
     )
 
-    plot.xscale = _inspectdr_getscale(xaxis[:scale], false)
+        plot.xscale = _inspectdr_getscale(xaxis[:scale], false)
-    strip.yscale = _inspectdr_getscale(yaxis[:scale], true)
+        strip.yscale = _inspectdr_getscale(yaxis[:scale], true)
-    xmin, xmax = axis_limits(sp, :x)
+        xmin, xmax  = axis_limits(sp, :x)
-    ymin, ymax = axis_limits(sp, :y)
+        ymin, ymax  = axis_limits(sp, :y)
-    if ispolar(sp)
+        if ispolar(sp)
-        #Plots.jl appears to give (xmin,xmax) ≜ (Θmin,Θmax) & (ymin,ymax) ≜ (rmin,rmax)
+            #Plots.jl appears to give (xmin,xmax) ≜ (Θmin,Θmax) & (ymin,ymax) ≜ (rmin,rmax)
-        rmax = NaNMath.max(abs(ymin), abs(ymax))
+            rmax = NaNMath.max(abs(ymin), abs(ymax))
-        xmin, xmax = -rmax, rmax
+            xmin, xmax = -rmax, rmax
-        ymin, ymax = -rmax, rmax
+            ymin, ymax = -rmax, rmax
-    end
+        end
-    plot.xext_full = InspectDR.PExtents1D(xmin, xmax)
+        plot.xext = InspectDR.PExtents1D() #reset
-    strip.yext_full = InspectDR.PExtents1D(ymin, ymax)
+        strip.yext = InspectDR.PExtents1D() #reset
-    #Set current extents = full extents (needed for _eval(strip.grid,...))
+        plot.xext_full = InspectDR.PExtents1D(xmin, xmax)
-    plot.xext = plot.xext_full
+        strip.yext_full = InspectDR.PExtents1D(ymin, ymax)
-    strip.yext = strip.yext_full
-    _inspectdr_setticks(sp, plot, strip, xaxis, yaxis)
-
     a = plot.annotation
-    a.title = texmath2unicode(sp[:title])
+        a.title = sp[:title]
-    a.xlabel = texmath2unicode(xaxis[:guide])
+        a.xlabel = xaxis[:guide]; a.ylabels = [yaxis[:guide]]
-    a.ylabels = [texmath2unicode(yaxis[:guide])]
 
-    #Modify base layout of new object:
+    l = plot.layout
-    l = plot.layout.defaults = deepcopy(InspectDR.defaults.plotlayout)
+        l[:frame_canvas].fillcolor = _inspectdr_mapcolor(sp[:background_color_subplot])
-    #IMPORTANT: Must deepcopy to ensure we don't change layouts of other plots.
+        l[:frame_data].fillcolor = _inspectdr_mapcolor(sp[:background_color_inside])
-    #Works because plot uses defaults (not user-overwritten `layout.values`)
+        l[:frame_data].line.color = _inspectdr_mapcolor(xaxis[:foreground_color_axis])
-    l.frame_canvas.fillcolor = _inspectdr_mapcolor(sp[:background_color_subplot])
+        l[:font_title] = InspectDR.Font(sp[:titlefontfamily],
-    l.frame_data.fillcolor = _inspectdr_mapcolor(sp[:background_color_inside])
+            _inspectdr_mapptsize(sp[:titlefontsize]),
-    l.frame_data.line.color = _inspectdr_mapcolor(xaxis[:foreground_color_axis])
+            color = _inspectdr_mapcolor(sp[:titlefontcolor])
-    l.font_title = InspectDR.Font(
+        )
-        sp[:titlefontfamily],
+        #Cannot independently control fonts of axes with InspectDR:
-        _inspectdr_mapptsize(sp[:titlefontsize]),
+        l[:font_axislabel] = InspectDR.Font(xaxis[:guidefontfamily],
-        color = _inspectdr_mapcolor(sp[:titlefontcolor]),
+            _inspectdr_mapptsize(xaxis[:guidefontsize]),
-    )
+            color = _inspectdr_mapcolor(xaxis[:guidefontcolor])
-    #Cannot independently control fonts of axes with InspectDR:
+        )
-    l.font_axislabel = InspectDR.Font(
+        l[:font_ticklabel] = InspectDR.Font(xaxis[:tickfontfamily],
-        xaxis[:guidefontfamily],
+            _inspectdr_mapptsize(xaxis[:tickfontsize]),
-        _inspectdr_mapptsize(xaxis[:guidefontsize]),
+            color = _inspectdr_mapcolor(xaxis[:tickfontcolor])
-        color = _inspectdr_mapcolor(xaxis[:guidefontcolor]),
+        )
-    )
+        l[:enable_legend] = (sp[:legend] != :none)
-    l.font_ticklabel = InspectDR.Font(
+        #l[:halloc_legend] = 150 #TODO: compute???
-        xaxis[:tickfontfamily],
+        l[:font_legend] = InspectDR.Font(sp[:legendfontfamily],
-        _inspectdr_mapptsize(xaxis[:tickfontsize]),
+            _inspectdr_mapptsize(sp[:legendfontsize]),
-        color = _inspectdr_mapcolor(xaxis[:tickfontcolor]),
+            color = _inspectdr_mapcolor(sp[:legendfontcolor])
-    )
+        )
-    l.enable_legend = (sp[:legend_position] != :none)
+        l[:frame_legend].fillcolor = _inspectdr_mapcolor(sp[:background_color_legend])
-    #l.halloc_legend = 150 #TODO: compute???
-    l.font_legend = InspectDR.Font(
-        sp[:legend_font_family],
-        _inspectdr_mapptsize(sp[:legend_font_pointsize]),
-        color = _inspectdr_mapcolor(sp[:legend_font_color]),
-    )
-    l.frame_legend.fillcolor = _inspectdr_mapcolor(sp[:legend_background_color])
-    #_round!() ensures values use integer spacings (looks better on screen):
-    InspectDR._round!(InspectDR.autofit2font!(l, legend_width = 10.0)) #10 "em"s wide
-    return
 end
 
 # called just before updating layout bounding boxes... in case you need to prep
 # for the calcs
 function _before_layout_calcs(plt::Plot{InspectDRBackend})
     mplot = _inspectdr_getmplot(plt.o)
-    if nothing == mplot
+    if nothing == mplot; return; end
-        return
-    end
 
     mplot.title = plt[:plot_title]
     if "" == mplot.title
         #Don't use window_title... probably not what you want.
         #mplot.title = plt[:window_title]
     end
-
     mplot.layout[:frame].fillcolor = _inspectdr_mapcolor(plt[:background_color_outside])
-    mplot.layout[:frame] = mplot.layout[:frame] #register changes
+
     resize!(mplot.subplots, length(plt.subplots))
     nsubplots = length(plt.subplots)
     for (i, sp) in enumerate(plt.subplots)
@@ -483,19 +392,17 @@ end
 # to fit ticks, tick labels, guides, colorbars, etc.
 function _update_min_padding!(sp::Subplot{InspectDRBackend})
     plot = sp.o
-    if !isa(plot, InspectDR.Plot2D)
+    if !isa(plot, InspectDR.Plot2D); return sp.minpad; end
-        return sp.minpad
-    end
     #Computing plotbounds with 0-BoundingBox returns required padding:
-    bb = InspectDR.plotbounds(plot.layout.values, InspectDR.BoundingBox(0, 0, 0, 0))
+    bb = InspectDR.plotbounds(plot.layout.values, InspectDR.BoundingBox(0,0,0,0))
     #NOTE: plotbounds always pads for titles, legends, etc. even if not in use.
     #TODO: possibly zero-out items not in use??
 
     # add in the user-specified margin to InspectDR padding:
-    leftpad   = abs(bb.xmin) * px + sp[:left_margin]
+    leftpad   = abs(bb.xmin)*px + sp[:left_margin]
-    toppad    = abs(bb.ymin) * px + sp[:top_margin]
+    toppad    = abs(bb.ymin)*px + sp[:top_margin]
-    rightpad  = abs(bb.xmax) * px + sp[:right_margin]
+    rightpad  = abs(bb.xmax)*px + sp[:right_margin]
-    bottompad = abs(bb.ymax) * px + sp[:bottom_margin]
+    bottompad = abs(bb.ymax)*px + sp[:bottom_margin]
     sp.minpad = (leftpad, toppad, rightpad, bottompad)
 end
 
@@ -504,25 +411,16 @@ end
 # Override this to update plot items (title, xlabel, etc), and add annotations (plotattributes[:annotations])
 function _update_plot_object(plt::Plot{InspectDRBackend})
     mplot = _inspectdr_getmplot(plt.o)
-    if nothing == mplot
+    if nothing == mplot; return; end
-        return
-    end
-    mplot.bblist = InspectDR.BoundingBox[]
 
     for (i, sp) in enumerate(plt.subplots)
-        figw, figh = sp.plt[:size]
+        graphbb = _inspectdr_to_pixels(plotarea(sp))
-        pcts = bbox_to_pcts(sp.bbox, figw * px, figh * px)
+        plot = mplot.subplots[i]
-        _left, _bottom, _width, _height = pcts
+        plot.plotbb = InspectDR.plotbounds(plot.layout.values, graphbb)
-        ymax = 1.0 - _bottom
-        ymin = ymax - _height
-        bb = InspectDR.BoundingBox(_left, _left + _width, ymin, ymax)
-        push!(mplot.bblist, bb)
     end
 
     gplot = _inspectdr_getgui(plt.o)
-    if nothing == gplot
+    if nothing == gplot; return; end
-        return
-    end
 
     gplot.src = mplot #Ensure still references current plot
     InspectDR.refresh(gplot)
@@ -531,23 +429,29 @@ end
 
 # ----------------------------------------------------------------
 
+const _inspectdr_mimeformats_dpi = Dict(
+    "image/png"               => "png"
+)
+const _inspectdr_mimeformats_nodpi = Dict(
+    "image/svg+xml"           => "svg",
+    "application/eps"         => "eps",
+    "image/eps"               => "eps",
+#    "application/postscript"  => "ps", #TODO: support once Cairo supports PSSurface
+    "application/pdf"         => "pdf"
+)
 _inspectdr_show(io::IO, mime::MIME, ::Nothing, w, h) =
     throw(ErrorException("Cannot show(::IO, ...) plot - not yet generated"))
 function _inspectdr_show(io::IO, mime::MIME, mplot, w, h)
     InspectDR._show(io, mime, mplot, Float64(w), Float64(h))
 end
 
-function _show(io::IO, mime::MIME{Symbol("image/png")}, plt::Plot{InspectDRBackend})
+for (mime, fmt) in _inspectdr_mimeformats_dpi
-    dpi = plt[:dpi] # TODO: support
+    @eval function _show(io::IO, mime::MIME{Symbol($mime)}, plt::Plot{InspectDRBackend})
-    _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o), plt[:size]...)
+        dpi = plt[:dpi]#TODO: support
+        _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o), plt[:size]...)
+    end
 end
-for (mime, fmt) in (
+for (mime, fmt) in _inspectdr_mimeformats_nodpi
-    "image/svg+xml" => "svg",
-    "application/eps" => "eps",
-    "image/eps" => "eps",
-    # "application/postscript" => "ps", # TODO: support once Cairo supports PSSurface
-    "application/pdf" => "pdf",
-)
     @eval function _show(io::IO, mime::MIME{Symbol($mime)}, plt::Plot{InspectDRBackend})
         _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o), plt[:size]...)
     end
@@ -558,9 +462,7 @@ end
 # Display/show the plot (open a GUI window, or browser page, for example).
 function _display(plt::Plot{InspectDRBackend})
     mplot = _inspectdr_getmplot(plt.o)
-    if nothing == mplot
+    if nothing == mplot; return; end
-        return
-    end
     gplot = _inspectdr_getgui(plt.o)
 
     if nothing == gplot

src/backends/pgfplots.jl

@@ -3,7 +3,7 @@
 # significant contributions by: @pkofod
 
 # --------------------------------------------------------------------------------------
-# COV_EXCL_START
+
 const _pgfplots_linestyles = KW(
     :solid => "solid",
     :dash => "dashed",
@@ -27,7 +27,7 @@ const _pgfplots_markers = KW(
     :diamond => "diamond*",
     :pentagon => "pentagon*",
     :hline => "-",
-    :vline => "|",
+    :vline => "|"
 )
 
 const _pgfplots_legend_pos = KW(
@@ -38,6 +38,7 @@ const _pgfplots_legend_pos = KW(
     :outertopright => "outer north east",
 )
 
+
 const _pgf_series_extrastyle = KW(
     :steppre => "const plot mark right",
     :stepmid => "const plot mark mid",
@@ -49,7 +50,11 @@ const _pgf_series_extrastyle = KW(
 
 # PGFPlots uses the anchors to define orientations for example to align left
 # one needs to use the right edge as anchor
-const _pgf_annotation_halign = KW(:center => "", :left => "right", :right => "left")
+const _pgf_annotation_halign = KW(
+    :center => "",
+    :left => "right",
+    :right => "left"
+)
 
 const _pgf_framestyles = [:box, :axes, :origin, :zerolines, :grid, :none]
 const _pgf_framestyle_defaults = Dict(:semi => :box)
@@ -58,9 +63,7 @@ function pgf_framestyle(style::Symbol)
         return style
     else
         default_style = get(_pgf_framestyle_defaults, style, :axes)
-        @warn(
+        @warn("Framestyle :$style is not (yet) supported by the PGFPlots backend. :$default_style was cosen instead.")
-            "Framestyle :$style is not (yet) supported by the PGFPlots backend. :$default_style was cosen instead."
-        )
         default_style
     end
 end
@@ -75,15 +78,15 @@ end
 
 function pgf_color(grad::ColorGradient)
     # Can't handle ColorGradient here, fallback to defaults.
-    cstr = @sprintf("{rgb,1:red,%.8f;green,%.8f;blue,%.8f}", 0.0, 0.60560316, 0.97868012)
+    cstr = @sprintf("{rgb,1:red,%.8f;green,%.8f;blue,%.8f}", 0.0, 0.60560316,0.97868012)
     cstr, 1
 end
 
 # Generates a colormap for pgfplots based on a ColorGradient
 function pgf_colormap(grad::ColorGradient)
     join(map(grad.colors) do c
-        @sprintf("rgb=(%.8f,%.8f,%.8f)", red(c), green(c), blue(c))
+        @sprintf("rgb=(%.8f,%.8f,%.8f)", red(c), green(c),blue(c))
-    end, ", ")
+    end,", ")
 end
 
 pgf_thickness_scaling(plt::Plot) = plt[:thickness_scaling]
@@ -91,7 +94,7 @@ pgf_thickness_scaling(sp::Subplot) = pgf_thickness_scaling(sp.plt)
 pgf_thickness_scaling(series) = pgf_thickness_scaling(series[:subplot])
 
 function pgf_fillstyle(plotattributes, i = 1)
-    cstr, a = pgf_color(get_fillcolor(plotattributes, i))
+    cstr,a = pgf_color(get_fillcolor(plotattributes, i))
     fa = get_fillalpha(plotattributes, i)
     if fa !== nothing
         a = fa
@@ -123,47 +126,32 @@ end
 
 function pgf_marker(plotattributes, i = 1)
     shape = _cycle(plotattributes[:markershape], i)
-    cstr, a = pgf_color(
+    cstr, a = pgf_color(plot_color(get_markercolor(plotattributes, i), get_markeralpha(plotattributes, i)))
-        plot_color(get_markercolor(plotattributes, i), get_markeralpha(plotattributes, i)),
+    cstr_stroke, a_stroke = pgf_color(plot_color(get_markerstrokecolor(plotattributes, i), get_markerstrokealpha(plotattributes, i)))
-    )
+    """
-    cstr_stroke, a_stroke = pgf_color(
+    mark = $(get(_pgfplots_markers, shape, "*")),
-        plot_color(
+    mark size = $(pgf_thickness_scaling(plotattributes) * 0.5 * _cycle(plotattributes[:markersize], i)),
-            get_markerstrokecolor(plotattributes, i),
+    mark options = {
-            get_markerstrokealpha(plotattributes, i),
+        color = $cstr_stroke, draw opacity = $a_stroke,
-        ),
+        fill = $cstr, fill opacity = $a,
-    )
+        line width = $(pgf_thickness_scaling(plotattributes) * _cycle(plotattributes[:markerstrokewidth], i)),
-    return string(
+        rotate = $(shape == :dtriangle ? 180 : 0),
-        "mark = $(get(_pgfplots_markers, shape, "*")),\n",
+        $(get(_pgfplots_linestyles, _cycle(plotattributes[:markerstrokestyle], i), "solid"))
-        "mark size = $(pgf_thickness_scaling(plotattributes) * 0.5 * _cycle(plotattributes[:markersize], i)),\n",
+    }"""
-        plotattributes[:seriestype] == :scatter ? "only marks,\n" : "",
-        "mark options = {
-            color = $cstr_stroke, draw opacity = $a_stroke,
-            fill = $cstr, fill opacity = $a,
-            line width = $(pgf_thickness_scaling(plotattributes) * _cycle(plotattributes[:markerstrokewidth], i)),
-            rotate = $(shape == :dtriangle ? 180 : 0),
-            $(get(_pgfplots_linestyles, _cycle(plotattributes[:markerstrokestyle], i), "solid"))
-        }",
-    )
 end
 
 function pgf_add_annotation!(o, x, y, val, thickness_scaling = 1)
     # Construct the style string.
     # Currently supports color and orientation
-    cstr, a = pgf_color(val.font.color)
+    cstr,a = pgf_color(val.font.color)
-    push!(
+    push!(o, PGFPlots.Plots.Node(val.str, # Annotation Text
-        o,
+        x, y,
-        PGFPlots.Plots.Node(
+        style="""
-            val.str, # Annotation Text
+        $(get(_pgf_annotation_halign,val.font.halign,"")),
-            x,
+        color=$cstr, draw opacity=$(convert(Float16,a)),
-            y,
+        rotate=$(val.font.rotation),
-            style = """
+        font=$(pgf_font(val.font.pointsize, thickness_scaling))
-              $(get(_pgf_annotation_halign,val.font.halign,"")),
+        """))
-              color=$cstr, draw opacity=$(convert(Float16,a)),
-              rotate=$(val.font.rotation),
-              font=$(pgf_font(val.font.pointsize, thickness_scaling))
-              """,
-        ),
-    )
 end
 
 # --------------------------------------------------------------------------------------
@@ -176,7 +164,7 @@ function pgf_series(sp::Subplot, series::Series)
     # function args
     args = if st == :contour
         plotattributes[:z].surf, plotattributes[:x], plotattributes[:y]
-    elseif RecipesPipeline.is3d(st)
+    elseif is3d(st)
         plotattributes[:x], plotattributes[:y], plotattributes[:z]
     elseif st == :straightline
         straightline_data(series)
@@ -190,11 +178,11 @@ function pgf_series(sp::Subplot, series::Series)
     end
 
     # PGFPlots can't handle non-Vector?
-    # args = map(a -> if typeof(a) <: AbstractVector && typeof(a) != Vector
+    args = map(a -> if typeof(a) <: AbstractVector && typeof(a) != Vector
-    #         collect(a)
+            collect(a)
-    #     else
+        else
-    #         a
+            a
-    #     end, args)
+        end, args)
 
     if st in (:contour, :histogram2d)
         style = []
@@ -227,7 +215,7 @@ function pgf_series(sp::Subplot, series::Series)
             end
 
             # add to legend?
-            if i == 1 && sp[:legend_position] != :none && should_add_to_legend(series)
+            if i == 1 && sp[:legend] != :none && should_add_to_legend(series)
                 if plotattributes[:fillrange] !== nothing
                     push!(style, "forget plot")
                     push!(series_collection, pgf_fill_legend_hack(plotattributes, args))
@@ -251,15 +239,7 @@ function pgf_series(sp::Subplot, series::Series)
 
             # add fillrange
             if series[:fillrange] !== nothing && st != :shape
-                push!(
+                push!(series_collection, pgf_fillrange_series(series, i, _cycle(series[:fillrange], rng), seg_args...))
-                    series_collection,
-                    pgf_fillrange_series(
-                        series,
-                        i,
-                        _cycle(series[:fillrange], rng),
-                        seg_args...,
-                    ),
-                )
             end
 
             # build/return the series object
@@ -289,7 +269,7 @@ function pgf_fillrange_series(series, i, fillrange, args...)
         push!(style, _pgf_series_extrastyle[st])
     end
     kw[:style] = join(style, ',')
-    func = RecipesPipeline.is3d(series) ? PGFPlots.Linear3 : PGFPlots.Linear
+    func = is3d(series) ? PGFPlots.Linear3 : PGFPlots.Linear
     return func(pgf_fillrange_args(fillrange, args...)...; kw...)
 end
 
@@ -331,7 +311,7 @@ end
 # ----------------------------------------------------------------
 
 function pgf_axis(sp::Subplot, letter)
-    axis = sp[get_attr_symbol(letter, :axis)]
+    axis = sp[Symbol(letter,:axis)]
     style = []
     kw = KW()
 
@@ -342,7 +322,7 @@ function pgf_axis(sp::Subplot, letter)
     framestyle = pgf_framestyle(sp[:framestyle])
 
     # axis guide
-    kw[get_attr_symbol(letter, :label)] = axis[:guide]
+    kw[Symbol(letter,:label)] = axis[:guide]
 
     # axis label position
     labelpos = ""
@@ -354,23 +334,7 @@ function pgf_axis(sp::Subplot, letter)
 
     # Add label font
     cstr, α = pgf_color(plot_color(axis[:guidefontcolor]))
-    push!(
+    push!(style, string(letter, "label style = {", labelpos ,"font = ", pgf_font(axis[:guidefontsize], pgf_thickness_scaling(sp)), ", color = ", cstr, ", draw opacity = ", α, ", rotate = ", axis[:guidefontrotation], "}"))
-        style,
-        string(
-            letter,
-            "label style = {",
-            labelpos,
-            "font = ",
-            pgf_font(axis[:guidefontsize], pgf_thickness_scaling(sp)),
-            ", color = ",
-            cstr,
-            ", draw opacity = ",
-            α,
-            ", rotate = ",
-            axis[:guidefontrotation],
-            "}",
-        ),
-    )
 
     # flip/reverse?
     axis[:flip] && push!(style, "$letter dir=reverse")
@@ -378,7 +342,7 @@ function pgf_axis(sp::Subplot, letter)
     # scale
     scale = axis[:scale]
     if scale in (:log2, :ln, :log10)
-        kw[get_attr_symbol(letter, :mode)] = "log"
+        kw[Symbol(letter,:mode)] = "log"
         scale == :ln || push!(style, "log basis $letter=$(scale == :log2 ? 2 : 10)")
     end
 
@@ -397,20 +361,16 @@ function pgf_axis(sp::Subplot, letter)
     # limits
     # TODO: support zlims
     if letter != :z
-        lims =
+        lims = ispolar(sp) && letter == :x ? rad2deg.(axis_limits(sp, :x)) : axis_limits(sp, letter)
-            ispolar(sp) && letter == :x ? rad2deg.(axis_limits(sp, :x)) :
+        kw[Symbol(letter,:min)] = lims[1]
-            axis_limits(sp, letter)
+        kw[Symbol(letter,:max)] = lims[2]
-        kw[get_attr_symbol(letter, :min)] = lims[1]
-        kw[get_attr_symbol(letter, :max)] = lims[2]
     end
 
     if !(axis[:ticks] in (nothing, false, :none, :native)) && framestyle != :none
         ticks = get_ticks(sp, axis)
         #pgf plot ignores ticks with angle below 90 when xmin = 90 so shift values
-        tick_values =
+        tick_values = ispolar(sp) && letter == :x ? [rad2deg.(ticks[1])[3:end]..., 360, 405] : ticks[1]
-            ispolar(sp) && letter == :x ? [rad2deg.(ticks[1])[3:end]..., 360, 405] :
+        push!(style, string(letter, "tick = {", join(tick_values,","), "}"))
-            ticks[1]
-        push!(style, string(letter, "tick = {", join(tick_values, ","), "}"))
         if axis[:showaxis] && axis[:scale] in (:ln, :log2, :log10) && axis[:ticks] == :auto
             # wrap the power part of label with }
             tick_labels = Vector{String}(undef, length(ticks[2]))
@@ -419,59 +379,21 @@ function pgf_axis(sp::Subplot, letter)
                 power = string("{", power, "}")
                 tick_labels[i] = string(base, "^", power)
             end
-            push!(
+            push!(style, string(letter, "ticklabels = {\$", join(tick_labels,"\$,\$"), "\$}"))
-                style,
-                string(letter, "ticklabels = {\$", join(tick_labels, "\$,\$"), "\$}"),
-            )
         elseif axis[:showaxis]
-            tick_labels =
+            tick_labels = ispolar(sp) && letter == :x ? [ticks[2][3:end]..., "0", "45"] : ticks[2]
-                ispolar(sp) && letter == :x ? [ticks[2][3:end]..., "0", "45"] : ticks[2]
             if axis[:formatter] in (:scientific, :auto)
                 tick_labels = string.("\$", convert_sci_unicode.(tick_labels), "\$")
                 tick_labels = replace.(tick_labels, Ref("×" => "\\times"))
             end
-            push!(style, string(letter, "ticklabels = {", join(tick_labels, ","), "}"))
+            push!(style, string(letter, "ticklabels = {", join(tick_labels,","), "}"))
         else
             push!(style, string(letter, "ticklabels = {}"))
         end
-        push!(
+        push!(style, string(letter, "tick align = ", (axis[:tick_direction] == :out ? "outside" : "inside")))
-            style,
-            string(
-                letter,
-                "tick align = ",
-                (axis[:tick_direction] == :out ? "outside" : "inside"),
-            ),
-        )
         cstr, α = pgf_color(plot_color(axis[:tickfontcolor]))
-        push!(
+        push!(style, string(letter, "ticklabel style = {font = ", pgf_font(axis[:tickfontsize], pgf_thickness_scaling(sp)), ", color = ", cstr, ", draw opacity = ", α, ", rotate = ", axis[:tickfontrotation], "}"))
-            style,
+        push!(style, string(letter, " grid style = {", pgf_linestyle(pgf_thickness_scaling(sp) * axis[:gridlinewidth], axis[:foreground_color_grid], axis[:gridalpha], axis[:gridstyle]), "}"))
-            string(
-                letter,
-                "ticklabel style = {font = ",
-                pgf_font(axis[:tickfontsize], pgf_thickness_scaling(sp)),
-                ", color = ",
-                cstr,
-                ", draw opacity = ",
-                α,
-                ", rotate = ",
-                axis[:tickfontrotation],
-                "}",
-            ),
-        )
-        push!(
-            style,
-            string(
-                letter,
-                " grid style = {",
-                pgf_linestyle(
-                    pgf_thickness_scaling(sp) * axis[:gridlinewidth],
-                    axis[:foreground_color_grid],
-                    axis[:gridalpha],
-                    axis[:gridstyle],
-                ),
-                "}",
-            ),
-        )
     end
 
     # framestyle
@@ -488,20 +410,7 @@ function pgf_axis(sp::Subplot, letter)
     if framestyle == :zerolines
         push!(style, string("extra ", letter, " ticks = 0"))
         push!(style, string("extra ", letter, " tick labels = "))
-        push!(
+        push!(style, string("extra ", letter, " tick style = {grid = major, major grid style = {", pgf_linestyle(pgf_thickness_scaling(sp), axis[:foreground_color_border], 1.0), "}}"))
-            style,
-            string(
-                "extra ",
-                letter,
-                " tick style = {grid = major, major grid style = {",
-                pgf_linestyle(
-                    pgf_thickness_scaling(sp),
-                    axis[:foreground_color_border],
-                    1.0,
-                ),
-                "}}",
-            ),
-        )
     end
 
     if !axis[:showaxis]
@@ -510,19 +419,7 @@ function pgf_axis(sp::Subplot, letter)
     if !axis[:showaxis] || framestyle in (:zerolines, :grid, :none)
         push!(style, string(letter, " axis line style = {draw opacity = 0}"))
     else
-        push!(
+        push!(style, string(letter, " axis line style = {", pgf_linestyle(pgf_thickness_scaling(sp), axis[:foreground_color_border], 1.0), "}"))
-            style,
-            string(
-                letter,
-                " axis line style = {",
-                pgf_linestyle(
-                    pgf_thickness_scaling(sp),
-                    axis[:foreground_color_border],
-                    1.0,
-                ),
-                "}",
-            ),
-        )
     end
 
     # return the style list and KW args
@@ -531,6 +428,7 @@ end
 
 # ----------------------------------------------------------------
 
+
 function _update_plot_object(plt::Plot{PGFPlotsBackend})
     plt.o = PGFPlots.Axis[]
     # Obtain the total height of the plot by extracting the maximal bottom
@@ -538,13 +436,13 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
     total_height = bottom(bbox(plt.layout))
 
     for sp in plt.subplots
-        # first build the PGFPlots.Axis object
+       # first build the PGFPlots.Axis object
         style = ["unbounded coords=jump"]
         kw = KW()
 
         # add to style/kw for each axis
         for letter in (:x, :y, :z)
-            if letter != :z || RecipesPipeline.is3d(sp)
+            if letter != :z || is3d(sp)
                 axisstyle, axiskw = pgf_axis(sp, letter)
                 append!(style, axisstyle)
                 merge!(kw, axiskw)
@@ -556,71 +454,35 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
         # A round on 2 decimal places should be enough precision for 300 dpi
         # plots.
         bb = bbox(sp)
-        push!(
+        push!(style, """
-            style,
+            xshift = $(left(bb).value)mm,
-            """
+            yshift = $(round((total_height - (bottom(bb))).value, digits=2))mm,
-    xshift = $(left(bb).value)mm,
+            axis background/.style={fill=$(pgf_color(sp[:background_color_inside])[1])}
-    yshift = $(round((total_height - (bottom(bb))).value, digits=2))mm,
+        """)
-    axis background/.style={fill=$(pgf_color(sp[:background_color_inside])[1])}
-""",
-        )
         kw[:width] = "$(width(bb).value)mm"
         kw[:height] = "$(height(bb).value)mm"
 
         if sp[:title] != ""
             kw[:title] = "$(sp[:title])"
             cstr, α = pgf_color(plot_color(sp[:titlefontcolor]))
-            push!(
+            push!(style, string("title style = {font = ", pgf_font(sp[:titlefontsize], pgf_thickness_scaling(sp)), ", color = ", cstr, ", draw opacity = ", α, ", rotate = ", sp[:titlefontrotation], "}"))
-                style,
-                string(
-                    "title style = {font = ",
-                    pgf_font(sp[:titlefontsize], pgf_thickness_scaling(sp)),
-                    ", color = ",
-                    cstr,
-                    ", draw opacity = ",
-                    α,
-                    ", rotate = ",
-                    sp[:titlefontrotation],
-                    "}",
-                ),
-            )
         end
 
-        if get_aspect_ratio(sp) in (1, :equal)
+        if sp[:aspect_ratio] in (1, :equal)
             kw[:axisEqual] = "true"
         end
 
-        legpos = sp[:legend_position]
+        legpos = sp[:legend]
         if haskey(_pgfplots_legend_pos, legpos)
             kw[:legendPos] = _pgfplots_legend_pos[legpos]
         end
-        cstr, bg_alpha = pgf_color(plot_color(sp[:legend_background_color]))
+        cstr, a = pgf_color(plot_color(sp[:background_color_legend]))
-        fg_alpha = alpha(plot_color(sp[:legend_foreground_color]))
+        push!(style, string("legend style = {", pgf_linestyle(pgf_thickness_scaling(sp), sp[:foreground_color_legend], 1.0, "solid"), ",", "fill = $cstr,", "font = ", pgf_font(sp[:legendfontsize], pgf_thickness_scaling(sp)), "}"))
-
-        push!(
-            style,
-            string(
-                "legend style = {",
-                pgf_linestyle(
-                    pgf_thickness_scaling(sp),
-                    sp[:legend_foreground_color],
-                    fg_alpha,
-                    "solid",
-                ),
-                ",",
-                "fill = $cstr,",
-                "fill opacity = $bg_alpha,",
-                "text opacity = $(alpha(plot_color(sp[:legend_font_color]))),",
-                "font = ",
-                pgf_font(sp[:legend_font_pointsize], pgf_thickness_scaling(sp)),
-                "}",
-            ),
-        )
 
         if any(s[:seriestype] == :contour for s in series_list(sp))
             kw[:view] = "{0}{90}"
             kw[:colorbar] = !(sp[:colorbar] in (:none, :off, :hide, false))
-        elseif RecipesPipeline.is3d(sp)
+        elseif is3d(sp)
             azim, elev = sp[:camera]
             kw[:view] = "{$(azim)}{$(elev)}"
         end
@@ -646,10 +508,7 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
         for series in series_list(sp)
             for col in (:markercolor, :fillcolor, :linecolor)
                 if typeof(series.plotattributes[col]) == ColorGradient
-                    push!(
+                    push!(style,"colormap={plots}{$(pgf_colormap(series.plotattributes[col]))}")
-                        style,
-                        "colormap={plots}{$(pgf_colormap(series.plotattributes[col]))}",
-                    )
 
                     if sp[:colorbar] == :none
                         kw[:colorbar] = "false"
@@ -672,26 +531,17 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
 
             # add series annotations
             anns = series[:series_annotations]
-            for (xi, yi, str, fnt) in EachAnn(anns, series[:x], series[:y])
+            for (xi,yi,str,fnt) in EachAnn(anns, series[:x], series[:y])
-                pgf_add_annotation!(
+                pgf_add_annotation!(o, xi, yi, PlotText(str, fnt), pgf_thickness_scaling(series))
-                    o,
-                    xi,
-                    yi,
-                    PlotText(str, fnt),
-                    pgf_thickness_scaling(series),
-                )
             end
         end
 
         # add the annotations
         for ann in sp[:annotations]
-            pgf_add_annotation!(
+            pgf_add_annotation!(o, locate_annotation(sp, ann...)..., pgf_thickness_scaling(sp))
-                o,
-                locate_annotation(sp, ann...)...,
-                pgf_thickness_scaling(sp),
-            )
         end
 
+
         # add the PGFPlots.Axis to the list
         push!(plt.o, o)
     end
@@ -706,7 +556,7 @@ function _show(io::IO, mime::MIME"application/pdf", plt::Plot{PGFPlotsBackend})
     pgfplt = PGFPlots.plot(plt.o)
 
     # save a pdf
-    fn = tempname() * ".pdf"
+    fn = tempname()*".pdf"
     PGFPlots.save(PGFPlots.PDF(fn), pgfplt)
 
     # read it into io
@@ -717,12 +567,8 @@ function _show(io::IO, mime::MIME"application/pdf", plt::Plot{PGFPlotsBackend})
 end
 
 function _show(io::IO, mime::MIME"application/x-tex", plt::Plot{PGFPlotsBackend})
-    fn = tempname() * ".tex"
+    fn = tempname()*".tex"
-    PGFPlots.save(
+    PGFPlots.save(fn, backend_object(plt), include_preamble=plt.attr[:tex_output_standalone])
-        fn,
-        backend_object(plt),
-        include_preamble = plt.attr[:tex_output_standalone],
-    )
     write(io, read(open(fn), String))
 end
 
@@ -740,5 +586,3 @@ function _display(plt::Plot{PGFPlotsBackend})
     # cleanup
     PGFPlots.cleanup(plt.o)
 end
-
-# COV_EXCL_STOP

src/backends/plotlybase.jl

@@ -1,23 +0,0 @@
-function plotlybase_syncplot(plt::Plot)
-    plt.o = PlotlyBase.Plot()
-    traces = PlotlyBase.GenericTrace[]
-    for series_dict in plotly_series(plt)
-        plotly_type = pop!(series_dict, :type)
-        push!(traces, PlotlyBase.GenericTrace(plotly_type; series_dict...))
-    end
-    PlotlyBase.addtraces!(plt.o, traces...)
-    layout = plotly_layout(plt)
-    w, h = plt[:size]
-    PlotlyBase.relayout!(plt.o, layout, width = w, height = h)
-    return plt.o
-end
-
-for (mime, fmt) in (
-    "application/pdf" => "pdf",
-    "image/png" => "png",
-    "image/svg+xml" => "svg",
-    "image/eps" => "eps",
-)
-    @eval _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PlotlyBackend}) =
-        PlotlyBase.savefig(io, plotlybase_syncplot(plt), format = $fmt)
-end

src/backends/plotlyjs.jl

@@ -8,7 +8,6 @@ function plotlyjs_syncplot(plt::Plot{PlotlyJSBackend})
     traces = PlotlyJS.GenericTrace[]
     for series_dict in plotly_series(plt)
         plotly_type = pop!(series_dict, :type)
-        series_dict[:transpose] = false
         push!(traces, PlotlyJS.GenericTrace(plotly_type; series_dict...))
     end
     PlotlyJS.addtraces!(plt.o, traces...)
@@ -20,30 +19,32 @@ end
 
 # ------------------------------------------------------------------------------
 
-for (mime, fmt) in (
+const _plotlyjs_mimeformats = Dict(
     "application/pdf" => "pdf",
     "image/png"       => "png",
     "image/svg+xml"   => "svg",
     "image/eps"       => "eps",
 )
-    @eval _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PlotlyJSBackend}) =
+
-        PlotlyJS.savefig(io, plotlyjs_syncplot(plt), format = $fmt)
+for (mime, fmt) in _plotlyjs_mimeformats
+    @eval _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plotlyjs_syncplot(plt), format = $fmt)
 end
 
 # Use the Plotly implementation for json and html:
-_show(io::IO, mime::MIME"application/vnd.plotly.v1+json", plt::Plot{PlotlyJSBackend}) =
+_show(io::IO, mime::MIME"application/vnd.plotly.v1+json", plt::Plot{PlotlyJSBackend}) = plotly_show_js(io, plt)
-    plotly_show_js(io, plt)
 
 html_head(plt::Plot{PlotlyJSBackend}) = plotly_html_head(plt)
 html_body(plt::Plot{PlotlyJSBackend}) = plotly_html_body(plt)
 
-_show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend}) =
+_show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend}) = write(io, standalone_html(plt))
-    write(io, embeddable_html(plt))
 
 _display(plt::Plot{PlotlyJSBackend}) = display(plotlyjs_syncplot(plt))
 
-function PlotlyJS.WebIO.render(plt::Plot{PlotlyJSBackend})
+@require WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29" begin
-    return PlotlyJS.WebIO.render(plotlyjs_syncplot(plt))
+    function WebIO.render(plt::Plot{PlotlyJSBackend})
+        prepare_output(plt)
+        WebIO.render(plt.o)
+    end
 end
 
 function closeall(::PlotlyJSBackend)
@@ -51,5 +52,3 @@ function closeall(::PlotlyJSBackend)
         close(current().o)
     end
 end
-
-Base.showable(::MIME"application/prs.juno.plotpane+html", plt::Plot{PlotlyJSBackend}) = true

src/backends/unicodeplots.jl

@@ -1,373 +1,182 @@
-# https://github.com/JuliaPlots/UnicodePlots.jl
 
-const _canvas_map = (
+# https://github.com/Evizero/UnicodePlots.jl
-    braille = UnicodePlots.BrailleCanvas,
-    density = UnicodePlots.DensityCanvas,
-    heatmap = UnicodePlots.HeatmapCanvas,
-    lookup = UnicodePlots.LookupCanvas,
-    ascii = UnicodePlots.AsciiCanvas,
-    block = UnicodePlots.BlockCanvas,
-    dot = UnicodePlots.DotCanvas,
-)
 
-should_warn_on_unsupported(::UnicodePlotsBackend) = false
 
-function _before_layout_calcs(plt::Plot{UnicodePlotsBackend})
+# don't warn on unsupported... there's just too many warnings!!
-    plt.o = UnicodePlots.Plot[]
+warnOnUnsupported_args(::UnicodePlotsBackend, plotattributes::KW) = nothing
-    up_width = UnicodePlots.DEFAULT_WIDTH[]
+
-    up_height = UnicodePlots.DEFAULT_HEIGHT[]
+# --------------------------------------------------------------------------------------
+
+const _canvas_type = Ref(:auto)
+
+function _canvas_map()
+    KW(
+        :braille => UnicodePlots.BrailleCanvas,
+        :ascii => UnicodePlots.AsciiCanvas,
+        :block => UnicodePlots.BlockCanvas,
+        :dot => UnicodePlots.DotCanvas,
+        :density => UnicodePlots.DensityCanvas,
+    )
+end
+
+
+# do all the magic here... build it all at once, since we need to know about all the series at the very beginning
+function rebuildUnicodePlot!(plt::Plot, width, height)
+    plt.o = []
 
-    has_layout = prod(size(plt.layout)) > 1
     for sp in plt.subplots
-        sp_kw = sp[:extra_kwargs]
         xaxis = sp[:xaxis]
         yaxis = sp[:yaxis]
-        xlim = collect(axis_limits(sp, :x))
+        xlim =  axis_limits(sp, :x)
-        ylim = collect(axis_limits(sp, :y))
+        ylim =  axis_limits(sp, :y)
-        zlim = collect(axis_limits(sp, :z))
-        F = float(eltype(xlim))
 
-        # We set x/y to have a single point,
+        # make vectors
-        # since we need to create the plot with some data.
+        xlim = [xlim[1], xlim[2]]
-        # Since this point is at the bottom left corner of the plot,
+        ylim = [ylim[1], ylim[2]]
-        # it should be hidden by consecutive plotting commands.
-        x = Vector{F}(xlim)
-        y = Vector{F}(ylim)
-        z = Vector{F}(zlim)
 
-        # create a plot window with xlim/ylim set,
+        # we set x/y to have a single point, since we need to create the plot with some data.
-        # but the X/Y vectors are outside the bounds
+        # since this point is at the bottom left corner of the plot, it shouldn't actually be shown
-        canvas = if (up_c = get(sp_kw, :canvas, :auto)) === :auto
+        x = Float64[xlim[1]]
-            isijulia() ? :ascii : :braille
+        y = Float64[ylim[1]]
+
+        # create a plot window with xlim/ylim set, but the X/Y vectors are outside the bounds
+        ct = _canvas_type[]
+        canvas_type = if ct == :auto
+            isijulia() ? UnicodePlots.AsciiCanvas : UnicodePlots.BrailleCanvas
         else
-            up_c
+            _canvas_map()[ct]
         end
 
-        border = if (up_b = get(sp_kw, :border, :auto)) === :auto
+        # special handling for spy
-            isijulia() ? :ascii : :solid
+        if length(sp.series_list) == 1
-        else
+            series = sp.series_list[1]
-            up_b
+            if series[:seriestype] == :spy
-        end
+                push!(plt.o, UnicodePlots.spy(
-
+                    series[:z].surf,
-        # blank plots will not be shown
+                    width = width,
-        width = has_layout && isempty(series_list(sp)) ? 0 : get(sp_kw, :width, up_width)
+                    height = height,
-        height = get(sp_kw, :height, up_height)
+                    title = sp[:title],
-
+                    canvas = canvas_type
-        plot_3d = is3d(sp)
+                ))
-        blend = get(sp_kw, :blend, true)
+                continue
-        grid = xaxis[:grid] && yaxis[:grid]
-        quiver = contour = false
-        for series in series_list(sp)
-            st = series[:seriestype]
-            blend &= get(series[:extra_kwargs], :blend, true)
-            quiver |= series[:arrow] isa Arrow  # post-pipeline detection (:quiver -> :path)
-            contour |= st === :contour
-            if st === :histogram2d
-                xlim = ylim = (0, 0)
-            elseif st === :spy || st === :heatmap
-                width = height = 0
-                grid = false
             end
         end
-        grid &= !(quiver || contour)
-        blend &= !(quiver || contour)
 
-        plot_3d && (xlim = ylim = (0, 0))  # determined using projection
+        # # make it a bar canvas if plotting bar
-        azimuth, elevation = sp[:camera]  # PyPlot: azimuth = -60 & elevation = 30
+        # if any(series -> series[:seriestype] == :bar, series_list(sp))
-        projection = plot_3d ? get(sp_kw, :projection, :orthographic) : nothing
+        #     canvas_type = UnicodePlots.BarplotGraphics
+        # end
 
-        kw = (
+        o = UnicodePlots.Plot(x, y, canvas_type;
-            compact = true,
-            title = texmath2unicode(sp[:title]),
-            xlabel = texmath2unicode(xaxis[:guide]),
-            ylabel = texmath2unicode(yaxis[:guide]),
-            grid = grid,
-            blend = blend,
-            height = height,
             width = width,
-            xscale = xaxis[:scale],
+            height = height,
-            yscale = yaxis[:scale],
+            title = sp[:title],
-            border = border,
             xlim = xlim,
             ylim = ylim,
-            # 3d
+            border = isijulia() ? :ascii : :solid
-            projection = projection,
-            elevation = elevation,
-            azimuth = azimuth,
-            zoom = get(sp_kw, :zoom, 1),
-            up = get(sp_kw, :up, :z),
         )
 
-        o = UnicodePlots.Plot(x, y, plot_3d ? z : nothing, _canvas_map[canvas]; kw...)
+        # set the axis labels
+        UnicodePlots.xlabel!(o, xaxis[:guide])
+        UnicodePlots.ylabel!(o, yaxis[:guide])
+
+        # now use the ! functions to add to the plot
         for series in series_list(sp)
-            o = addUnicodeSeries!(
+            addUnicodeSeries!(o, series.plotattributes, sp[:legend] != :none, xlim, ylim)
-                sp,
-                o,
-                kw,
-                series,
-                sp[:legend_position] !== :none,
-                plot_3d,
-            )
         end
 
-        for ann in sp[:annotations]
+        # save the object
-            x, y, val = locate_annotation(sp, ann...)
+        push!(plt.o, o)
-            o = UnicodePlots.annotate!(
-                o,
-                x,
-                y,
-                texmath2unicode(val.str);
-                color = up_color(val.font.color),
-                halign = val.font.halign,
-                valign = val.font.valign,
-            )
-        end
-
-        push!(plt.o, o)  # save the object
     end
 end
 
-up_color(col::UnicodePlots.UserColorType) = col
-up_color(col::RGBA) =
-    (c = convert(ARGB32, col); map(Int, (red(c).i, green(c).i, blue(c).i)))
-up_color(col) = :auto
-
-function up_cmap(series)
-    rng = range(0, 1, length = length(UnicodePlots.COLOR_MAP_DATA[:viridis]))
-    [(red(c), green(c), blue(c)) for c in get(get_colorgradient(series), rng)]
-end
 
 # add a single series
-function addUnicodeSeries!(
+function addUnicodeSeries!(o, plotattributes::KW, addlegend::Bool, xlim, ylim)
-    sp::Subplot{UnicodePlotsBackend},
+    # get the function, or special handling for step/bar/hist
-    up::UnicodePlots.Plot,
+    st = plotattributes[:seriestype]
-    kw,
+    if st == :histogram2d
-    series,
+        UnicodePlots.densityplot!(o, plotattributes[:x], plotattributes[:y])
-    addlegend::Bool,
+        return
-    plot_3d::Bool,
+    end
-)
+
-    st = series[:seriestype]
+    if st in (:path, :straightline)
-    se_kw = series[:extra_kwargs]
+        func = UnicodePlots.lineplot!
+    elseif st == :scatter || plotattributes[:markershape] != :none
+        func = UnicodePlots.scatterplot!
+    # elseif st == :bar
+    #     func = UnicodePlots.barplot!
+    elseif st == :shape
+        func = UnicodePlots.lineplot!
+    else
+        error("Linestyle $st not supported by UnicodePlots")
+    end
 
     # get the series data and label
-    x, y = if st === :straightline
+    x, y = if st == :straightline
-        straightline_data(series)
+        straightline_data(plotattributes)
-    elseif st === :shape
+    elseif st == :shape
-        shape_data(series)
+        shape_data(plotattributes)
     else
-        series[:x], series[:y]
+        [collect(float(plotattributes[s])) for s in (:x, :y)]
     end
+    label = addlegend ? plotattributes[:label] : ""
 
-    if ispolar(sp) || ispolar(series)
+    # if we happen to pass in allowed color symbols, great... otherwise let UnicodePlots decide
-        return UnicodePlots.polarplot(x, y)
+    color = plotattributes[:linecolor] in UnicodePlots.color_cycle ? plotattributes[:linecolor] : :auto
-    end
 
-    # special handling (src/interface)
+    # add the series
-    fix_ar = get(se_kw, :fix_ar, true)
+    x, y = Plots.unzip(collect(Base.Iterators.filter(xy->isfinite(xy[1])&&isfinite(xy[2]), zip(x,y))))
-    if st === :histogram2d
+    func(o, x, y; color = color, name = label)
-        return UnicodePlots.densityplot(x, y; kw...)
-    elseif st === :spy
-        return UnicodePlots.spy(Array(series[:z]); fix_ar = fix_ar, kw...)
-    elseif st in (:contour, :heatmap)  # 2D
-        colormap = get(se_kw, :colormap, :none)
-        kw = (
-            kw...,
-            zlabel = sp[:colorbar_title],
-            colormap = colormap === :none ? up_cmap(series) : colormap,
-            colorbar = hascolorbar(sp),
-        )
-        if st === :contour
-            isfilledcontour(series) &&
-                @warn "Plots(UnicodePlots): filled contour is not implemented"
-            return UnicodePlots.contourplot(
-                x,
-                y,
-                Array(series[:z]);
-                kw...,
-                levels = series[:levels],
-            )
-        elseif st === :heatmap
-            return UnicodePlots.heatmap(Array(series[:z]); fix_ar = fix_ar, kw...)
-        end
-    elseif st in (:surface, :wireframe)  # 3D
-        colormap = get(se_kw, :colormap, :none)
-        lines = get(se_kw, :lines, st === :wireframe)
-        zscale = get(se_kw, :zscale, :identity)
-        kw = (
-            kw...,
-            zlabel = sp[:colorbar_title],
-            colormap = colormap === :none ? up_cmap(series) : colormap,
-            colorbar = hascolorbar(sp),
-            color = st === :wireframe ? up_color(get_linecolor(series, 1)) : nothing,
-            zscale = zscale,
-            lines = lines,
-        )
-        return UnicodePlots.surfaceplot(x, y, Array(series[:z]); kw...)
-    elseif st === :mesh3d
-        return UnicodePlots.lineplot!(
-            up,
-            mesh3d_triangles(x, y, series[:z], series[:connections])...,
-        )
-    end
-
-    # now use the ! functions to add to the plot
-    if st in (:path, :path3d, :straightline, :shape, :mesh3d)
-        func = UnicodePlots.lineplot!
-        series_kw = (; head_tail = series[:arrow] isa Arrow ? series[:arrow].side : nothing)
-    elseif st in (:scatter, :scatter3d) || series[:markershape] !== :none
-        func = UnicodePlots.scatterplot!
-        series_kw = (; marker = series[:markershape])
-    else
-        error("Plots(UnicodePlots): series type $st not supported")
-    end
-
-    label = addlegend ? series[:label] : ""
-
-    for (n, segment) in enumerate(series_segments(series, st; check = true))
-        i, rng = segment.attr_index, segment.range
-        lc = get_linecolor(series, i)
-        up = func(
-            up,
-            x[rng],
-            y[rng],
-            plot_3d ? series[:z][rng] : nothing;
-            color = up_color(lc),
-            name = n == 1 ? label : "",
-            series_kw...,
-        )
-    end
-
-    for (xi, yi, str, fnt) in EachAnn(series[:series_annotations], x, y)
-        up = UnicodePlots.annotate!(
-            up,
-            xi,
-            yi,
-            str;
-            color = up_color(fnt.color),
-            halign = fnt.halign,
-            valign = fnt.valign,
-        )
-    end
-
-    up
 end
 
-# ------------------------------------------------------------------------------------------
+# -------------------------------
 
-function _show(io::IO, ::MIME"image/png", plt::Plot{UnicodePlotsBackend})
+# since this is such a hack, it's only callable using `png`... should error during normal `show`
-    prepare_output(plt)
+function png(plt::AbstractPlot{UnicodePlotsBackend}, fn::AbstractString)
-    nr, nc = size(plt.layout)
+    fn = addExtension(fn, "png")
-    s1 = zeros(Int, nr, nc)
+
-    s2 = zeros(Int, nr, nc)
+    # make some whitespace and show the plot
-    canvas_type = nothing
+    println("\n\n\n\n\n\n")
-    imgs = []
+    gui(plt)
-    sps = 0
+
-    for r in 1:nr
+    # @osx_only begin
-        for c in 1:nc
+    @static if Sys.isapple()
-            if (l = plt.layout[r, c]) isa GridLayout && size(l) != (1, 1)
+        # BEGIN HACK
-                error("Plots(UnicodePlots): complex nested layout is currently unsupported")
+
-            else
+        # wait while the plot gets drawn
-                img = UnicodePlots.png_image(plt.o[sps += 1])
+        sleep(0.5)
-                canvas_type = eltype(img)
+
-                h, w = size(img)
+        # use osx screen capture when my terminal is maximized and cursor starts at the bottom (I know, right?)
-                s1[r, c] = h
+        # TODO: compute size of plot to adjust these numbers (or maybe implement something good??)
-                s2[r, c] = w
+        run(`screencapture -R50,600,700,420 $fn`)
-                push!(imgs, img)
+
-            end
+        # END HACK (phew)
-        end
+        return
     end
-    if canvas_type !== nothing
+
-        m1 = maximum(s1; dims = 2)
+    error("Can only savepng on osx with UnicodePlots (though even then I wouldn't do it)")
-        m2 = maximum(s2; dims = 1)
-        img = zeros(canvas_type, sum(m1), sum(m2))
-        sps = 0
-        n1 = 1
-        for r in 1:nr
-            n2 = 1
-            for c in 1:nc
-                sp = imgs[sps += 1]
-                h, w = size(sp)
-                img[n1:(n1 + (h - 1)), n2:(n2 + (w - 1))] = sp
-                n2 += m2[c]
-            end
-            n1 += m1[r]
-        end
-        stream = UnicodePlots.FileIO.Stream{UnicodePlots.FileIO.format"PNG"}(io)
-        UnicodePlots.FileIO.save(stream, img)
-    end
-    nothing
 end
 
-Base.show(plt::Plot{UnicodePlotsBackend}) = show(stdout, plt)
+# -------------------------------
-Base.show(io::IO, plt::Plot{UnicodePlotsBackend}) = _show(io, MIME("text/plain"), plt)
+
+# we don't do very much for subplots... just stack them vertically
+
+function unicodeplots_rebuild(plt::Plot{UnicodePlotsBackend})
+    w, h = plt[:size]
+    plt.attr[:color_palette] = [RGB(0,0,0)]
+    rebuildUnicodePlot!(plt, div(w, 10), div(h, 20))
+end
 
-# NOTE: _show(...) must be kept for Base.showable (src/output.jl)
 function _show(io::IO, ::MIME"text/plain", plt::Plot{UnicodePlotsBackend})
-    prepare_output(plt)
+    unicodeplots_rebuild(plt)
-    nr, nc = size(plt.layout)
+    foreach(x -> show(io, x), plt.o)
-    if nr == 1 && nc == 1  # fast path
-        n = length(plt.o)
-        for (i, p) in enumerate(plt.o)
-            show(io, p)
-            i < n && println(io)
-        end
-    else
-        have_color = Base.get_have_color()
-        buf = IOContext(PipeBuffer(), :color => have_color)
-        lines_colored = Array{Union{Nothing,Vector{String}}}(undef, nr, nc)
-        lines_uncolored = have_color ? similar(lines_colored) : lines_colored
-        l_max = zeros(Int, nr)
-        w_max = zeros(Int, nc)
-        sps = 0
-        for r in 1:nr
-            lmax = 0
-            for c in 1:nc
-                if (l = plt.layout[r, c]) isa GridLayout && size(l) != (1, 1)
-                    error(
-                        "Plots(UnicodePlots): complex nested layout is currently unsupported",
-                    )
-                else
-                    if get(l.attr, :blank, false)
-                        lines_colored[r, c] = lines_uncolored[r, c] = nothing
-                    else
-                        sp = plt.o[sps += 1]
-                        show(buf, sp)
-                        colored = read(buf, String)
-                        lines_colored[r, c] = lu = lc = split(colored, '\n')
-                        if have_color
-                            uncolored = UnicodePlots.no_ansi_escape(colored)
-                            lines_uncolored[r, c] = lu = split(uncolored, '\n')
-                        end
-                        lmax = max(length(lc), lmax)
-                        w_max[c] = max(maximum(length.(lu)), w_max[c])
-                    end
-                end
-            end
-            l_max[r] = lmax
-        end
-        empty = String[' '^w for w in w_max]
-        for r in 1:nr
-            for n in 1:l_max[r]
-                for c in 1:nc
-                    pre = c == 1 ? '\0' : ' '
-                    lc = lines_colored[r, c]
-                    if lc === nothing || length(lc) < n
-                        print(io, pre, empty[c])
-                    else
-                        lu = lines_uncolored[r, c]
-                        print(io, pre, lc[n], ' '^(w_max[c] - length(lu[n])))
-                    end
-                end
-                n < l_max[r] && println(io)
-            end
-            r < nr && println(io)
-        end
-    end
     nothing
 end
 
-# we only support MIME"text/plain", hence display(...) falls back to plain-text on stdout
+
 function _display(plt::Plot{UnicodePlotsBackend})
-    show(stdout, plt)
+    unicodeplots_rebuild(plt)
-    println(stdout)
+    map(show, plt.o)
+    nothing
 end

src/backends/web.jl

@@ -3,10 +3,7 @@
 
 # CREDIT: parts of this implementation were inspired by @joshday's PlotlyLocal.jl
 
-function standalone_html(
+function standalone_html(plt::AbstractPlot; title::AbstractString = get(plt.attr, :window_title, "Plots.jl"))
-    plt::AbstractPlot;
-    title::AbstractString = get(plt.attr, :window_title, "Plots.jl"),
-)
     """
     <!DOCTYPE html>
     <html>
@@ -22,10 +19,6 @@ function standalone_html(
     """
 end
 
-function embeddable_html(plt::AbstractPlot)
-    html_head(plt) * html_body(plt)
-end
-
 function open_browser_window(filename::AbstractString)
     @static if Sys.isapple()
         return run(`open $(filename)`)
@@ -52,8 +45,7 @@ function standalone_html_window(plt::AbstractPlot)
     old = use_local_dependencies[] # save state to restore afterwards
     # if we open a browser ourself, we can host local files, so
     # when we have a local plotly downloaded this is the way to go!
-    use_local_dependencies[] =
+    use_local_dependencies[] = isfile(plotly_local_file_path)
-        plotly_local_file_path[] === nothing ? false : isfile(plotly_local_file_path[])
     filename = write_temp_html(plt)
     open_browser_window(filename)
     # restore for other backends
@@ -62,9 +54,7 @@ end
 
 # uses wkhtmltopdf/wkhtmltoimage: http://wkhtmltopdf.org/downloads.html
 function html_to_png(html_fn, png_fn, w, h)
-    run(
+    run(`wkhtmltoimage -f png -q --width $w --height $h --disable-smart-width $html_fn $png_fn`)
-        `wkhtmltoimage -f png -q --width $w --height $h --disable-smart-width $html_fn $png_fn`,
-    )
 end
 
 function show_png_from_html(io::IO, plt::AbstractPlot)

src/colorbars.jl

@@ -1,105 +0,0 @@
-# These functions return an operator for use in `get_clims(::Seres, op)`
-process_clims(lims::Tuple{<:Number,<:Number}) =
-    (zlims -> ifelse.(isfinite.(lims), lims, zlims)) ∘ ignorenan_extrema
-process_clims(s::Union{Symbol,Nothing,Missing}) = ignorenan_extrema
-# don't specialize on ::Function otherwise python functions won't work
-process_clims(f) = f
-
-get_clims(sp::Subplot)::Tuple{Float64,Float64} =
-    haskey(sp.attr, :clims_calculated) ? sp[:clims_calculated] : update_clims(sp)
-get_clims(series::Series)::Tuple{Float64,Float64} =
-    haskey(series.plotattributes, :clims_calculated) ?
-    series[:clims_calculated]::Tuple{Float64,Float64} : update_clims(series)
-get_clims(sp::Subplot, series::Series)::Tuple{Float64,Float64} =
-    series[:colorbar_entry] ? get_clims(sp) : get_clims(series)
-
-function update_clims(sp::Subplot, op = process_clims(sp[:clims]))::Tuple{Float64,Float64}
-    zmin, zmax = Inf, -Inf
-    for series in series_list(sp)
-        if series[:colorbar_entry]::Bool
-            zmin, zmax = _update_clims(zmin, zmax, update_clims(series, op)...)
-        else
-            update_clims(series, op)
-        end
-    end
-    return sp[:clims_calculated] = zmin <= zmax ? (zmin, zmax) : (NaN, NaN)
-end
-
-"""
-    update_clims(::Series, op=Plots.ignorenan_extrema)
-Finds the limits for the colorbar by taking the "z-values" for the series and passing them into `op`,
-which must return the tuple `(zmin, zmax)`. The default op is the extrema of the finite
-values of the input. The value is stored as a series property, which is retrieved by `get_clims`.
-"""
-function update_clims(series::Series, op = ignorenan_extrema)::Tuple{Float64,Float64}
-    zmin, zmax = Inf, -Inf
-
-    # keeping this unrolled has higher performance
-    if series[:seriestype] ∈ _z_colored_series && series[:z] !== nothing
-        zmin, zmax = update_clims(zmin, zmax, series[:z], op)
-    end
-    if series[:line_z] !== nothing
-        zmin, zmax = update_clims(zmin, zmax, series[:line_z], op)
-    end
-    if series[:marker_z] !== nothing
-        zmin, zmax = update_clims(zmin, zmax, series[:marker_z], op)
-    end
-    if series[:fill_z] !== nothing
-        zmin, zmax = update_clims(zmin, zmax, series[:fill_z], op)
-    end
-    return series[:clims_calculated] = zmin <= zmax ? (zmin, zmax) : (NaN, NaN)
-end
-
-update_clims(zmin, zmax, vals::AbstractSurface, op)::Tuple{Float64,Float64} =
-    update_clims(zmin, zmax, vals.surf, op)
-update_clims(zmin, zmax, vals::Any, op)::Tuple{Float64,Float64} =
-    _update_clims(zmin, zmax, op(vals)...)
-update_clims(zmin, zmax, ::Nothing, ::Any)::Tuple{Float64,Float64} = zmin, zmax
-
-_update_clims(zmin, zmax, emin, emax) = NaNMath.min(zmin, emin), NaNMath.max(zmax, emax)
-
-@enum ColorbarStyle cbar_gradient cbar_fill cbar_lines
-
-function colorbar_style(series::Series)
-    colorbar_entry = series[:colorbar_entry]
-    if !(colorbar_entry isa Bool)
-        @warn "Non-boolean colorbar_entry ignored."
-        colorbar_entry = true
-    end
-
-    if !colorbar_entry
-        nothing
-    elseif isfilledcontour(series)
-        cbar_fill
-    elseif iscontour(series)
-        cbar_lines
-    elseif series[:seriestype] ∈ (:heatmap, :surface) ||
-           any(series[z] !== nothing for z in [:marker_z, :line_z, :fill_z])
-        cbar_gradient
-    else
-        nothing
-    end
-end
-
-hascolorbar(series::Series) = colorbar_style(series) !== nothing
-hascolorbar(sp::Subplot) =
-    sp[:colorbar] != :none && any(hascolorbar(s) for s in series_list(sp))
-
-function get_colorbar_ticks(sp::Subplot; update = true)
-    if update || !haskey(sp.attr, :colorbar_optimized_ticks)
-        ticks = _transform_ticks(sp[:colorbar_ticks])
-        cvals = sp[:colorbar_continuous_values]
-        dvals = sp[:colorbar_discrete_values]
-        clims = get_clims(sp)
-        scale = sp[:colorbar_scale]
-        formatter = sp[:colorbar_formatter]
-        sp.attr[:colorbar_optimized_ticks] =
-            get_ticks(ticks, cvals, dvals, clims, scale, formatter)
-    end
-    return sp.attr[:colorbar_optimized_ticks]
-end
-
-function _update_subplot_colorbars(sp::Subplot)
-    # Dynamic callback from the pipeline if needed
-    update_clims(sp)
-end

src/consts.jl

@@ -1,88 +0,0 @@
-
-const _deprecated_attributes = Dict{Symbol,Symbol}(:orientation => :permute)
-const _all_defaults = KW[_series_defaults, _plot_defaults, _subplot_defaults]
-
-const _initial_defaults = deepcopy(_all_defaults)
-const _initial_axis_defaults = deepcopy(_axis_defaults)
-
-# add defaults for the letter versions
-const _axis_defaults_byletter = KW()
-
-function reset_axis_defaults_byletter!()
-    for letter in (:x, :y, :z)
-        _axis_defaults_byletter[letter] = KW()
-        for (k, v) in _axis_defaults
-            _axis_defaults_byletter[letter][k] = v
-        end
-    end
-end
-reset_axis_defaults_byletter!()
-
-# to be able to reset font sizes to initial values
-const _initial_plt_fontsizes =
-    Dict(:plot_titlefontsize => _plot_defaults[:plot_titlefontsize])
-
-const _initial_sp_fontsizes = Dict(
-    :titlefontsize => _subplot_defaults[:titlefontsize],
-    :legend_font_pointsize => _subplot_defaults[:legend_font_pointsize],
-    :legend_title_font_pointsize => _subplot_defaults[:legend_title_font_pointsize],
-    :annotationfontsize => _subplot_defaults[:annotationfontsize],
-    :colorbar_tickfontsize => _subplot_defaults[:colorbar_tickfontsize],
-    :colorbar_titlefontsize => _subplot_defaults[:colorbar_titlefontsize],
-)
-
-const _initial_ax_fontsizes = Dict(
-    :tickfontsize  => _axis_defaults[:tickfontsize],
-    :guidefontsize => _axis_defaults[:guidefontsize],
-)
-
-const _initial_fontsizes =
-    merge(_initial_plt_fontsizes, _initial_sp_fontsizes, _initial_ax_fontsizes)
-
-const _internal_args =
-    [:plot_object, :series_plotindex, :markershape_to_add, :letter, :idxfilter]
-
-const _axis_args = Set(keys(_axis_defaults))
-const _series_args = Set(keys(_series_defaults))
-const _subplot_args = Set(keys(_subplot_defaults))
-const _plot_args = Set(keys(_plot_defaults))
-
-const _magic_axis_args = [:axis, :tickfont, :guidefont, :grid, :minorgrid]
-const _magic_subplot_args =
-    [:title_font, :legend_font, :legend_title_font, :plot_title_font, :colorbar_titlefont]
-const _magic_series_args = [:line, :marker, :fill]
-const _all_magic_args =
-    Set(union(_magic_axis_args, _magic_series_args, _magic_subplot_args))
-
-const _all_axis_args = union(_axis_args, _magic_axis_args)
-const _lettered_all_axis_args =
-    Set([Symbol(letter, kw) for letter in (:x, :y, :z) for kw in _all_axis_args])
-const _all_subplot_args = union(_subplot_args, _magic_subplot_args)
-const _all_series_args = union(_series_args, _magic_series_args)
-const _all_plot_args = _plot_args
-
-const _all_args =
-    union(_lettered_all_axis_args, _all_subplot_args, _all_series_args, _all_plot_args)
-
-# add all pluralized forms to the _keyAliases dict
-for arg in _all_args
-    add_aliases(arg, makeplural(arg))
-end
-
-# fill symbol cache
-for letter in (:x, :y, :z)
-    _attrsymbolcache[letter] = Dict{Symbol,Symbol}()
-    for k in _axis_args
-        # populate attribute cache
-        lk = Symbol(letter, k)
-        _attrsymbolcache[letter][k] = lk
-        # allow the underscore version too: xguide or x_guide
-        add_aliases(lk, Symbol(letter, "_", k))
-    end
-    for k in (_magic_axis_args..., :(_discrete_indices))
-        _attrsymbolcache[letter][k] = Symbol(letter, k)
-    end
-end
-
-# add all non_underscored forms to the _keyAliases
-add_non_underscore_aliases!(_keyAliases)

src/fileio.jl

@@ -1,10 +1,8 @@
 # ---------------------------------------------------------
 # A backup, if no PNG generation is defined, is to try to make a PDF and use FileIO to convert
 
-_fileio_load(@nospecialize(filename::AbstractString)) =
+_fileio_load(@nospecialize(filename::AbstractString)) = FileIO.load(filename::AbstractString)
-    FileIO.load(filename::AbstractString)
+_fileio_save(@nospecialize(filename::AbstractString), @nospecialize(x)) = FileIO.save(filename::AbstractString, x)
-_fileio_save(@nospecialize(filename::AbstractString), @nospecialize(x)) =
-    FileIO.save(filename::AbstractString, x)
 
 function _show_pdfbackends(io::IO, ::MIME"image/png", plt::Plot)
     fn = tempname()
@@ -23,5 +21,4 @@ function _show_pdfbackends(io::IO, ::MIME"image/png", plt::Plot)
     write(io, read(open(pngfn), String))
 end
 
-const PDFBackends =
+const PDFBackends = Union{PGFPlotsBackend,PlotlyJSBackend,PyPlotBackend,InspectDRBackend,GRBackend}
-    Union{PGFPlotsBackend,PlotlyJSBackend,PyPlotBackend,InspectDRBackend,GRBackend}

src/ijulia.jl

@@ -1,14 +1,15 @@
 const use_local_dependencies = Ref(false)
 const use_local_plotlyjs = Ref(false)
 
+
 function _init_ijulia_plotting()
     # IJulia is more stable with local file
-    use_local_plotlyjs[] =
+    use_local_plotlyjs[] = isfile(plotly_local_file_path)
-        plotly_local_file_path[] === nothing ? false : isfile(plotly_local_file_path[])
 
     ENV["MPLBACKEND"] = "Agg"
 end
 
+
 """
 Add extra jupyter mimetypes to display_dict based on the plot backed.
 
@@ -19,17 +20,22 @@ frontends like jupyterlab and nteract.
 _ijulia__extra_mime_info!(plt::Plot, out::Dict) = out
 
 function _ijulia__extra_mime_info!(plt::Plot{PlotlyJSBackend}, out::Dict)
-    out["application/vnd.plotly.v1+json"] =
+    out["application/vnd.plotly.v1+json"] = Dict(
-        Dict(:data => plotly_series(plt), :layout => plotly_layout(plt))
+        :data => plotly_series(plt),
+        :layout => plotly_layout(plt)
+    )
     out
 end
 
 function _ijulia__extra_mime_info!(plt::Plot{PlotlyBackend}, out::Dict)
-    out["application/vnd.plotly.v1+json"] =
+    out["application/vnd.plotly.v1+json"] = Dict(
-        Dict(:data => plotly_series(plt), :layout => plotly_layout(plt))
+        :data => plotly_series(plt),
+        :layout => plotly_layout(plt)
+    )
     out
 end
 
+
 function _ijulia_display_dict(plt::Plot)
     output_type = Symbol(plt.attr[:html_output_format])
     if output_type == :auto
@@ -48,12 +54,9 @@ function _ijulia_display_dict(plt::Plot)
     elseif output_type == :html
         mime = "text/html"
         out[mime] = sprint(show, MIME(mime), plt)
-        _ijulia__extra_mime_info!(plt, out)
-    elseif output_type == :pdf
-        mime = "application/pdf"
-        out[mime] = base64encode(show, MIME(mime), plt)
     else
         error("Unsupported output type $output_type")
     end
+    _ijulia__extra_mime_info!(plt, out)
     out
 end

src/init.jl

@@ -1,115 +1,60 @@
 using REPL
-using Scratch
 
-const plotly_local_file_path = Ref{Union{Nothing,String}}(nothing)
 
 function _plots_defaults()
     if isdefined(Main, :PLOTS_DEFAULTS)
-        copy(Dict{Symbol,Any}(Main.PLOTS_DEFAULTS))
+        Dict{Symbol,Any}(Main.PLOTS_DEFAULTS)
     else
         Dict{Symbol,Any}()
     end
 end
 
+
 function __init__()
     user_defaults = _plots_defaults()
     if haskey(user_defaults, :theme)
-        theme(pop!(user_defaults, :theme); user_defaults...)
+        theme(user_defaults[:theme])
-    else
+    end
-        default(; user_defaults...)
+    for (k,v) in user_defaults
+        k == :theme || default(k, v)
     end
 
-    insert!(
+    insert!(Base.Multimedia.displays, findlast(x -> x isa Base.TextDisplay || x isa REPL.REPLDisplay, Base.Multimedia.displays) + 1, PlotsDisplay())
-        Base.Multimedia.displays,
-        findlast(
-            x -> x isa Base.TextDisplay || x isa REPL.REPLDisplay,
-            Base.Multimedia.displays,
-        ) + 1,
-        PlotsDisplay(),
-    )
 
-    atreplinit(
+    atreplinit(i -> begin
-        i -> begin
+        while PlotsDisplay() in Base.Multimedia.displays
-            while PlotsDisplay() in Base.Multimedia.displays
+            popdisplay(PlotsDisplay())
-                popdisplay(PlotsDisplay())
+        end
-            end
+        insert!(Base.Multimedia.displays, findlast(x -> x isa REPL.REPLDisplay, Base.Multimedia.displays) + 1, PlotsDisplay())
-            insert!(
+    end)
-                Base.Multimedia.displays,
-                findlast(x -> x isa REPL.REPLDisplay, Base.Multimedia.displays) + 1,
-                PlotsDisplay(),
-            )
-        end,
-    )
 
-    @require HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" begin
+    @require HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" include(joinpath(@__DIR__, "backends", "hdf5.jl"))
-        fn = joinpath(@__DIR__, "backends", "hdf5.jl")
+    @require InspectDR = "d0351b0e-4b05-5898-87b3-e2a8edfddd1d" include(joinpath(@__DIR__, "backends", "inspectdr.jl"))
-        include(fn)
+    @require PGFPlots = "3b7a836e-365b-5785-a47d-02c71176b4aa" include(joinpath(@__DIR__, "backends", "pgfplots.jl"))
-    end
+    @require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" include(joinpath(@__DIR__, "backends", "plotlyjs.jl"))
-
+    @require PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" include(joinpath(@__DIR__, "backends", "pyplot.jl"))
-    @require InspectDR = "d0351b0e-4b05-5898-87b3-e2a8edfddd1d" begin
+    @require UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228" include(joinpath(@__DIR__, "backends", "unicodeplots.jl"))
-        fn = joinpath(@__DIR__, "backends", "inspectdr.jl")
-        include(fn)
-    end
-
-    @require PGFPlots = "3b7a836e-365b-5785-a47d-02c71176b4aa" begin
-        fn = joinpath(@__DIR__, "backends", "deprecated", "pgfplots.jl")
-        include(fn)
-    end
-
-    @require PlotlyBase = "a03496cd-edff-5a9b-9e67-9cda94a718b5" begin
-        fn = joinpath(@__DIR__, "backends", "plotlybase.jl")
-        include(fn)
-    end
-
-    @require PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925" begin
-        fn = joinpath(@__DIR__, "backends", "pgfplotsx.jl")
-        include(fn)
-    end
-
-    @require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" begin
-        fn = joinpath(@__DIR__, "backends", "plotlyjs.jl")
-        include(fn)
-    end
-
-    @require PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" begin
-        fn = joinpath(@__DIR__, "backends", "pyplot.jl")
-        include(fn)
-    end
-
-    @require UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228" begin
-        fn = joinpath(@__DIR__, "backends", "unicodeplots.jl")
-        include(fn)
-    end
-
-    @require Gaston = "4b11ee91-296f-5714-9832-002c20994614" begin
-        fn = joinpath(@__DIR__, "backends", "gaston.jl")
-        include(fn)
-    end
 
     @require IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a" begin
         if IJulia.inited
             _init_ijulia_plotting()
+
             IJulia.display_dict(plt::Plot) = _ijulia_display_dict(plt)
         end
     end
 
-    if get(ENV, "PLOTS_HOST_DEPENDENCY_LOCAL", "false") == "true"
+    if haskey(ENV, "PLOTS_HOST_DEPENDENCY_LOCAL")
-        global plotly_local_file_path[] =
+        use_local_plotlyjs[] = ENV["PLOTS_HOST_DEPENDENCY_LOCAL"] == "true"
-            joinpath(@get_scratch!("plotly"), _plotly_min_js_filename)
+        use_local_dependencies[] = isfile(plotly_local_file_path) && use_local_plotlyjs[]
-        if !isfile(plotly_local_file_path[])
+        if use_local_plotlyjs[] && !isfile(plotly_local_file_path)
-            Downloads.download(
+            @warn("PLOTS_HOST_DEPENDENCY_LOCAL is set to true, but no local plotly file found. run Pkg.build(\"Plots\") and make sure PLOTS_HOST_DEPENDENCY_LOCAL is set to true")
-                "https://cdn.plot.ly/$(_plotly_min_js_filename)",
-                plotly_local_file_path[],
-            )
         end
-
+    else
-        use_local_plotlyjs[] = true
+        use_local_dependencies[] = use_local_plotlyjs[]
     end
 
-    use_local_dependencies[] = use_local_plotlyjs[]
 
     @require FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" begin
-        _show(io::IO, mime::MIME"image/png", plt::Plot{<:PDFBackends}) =
+        _show(io::IO, mime::MIME"image/png", plt::Plot{<:PDFBackends}) = _show_pdfbackends(io, mime, plt)
-            _show_pdfbackends(io, mime, plt)
     end
 end

src/layouts.jl

@@ -4,6 +4,34 @@
 to_pixels(m::AbsoluteLength) = m.value / 0.254
 
 const _cbar_width = 5mm
+
+#Base.broadcast(::typeof(Base.:.*), m::Measure, n::Number) = m * n
+#Base.broadcast(::typeof(Base.:.*), m::Number, n::Measure) = m * n
+Base.:-(m::Measure, a::AbstractArray) = map(ai -> m - ai, a)
+Base.:-(a::AbstractArray, m::Measure) = map(ai -> ai - m, a)
+Base.zero(::Type{typeof(mm)}) = 0mm
+Base.one(::Type{typeof(mm)}) = 1mm
+Base.typemin(::typeof(mm)) = -Inf*mm
+Base.typemax(::typeof(mm)) = Inf*mm
+Base.convert(::Type{F}, l::AbsoluteLength) where {F<:AbstractFloat} = convert(F, l.value)
+
+# TODO: these are unintuitive and may cause tricky bugs
+# Base.:+(m1::AbsoluteLength, m2::Length{:pct}) = AbsoluteLength(m1.value * (1 + m2.value))
+# Base.:+(m1::Length{:pct}, m2::AbsoluteLength) = AbsoluteLength(m2.value * (1 + m1.value))
+# Base.:-(m1::AbsoluteLength, m2::Length{:pct}) = AbsoluteLength(m1.value * (1 - m2.value))
+# Base.:-(m1::Length{:pct}, m2::AbsoluteLength) = AbsoluteLength(m2.value * (m1.value - 1))
+
+Base.:*(m1::AbsoluteLength, m2::Length{:pct}) = AbsoluteLength(m1.value * m2.value)
+Base.:*(m1::Length{:pct}, m2::AbsoluteLength) = AbsoluteLength(m2.value * m1.value)
+Base.:/(m1::AbsoluteLength, m2::Length{:pct}) = AbsoluteLength(m1.value / m2.value)
+Base.:/(m1::Length{:pct}, m2::AbsoluteLength) = AbsoluteLength(m2.value / m1.value)
+
+
+Base.zero(::Type{typeof(pct)}) = 0pct
+Base.one(::Type{typeof(pct)}) = 1pct
+Base.typemin(::typeof(pct)) = 0pct
+Base.typemax(::typeof(pct)) = 1pct
+
 const defaultbox = BoundingBox(0mm, 0mm, 0mm, 0mm)
 
 left(bbox::BoundingBox) = bbox.x0[1]
@@ -18,16 +46,16 @@ ispositive(m::Measure) = m.value > 0
 # union together bounding boxes
 function Base.:+(bb1::BoundingBox, bb2::BoundingBox)
     # empty boxes don't change the union
-    ispositive(width(bb1)) || return bb2
+    ispositive(width(bb1))  || return bb2
     ispositive(height(bb1)) || return bb2
-    ispositive(width(bb2)) || return bb1
+    ispositive(width(bb2))  || return bb1
     ispositive(height(bb2)) || return bb1
 
     l = min(left(bb1), left(bb2))
     t = min(top(bb1), top(bb2))
     r = max(right(bb1), right(bb2))
     b = max(bottom(bb1), bottom(bb2))
-    BoundingBox(l, t, r - l, b - t)
+    BoundingBox(l, t, r-l, b-t)
 end
 
 # this creates a bounding box in the parent's scope, where the child bounding box
@@ -53,7 +81,7 @@ end
 # convert a bounding box from absolute coords to percentages...
 # returns an array of percentages of figure size: [left, bottom, width, height]
 function bbox_to_pcts(bb::BoundingBox, figw, figh, flipy = true)
-    mms = Float64[f(bb).value for f in (left, bottom, width, height)]
+    mms = Float64[f(bb).value for f in (left,bottom,width,height)]
     if flipy
         mms[2] = figh.value - mms[2]  # flip y when origin in bottom-left
     end
@@ -61,10 +89,7 @@ function bbox_to_pcts(bb::BoundingBox, figw, figh, flipy = true)
 end
 
 function Base.show(io::IO, bbox::BoundingBox)
-    print(
+    print(io, "BBox{l,t,r,b,w,h = $(left(bbox)),$(top(bbox)), $(right(bbox)),$(bottom(bbox)), $(width(bbox)),$(height(bbox))}")
-        io,
-        "BBox{l,t,r,b,w,h = $(left(bbox)),$(top(bbox)), $(right(bbox)),$(bottom(bbox)), $(width(bbox)),$(height(bbox))}",
-    )
 end
 
 # -----------------------------------------------------------
@@ -82,15 +107,17 @@ function resolve_mixed(mix::MixedMeasures, sp::Subplot, letter::Symbol)
     if mix.len != 0mm
         f = (letter == :x ? width : height)
         totlen = f(plotarea(sp))
+        @show totlen
         pct += mix.len / totlen
     end
     if pct != 0
         amin, amax = axis_limits(sp, letter)
-        xy += pct * (amax - amin)
+        xy += pct * (amax-amin)
     end
     xy
 end
 
+
 # -----------------------------------------------------------
 # AbstractLayout
 
@@ -161,30 +188,29 @@ parent_bbox(layout::AbstractLayout) = bbox(parent(layout))
 # padding_h(layout::AbstractLayout) = bottom_padding(layout) + top_padding(layout)
 # padding(layout::AbstractLayout) = (padding_w(layout), padding_h(layout))
 
-update_position!(layout::AbstractLayout) = nothing
+@noinline update_position!(layout::AbstractLayout) = nothing
-update_child_bboxes!(layout::AbstractLayout, minimum_perimeter = [0mm, 0mm, 0mm, 0mm]) =
+@noinline update_child_bboxes!(layout::AbstractLayout, minimum_perimeter = [0mm,0mm,0mm,0mm]) = nothing
-    nothing
 
-left(layout::AbstractLayout) = left(bbox(layout))
+@noinline left(layout::AbstractLayout) = left(bbox(layout))
-top(layout::AbstractLayout) = top(bbox(layout))
+@noinline top(layout::AbstractLayout) = top(bbox(layout))
-right(layout::AbstractLayout) = right(bbox(layout))
+@noinline right(layout::AbstractLayout) = right(bbox(layout))
-bottom(layout::AbstractLayout) = bottom(bbox(layout))
+@noinline bottom(layout::AbstractLayout) = bottom(bbox(layout))
-width(layout::AbstractLayout) = width(bbox(layout))
+@noinline width(layout::AbstractLayout) = width(bbox(layout))
-height(layout::AbstractLayout) = height(bbox(layout))
+@noinline height(layout::AbstractLayout) = height(bbox(layout))
 
 # pass these through to the bbox methods if there's no plotarea
-plotarea(layout::AbstractLayout) = bbox(layout)
+@noinline plotarea(layout::AbstractLayout) = bbox(layout)
-plotarea!(layout::AbstractLayout, bb::BoundingBox) = bbox!(layout, bb)
+@noinline plotarea!(layout::AbstractLayout, bb::BoundingBox) = bbox!(layout, bb)
 
-attr(layout::AbstractLayout, k::Symbol) = layout.attr[k]
+@noinline attr(layout::AbstractLayout, k::Symbol) = layout.attr[k]
-attr(layout::AbstractLayout, k::Symbol, v) = get(layout.attr, k, v)
+@noinline attr(layout::AbstractLayout, k::Symbol, v) = get(layout.attr, k, v)
-attr!(layout::AbstractLayout, v, k::Symbol) = (layout.attr[k] = v)
+@noinline attr!(layout::AbstractLayout, v, k::Symbol) = (layout.attr[k] = v)
-hasattr(layout::AbstractLayout, k::Symbol) = haskey(layout.attr, k)
+@noinline hasattr(layout::AbstractLayout, k::Symbol) = haskey(layout.attr, k)
 
-leftpad(layout::AbstractLayout)   = 0mm
+@noinline leftpad(layout::AbstractLayout)   = 0mm
-toppad(layout::AbstractLayout)    = 0mm
+@noinline toppad(layout::AbstractLayout)    = 0mm
-rightpad(layout::AbstractLayout)  = 0mm
+@noinline rightpad(layout::AbstractLayout)  = 0mm
-bottompad(layout::AbstractLayout) = 0mm
+@noinline bottompad(layout::AbstractLayout) = 0mm
 
 # -----------------------------------------------------------
 # RootLayout
@@ -192,7 +218,6 @@ bottompad(layout::AbstractLayout) = 0mm
 # this is the parent of the top-level layout
 struct RootLayout <: AbstractLayout end
 
-Base.show(io::IO, layout::RootLayout) = Base.show_default(io, layout)
 Base.parent(::RootLayout) = nothing
 parent_bbox(::RootLayout) = defaultbox
 bbox(::RootLayout) = defaultbox
@@ -202,14 +227,14 @@ bbox(::RootLayout) = defaultbox
 
 # contains blank space
 mutable struct EmptyLayout <: AbstractLayout
-    parent::AbstractLayout
+    parent
-    bbox::BoundingBox
+    bbox#::BoundingBox
     attr::KW  # store label, width, and height for initialization
     # label  # this is the label that the subplot will take (since we create a layout before initialization)
 end
 EmptyLayout(parent = RootLayout(); kw...) = EmptyLayout(parent, defaultbox, KW(kw))
 
-Base.size(layout::EmptyLayout) = (0, 0)
+Base.size(layout::EmptyLayout) = (0,0)
 Base.length(layout::EmptyLayout) = 0
 Base.getindex(layout::EmptyLayout, r::Int, c::Int) = nothing
 
@@ -220,12 +245,12 @@ _update_min_padding!(layout::EmptyLayout) = nothing
 
 # nested, gridded layout with optional size percentages
 mutable struct GridLayout <: AbstractLayout
-    parent::AbstractLayout
+    parent
-    minpad::Tuple # leftpad, toppad, rightpad, bottompad
+    minpad::Tuple{AbsoluteLength,AbsoluteLength,AbsoluteLength,AbsoluteLength} # leftpad, toppad, rightpad, bottompad
-    bbox::BoundingBox
+    bbox#::BoundingBox
-    grid::Matrix{AbstractLayout} # Nested layouts. Each position is a AbstractLayout, which allows for arbitrary recursion
+    grid::Matrix{Any} # Nested layouts. Each position is a AbstractLayout, which allows for arbitrary recursion
-    widths::Vector{Measure}
+    widths::Vector{Any}
-    heights::Vector{Measure}
+    heights::Vector{Any}
     attr::KW
 end
 
@@ -233,30 +258,27 @@ end
     grid(args...; kw...)
 
 Create a grid layout for subplots. `args` specify the dimensions, e.g.
-`grid(3,2, widths = (0.6,0.4))` creates a grid with three rows and two
+`grid(3,2, widths = (0.6,04))` creates a grid with three rows and two
 columns of different width.
 """
 grid(args...; kw...) = GridLayout(args...; kw...)
 
-function GridLayout(
+function GridLayout(dims...;
-    dims...;
+                    parent = RootLayout(),
-    parent = RootLayout(),
+                    widths = zeros(dims[2]),
-    widths = zeros(dims[2]),
+                    heights = zeros(dims[1]),
-    heights = zeros(dims[1]),
+                    kw...)
-    kw...,
+    grid = Matrix{Any}(undef, dims...)
-)
-    grid = Matrix{AbstractLayout}(undef, dims...)
     layout = GridLayout(
         parent,
         (20mm, 5mm, 2mm, 10mm),
         defaultbox,
         grid,
-        Measure[w * pct for w in widths],
+        Any[w*pct for w in widths],
-        Measure[h * pct for h in heights],
+        Any[h*pct for h in heights],
         # convert(Vector{Float64}, widths),
         # convert(Vector{Float64}, heights),
-        KW(kw),
+        KW(kw))
-    )
     for i in eachindex(grid)
         grid[i] = EmptyLayout(layout)
     end
@@ -265,12 +287,9 @@ end
 
 Base.size(layout::GridLayout) = size(layout.grid)
 Base.length(layout::GridLayout) = length(layout.grid)
-Base.getindex(layout::GridLayout, r::Int, c::Int) = layout.grid[r, c]
+Base.getindex(layout::GridLayout, r::Int, c::Int) = layout.grid[r,c]
 function Base.setindex!(layout::GridLayout, v, r::Int, c::Int)
-    layout.grid[r, c] = v
+    layout.grid[r,c] = v
-end
-function Base.setindex!(layout::GridLayout, v, ci::CartesianIndex)
-    layout.grid[ci] = v
 end
 
 leftpad(layout::GridLayout)   = layout.minpad[1]
@@ -278,6 +297,7 @@ toppad(layout::GridLayout)    = layout.minpad[2]
 rightpad(layout::GridLayout)  = layout.minpad[3]
 bottompad(layout::GridLayout) = layout.minpad[4]
 
+
 # here's how this works... first we recursively "update the minimum padding" (which
 # means to calculate the minimum size needed from the edge of the subplot to plot area)
 # for the whole layout tree.  then we can compute the "padding borders" of this
@@ -289,13 +309,14 @@ bottompad(layout::GridLayout) = layout.minpad[4]
 function _update_min_padding!(layout::GridLayout)
     map(_update_min_padding!, layout.grid)
     layout.minpad = (
-        maximum(map(leftpad, layout.grid[:, 1])),
+        maximum(map(leftpad,   layout.grid[:,1])),
-        maximum(map(toppad, layout.grid[1, :])),
+        maximum(map(toppad,    layout.grid[1,:])),
-        maximum(map(rightpad, layout.grid[:, end])),
+        maximum(map(rightpad,  layout.grid[:,end])),
-        maximum(map(bottompad, layout.grid[end, :])),
+        maximum(map(bottompad, layout.grid[end,:]))
     )
 end
 
+
 function update_position!(layout::GridLayout)
     map(update_position!, layout.grid)
 end
@@ -314,9 +335,7 @@ function recompute_lengths(v)
     end
     leftover = 1.0pct - tot
     if cnt > 1 && leftover.value <= 0
-        error(
+        error("Not enough length left over in layout!  v = $v, cnt = $cnt, leftover = $leftover")
-            "Not enough length left over in layout!  v = $v, cnt = $cnt, leftover = $leftover",
-        )
     end
 
     # now fill in the blanks
@@ -324,22 +343,24 @@ function recompute_lengths(v)
 end
 
 # recursively compute the bounding boxes for the layout and plotarea (relative to canvas!)
-function update_child_bboxes!(layout::GridLayout, minimum_perimeter = [0mm, 0mm, 0mm, 0mm])
+function update_child_bboxes!(layout::GridLayout, minimum_perimeter = [0mm,0mm,0mm,0mm])
     nr, nc = size(layout)
+
     # # create a matrix for each minimum padding direction
     # _update_min_padding!(layout)
-    minpad_left   = map(leftpad, layout.grid)
+
-    minpad_top    = map(toppad, layout.grid)
+    minpad_left::Matrix{AbsoluteLength}   = map(leftpad,   layout.grid)
-    minpad_right  = map(rightpad, layout.grid)
+    minpad_top::Matrix{AbsoluteLength}    = map(toppad,    layout.grid)
-    minpad_bottom = map(bottompad, layout.grid)
+    minpad_right::Matrix{AbsoluteLength}  = map(rightpad,  layout.grid)
+    minpad_bottom::Matrix{AbsoluteLength} = map(bottompad, layout.grid)
 
     # get the max horizontal (left and right) padding over columns,
     # and max vertical (bottom and top) padding over rows
     # TODO: add extra padding here
-    pad_left   = maximum(minpad_left, dims = 1)
+    pad_left::Matrix{AbsoluteLength}   = maximum(minpad_left,   dims = 1)
-    pad_top    = maximum(minpad_top, dims = 2)
+    pad_top::Matrix{AbsoluteLength}    = maximum(minpad_top,    dims = 2)
-    pad_right  = maximum(minpad_right, dims = 1)
+    pad_right::Matrix{AbsoluteLength}  = maximum(minpad_right,  dims = 1)
-    pad_bottom = maximum(minpad_bottom, dims = 2)
+    pad_bottom::Matrix{AbsoluteLength} = maximum(minpad_bottom, dims = 2)
 
     # make sure the perimeter match the parent
     pad_left[1]     = max(pad_left[1], minimum_perimeter[1])
@@ -352,7 +373,7 @@ function update_child_bboxes!(layout::GridLayout, minimum_perimeter = [0mm, 0mm,
     total_pad_vertical   = sum(pad_top + pad_bottom)
 
     # now we can compute the total plot area in each direction
-    total_plotarea_horizontal = width(layout) - total_pad_horizontal
+    total_plotarea_horizontal = width(layout)  - total_pad_horizontal
     total_plotarea_vertical   = height(layout) - total_pad_vertical
 
     # recompute widths/heights
@@ -364,22 +385,19 @@ function update_child_bboxes!(layout::GridLayout, minimum_perimeter = [0mm, 0mm,
     # denom_h = sum(layout.heights)
 
     # we have all the data we need... lets compute the plot areas and set the bounding boxes
-    for r in 1:nr, c in 1:nc
+    for r=1:nr, c=1:nc
-        child = layout[r, c]
+        child = layout[r,c]
 
         # get the top-left corner of this child... the first one is top-left of the parent (i.e. layout)
-        child_left = (c == 1 ? left(layout.bbox) : right(layout[r, c - 1].bbox))
+        child_left::AbsoluteLength  = (c == 1 ? left(layout.bbox) : right(layout[r, c-1].bbox))
-        child_top  = (r == 1 ? top(layout.bbox) : bottom(layout[r - 1, c].bbox))
+        child_top::AbsoluteLength   = (r == 1 ? top(layout.bbox) : bottom(layout[r-1, c].bbox))
 
         # compute plot area
-        plotarea_left   = child_left + pad_left[c]
+        plotarea_left::AbsoluteLength    = child_left + pad_left[c]
-        plotarea_top    = child_top + pad_top[r]
+        plotarea_top::AbsoluteLength     = child_top + pad_top[r]
-        plotarea_width  = total_plotarea_horizontal * layout.widths[c]
+        plotarea_width::AbsoluteLength   = total_plotarea_horizontal * layout.widths[c]
-        plotarea_height = total_plotarea_vertical * layout.heights[r]
+        plotarea_height::AbsoluteLength  = total_plotarea_vertical * layout.heights[r]
-        plotarea!(
+        plotarea!(child, BoundingBox(plotarea_left, plotarea_top, plotarea_width, plotarea_height))
-            child,
-            BoundingBox(plotarea_left, plotarea_top, plotarea_width, plotarea_height),
-        )
 
         # compute child bbox
         child_width  = pad_left[c] + plotarea_width + pad_right[c]
@@ -389,10 +407,10 @@ function update_child_bboxes!(layout::GridLayout, minimum_perimeter = [0mm, 0mm,
         # this is the minimum perimeter as decided by this child's parent, so that
         # all children on this border have the same value
         min_child_perimeter = [
-            c == 1 ? layout.minpad[1] : pad_left[c],
+            c == 1  ? layout.minpad[1] : 0mm,
-            r == 1 ? layout.minpad[2] : pad_top[r],
+            r == 1  ? layout.minpad[2] : 0mm,
-            c == nc ? layout.minpad[3] : pad_right[c],
+            c == nc ? layout.minpad[3] : 0mm,
-            r == nr ? layout.minpad[4] : pad_bottom[r],
+            r == nr ? layout.minpad[4] : 0mm
         ]
 
         # recursively update the child's children
@@ -407,21 +425,18 @@ function update_inset_bboxes!(plt::Plot)
         p_area = Measures.resolve(plotarea(sp.parent), sp[:relative_bbox])
         plotarea!(sp, p_area)
 
-        bbox!(
+        bbox!(sp, bbox(
-            sp,
+            left(p_area) - leftpad(sp),
-            bbox(
+            top(p_area) - toppad(sp),
-                left(p_area) - leftpad(sp),
+            width(p_area) + leftpad(sp) + rightpad(sp),
-                top(p_area) - toppad(sp),
+            height(p_area) + toppad(sp) + bottompad(sp)
-                width(p_area) + leftpad(sp) + rightpad(sp),
+        ))
-                height(p_area) + toppad(sp) + bottompad(sp),
-            ),
-        )
     end
 end
 
 # ----------------------------------------------------------------------
 
-calc_num_subplots(layout::AbstractLayout) = get(layout.attr, :blank, false) ? 0 : 1
+calc_num_subplots(layout::AbstractLayout) = 1
 function calc_num_subplots(layout::GridLayout)
     tot = 0
     for l in layout.grid
@@ -449,16 +464,14 @@ end
 # constructors
 
 # pass the layout arg through
-function layout_args(plotattributes::AKW)
+function layout_args(plotattributes::KW)
-    layout_args(plotattributes[:layout])
+    layout_args(get(plotattributes, :layout, default(:layout)))
 end
 
-function layout_args(plotattributes::AKW, n_override::Integer)
+function layout_args(plotattributes::KW, n_override::Integer)
-    layout, n = layout_args(n_override, get(plotattributes, :layout, n_override))
+    layout, n = layout_args(get(plotattributes, :layout, n_override))
     if n != n_override
-        error(
+        error("When doing layout, n ($n) != n_override ($(n_override)).  You're probably trying to force existing plots into a layout that doesn't fit them.")
-            "When doing layout, n ($n) != n_override ($(n_override)).  You're probably trying to force existing plots into a layout that doesn't fit them.",
-        )
     end
     layout, n
 end
@@ -468,45 +481,17 @@ function layout_args(n::Integer)
     GridLayout(nr, nc), n
 end
 
-function layout_args(sztup::NTuple{2,Integer})
+function layout_args(sztup::NTuple{2,I}) where I<:Integer
     nr, nc = sztup
-    GridLayout(nr, nc), nr * nc
+    GridLayout(nr, nc), nr*nc
 end
 
-layout_args(n_override::Integer, n::Integer) = layout_args(n)
+function layout_args(sztup::NTuple{3,I}) where I<:Integer
-layout_args(n, sztup::NTuple{2,Integer}) = layout_args(sztup)
-
-function layout_args(n, sztup::Tuple{Colon,Integer})
-    nc = sztup[2]
-    nr = ceil(Int, n / nc)
-    GridLayout(nr, nc), n
-end
-
-function layout_args(n, sztup::Tuple{Integer,Colon})
-    nr = sztup[1]
-    nc = ceil(Int, n / nr)
-    GridLayout(nr, nc), n
-end
-
-function layout_args(sztup::NTuple{3,Integer})
     n, nr, nc = sztup
     nr, nc = compute_gridsize(n, nr, nc)
     GridLayout(nr, nc), n
 end
 
-layout_args(nt::NamedTuple) = EmptyLayout(; nt...), 1
-
-function layout_args(m::AbstractVecOrMat)
-    sz = size(m)
-    nr = sz[1]
-    nc = get(sz, 2, 1)
-    gl = GridLayout(nr, nc)
-    for ci in CartesianIndices(m)
-        gl[ci] = layout_args(m[ci])[1]
-    end
-    layout_args(gl)
-end
-
 # compute number of subplots
 function layout_args(layout::GridLayout)
     # recursively get the size of the grid
@@ -514,63 +499,55 @@ function layout_args(layout::GridLayout)
     layout, n
 end
 
-layout_args(n_override::Integer, layout::Union{AbstractVecOrMat,GridLayout}) =
-    layout_args(layout)
-
 layout_args(huh) = error("unhandled layout type $(typeof(huh)): $huh")
 
+
 # ----------------------------------------------------------------------
 
+
 function build_layout(args...)
     layout, n = layout_args(args...)
-    build_layout(layout, n, Array{Plot}(undef, 0))
+    build_layout(layout, n)
 end
 
-# n is the number of subplots...
+# # just a single subplot
-function build_layout(layout::GridLayout, n::Integer, plts::AVec{Plot})
+# function build_layout(sp::Subplot, n::Integer)
+#     sp, Subplot[sp], KW(gensym() => sp)
+# end
+
+# n is the number of subplots... build a grid and initialize the inner subplots recursively
+function build_layout(layout::GridLayout, n::Integer)
     nr, nc = size(layout)
-    subplots = Subplot[]
+    subplots = Any[]
-    spmap = SubplotMap()
+    spmap = KW()
-    empty = isempty(plts)
     i = 0
-    for r in 1:nr, c in 1:nc
+    for r=1:nr, c=1:nc
-        l = layout[r, c]
+        l = layout[r,c]
         if isa(l, EmptyLayout) && !get(l.attr, :blank, false)
-            if empty
+            sp = Subplot(backend(), parent=layout)
-                # initialize the inner subplots recursively
+            layout[r,c] = sp
-                sp = Subplot(backend(), parent = layout)
+            push!(subplots, sp)
-                layout[r, c] = sp
+            spmap[attr(l,:label,gensym())] = sp
-                push!(subplots, sp)
-                spmap[attr(l, :label, gensym())] = sp
-                inc = 1
-            else
-                # build a layout from a list of existing Plot objects
-                plt = popfirst!(plts)  # grab the first plot out of the list
-                layout[r, c] = plt.layout
-                append!(subplots, plt.subplots)
-                merge!(spmap, plt.spmap)
-                inc = length(plt.subplots)
-            end
             if get(l.attr, :width, :auto) != :auto
-                layout.widths[c] = attr(l, :width)
+                layout.widths[c] = attr(l,:width)
             end
             if get(l.attr, :height, :auto) != :auto
-                layout.heights[r] = attr(l, :height)
+                layout.heights[r] = attr(l,:height)
             end
-            i += inc
+            i += 1
         elseif isa(l, GridLayout)
             # sub-grid
             if get(l.attr, :width, :auto) != :auto
-                layout.widths[c] = attr(l, :width)
+                layout.widths[c] = attr(l,:width)
             end
             if get(l.attr, :height, :auto) != :auto
-                layout.heights[r] = attr(l, :height)
+                layout.heights[r] = attr(l,:height)
             end
-            l, sps, m = build_layout(l, n - i, plts)
+            l, sps, m = build_layout(l, n-i)
             append!(subplots, sps)
             merge!(spmap, m)
             i += length(sps)
-        elseif isa(l, Subplot) && empty
+        elseif isa(l, Subplot)
             error("Subplot exists. Cannot re-use existing layout.  Please make a new one.")
         end
         i >= n && break  # only add n subplots
@@ -579,13 +556,161 @@ function build_layout(layout::GridLayout, n::Integer, plts::AVec{Plot})
     layout, subplots, spmap
 end
 
+# build a layout from a list of existing Plot objects
+# TODO... much of the logic overlaps with the method above... can we merge?
+function build_layout(layout::GridLayout, numsp::Integer, plts::AVec{Plot})
+    nr, nc = size(layout)
+    subplots = Any[]
+    spmap = KW()
+    i = 0
+    for r=1:nr, c=1:nc
+        l = layout[r,c]
+        if isa(l, EmptyLayout) && !get(l.attr, :blank, false)
+            plt = popfirst!(plts)  # grab the first plot out of the list
+            layout[r,c] = plt.layout
+            append!(subplots, plt.subplots)
+            merge!(spmap, plt.spmap)
+            if get(l.attr, :width, :auto) != :auto
+                layout.widths[c] = attr(l,:width)
+            end
+            if get(l.attr, :height, :auto) != :auto
+                layout.heights[r] = attr(l,:height)
+            end
+            i += length(plt.subplots)
+        elseif isa(l, GridLayout)
+            # sub-grid
+            if get(l.attr, :width, :auto) != :auto
+                layout.widths[c] = attr(l,:width)
+            end
+            if get(l.attr, :height, :auto) != :auto
+                layout.heights[r] = attr(l,:height)
+            end
+            l, sps, m = build_layout(l, numsp-i, plts)
+            append!(subplots, sps)
+            merge!(spmap, m)
+            i += length(sps)
+        end
+        i >= numsp && break  # only add n subplots
+    end
+    layout, subplots, spmap
+end
+
+
+# ----------------------------------------------------------------------
+# @layout macro
+
+function add_layout_pct!(kw::KW, v::Expr, idx::Integer, nidx::Integer)
+    # dump(v)
+    # something like {0.2w}?
+    if v.head == :call && v.args[1] == :*
+        num = v.args[2]
+        if length(v.args) == 3 && isa(num, Number)
+            units = v.args[3]
+            if units == :h
+                return kw[:h] = num*pct
+            elseif units == :w
+                return kw[:w] = num*pct
+            elseif units in (:pct, :px, :mm, :cm, :inch)
+                idx == 1 && (kw[:w] = v)
+                (idx == 2 || nidx == 1) && (kw[:h] = v)
+                # return kw[idx == 1 ? :w : :h] = v
+            end
+        end
+    end
+    error("Couldn't match layout curly (idx=$idx): $v")
+end
+
+function add_layout_pct!(kw::KW, v::Number, idx::Integer)
+    # kw[idx == 1 ? :w : :h] = v*pct
+    idx == 1 && (kw[:w] = v*pct)
+    (idx == 2 || nidx == 1) && (kw[:h] = v*pct)
+end
+
+isrow(v) = isa(v, Expr) && v.head in (:hcat,:row)
+iscol(v) = isa(v, Expr) && v.head == :vcat
+rowsize(v) = isrow(v) ? length(v.args) : 1
+
+
+function create_grid(expr::Expr)
+    if iscol(expr)
+        create_grid_vcat(expr)
+    elseif isrow(expr)
+        :(let cell = GridLayout(1, $(length(expr.args)))
+            $([:(cell[1,$i] = $(create_grid(v))) for (i,v) in enumerate(expr.args)]...)
+            cell
+        end)
+
+    elseif expr.head == :curly
+        create_grid_curly(expr)
+    else
+        # if it's something else, just return that (might be an existing layout?)
+        esc(expr)
+    end
+end
+
+function create_grid_vcat(expr::Expr)
+    rowsizes = map(rowsize, expr.args)
+    rmin, rmax = extrema(rowsizes)
+    if rmin > 0 && rmin == rmax
+        # we have a grid... build the whole thing
+        # note: rmin is the number of columns
+        nr = length(expr.args)
+        nc = rmin
+        body = Expr(:block)
+        for r=1:nr
+            arg = expr.args[r]
+            if isrow(arg)
+                for (c,item) in enumerate(arg.args)
+                    push!(body.args, :(cell[$r,$c] = $(create_grid(item))))
+                end
+            else
+                push!(body.args, :(cell[$r,1] = $(create_grid(arg))))
+            end
+        end
+        :(let cell = GridLayout($nr, $nc)
+            $body
+            cell
+        end)
+    else
+        # otherwise just build one row at a time
+        :(let cell = GridLayout($(length(expr.args)), 1)
+            $([:(cell[$i,1] = $(create_grid(v))) for (i,v) in enumerate(expr.args)]...)
+            cell
+        end)
+    end
+end
+
+function create_grid_curly(expr::Expr)
+    kw = KW()
+    for (i,arg) in enumerate(expr.args[2:end])
+        add_layout_pct!(kw, arg, i, length(expr.args)-1)
+    end
+    s = expr.args[1]
+    if isa(s, Expr) && s.head == :call && s.args[1] == :grid
+        create_grid(:(grid($(s.args[2:end]...), width = $(get(kw, :w, QuoteNode(:auto))), height = $(get(kw, :h, QuoteNode(:auto))))))
+    elseif isa(s, Symbol)
+        :(EmptyLayout(label = $(QuoteNode(s)), width = $(get(kw, :w, QuoteNode(:auto))), height = $(get(kw, :h, QuoteNode(:auto)))))
+    else
+        error("Unknown use of curly brackets: $expr")
+    end
+end
+
+function create_grid(s::Symbol)
+    :(EmptyLayout(label = $(QuoteNode(s)), blank = $(s == :_)))
+end
+
+macro layout(mat::Expr)
+    create_grid(mat)
+end
+
+
 # -------------------------------------------------------------------------
 
 # make all reference the same axis extrema/values.
 # merge subplot lists.
 function link_axes!(axes::Axis...)
     a1 = axes[1]
-    for i in 2:length(axes)
+    for i=2:length(axes)
         a2 = axes[i]
         expand_extrema!(a1, ignorenan_extrema(a2))
         for k in (:extrema, :discrete_values, :continuous_values, :discrete_map)
@@ -607,8 +732,8 @@ function link_subplots(a::AbstractArray{AbstractLayout}, axissym::Symbol)
     for l in a
         if isa(l, Subplot)
             push!(subplots, l)
-        elseif isa(l, GridLayout) && size(l) == (1, 1)
+        elseif isa(l, GridLayout) && size(l) == (1,1)
-            push!(subplots, l[1, 1])
+            push!(subplots, l[1,1])
         end
     end
     subplots
@@ -624,19 +749,20 @@ function link_axes!(a::AbstractArray{AbstractLayout}, axissym::Symbol)
 end
 
 # don't do anything for most layout types
-function link_axes!(l::AbstractLayout, link::Symbol) end
+function link_axes!(l::AbstractLayout, link::Symbol)
+end
 
 # process a GridLayout, recursively linking axes according to the link symbol
 function link_axes!(layout::GridLayout, link::Symbol)
     nr, nc = size(layout)
     if link in (:x, :both)
-        for c in 1:nc
+        for c=1:nc
-            link_axes!(layout.grid[:, c], :xaxis)
+            link_axes!(layout.grid[:,c], :xaxis)
         end
     end
     if link in (:y, :both)
-        for r in 1:nr
+        for r=1:nr
-            link_axes!(layout.grid[r, :], :yaxis)
+            link_axes!(layout.grid[r,:], :yaxis)
         end
     end
     if link == :square
@@ -662,20 +788,11 @@ end
 
 "Adds a new, empty subplot overlayed on top of `sp`, with a mirrored y-axis and linked x-axis."
 function twinx(sp::Subplot)
-    plot!(
+    sp[:right_margin] = max(sp[:right_margin], 30px)
-        sp.plt,
+    plot!(sp.plt, inset = (sp[:subplot_index], bbox(0,0,1,1)))
-        inset = (sp[:subplot_index], bbox(0, 0, 1, 1)),
-        right_margin = sp[:right_margin],
-        left_margin = sp[:left_margin],
-        top_margin = sp[:top_margin],
-        bottom_margin = sp[:bottom_margin],
-    )
     twinsp = sp.plt.subplots[end]
-    twinsp[:xaxis][:grid] = false
-    twinsp[:yaxis][:grid] = false
-    twinsp[:xaxis][:showaxis] = false
     twinsp[:yaxis][:mirror] = true
-    twinsp[:background_color_inside] = RGBA{Float64}(0, 0, 0, 0)
+    twinsp[:background_color_inside] = RGBA{Float64}(0,0,0,0)
     link_axes!(sp[:xaxis], twinsp[:xaxis])
     twinsp
 end

src/legend.jl

@@ -1,57 +0,0 @@
-"""
-```julia
-legend_pos_from_angle(theta, xmin, xcenter, xmax, ymin, ycenter, ymax, inout)
-```
-
-Return `(x,y)` at an angle `theta` degrees from
-`(xcenter,ycenter)` on a rectangle defined by (`xmin`, `xmax`, `ymin`, `ymax`).
-"""
-function legend_pos_from_angle(theta, xmin, xcenter, xmax, ymin, ycenter, ymax)
-    (s, c) = sincosd(theta)
-    x = c < 0 ? (xmin - xcenter) / c : (xmax - xcenter) / c
-    y = s < 0 ? (ymin - ycenter) / s : (ymax - ycenter) / s
-    A = min(x, y)
-    return (xcenter + A * c, ycenter + A * s)
-end
-
-"""
-Split continuous range `[-1,1]` evenly into an integer `[1,2,3]`
-"""
-function legend_anchor_index(x)
-    x < -1 // 3 && return 1
-    x < 1 // 3 && return 2
-    return 3
-end
-
-"""
-Turn legend argument into a (theta, :inner) or (theta, :outer) tuple.
-For backends where legend position is given in normal coordinates (0,0) -- (1,1),
-so :topleft exactly corresponds to (45, :inner) etc.
-
-If `leg` is a (::Real,::Real) tuple, keep it as is.
-"""
-legend_angle(leg::Real) = (leg, :inner)
-legend_angle(leg::Tuple{S,T}) where {S<:Real,T<:Real} = leg
-legend_angle(leg::Tuple{S,Symbol}) where {S<:Real} = leg
-legend_angle(leg::Symbol) = get(
-    (
-        topleft          = (135, :inner),
-        top              = (90, :inner),
-        topright         = (45, :inner),
-        left             = (180, :inner),
-        right            = (0, :inner),
-        bottomleft       = (225, :inner),
-        bottom           = (270, :inner),
-        bottomright      = (315, :inner),
-        outertopleft     = (135, :outer),
-        outertop         = (90, :outer),
-        outertopright    = (45, :outer),
-        outerleft        = (180, :outer),
-        outerright       = (0, :outer),
-        outerbottomleft  = (225, :outer),
-        outerbottom      = (270, :outer),
-        outerbottomright = (315, :outer),
-    ),
-    leg,
-    (45, :inner),
-)

src/output.jl

@@ -1,101 +1,98 @@
 
+
 defaultOutputFormat(plt::Plot) = "png"
 
 function png(plt::Plot, fn::AbstractString)
-    open(addExtension(fn, "png"), "w") do io
+  fn = addExtension(fn, "png")
-        show(io, MIME("image/png"), plt)
+  io = open(fn, "w")
-    end
+  show(io, MIME("image/png"), plt)
+  close(io)
 end
 png(fn::AbstractString) = png(current(), fn)
 
 function svg(plt::Plot, fn::AbstractString)
-    open(addExtension(fn, "svg"), "w") do io
+  fn = addExtension(fn, "svg")
-        show(io, MIME("image/svg+xml"), plt)
+  io = open(fn, "w")
-    end
+  show(io, MIME("image/svg+xml"), plt)
+  close(io)
 end
 svg(fn::AbstractString) = svg(current(), fn)
 
+
 function pdf(plt::Plot, fn::AbstractString)
-    open(addExtension(fn, "pdf"), "w") do io
+  fn = addExtension(fn, "pdf")
-        show(io, MIME("application/pdf"), plt)
+  io = open(fn, "w")
-    end
+  show(io, MIME("application/pdf"), plt)
+  close(io)
 end
 pdf(fn::AbstractString) = pdf(current(), fn)
 
+
 function ps(plt::Plot, fn::AbstractString)
-    open(addExtension(fn, "ps"), "w") do io
+  fn = addExtension(fn, "ps")
-        show(io, MIME("application/postscript"), plt)
+  io = open(fn, "w")
-    end
+  show(io, MIME("application/postscript"), plt)
+  close(io)
 end
 ps(fn::AbstractString) = ps(current(), fn)
 
 function eps(plt::Plot, fn::AbstractString)
-    open(addExtension(fn, "eps"), "w") do io
+  fn = addExtension(fn, "eps")
-        show(io, MIME("image/eps"), plt)
+  io = open(fn, "w")
-    end
+  show(io, MIME("image/eps"), plt)
+  close(io)
 end
 eps(fn::AbstractString) = eps(current(), fn)
 
 function tex(plt::Plot, fn::AbstractString)
-    open(addExtension(fn, "tex"), "w") do io
+  fn = addExtension(fn, "tex")
-        show(io, MIME("application/x-tex"), plt)
+  io = open(fn, "w")
-    end
+  show(io, MIME("application/x-tex"), plt)
+  close(io)
 end
 tex(fn::AbstractString) = tex(current(), fn)
 
-function json(plt::Plot, fn::AbstractString)
-    open(addExtension(fn, "json"), "w") do io
-        show(io, MIME("application/vnd.plotly.v1+json"), plt)
-    end
-end
-json(fn::AbstractString) = json(current(), fn)
-
 function html(plt::Plot, fn::AbstractString)
-    open(addExtension(fn, "html"), "w") do io
+    fn = addExtension(fn, "html")
-        show(io, MIME("text/html"), plt)
+    io = open(fn, "w")
-    end
+    show(io, MIME("text/html"), plt)
+    close(io)
 end
 html(fn::AbstractString) = html(current(), fn)
 
-function txt(plt::Plot, fn::AbstractString; color::Bool = true)
-    open(addExtension(fn, "txt"), "w") do io
-        show(IOContext(io, :color => color), MIME("text/plain"), plt)
-    end
-end
-txt(fn::AbstractString) = txt(current(), fn)
 
 # ----------------------------------------------------------------
 
+
 const _savemap = Dict(
     "png" => png,
     "svg" => svg,
     "pdf" => pdf,
-    "ps" => ps,
+    "ps"  => ps,
     "eps" => eps,
     "tex" => tex,
-    "json" => json,
     "html" => html,
-    "tikz" => tex,
+  )
-    "txt" => txt,
-)
 
-for out in Symbol.(unique(values(_savemap)))
+function getExtension(fn::AbstractString)
-    @eval @doc """
+  pieces = split(fn, ".")
-        $($out)([plot,], filename)
+  length(pieces) > 1 || error("Can't extract file extension: ", fn)
-    Save plot as $($out)-file.
+  ext = pieces[end]
-    """ $out
+  haskey(_savemap, ext) || error("Invalid file extension: ", fn)
+  ext
 end
 
-const _extension_map = Dict("tikz" => "tex")
-
 function addExtension(fn::AbstractString, ext::AbstractString)
-    oldfn, oldext = splitext(fn)
+  try
-    oldext = chop(oldext, head = 1, tail = 0)
+    oldext = getExtension(fn)
-    if get(_extension_map, oldext, oldext) == ext
+    if oldext == ext
-        return fn
+      return fn
     else
-        return string(fn, ".", ext)
+      return "$fn.$ext"
     end
+  catch
+    return "$fn.$ext"
+  end
 end
 
 """
@@ -106,71 +103,70 @@ type is inferred from the file extension. All backends support png and pdf
 file types, some also support svg, ps, eps, html and tex.
 """
 function savefig(plt::Plot, fn::AbstractString)
-    fn = abspath(expanduser(fn))
+  fn = abspath(expanduser(fn))
+  # get the extension
+  local ext
+  try
+    ext = getExtension(fn)
+  catch
+    # if we couldn't extract the extension, add the default
+    ext = defaultOutputFormat(plt)
+    fn = addExtension(fn, ext)
+  end
 
-    # get the extension
+  # save it
-    _, ext = splitext(fn)
+  func = get(_savemap, ext) do
-    ext = chop(ext, head = 1, tail = 0)
+    error("Unsupported extension $ext with filename ", fn)
-    if isempty(ext)
+  end
-        ext = defaultOutputFormat(plt)
+  func(plt, fn)
-    end
-
-    # save it
-    if haskey(_savemap, ext)
-        func = _savemap[ext]
-        return func(plt, fn)
-    else
-        error("Invalid file extension: ", fn)
-    end
 end
 savefig(fn::AbstractString) = savefig(current(), fn)
 
-# ---------------------------------------------------------
 
+# ---------------------------------------------------------
 """
     gui([plot])
 
 Display a plot using the backends' gui window
 """
-gui(plt::Plot = current()) = display(PlotsDisplay(), plt)
+@noinline gui(plt::Plot = current()) = display(PlotsDisplay(), plt)
 
 # IJulia only... inline display
-function inline(plt::Plot = current())
+@noinline function inline(plt::Plot = current())
     isijulia() || error("inline() is IJulia-only")
     Main.IJulia.clear_output(true)
     display(Main.IJulia.InlineDisplay(), plt)
 end
 
-function Base.display(::PlotsDisplay, plt::Plot)
+@noinline function Base.display(::PlotsDisplay, plt::Plot)
     prepare_output(plt)
     _display(plt)
 end
 
-_do_plot_show(plt, showval::Bool) = showval && gui(plt)
+@noinline _do_plot_show(plt, showval::Bool) = showval && gui(plt)
-function _do_plot_show(plt, showval::Symbol)
+@noinline function _do_plot_show(plt, showval::Symbol)
     showval == :gui && gui(plt)
-    showval in (:inline, :ijulia) && inline(plt)
+    showval in (:inline,:ijulia) && inline(plt)
 end
 
 # ---------------------------------------------------------
 
-const _best_html_output_type =
+const _best_html_output_type = Dict{Symbol,Symbol}(
-    KW(:pyplot => :png, :unicodeplots => :txt, :plotlyjs => :html, :plotly => :html)
+    :pyplot => :png,
+    :unicodeplots => :txt,
+    :plotlyjs => :html,
+    :plotly => :html
+)
 
 # a backup for html... passes to svg or png depending on the html_output_format arg
-function _show(io::IO, ::MIME"text/html", plt::Plot)
+@noinline function _show(io::IO, ::MIME"text/html", plt::Plot)
     output_type = Symbol(plt.attr[:html_output_format])
     if output_type == :auto
         output_type = get(_best_html_output_type, backend_name(plt.backend), :svg)
     end
     if output_type == :png
         # @info("writing png to html output")
-        print(
+        print(io, "<img src=\"data:image/png;base64,", base64encode(show, MIME("image/png"), plt), "\" />")
-            io,
-            "<img src=\"data:image/png;base64,",
-            base64encode(show, MIME("image/png"), plt),
-            "\" />",
-        )
     elseif output_type == :svg
         # @info("writing svg to html output")
         show(io, MIME("image/svg+xml"), plt)
@@ -182,47 +178,36 @@ function _show(io::IO, ::MIME"text/html", plt::Plot)
 end
 
 # delegate showable to _show instead
-function Base.showable(m::M, plt::P) where {M<:MIME,P<:Plot}
+@noinline function Base.showable(m::M, plt::P) where {M<:MIME, P<:Plot}
-    return hasmethod(_show, Tuple{IO,M,P})
+    return hasmethod(_show, Tuple{IO, M, P})
 end
 
-function _display(plt::Plot)
+@noinline function _display(plt::Plot)
     @warn("_display is not defined for this backend.")
 end
 
-Base.show(io::IO, m::MIME"text/plain", plt::Plot) = show(io, plt)
 # for writing to io streams... first prepare, then callback
-for mime in (
+for mime in ("text/plain", "text/html", "image/png", "image/eps", "image/svg+xml",
-    "text/html",
+             "application/eps", "application/pdf", "application/postscript",
-    "text/latex",
+             "application/x-tex", "application/vnd.plotly.v1+json")
-    "image/png",
-    "image/eps",
-    "image/svg+xml",
-    "application/eps",
-    "application/pdf",
-    "application/postscript",
-    "application/x-tex",
-    "application/vnd.plotly.v1+json",
-)
     @eval function Base.show(io::IO, m::MIME{Symbol($mime)}, plt::Plot)
         if haskey(io, :juno_plotsize)
-            showjuno(io, m, plt)
+          showjuno(io, m, plt)
         else
-            prepare_output(plt)
+          prepare_output(plt)
-            _show(io, m, plt)
+          _show(io, m, plt)
         end
         return nothing
     end
 end
 
-Base.showable(::MIME"text/html", plt::Plot{UnicodePlotsBackend}) = false  # Pluto
+# default text/plain for all backends
-
+@noinline _show(io::IO, ::MIME{Symbol("text/plain")}, plt::Plot) = show(io, plt)
-Base.show(io::IO, m::MIME"application/prs.juno.plotpane+html", plt::Plot) =
-    showjuno(io, MIME("text/html"), plt)
 
 "Close all open gui windows of the current backend"
 closeall() = closeall(backend())
 
+
 # function html_output_format(fmt)
 #     if fmt == "png"
 #         @eval function Base.show(io::IO, ::MIME"text/html", plt::Plot)
@@ -239,32 +224,38 @@ closeall() = closeall(backend())
 #
 # html_output_format("svg")
 
+
 # ---------------------------------------------------------
 # Atom PlotPane
 # ---------------------------------------------------------
-function showjuno(io::IO, m, plt)
+@noinline function showjuno(io::IO, m, plt)
+    sz = plt[:size]
     dpi = plt[:dpi]
+    thickness_scaling = plt[:thickness_scaling]
 
-    jratio = get(io, :juno_dpi_ratio, 1)
+    jsize = get(io, :juno_plotsize, [400, 500])
 
-    plt[:dpi] = jratio * Plots.DPI
+    scale = minimum(jsize[i] / sz[i] for i in 1:2)
+    plt[:size] = (s * scale for s in sz)
+    plt[:dpi] = Plots.DPI
+    plt[:thickness_scaling] *= scale
 
     prepare_output(plt)
     try
-        _showjuno(io, m, plt)
+      _showjuno(io, m, plt)
     finally
-        plt[:dpi] = dpi
+      plt[:size] = sz
+      plt[:dpi] = dpi
+      plt[:thickness_scaling] = thickness_scaling
     end
 end
 
-function _showjuno(io::IO, m::MIME"image/svg+xml", plt)
+@noinline function _showjuno(io::IO, m::MIME"image/svg+xml", plt)
-    if Symbol(plt.attr[:html_output_format]) ≠ :svg
+  if Symbol(plt.attr[:html_output_format]) ≠ :svg
-        throw(MethodError(show, (typeof(m), typeof(plt))))
+    throw(MethodError(show, (typeof(m), typeof(plt))))
-    else
+  else
-        _show(io, m, plt)
+    _show(io, m, plt)
-    end
+  end
 end
 
-Base.showable(::MIME"application/prs.juno.plotpane+html", plt::Plot) = false
+@noinline _showjuno(io::IO, m, plt) = _show(io, m, plt)
-
-_showjuno(io::IO, m, plt) = _show(io, m, plt)

src/pipeline.jl

@@ -1,60 +1,103 @@
-# RecipesPipeline API
 
-## Warnings
 
-function RecipesPipeline.warn_on_recipe_aliases!(
+# ------------------------------------------------------------------
-    plt::Plot,
+# preprocessing
-    plotattributes::AKW,
+
-    recipe_type::Symbol,
+@noinline function command_idx(kw_list::AVec{KW}, kw::KW)
-    @nospecialize(args)
+    Int(kw[:series_plotindex]) - Int(kw_list[1][:series_plotindex]) + 1
-)
+end
-    pkeys = keys(plotattributes)
+
-    for k in pkeys
+@noinline function _expand_seriestype_array(plotattributes::KW, args)
-        dk = get(_keyAliases, k, nothing)
+    sts = get(plotattributes, :seriestype, :path)
-        if dk !== nothing
+    if typeof(sts) <: AbstractArray
-            kv = RecipesPipeline.pop_kw!(plotattributes, k)
+        delete!(plotattributes, :seriestype)
-            if dk ∉ pkeys
+        rd = Vector{RecipeData}(undef, size(sts, 1))
-                plotattributes[dk] = kv
+        for r in 1:size(sts, 1)
+            dc = copy(plotattributes)
+            dc[:seriestype] = sts[r:r,:]
+            rd[r] = RecipeData(dc, args)
+        end
+        rd
+    else
+        RecipeData[RecipeData(copy(plotattributes), args)]
+    end
+end
+
+@noinline function _preprocess_args(plotattributes::KW, args, still_to_process::Vector{RecipeData})
+    # the grouping mechanism is a recipe on a GroupBy object
+    # we simply add the GroupBy object to the front of the args list to allow
+    # the recipe to be applied
+    if haskey(plotattributes, :group)
+        args = (extractGroupArgs(plotattributes[:group], args...), args...)
+    end
+
+    # if we were passed a vector/matrix of seriestypes and there's more than one row,
+    # we want to duplicate the inputs, once for each seriestype row.
+    if !isempty(args)
+        append!(still_to_process, _expand_seriestype_array(plotattributes, args))
+    end
+
+    # remove subplot and axis args from plotattributes... they will be passed through in the kw_list
+    if !isempty(args)
+        for (k,v) in plotattributes
+            for defdict in (_subplot_defaults,
+                            _axis_defaults,
+                            _axis_defaults_byletter)
+                if haskey(defdict, k)
+                    delete!(plotattributes, k)
+                end
             end
         end
     end
+
+    args
 end
 
-## Grouping
+# ------------------------------------------------------------------
+# user recipes
 
-RecipesPipeline.splittable_attribute(plt::Plot, key, val::SeriesAnnotations, len) =
-    RecipesPipeline.splittable_attribute(plt, key, val.strs, len)
 
-function RecipesPipeline.split_attribute(plt::Plot, key, val::SeriesAnnotations, indices)
+@noinline function _process_userrecipes(plt::Plot, plotattributes::KW, args)
-    split_strs = RecipesPipeline.split_attribute(plt, key, val.strs, indices)
+    still_to_process = RecipeData[]
-    return SeriesAnnotations(split_strs, val.font, val.baseshape, val.scalefactor)
+    args = _preprocess_args(plotattributes, args, still_to_process)
-end
 
-## Preprocessing attributes
+    # for plotting recipes, swap out the args and update the parameter dictionary
-function RecipesPipeline.preprocess_axis_args!(plt::Plot, plotattributes, letter)
+    # we are keeping a stack of series that still need to be processed.
-    # Fix letter for seriestypes that are x only but data gets passed as y
+    # each pass through the loop, we pop one off and apply the recipe.
-    if treats_y_as_x(get(plotattributes, :seriestype, :path))
+    # the recipe will return a list a Series objects... the ones that are
-        if get(plotattributes, :orientation, :vertical) == :vertical
+    # finished (no more args) get added to the kw_list, the ones that are not
-            letter = :x
+    # are placed on top of the stack and are then processed further.
+    kw_list = KW[]
+    while !isempty(still_to_process)
+        # grab the first in line to be processed and either add it to the kw_list or
+        # pass it through apply_recipe to generate a list of RecipeData objects (data + attributes)
+        # for further processing.
+        next_series = popfirst!(still_to_process)
+        # recipedata should be of type RecipeData.  if it's not then the inputs must not have been fully processed by recipes
+        if !(typeof(next_series) <: RecipeData)
+            error("Inputs couldn't be processed... expected RecipeData but got: $next_series")
+        end
+        if isempty(next_series.args)
+            _process_userrecipe(plt, kw_list, next_series)
+        else
+            rd_list = RecipesBase.apply_recipe(next_series.plotattributes, next_series.args...)
+            prepend!(still_to_process,rd_list)
         end
     end
 
-    plotattributes[:letter] = letter
+    # don't allow something else to handle it
-    RecipesPipeline.preprocess_axis_args!(plt, plotattributes)
+    plotattributes[:smooth] = false
+    kw_list
 end
 
-RecipesPipeline.preprocess_attributes!(plt::Plot, plotattributes) =
+@noinline function _process_userrecipe(plt::Plot, kw_list::Vector{KW}, recipedata::RecipeData)
-    RecipesPipeline.preprocess_attributes!(plotattributes) # in src/args.jl
+    # when the arg tuple is empty, that means there's nothing left to recursively
-
+    # process... finish up and add to the kw_list
-RecipesPipeline.is_axis_attribute(plt::Plot, attr) = is_axis_attr_noletter(attr) # in src/args.jl
+    kw = recipedata.plotattributes
-
+    preprocessArgs!(kw)
-RecipesPipeline.is_subplot_attribute(plt::Plot, attr) = is_subplot_attr(attr) # in src/args.jl
-
-## User recipes
-
-function RecipesPipeline.process_userrecipe!(plt::Plot, kw_list, kw)
     _preprocess_userrecipe(kw)
-    warn_on_unsupported_scales(plt.backend, kw)
+    warnOnUnsupported_scales(plt.backend, kw)
+
     # add the plot index
     plt.n += 1
     kw[:series_plotindex] = plt.n
@@ -65,42 +108,34 @@ function RecipesPipeline.process_userrecipe!(plt::Plot, kw_list, kw)
     return
 end
 
-function _preprocess_userrecipe(kw::AKW)
+@noinline function _preprocess_userrecipe(kw::KW)
     _add_markershape(kw)
 
-    if get(kw, :permute, default(:permute)) != :none
+    # if there was a grouping, filter the data here
-        l1, l2 = kw[:permute]
+    _filter_input_data!(kw)
-        for k in _axis_args
+
-            k1 = _attrsymbolcache[l1][k]
-            k2 = _attrsymbolcache[l2][k]
-            kwk = keys(kw)
-            if k1 in kwk || k2 in kwk
-                kw[k1], kw[k2] = get(kw, k2, default(k2)), get(kw, k1, default(k1))
-            end
-        end
-    end
     # map marker_z if it's a Function
-    if isa(get(kw, :marker_z, default(:marker_z)), Function)
+    if isa(get(kw, :marker_z, nothing), Function)
         # TODO: should this take y and/or z as arguments?
-        kw[:marker_z] =
+        kw[:marker_z] = isa(kw[:z], Nothing) ? map(kw[:marker_z], kw[:x], kw[:y]) : map(kw[:marker_z], kw[:x], kw[:y], kw[:z])
-            isa(kw[:z], Nothing) ? map(kw[:marker_z], kw[:x], kw[:y]) :
-            map(kw[:marker_z], kw[:x], kw[:y], kw[:z])
     end
 
     # map line_z if it's a Function
-    if isa(get(kw, :line_z, default(:line_z)), Function)
+    if isa(get(kw, :line_z, nothing), Function)
-        kw[:line_z] =
+        kw[:line_z] = isa(kw[:z], Nothing) ? map(kw[:line_z], kw[:x], kw[:y]) : map(kw[:line_z], kw[:x], kw[:y], kw[:z])
-            isa(kw[:z], Nothing) ? map(kw[:line_z], kw[:x], kw[:y]) :
-            map(kw[:line_z], kw[:x], kw[:y], kw[:z])
     end
 
+    # convert a ribbon into a fillrange
+    if get(kw, :ribbon, nothing) !== nothing
+        make_fillrange_from_ribbon(kw)
+    end
     return
 end
 
-function _add_errorbar_kw(kw_list::Vector{KW}, kw::AKW)
+@noinline function _add_errorbar_kw(kw_list::Vector{KW}, kw::KW)
     # handle error bars by creating new recipedata data... these will have
     # the same recipedata index as the recipedata they are copied from
-    for esym in (:xerror, :yerror, :zerror)
+    for esym in (:xerror, :yerror)
         if get(kw, esym, nothing) !== nothing
             # we make a copy of the KW and apply an errorbar recipe
             errkw = copy(kw)
@@ -112,78 +147,65 @@ function _add_errorbar_kw(kw_list::Vector{KW}, kw::AKW)
     end
 end
 
-function _add_smooth_kw(kw_list::Vector{KW}, kw::AKW)
+@noinline function _add_smooth_kw(kw_list::Vector{KW}, kw::KW)
     # handle smoothing by adding a new series
     if get(kw, :smooth, false)
         x, y = kw[:x], kw[:y]
         β, α = convert(Matrix{Float64}, [x ones(length(x))]) \ convert(Vector{Float64}, y)
         sx = [ignorenan_minimum(x), ignorenan_maximum(x)]
         sy = β .* sx .+ α
-        push!(
+        push!(kw_list, merge(copy(kw), KW(
-            kw_list,
+            :seriestype => :path,
-            merge(
+            :x => sx,
-                copy(kw),
+            :y => sy,
-                KW(
+            :fillrange => nothing,
-                    :seriestype => :path,
+            :label => "",
-                    :x => sx,
+            :primary => false,
-                    :y => sy,
+        )))
-                    :fillrange => nothing,
-                    :label => "",
-                    :primary => false,
-                ),
-            ),
-        )
     end
 end
 
-RecipesPipeline.get_axis_limits(plt::Plot, letter) = axis_limits(plt[1], letter, false)
+# ------------------------------------------------------------------
+# plot recipes
 
-## Plot recipes
+# Grab the first in line to be processed and pass it through apply_recipe
-
+# to generate a list of RecipeData objects (data + attributes).
-RecipesPipeline.type_alias(plt::Plot) = get(_typeAliases, st, st)
+# If we applied a "plot recipe" without error, then add the returned datalist's KWs,
-
+# otherwise we just add the original KW.
-## Plot setup
+function _process_plotrecipe(plt::Plot, kw::KW, kw_list::Vector{KW}, still_to_process::Vector{KW})
-
+    if !isa(get(kw, :seriestype, nothing), Symbol)
-function RecipesPipeline.plot_setup!(plt::Plot, plotattributes, kw_list)
+        # seriestype was never set, or it's not a Symbol, so it can't be a plot recipe
-    _plot_setup(plt, plotattributes, kw_list)
+        push!(kw_list, kw)
-    _subplot_setup(plt, plotattributes, kw_list)
+        return
-    return nothing
+    end
-end
+    try
-
+        st = kw[:seriestype]
-function RecipesPipeline.process_sliced_series_attributes!(plt::Plots.Plot, kw_list)
+        st = kw[:seriestype] = get(_typeAliases, st, st)
-    # swap errors
+        datalist = RecipesBase.apply_recipe(kw, Val{st}, plt)
-    err_inds =
+        for data in datalist
-        findall(kw -> get(kw, :seriestype, :path) in (:xerror, :yerror, :zerror), kw_list)
+            preprocessArgs!(data.plotattributes)
-    for ind in err_inds
+            if data.plotattributes[:seriestype] == st
-        if get(kw_list[ind - 1], :seriestype, :path) == :scatter
+                error("Plot recipe $st returned the same seriestype: $(data.plotattributes)")
-            tmp = copy(kw_list[ind])
+            end
-            kw_list[ind] = copy(kw_list[ind - 1])
+            push!(still_to_process, data.plotattributes)
-            kw_list[ind - 1] = tmp
+        end
+    catch err
+        if isa(err, MethodError)
+            push!(kw_list, kw)
+        else
+            rethrow()
         end
     end
-
+    return
-    for kw in kw_list
-        rib = get(kw, :ribbon, default(:ribbon))
-        fr = get(kw, :fillrange, default(:fillrange))
-        # map ribbon if it's a Function
-        if rib isa Function
-            kw[:ribbon] = map(rib, kw[:x])
-        end
-        # convert a ribbon into a fillrange
-        if rib !== nothing
-            make_fillrange_from_ribbon(kw)
-            # map fillrange if it's a Function
-        elseif fr !== nothing && fr isa Function
-            kw[:fillrange] = map(fr, kw[:x])
-        end
-    end
-    return nothing
 end
 
-# TODO: Should some of this logic be moved to RecipesPipeline?
+
-function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
+# ------------------------------------------------------------------
+# setup plot and subplot
+
+function _plot_setup(plt::Plot{T}, plotattributes::KW, kw_list::Vector{KW}) where {T}
     # merge in anything meant for the Plot
-    for kw in kw_list, (k, v) in kw
+    for kw in kw_list, (k,v) in kw
         haskey(_plot_defaults, k) && (plotattributes[k] = pop!(kw, k))
     end
 
@@ -194,7 +216,7 @@ function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
 
         # create the layout and subplots from the inputs
         plt.layout, plt.subplots, plt.spmap = build_layout(plt.attr)
-        for (idx, sp) in enumerate(plt.subplots)
+        for (idx,sp) in enumerate(plt.subplots)
             sp.plt = plt
             sp.attr[:subplot_index] = idx
         end
@@ -202,6 +224,7 @@ function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
         plt.init = true
     end
 
+
     # handle inset subplots
     insets = plt[:inset_subplots]
     if insets !== nothing
@@ -218,7 +241,7 @@ function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
             else
                 parent = plt.layout
             end
-            sp = Subplot(backend(), parent = parent)
+            sp = Subplot(backend(), parent=parent)
             sp.plt = plt
             push!(plt.subplots, sp)
             push!(plt.inset_subplots, sp)
@@ -229,57 +252,42 @@ function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
     plt[:inset_subplots] = nothing
 end
 
-function _subplot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
+function _subplot_setup(plt::Plot{T}, plotattributes::KW, kw_list::Vector{KW}) where T
     # we'll keep a map of subplot to an attribute override dict.
     # Subplot/Axis attributes set by a user/series recipe apply only to the
     # Subplot object which they belong to.
     # TODO: allow matrices to still apply to all subplots
-    sp_attrs = Dict{Subplot,Any}()
+    sp_attrs = Dict{Any,Any}()
     for kw in kw_list
         # get the Subplot object to which the series belongs.
         sps = get(kw, :subplot, :auto)
-        sp = get_subplot(
+        sp = get_subplot(plt, _cycle(sps == :auto ? plt.subplots : plt.subplots[sps], command_idx(kw_list,kw)))
-            plt,
-            _cycle(
-                sps == :auto ? plt.subplots : plt.subplots[sps],
-                series_idx(kw_list, kw),
-            ),
-        )
         kw[:subplot] = sp
-
         # extract subplot/axis attributes from kw and add to sp_attr
         attr = KW()
-        for (k, v) in collect(kw)
+        for (k,v) in collect(kw)
-            if is_subplot_attr(k) || is_axis_attr(k)
+            if haskey(_subplot_defaults, k) || haskey(_axis_defaults_byletter, k)
-                v = pop!(kw, k)
+                attr[k] = pop!(kw, k)
-                if sps isa AbstractArray && v isa AbstractArray && length(v) == length(sps)
-                    v = v[series_idx(kw_list, kw)]
-                end
-                attr[k] = v
             end
-            if is_axis_attr_noletter(k)
+            if haskey(_axis_defaults, k)
                 v = pop!(kw, k)
-                if sps isa AbstractArray && v isa AbstractArray && length(v) == length(sps)
+                for letter in (:x,:y,:z)
-                    v = v[series_idx(kw_list, kw)]
+                    attr[Symbol(letter,k)] = v
-                end
-                for letter in (:x, :y, :z)
-                    attr[get_attr_symbol(letter, k)] = v
                 end
             end
-        end
+            for k in (:scale,), letter in (:x,:y,:z)
-        for k in (:scale,), letter in (:x, :y, :z)
+                # Series recipes may need access to this information
-            # Series recipes may need access to this information
+                lk = Symbol(letter,k)
-            lk = get_attr_symbol(letter, k)
+                if haskey(attr, lk)
-            if haskey(attr, lk)
+                    kw[lk] = attr[lk]
-                kw[lk] = attr[lk]
+                end
             end
         end
         sp_attrs[sp] = attr
     end
 
-    _add_plot_title!(plt)
     # override subplot/axis args.  `sp_attrs` take precendence
-    for (idx, sp) in enumerate(plt.subplots)
+    for (idx,sp) in enumerate(plt.subplots)
         attr = if !haskey(plotattributes, :subplot) || plotattributes[:subplot] == idx
             merge(plotattributes, get(sp_attrs, sp, KW()))
         else
@@ -290,86 +298,11 @@ function _subplot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
 
     # do we need to link any axes together?
     link_axes!(plt.layout, plt[:link])
-    return nothing
-end
-
-function series_idx(kw_list::AVec{KW}, kw::AKW)
-    Int(kw[:series_plotindex]) - Int(kw_list[1][:series_plotindex]) + 1
-end
-
-function _add_plot_title!(plt)
-    plot_title = plt[:plot_title]
-    plot_titleindex = nothing
-
-    if plot_title != ""
-        # make new subplot for plot title
-        if plt[:plot_titleindex] == 0
-            the_layout = plt.layout
-            vspan = plt[:plot_titlevspan]
-            plt.layout = grid(2, 1, heights = (vspan, 1 - vspan))
-            plt.layout.grid[1, 1] =
-                subplot = Subplot(plt.backend, parent = plt.layout[1, 1])
-            plt.layout.grid[2, 1] = the_layout
-            subplot.plt = plt
-
-            top = plt.backend isa PyPlotBackend ? nothing : 0mm
-            bot = 0mm
-            plt[:force_minpad] = nothing, top, nothing, bot
-            subplot[:subplot_index] = last(plt.subplots)[:subplot_index] + 1
-            plt[:plot_titleindex] = subplot[:subplot_index]
-            subplot[:framestyle] = :none
-            subplot[:margin] = 0px
-            push!(plt.subplots, subplot)
-        end
-
-        # propagate arguments plt[:plot_titleXXX] --> subplot[:titleXXX]
-        plot_titleindex = plt[:plot_titleindex]
-        subplot = plt.subplots[plot_titleindex]
-        for sym in filter(x -> startswith(string(x), "plot_title"), keys(_plot_defaults))
-            subplot[Symbol(string(sym)[(length("plot_") + 1):end])] = plt[sym]
-        end
-    end
-
-    return plot_titleindex
-end
-
-## Series recipes
-
-function RecipesPipeline.slice_series_attributes!(plt::Plot, kw_list, kw)
-    sp::Subplot = kw[:subplot]
-    # in series attributes given as vector with one element per series,
-    # select the value for current series
-    _slice_series_args!(kw, plt, sp, series_idx(kw_list, kw))
-    return nothing
-end
-
-RecipesPipeline.series_defaults(plt::Plot) = _series_defaults # in args.jl
-
-RecipesPipeline.is_seriestype_supported(plt::Plot, st) = is_seriestype_supported(st)
-
-function RecipesPipeline.add_series!(plt::Plot, plotattributes)
-    sp = _prepare_subplot(plt, plotattributes)
-    if plotattributes[:permute] != :none
-        letter1, letter2 = plotattributes[:permute]
-        if plotattributes[:markershape] == :hline &&
-           (plotattributes[:permute] == (:x, :y) || plotattributes[:permute] == (:y, :x))
-            plotattributes[:markershape] = :vline
-        elseif plotattributes[:markershape] == :vline && (
-            plotattributes[:permute] == (:x, :y) || plotattributes[:permute] == (:y, :x)
-        )
-            plotattributes[:markershape] = :hline
-        end
-        plotattributes[letter1], plotattributes[letter2] =
-            plotattributes[letter2], plotattributes[letter1]
-    end
-    _expand_subplot_extrema(sp, plotattributes, plotattributes[:seriestype])
-    _update_series_attributes!(plotattributes, plt, sp)
-    _add_the_series(plt, sp, plotattributes)
 end
 
 # getting ready to add the series... last update to subplot from anything
 # that might have been added during series recipes
-function _prepare_subplot(plt::Plot{T}, plotattributes::AKW) where {T}
+@noinline function _prepare_subplot(plt::Plot{T}, plotattributes::KW) where T
     st::Symbol = plotattributes[:seriestype]
     sp::Subplot{T} = plotattributes[:subplot]
     sp_idx = get_subplot_index(plt, sp)
@@ -378,10 +311,7 @@ function _prepare_subplot(plt::Plot{T}, plotattributes::AKW) where {T}
     st = _override_seriestype_check(plotattributes, st)
 
     # change to a 3d projection for this subplot?
-    if (
+    if is3d(st)
-        RecipesPipeline.needs_3d_axes(st) ||
-        (st == :quiver && plotattributes[:z] !== nothing)
-    )
         sp.attr[:projection] = "3d"
     end
 
@@ -393,14 +323,14 @@ function _prepare_subplot(plt::Plot{T}, plotattributes::AKW) where {T}
     sp
 end
 
-function _override_seriestype_check(plotattributes::AKW, st::Symbol)
+# ------------------------------------------------------------------
+# series types
+
+@noinline function _override_seriestype_check(plotattributes::KW, st::Symbol)
     # do we want to override the series type?
-    if !RecipesPipeline.is3d(st) && !(st in (:contour, :contour3d, :quiver))
+    if !is3d(st) && !(st in (:contour,:contour3d))
         z = plotattributes[:z]
-        if (
+        if !isa(z, Nothing) && (size(plotattributes[:x]) == size(plotattributes[:y]) == size(z))
-            z !== nothing &&
-            (size(plotattributes[:x]) == size(plotattributes[:y]) == size(z))
-        )
             st = (st == :scatter ? :scatter3d : :path3d)
             plotattributes[:seriestype] = st
         end
@@ -408,22 +338,30 @@ function _override_seriestype_check(plotattributes::AKW, st::Symbol)
     st
 end
 
-function needs_any_3d_axes(sp::Subplot)
+@noinline function _prepare_annotations(sp::Subplot, plotattributes::KW)
-    any(
+    # strip out series annotations (those which are based on series x/y coords)
-        RecipesPipeline.needs_3d_axes(
+    # and add them to the subplot attr
-            _override_seriestype_check(s.plotattributes, s.plotattributes[:seriestype]),
+    sp_anns = annotations(sp[:annotations])
-        ) for s in series_list(sp)
+    # series_anns = annotations(pop!(plotattributes, :series_annotations, []))
-    )
+    # if isa(series_anns, SeriesAnnotations)
+    #     series_anns.x = plotattributes[:x]
+    #     series_anns.y = plotattributes[:y]
+    # elseif length(series_anns) > 0
+    #     x, y = plotattributes[:x], plotattributes[:y]
+    #     nx, ny, na = map(length, (x,y,series_anns))
+    #     n = max(nx, ny, na)
+    #     series_anns = [(x[mod1(i,nx)], y[mod1(i,ny)], text(series_anns[mod1(i,na)])) for i=1:n]
+    # end
+    # sp.attr[:annotations] = vcat(sp_anns, series_anns)
 end
 
-function _expand_subplot_extrema(sp::Subplot, plotattributes::AKW, st::Symbol)
+function _expand_subplot_extrema(sp::Subplot, plotattributes::KW, st::Symbol)
     # adjust extrema and discrete info
     if st == :image
-        xmin, xmax = ignorenan_extrema(plotattributes[:x])
+        xmin, xmax = ignorenan_extrema(plotattributes[:x]); ymin, ymax = ignorenan_extrema(plotattributes[:y])
-        ymin, ymax = ignorenan_extrema(plotattributes[:y])
         expand_extrema!(sp[:xaxis], (xmin, xmax))
         expand_extrema!(sp[:yaxis], (ymin, ymax))
-    elseif !(st in (:histogram, :bins2d, :histogram2d))
+    elseif !(st in (:pie, :histogram, :bins2d, :histogram2d))
         expand_extrema!(sp, plotattributes)
     end
     # expand for zerolines (axes through origin)
@@ -433,34 +371,54 @@ function _expand_subplot_extrema(sp::Subplot, plotattributes::AKW, st::Symbol)
     end
 end
 
-function _add_the_series(plt, sp, plotattributes)
+@noinline function _add_the_series(plt, sp, plotattributes)
-    extra_kwargs = warn_on_unsupported_args(plt.backend, plotattributes)
+    warnOnUnsupported_args(plt.backend, plotattributes)
-    if (kw = plt[:extra_kwargs]) isa AbstractDict
+    warnOnUnsupported(plt.backend, plotattributes)
-        plt[:extra_plot_kwargs] = get(kw, :plot, KW())
-        sp[:extra_kwargs] = get(kw, :subplot, KW())
-        plotattributes[:extra_kwargs] = get(kw, :series, KW())
-    elseif plt[:extra_kwargs] == :plot
-        plt[:extra_plot_kwargs] = extra_kwargs
-    elseif plt[:extra_kwargs] == :subplot
-        sp[:extra_kwargs] = extra_kwargs
-    elseif plt[:extra_kwargs] == :series
-        plotattributes[:extra_kwargs] = extra_kwargs
-    else
-        ArgumentError("Unsupported type for extra keyword arguments")
-    end
-    warn_on_unsupported(plt.backend, plotattributes)
     series = Series(plotattributes)
     push!(plt.series_list, series)
-    z_order = plotattributes[:z_order]
+    push!(sp.series_list, series)
-    if z_order == :front
-        push!(sp.series_list, series)
-    elseif z_order == :back
-        pushfirst!(sp.series_list, series)
-    elseif z_order isa Integer
-        insert!(sp.series_list, z_order, series)
-    else
-        @error "Wrong type $(typeof(z_order)) for attribute z_order"
-    end
     _series_added(plt, series)
-    _update_subplot_colorbars(sp)
+end
+
+# -------------------------------------------------------------------------------
+
+# this method recursively applies series recipes when the seriestype is not supported
+# natively by the backend
+function _process_seriesrecipe(plt::Plot, plotattributes::KW)
+    # replace seriestype aliases
+    st = Symbol(plotattributes[:seriestype])
+    st = plotattributes[:seriestype] = get(_typeAliases, st, st)
+
+    # shapes shouldn't have fillrange set
+    if plotattributes[:seriestype] == :shape
+        plotattributes[:fillrange] = nothing
+    end
+
+    # if it's natively supported, finalize processing and pass along to the backend, otherwise recurse
+    if is_seriestype_supported(st)
+        sp = _prepare_subplot(plt, plotattributes)
+        _prepare_annotations(sp, plotattributes)
+        _expand_subplot_extrema(sp, plotattributes, st)
+        _update_series_attributes!(plotattributes, plt, sp)
+        _add_the_series(plt, sp, plotattributes)
+
+    else
+        # get a sub list of series for this seriestype
+        datalist = RecipesBase.apply_recipe(plotattributes, Val{st}, plotattributes[:x], plotattributes[:y], plotattributes[:z])
+
+        # assuming there was no error, recursively apply the series recipes
+        for data in datalist
+            if isa(data, RecipeData)
+                preprocessArgs!(data.plotattributes)
+                if data.plotattributes[:seriestype] == st
+                    error("The seriestype didn't change in series recipe $st.  This will cause a StackOverflow.")
+                end
+                _process_seriesrecipe(plt, data.plotattributes)
+            else
+                @warn("Unhandled recipe: $(data)")
+                break
+            end
+        end
+    end
+    nothing
 end

src/plot.jl

@@ -1,70 +1,37 @@
 
 mutable struct CurrentPlot
-    nullableplot::Union{AbstractPlot,Nothing}
+    nullableplot::Union{AbstractPlot, Nothing}
 end
 const CURRENT_PLOT = CurrentPlot(nothing)
 
-isplotnull() = CURRENT_PLOT.nullableplot === nothing
+@noinline isplotnull() = CURRENT_PLOT.nullableplot === nothing
 
 """
     current()
 Returns the Plot object for the current plot
 """
-function current()
+@noinline function current()
     if isplotnull()
         error("No current plot/subplot")
     end
     CURRENT_PLOT.nullableplot
 end
-current(plot::AbstractPlot) = (CURRENT_PLOT.nullableplot = plot)
+@noinline current(plot::AbstractPlot) = (CURRENT_PLOT.nullableplot = plot)
 
 # ---------------------------------------------------------
 
+
 Base.string(plt::Plot) = "Plot{$(plt.backend) n=$(plt.n)}"
 Base.print(io::IO, plt::Plot) = print(io, string(plt))
-function Base.show(io::IO, plt::Plot)
+Base.show(io::IO, plt::Plot) = print(io, string(plt))
-    print(io, string(plt))
-    sp_ekwargs = getindex.(plt.subplots, :extra_kwargs)
-    s_ekwargs = getindex.(plt.series_list, :extra_kwargs)
-    if (
-        isempty(plt[:extra_plot_kwargs]) &&
-        all(isempty, sp_ekwargs) &&
-        all(isempty, s_ekwargs)
-    )
-        return
-    end
-    print(io, "\nCaptured extra kwargs:\n")
-    do_show = true
-    for (key, value) in plt[:extra_plot_kwargs]
-        do_show && println(io, "  Plot:")
-        println(io, " "^4, key, ": ", value)
-        do_show = false
-    end
-    do_show = true
-    for (i, ekwargs) in enumerate(sp_ekwargs)
-        for (key, value) in ekwargs
-            do_show && println(io, "  SubplotPlot{$i}:")
-            println(io, " "^4, key, ": ", value)
-            do_show = false
-        end
-        do_show = true
-    end
-    for (i, ekwargs) in enumerate(s_ekwargs)
-        for (key, value) in ekwargs
-            do_show && println(io, "  Series{$i}:")
-            println(io, " "^4, key, ": ", value)
-            do_show = false
-        end
-        do_show = true
-    end
-end
 
-getplot(plt::Plot) = plt
+@noinline getplot(plt::Plot) = plt
-getattr(plt::Plot, idx::Int = 1) = plt.attr
+@noinline getattr(plt::Plot, idx::Int = 1) = plt.attr
-convertSeriesIndex(plt::Plot, n::Int) = n
+@noinline convertSeriesIndex(plt::Plot, n::Int) = n
 
 # ---------------------------------------------------------
 
+
 """
 The main plot command. Use `plot` to create a new plot object, and `plot!` to add to an existing one:
 
@@ -75,38 +42,32 @@ The main plot command. Use `plot` to create a new plot object, and `plot!` to ad
 ```
 
 There are lots of ways to pass in data, and lots of keyword arguments... just try it and it will likely work as expected.
-When you pass in matrices, it splits by columns. To see the list of available attributes, use the `plotattr(attr)`
+When you pass in matrices, it splits by columns. To see the list of available attributes, use the `plotattr([attr])`
-function, where `attr` is the symbol `:Series`, `:Subplot`, `:Plot`, or `:Axis`. Pass any attribute to `plotattr`
+function, where `attr` is the symbol `:Series:`, `:Subplot:`, `:Plot` or `:Axis`. Pass any attribute to `plotattr`
-as a String to look up its docstring, e.g., `plotattr("seriestype")`.
+as a String to look up its docstring; e.g. `plotattr("seriestype")`.
 """
 function plot(args...; kw...)
-    @nospecialize
     # this creates a new plot with args/kw and sets it to be the current plot
     plotattributes = KW(kw)
-    RecipesPipeline.preprocess_attributes!(plotattributes)
+    preprocessArgs!(plotattributes)
-
     # create an empty Plot then process
     plt = Plot()
     # plt.user_attr = plotattributes
-    _plot!(plt, plotattributes, args)
+    _plot!(plt, plotattributes, Any[args...])
 end
 
 # build a new plot from existing plots
-# note: we split into plt1, plt2 and plts_tail so we can dispatch correctly
+# note: we split into plt1 and plts_tail so we can dispatch correctly
-plot(plt1::Plot, plt2::Plot, plts_tail::Plot...; kw...) =
+function plot(plt1::Plot, plts_tail::Plot...; kw...)
-    plot!(deepcopy(plt1), deepcopy(plt2), deepcopy.(plts_tail)...; kw...)
-function plot!(plt1::Plot, plt2::Plot, plts_tail::Plot...; kw...)
-    @nospecialize
     plotattributes = KW(kw)
-    RecipesPipeline.preprocess_attributes!(plotattributes)
+    preprocessArgs!(plotattributes)
 
     # build our plot vector from the args
-    n = length(plts_tail) + 2
+    n = length(plts_tail) + 1
     plts = Array{Plot}(undef, n)
     plts[1] = plt1
-    plts[2] = plt2
+    for (i,plt) in enumerate(plts_tail)
-    for (i, plt) in enumerate(plts_tail)
+        plts[i+1] = plt
-        plts[i + 2] = plt
     end
 
     # compute the layout
@@ -133,9 +94,9 @@ function plot!(plt1::Plot, plt2::Plot, plts_tail::Plot...; kw...)
     plt.init = true
 
     series_attr = KW()
-    for (k, v) in plotattributes
+    for (k,v) in plotattributes
-        if is_series_attr(k)
+        if haskey(_series_defaults, k)
-            series_attr[k] = pop!(plotattributes, k)
+            series_attr[k] = pop!(plotattributes,k)
         end
     end
 
@@ -157,17 +118,16 @@ function plot!(plt1::Plot, plt2::Plot, plts_tail::Plot...; kw...)
         sp.attr[:subplot_index] = idx
         for series in serieslist
             merge!(series.plotattributes, series_attr)
-            _slice_series_args!(series.plotattributes, plt, sp, cmdidx)
+            _add_defaults!(series.plotattributes, plt, sp, cmdidx)
             push!(plt.series_list, series)
             _series_added(plt, series)
             cmdidx += 1
         end
     end
-    ttl_idx = _add_plot_title!(plt)
 
     # first apply any args for the subplots
-    for (idx, sp) in enumerate(plt.subplots)
+    for (idx,sp) in enumerate(plt.subplots)
-        _update_subplot_args(plt, sp, idx == ttl_idx ? KW() : plotattributes, idx, false)
+        _update_subplot_args(plt, sp, plotattributes, idx, false)
     end
 
     # finish up
@@ -176,9 +136,10 @@ function plot!(plt1::Plot, plt2::Plot, plts_tail::Plot...; kw...)
     plt
 end
 
+
+
 # this adds to the current plot, or creates a new plot if none are current
-function plot!(args...; kw...)
+function  plot!(args...; kw...)
-    @nospecialize
     local plt
     try
         plt = current()
@@ -189,13 +150,11 @@ function plot!(args...; kw...)
 end
 
 # this adds to a specific plot... most plot commands will flow through here
-plot(plt::Plot, args...; kw...) = plot!(deepcopy(plt), args...; kw...)
 function plot!(plt::Plot, args...; kw...)
-    @nospecialize
     plotattributes = KW(kw)
-    RecipesPipeline.preprocess_attributes!(plotattributes)
+    preprocessArgs!(plotattributes)
     # merge!(plt.user_attr, plotattributes)
-    _plot!(plt, plotattributes, args)
+    _plot!(plt, plotattributes, Any[args...])
 end
 
 # -------------------------------------------------------------------------------
@@ -203,21 +162,105 @@ end
 # this is the core plotting function.  recursively apply recipes to build
 # a list of series KW dicts.
 # note: at entry, we only have those preprocessed args which were passed in... no default values yet
-function _plot!(plt::Plot, plotattributes, args)
+function _plot!(plt::Plot{T}, plotattributes::KW, args::Vector{Any}) where {T}
-    @nospecialize
+    plotattributes[:plot_object] = plt
-    RecipesPipeline.recipe_pipeline!(plt, plotattributes, args)
+
+
+    if !isempty(args) && !isdefined(Main, :StatsPlots) &&
+            first(split(string(typeof(args[1])), ".")) == "DataFrames"
+        @warn("You're trying to plot a DataFrame, but this functionality is provided by StatsPlots")
+    end
+
+    # --------------------------------
+    # "USER RECIPES"
+    # --------------------------------
+
+    # 1 second
+    kw_list = _process_userrecipes(plt, plotattributes, args)
+
+    # @info(1)
+    # map(DD, kw_list)
+
+
+    # --------------------------------
+    # "PLOT RECIPES"
+    # --------------------------------
+
+    # "plot recipe", which acts like a series type, and is processed before
+    # the plot layout is created, which allows for setting layouts and other plot-wide attributes.
+    # we get inputs which have been fully processed by "user recipes" and "type recipes",
+    # so we can expect standard vectors, surfaces, etc.  No defaults have been set yet.
+
+    still_to_process = kw_list
+    kw_list = KW[]
+    while !isempty(still_to_process)
+        next_kw = popfirst!(still_to_process)
+        _process_plotrecipe(plt, next_kw, kw_list, still_to_process)
+    end
+
+    # @info(2)
+    # map(DD, kw_list)
+
+    # --------------------------------
+    # Plot/Subplot/Layout setup
+    # --------------------------------
+
+    # 2.5 seconds
+    _plot_setup(plt, plotattributes, kw_list)
+
+    # 6 seconds
+    _subplot_setup(plt, plotattributes, kw_list)
+
+    # !!! note: At this point, kw_list is fully decomposed into individual series... one KW per series.          !!!
+    # !!!       The next step is to recursively apply series recipes until the backend supports that series type !!!
+
+    # --------------------------------
+    # "SERIES RECIPES"
+    # --------------------------------
+
+    # @info(3)
+    # map(DD, kw_list)
+
+    for kw in kw_list
+        sp::Subplot{T} = kw[:subplot]
+        # idx = get_subplot_index(plt, sp)
+
+        # # we update subplot args in case something like the color palatte is part of the recipe
+        # _update_subplot_args(plt, sp, kw, idx, true)
+
+        # set default values, select from attribute cycles, and generally set the final attributes
+        _add_defaults!(kw, plt, sp, command_idx(kw_list,kw))
+
+        # now we have a fully specified series, with colors chosen.   we must recursively handle
+        # series recipes, which dispatch on seriestype.  If a backend does not natively support a seriestype,
+        # we check for a recipe that will convert that series type into one made up of lower-level components.
+        # For example, a histogram is just a bar plot with binned data, a bar plot is really a filled step plot,
+        # and a step plot is really just a path.  So any backend that supports drawing a path will implicitly
+        # be able to support step, bar, and histogram plots (and any recipes that use those components).
+        _process_seriesrecipe(plt, kw)
+    end
+    # --------------------------------
+
+    # 7 seconds
     current(plt)
+
+    # do we want to force display?
+    # if plt[:show]
+    #     gui(plt)
+    # end
     _do_plot_show(plt, plt[:show])
-    return plt
+    plt
 end
 
+
 # we're getting ready to display/output.  prep for layout calcs, then update
 # the plot object after
-function prepare_output(plt::Plot)
+@noinline function prepare_output(plt::Plot)
+
     _before_layout_calcs(plt)
 
     w, h = plt.attr[:size]
-    plt.layout.bbox = BoundingBox(0mm, 0mm, w * px, h * px)
+    plt.layout.bbox = BoundingBox(0mm, 0mm, w*px, h*px)
 
     # One pass down and back up the tree to compute the minimum padding
     # of the children on the perimeter.  This is an backend callback.
@@ -226,17 +269,6 @@ function prepare_output(plt::Plot)
         _update_min_padding!(sp)
     end
 
-    # spedific to :plot_title see _add_plot_title!
-    force_minpad = get(plt, :force_minpad, ())
-    if !isempty(force_minpad)
-        for i in eachindex(plt.layout.grid)
-            plt.layout.grid[i].minpad = Tuple(
-                i === nothing ? j : i for
-                (i, j) in zip(force_minpad, plt.layout.grid[i].minpad)
-            )
-        end
-    end
-
     # now another pass down, to update the bounding boxes
     update_child_bboxes!(plt.layout)
 
@@ -245,15 +277,10 @@ function prepare_output(plt::Plot)
 
     # the backend callback, to reposition subplots, etc
     _update_plot_object(plt)
+
 end
 
-"""
+@noinline function backend_object(plt::Plot)
-    backend_object(plot)
-
-Returns the backend representation of a Plot object.
-Returns `nothing` if the backend does not support this.
-"""
-function backend_object(plt::Plot)
     prepare_output(plt)
     plt.o
 end
@@ -262,12 +289,12 @@ end
 # plot to a Subplot
 
 function plot(sp::Subplot, args...; kw...)
-    @nospecialize
     plt = sp.plt
     plot(plt, args...; kw..., subplot = findfirst(isequal(sp), plt.subplots))
 end
 function plot!(sp::Subplot, args...; kw...)
-    @nospecialize
     plt = sp.plt
     plot!(plt, args...; kw..., subplot = findfirst(isequal(sp), plt.subplots))
 end
+
+# --------------------------------------------------------------------

src/plotattr.jl

@@ -1,10 +1,8 @@
 
-const _attribute_defaults = Dict(
+const _attribute_defaults =  Dict(:Series => _series_defaults,
-    :Series => _series_defaults,
+                        :Subplot => _subplot_defaults,
-    :Subplot => _subplot_defaults,
+                        :Plot => _plot_defaults,
-    :Plot => _plot_defaults,
+                        :Axis => _axis_defaults)
-    :Axis => _axis_defaults,
-)
 
 attrtypes() = join(keys(_attribute_defaults), ", ")
 attributes(attrtype::Symbol) = sort(collect(keys(_attribute_defaults[attrtype])))
@@ -23,9 +21,7 @@ Look up the properties of a Plots attribute, or specify an attribute type. Call
 The information is the same as that given on https://docs.juliaplots.org/latest/attributes/.
 """
 function plotattr()
-    println(
+    println("Specify an attribute type to get a list of supported attributes. Options are $(attrtypes())")
-        "Specify an attribute type to get a list of supported attributes. Options are $(attrtypes())",
-    )
 end
 
 function plotattr(attrtype::Symbol)
@@ -48,8 +44,7 @@ printnothing(x) = x
 printnothing(x::Nothing) = "nothing"
 
 function plotattr(attrtype::Symbol, attribute::AbstractString)
-    in(attrtype, keys(_attribute_defaults)) ||
+    in(attrtype, keys(_attribute_defaults)) || ArgumentError("`attrtype` must match one of $(attrtypes())")
-        ArgumentError("`attrtype` must match one of $(attrtypes())")
 
     attribute = Symbol(lookup_aliases(attrtype, attribute))
 
@@ -59,21 +54,17 @@ function plotattr(attrtype::Symbol, attribute::AbstractString)
         typedesc = ""
         desc = strip(desc)
     else
-        typedesc = desc[1:(first_period_idx - 1)]
+        typedesc = desc[1:first_period_idx-1]
-        desc = strip(desc[(first_period_idx + 1):end])
+        desc = strip(desc[first_period_idx+1:end])
     end
-    als = keys(filter(x -> x[2] == attribute, _keyAliases)) |> collect |> sort
+    als = keys(filter(x->x[2]==attribute, _keyAliases)) |> collect |> sort
-    als = join(map(string, als), ", ")
+    als = join(map(string,als), ", ")
     def = _attribute_defaults[attrtype][attribute]
 
+
     # Looks up the different elements and plots them
-    println(
+    println("$(printnothing(attribute)) ", typedesc == "" ? "" : "{$(printnothing(typedesc))}", "\n",
-        "$(printnothing(attribute)) ",
-        typedesc == "" ? "" : "{$(printnothing(typedesc))}",
-        "\n",
         als == "" ? "" : "$(printnothing(als))\n",
         "\n$(printnothing(desc))\n",
-        "$(printnothing(attrtype)) attribute, ",
+        "$(printnothing(attrtype)) attribute, ", def == "" ? "" : " default: $(printnothing(def))")
-        def == "" ? "" : " default: $(printnothing(def))",
-    )
 end

src/precompile.jl

@@ -0,0 +1,3 @@
+function _precompile_()
+    ccall(:jl_generating_output, Cint, ()) == 1 || return nothing
+end

src/precompile_includer.jl

@@ -1,40 +0,0 @@
-#! format: off
-should_precompile =     true
-
-
-# Don't edit the following! Instead change the script for `snoop_bot`.
-ismultios = false
-ismultiversion = true
-# precompile_enclosure
-@static if !should_precompile
-    # nothing
-elseif !ismultios && !ismultiversion
-    @static if isfile(joinpath(@__DIR__, "../deps/SnoopCompile/precompile/precompile_Plots.jl"))
-        include("../deps/SnoopCompile/precompile/precompile_Plots.jl")
-        _precompile_()
-    end
-else
-    @static if v"1.6.0-DEV" <= VERSION <= v"1.6.9" 
-    @static if isfile(joinpath(@__DIR__, "../deps/SnoopCompile/precompile//1.6/precompile_Plots.jl"))
-        include("../deps/SnoopCompile/precompile//1.6/precompile_Plots.jl")
-        _precompile_()
-    end
-elseif v"1.7.0-DEV" <= VERSION <= v"1.7.9" 
-    @static if isfile(joinpath(@__DIR__, "../deps/SnoopCompile/precompile//1.7/precompile_Plots.jl"))
-        include("../deps/SnoopCompile/precompile//1.7/precompile_Plots.jl")
-        _precompile_()
-    end
-elseif v"1.8.0-DEV" <= VERSION <= v"1.8.9" 
-    @static if isfile(joinpath(@__DIR__, "../deps/SnoopCompile/precompile//1.8/precompile_Plots.jl"))
-        include("../deps/SnoopCompile/precompile//1.8/precompile_Plots.jl")
-        _precompile_()
-    end
-elseif v"1.9.0-DEV" <= VERSION <= v"1.9.9" 
-    @static if isfile(joinpath(@__DIR__, "../deps/SnoopCompile/precompile//1.9/precompile_Plots.jl"))
-        include("../deps/SnoopCompile/precompile//1.9/precompile_Plots.jl")
-        _precompile_()
-    end
-else 
-    end
-
-end # precompile_enclosure

src/series.jl

@@ -0,0 +1,625 @@
+
+
+# create a new "build_series_args" which converts all inputs into xs = Any[xitems], ys = Any[yitems].
+# Special handling for: no args, xmin/xmax, parametric, dataframes
+# Then once inputs have been converted, build the series args, map functions, etc.
+# This should cut down on boilerplate code and allow more focused dispatch on type
+# note: returns meta information... mainly for use with automatic labeling from DataFrames for now
+
+const FuncOrFuncs{F} = Union{F, Vector{F}, Matrix{F}}
+const DataPoint = Union{Number, AbstractString, Missing}
+const SeriesData = Union{AVec{<:DataPoint}, Function, Surface, Volume}
+
+prepareSeriesData(x) = error("Cannot convert $(typeof(x)) to series data for plotting")
+prepareSeriesData(::Nothing) = nothing
+prepareSeriesData(s::SeriesData) = handlemissings(s)
+
+handlemissings(v) = v
+handlemissings(v::AbstractArray{Union{T,Missing}}) where T <: Number = replace(v, missing => NaN)
+handlemissings(v::AbstractArray{Union{T,Missing}}) where T <: AbstractString = replace(v, missing => "")
+handlemissings(s::Surface) = Surface(handlemissings(s.surf))
+handlemissings(v::Volume) = Volume(handlemissings(v.v), v.x_extents, v.y_extents, v.z_extents)
+
+# default: assume x represents a single series
+convertToAnyVector(x) = Any[prepareSeriesData(x)]
+
+# fixed number of blank series
+convertToAnyVector(n::Integer) = Any[zeros(0) for i in 1:n]
+
+# vector of data points is a single series
+convertToAnyVector(v::AVec{<:DataPoint}) = Any[prepareSeriesData(v)]
+
+# list of things (maybe other vectors, functions, or something else)
+convertToAnyVector(v::AVec) = vcat((convertToAnyVector(vi) for vi in v)...)
+
+# Matrix is split into columns
+convertToAnyVector(v::AMat{<:DataPoint}) = Any[prepareSeriesData(v[:,i]) for i in 1:size(v,2)]
+
+# --------------------------------------------------------------------
+# Fillranges & ribbons
+
+
+process_fillrange(range::Number) = [range]
+process_fillrange(range) = convertToAnyVector(range)
+
+process_ribbon(ribbon::Number) = [ribbon]
+process_ribbon(ribbon) = convertToAnyVector(ribbon)
+# ribbon as a tuple: (lower_ribbons, upper_ribbons)
+process_ribbon(ribbon::Tuple{Any,Any}) = collect(zip(convertToAnyVector(ribbon[1]),
+                                                     convertToAnyVector(ribbon[2])))
+
+
+# --------------------------------------------------------------------
+
+# TODO: can we avoid the copy here?  one error that crops up is that mapping functions over the same array
+#       result in that array being shared.  push!, etc will add too many items to that array
+
+compute_x(x::Nothing, y::Nothing, z)      = 1:size(z,1)
+compute_x(x::Nothing, y, z)            = 1:size(y,1)
+compute_x(x::Function, y, z)        = map(x, y)
+compute_x(x, y, z)                  = copy(x)
+
+# compute_y(x::Void, y::Function, z)  = error()
+compute_y(x::Nothing, y::Nothing, z)      = 1:size(z,2)
+compute_y(x, y::Function, z)        = map(y, x)
+compute_y(x, y, z)                  = copy(y)
+
+compute_z(x, y, z::Function)        = map(z, x, y)
+compute_z(x, y, z::AbstractMatrix)  = Surface(z)
+compute_z(x, y, z::Nothing)            = nothing
+compute_z(x, y, z)                  = copy(z)
+
+nobigs(v::AVec{BigFloat}) = map(Float64, v)
+nobigs(v::AVec{BigInt}) = map(Int64, v)
+nobigs(v) = v
+
+@noinline function compute_xyz(x, y, z)
+    x = compute_x(x,y,z)
+    y = compute_y(x,y,z)
+    z = compute_z(x,y,z)
+    nobigs(x), nobigs(y), nobigs(z)
+end
+
+# not allowed
+compute_xyz(x::Nothing, y::FuncOrFuncs{F}, z) where {F<:Function}       = error("If you want to plot the function `$y`, you need to define the x values!")
+compute_xyz(x::Nothing, y::Nothing, z::FuncOrFuncs{F}) where {F<:Function} = error("If you want to plot the function `$z`, you need to define x and y values!")
+compute_xyz(x::Nothing, y::Nothing, z::Nothing)        = error("x/y/z are all nothing!")
+
+# --------------------------------------------------------------------
+
+
+# we are going to build recipes to do the processing and splitting of the args
+
+# ensure we dispatch to the slicer
+struct SliceIt end
+
+# the catch-all recipes
+@recipe function f(::Type{SliceIt}, x, y, z)
+
+    # handle data with formatting attached
+    if typeof(x) <: Formatted
+        xformatter := x.formatter
+        x = x.data
+    end
+    if typeof(y) <: Formatted
+        yformatter := y.formatter
+        y = y.data
+    end
+    if typeof(z) <: Formatted
+        zformatter := z.formatter
+        z = z.data
+    end
+
+    xs = convertToAnyVector(x)
+    ys = convertToAnyVector(y)
+    zs = convertToAnyVector(z)
+
+
+    fr = pop!(plotattributes, :fillrange, nothing)
+    fillranges = process_fillrange(fr)
+    mf = length(fillranges)
+
+    rib = pop!(plotattributes, :ribbon, nothing)
+    ribbons = process_ribbon(rib)
+    mr = length(ribbons)
+
+    # @show zs
+
+    mx = length(xs)
+    my = length(ys)
+    mz = length(zs)
+    if mx > 0 && my > 0 && mz > 0
+        for i in 1:max(mx, my, mz)
+            # add a new series
+            di = copy(plotattributes)
+            xi, yi, zi = xs[mod1(i,mx)], ys[mod1(i,my)], zs[mod1(i,mz)]
+            di[:x], di[:y], di[:z] = compute_xyz(xi, yi, zi)
+
+            # handle fillrange
+            fr = fillranges[mod1(i,mf)]
+            di[:fillrange] = isa(fr, Function) ? map(fr, di[:x]) : fr
+
+            # handle ribbons
+            rib = ribbons[mod1(i,mr)]
+            di[:ribbon] = isa(rib, Function) ? map(rib, di[:x]) : rib
+
+            push!(series_list, RecipeData(di, Any[]))
+        end
+    end
+    nothing  # don't add a series for the main block
+end
+
+# this is the default "type recipe"... just pass the object through
+@recipe f(::Type{T}, v::T) where {T<:Any} = v
+
+# this should catch unhandled "series recipes" and error with a nice message
+@recipe f(::Type{V}, x, y, z) where {V<:Val} = error("The backend must not support the series type $V, and there isn't a series recipe defined.")
+
+_apply_type_recipe(plotattributes, v) = RecipesBase.apply_recipe(plotattributes, typeof(v), v)[1].args[1]
+
+# Handle type recipes when the recipe is defined on the elements.
+# This sort of recipe should return a pair of functions... one to convert to number,
+# and one to format tick values.
+function _apply_type_recipe(plotattributes, v::AbstractArray)
+    isempty(skipmissing(v)) && return Float64[]
+    x = first(skipmissing(v))
+    args = RecipesBase.apply_recipe(plotattributes, typeof(x), x)[1].args
+    if length(args) == 2 && typeof(args[1]) <: Function && typeof(args[2]) <: Function
+        numfunc, formatter = args
+        Formatted(map(numfunc, v), formatter)
+    else
+        v
+    end
+end
+
+# # special handling for Surface... need to properly unwrap and re-wrap
+# function _apply_type_recipe(plotattributes, v::Surface)
+#     T = eltype(v.surf)
+#     @show T
+#     if T <: Integer || T <: AbstractFloat
+#         v
+#     else
+#         ret = _apply_type_recipe(plotattributes, v.surf)
+#         if typeof(ret) <: Formatted
+#             Formatted(Surface(ret.data), ret.formatter)
+#         else
+#             v
+#         end
+#     end
+# end
+
+# don't do anything for ints or floats
+_apply_type_recipe(plotattributes, v::AbstractArray{T}) where {T<:Union{Integer,AbstractFloat}} = v
+
+# handle "type recipes" by converting inputs, and then either re-calling or slicing
+@recipe function f(x, y, z)
+    did_replace = false
+    newx = _apply_type_recipe(plotattributes, x)
+    x === newx || (did_replace = true)
+    newy = _apply_type_recipe(plotattributes, y)
+    y === newy || (did_replace = true)
+    newz = _apply_type_recipe(plotattributes, z)
+    z === newz || (did_replace = true)
+    if did_replace
+        newx, newy, newz
+    else
+        SliceIt, x, y, z
+    end
+end
+@recipe function f(x, y)
+    did_replace = false
+    newx = _apply_type_recipe(plotattributes, x)
+    x === newx || (did_replace = true)
+    newy = _apply_type_recipe(plotattributes, y)
+    y === newy || (did_replace = true)
+    if did_replace
+        newx, newy
+    else
+        SliceIt, x, y, nothing
+    end
+end
+@recipe function f(y)
+    newy = _apply_type_recipe(plotattributes, y)
+    if y !== newy
+        newy
+    else
+        SliceIt, nothing, y, nothing
+    end
+end
+
+# if there's more than 3 inputs, it can't be passed directly to SliceIt
+# so we'll apply_type_recipe to all of them
+@recipe function f(v1, v2, v3, v4, vrest...)
+    did_replace = false
+    newargs = map(v -> begin
+        newv = _apply_type_recipe(plotattributes, v)
+        if newv !== v
+            did_replace = true
+        end
+        newv
+    end, (v1, v2, v3, v4, vrest...))
+    if !did_replace
+        error("Couldn't process recipe args: $(map(typeof, (v1, v2, v3, v4, vrest...)))")
+    end
+    newargs
+end
+
+
+# # --------------------------------------------------------------------
+# # 1 argument
+# # --------------------------------------------------------------------
+
+# helper function to ensure relevant attributes are wrapped by Surface
+function wrap_surfaces(plotattributes::KW)
+    if haskey(plotattributes, :fill_z)
+        v = plotattributes[:fill_z]
+        if !isa(v, Surface)
+            plotattributes[:fill_z] = Surface(v)
+        end
+    end
+end
+
+@recipe f(n::Integer) = is3d(get(plotattributes,:seriestype,:path)) ? (SliceIt, n, n, n) : (SliceIt, n, n, nothing)
+
+all3D(plotattributes::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image, :plots_heatmap), get(plotattributes, :seriestype, :none))
+
+# return a surface if this is a 3d plot, otherwise let it be sliced up
+@recipe function f(mat::AMat{T}) where T<:Union{Integer,AbstractFloat,Missing}
+    if all3D(plotattributes)
+        n,m = size(mat)
+        wrap_surfaces(plotattributes)
+        SliceIt, 1:m, 1:n, Surface(mat)
+    else
+        SliceIt, nothing, mat, nothing
+    end
+end
+
+# if a matrix is wrapped by Formatted, do similar logic, but wrap data with Surface
+@recipe function f(fmt::Formatted{T}) where T<:AbstractMatrix
+    if all3D(plotattributes)
+        mat = fmt.data
+        n,m = size(mat)
+        wrap_surfaces(plotattributes)
+        SliceIt, 1:m, 1:n, Formatted(Surface(mat), fmt.formatter)
+    else
+        SliceIt, nothing, fmt, nothing
+    end
+end
+
+# assume this is a Volume, so construct one
+@recipe function f(vol::AbstractArray{T,3}, args...) where T<:Union{Number,Missing}
+    seriestype := :volume
+    SliceIt, nothing, Volume(vol, args...), nothing
+end
+
+
+# # images - grays
+function clamp_greys!(mat::AMat{T}) where T<:Gray
+    for i in eachindex(mat)
+        mat[i].val < 0 && (mat[i] = Gray(0))
+        mat[i].val > 1 && (mat[i] = Gray(1))
+    end
+    mat
+end
+
+@recipe function f(mat::AMat{T}) where T<:Gray
+    n, m = size(mat)
+    if is_seriestype_supported(:image)
+        seriestype := :image
+        yflip --> true
+        SliceIt, 1:m, 1:n, Surface(clamp_greys!(mat))
+    else
+        seriestype := :heatmap
+        yflip --> true
+        cbar --> false
+        fillcolor --> ColorGradient([:black, :white])
+        SliceIt, 1:m, 1:n, Surface(clamp!(convert(Matrix{Float64}, mat), 0., 1.))
+    end
+end
+
+# # images - colors
+
+@recipe function f(mat::AMat{T}) where T<:Colorant
+	n, m = size(mat)
+
+    if is_seriestype_supported(:image)
+        seriestype := :image
+        yflip --> true
+        SliceIt, 1:m, 1:n, Surface(mat)
+    else
+        seriestype := :heatmap
+        yflip --> true
+        cbar --> false
+        z, plotattributes[:fillcolor] = replace_image_with_heatmap(mat)
+        SliceIt, 1:m, 1:n, Surface(z)
+    end
+end
+
+#
+# # plotting arbitrary shapes/polygons
+
+@recipe function f(shape::Shape)
+    seriestype --> :shape
+    coords(shape)
+end
+
+@recipe function f(shapes::AVec{Shape})
+    seriestype --> :shape
+    coords(shapes)
+end
+
+@recipe function f(shapes::AMat{Shape})
+    seriestype --> :shape
+    for j in 1:size(shapes,2)
+        @series coords(vec(shapes[:,j]))
+    end
+end
+
+# Dicts: each entry is a data point (x,y)=(key,value)
+
+@recipe f(d::AbstractDict) = collect(keys(d)), collect(values(d))
+
+# function without range... use the current range of the x-axis
+
+@recipe function f(f::FuncOrFuncs{F}) where F<:Function
+    plt = plotattributes[:plot_object]
+    xmin, xmax = try
+        axis_limits(plt[1], :x)
+    catch
+        xinv = invscalefunc(get(plotattributes, :xscale, :identity))
+        xm = tryrange(f, xinv.([-5,-1,0,0.01]))
+        xm, tryrange(f, filter(x->x>xm, xinv.([5,1,0.99, 0, -0.01])))
+    end
+
+    f, xmin, xmax
+end
+
+# try some intervals over which the function may be defined
+function tryrange(F::AbstractArray, vec)
+    rets = [tryrange(f, vec) for f in F] # get the preferred for each
+    maxind = maximum(indexin(rets, vec)) # get the last attempt that succeeded (most likely to fit all)
+    rets .= [tryrange(f, vec[maxind:maxind]) for f in F] # ensure that all functions compute there
+    rets[1]
+end
+
+function tryrange(F, vec)
+    for v in vec
+        try
+            tmp = F(v)
+            return v
+        catch
+        end
+    end
+    error("$F is not a Function, or is not defined at any of the values $vec")
+end
+#
+# # --------------------------------------------------------------------
+# # 2 arguments
+# # --------------------------------------------------------------------
+#
+#
+# # if functions come first, just swap the order (not to be confused with parametric functions...
+# # as there would be more than one function passed in)
+
+@recipe function f(f::FuncOrFuncs{F}, x) where F<:Function
+    F2 = typeof(x)
+    @assert !(F2 <: Function || (F2 <: AbstractArray && F2.parameters[1] <: Function))  # otherwise we'd hit infinite recursion here
+    x, f
+end
+
+#
+# # --------------------------------------------------------------------
+# # 3 arguments
+# # --------------------------------------------------------------------
+#
+#
+# # 3d line or scatter
+
+@recipe function f(x::AVec, y::AVec, z::AVec)
+    # st = get(plotattributes, :seriestype, :none)
+    # if st == :scatter
+    #     plotattributes[:seriestype] = :scatter3d
+    # elseif !is3d(st)
+    #     plotattributes[:seriestype] = :path3d
+    # end
+    SliceIt, x, y, z
+end
+
+@recipe function f(x::AMat, y::AMat, z::AMat)
+    # st = get(plotattributes, :seriestype, :none)
+    # if size(x) == size(y) == size(z)
+    #     if !is3d(st)
+    #         seriestype := :path3d
+    #     end
+    # end
+    wrap_surfaces(plotattributes)
+    SliceIt, x, y, z
+end
+
+#
+# # surface-like... function
+
+@recipe function f(x::AVec, y::AVec, zf::Function)
+    # x = X <: Number ? sort(x) : x
+    # y = Y <: Number ? sort(y) : y
+    wrap_surfaces(plotattributes)
+    SliceIt, x, y, Surface(zf, x, y)  # TODO: replace with SurfaceFunction when supported
+end
+
+#
+# # surface-like... matrix grid
+
+@recipe function f(x::AVec, y::AVec, z::AMat)
+    if !like_surface(get(plotattributes, :seriestype, :none))
+        plotattributes[:seriestype] = :contour
+    end
+    wrap_surfaces(plotattributes)
+    SliceIt, x, y, Surface(z)
+end
+
+# # images - grays
+
+@recipe function f(x::AVec, y::AVec, mat::AMat{T}) where T<:Gray
+    if is_seriestype_supported(:image)
+        seriestype := :image
+        yflip --> true
+        SliceIt, x, y, Surface(mat)
+    else
+        seriestype := :heatmap
+        yflip --> true
+        cbar --> false
+        fillcolor --> ColorGradient([:black, :white])
+        SliceIt, x, y, Surface(convert(Matrix{Float64}, mat))
+    end
+end
+
+# # images - colors
+
+@recipe function f(x::AVec, y::AVec, mat::AMat{T}) where T<:Colorant
+    if is_seriestype_supported(:image)
+        seriestype := :image
+        yflip --> true
+        SliceIt, x, y, Surface(mat)
+    else
+        seriestype := :heatmap
+        yflip --> true
+        cbar --> false
+        z, plotattributes[:fillcolor] = replace_image_with_heatmap(mat)
+        SliceIt, x, y, Surface(z)
+    end
+end
+
+#
+#
+# # --------------------------------------------------------------------
+# # Parametric functions
+# # --------------------------------------------------------------------
+
+#
+# # special handling... xmin/xmax with parametric function(s)
+@recipe function f(f::Function, xmin::Number, xmax::Number)
+    xscale, yscale = [get(plotattributes, sym, :identity) for sym=(:xscale,:yscale)]
+    xs = _scaled_adapted_grid(f, xscale, yscale, xmin, xmax)
+    xs, f
+end
+@recipe function f(fs::AbstractArray{F}, xmin::Number, xmax::Number) where F<:Function
+    xscale, yscale = [get(plotattributes, sym, :identity) for sym=(:xscale,:yscale)]
+    xs = Any[_scaled_adapted_grid(f, xscale, yscale, xmin, xmax) for f in fs]
+    xs, fs
+end
+@recipe f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, u::AVec) where {F<:Function,G<:Function}  = mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u)
+@recipe f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, umin::Number, umax::Number, n = 200) where {F<:Function,G<:Function} = fx, fy, range(umin, stop = umax, length = n)
+
+function _scaled_adapted_grid(f, xscale, yscale, xmin, xmax)
+    (xf, xinv), (yf, yinv) =  ((scalefunc(s),invscalefunc(s)) for s in (xscale,yscale))
+    xinv.(adapted_grid(yf∘f∘xinv, xf.((xmin, xmax))))
+end
+
+#
+# # special handling... 3D parametric function(s)
+@recipe function f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, fz::FuncOrFuncs{H}, u::AVec) where {F<:Function,G<:Function,H<:Function}
+    mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u), mapFuncOrFuncs(fz, u)
+end
+@recipe function f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, fz::FuncOrFuncs{H}, umin::Number, umax::Number, numPoints = 200) where {F<:Function,G<:Function,H<:Function}
+    fx, fy, fz, range(umin, stop = umax, length = numPoints)
+end
+
+#
+#
+# # --------------------------------------------------------------------
+# # Lists of tuples and GeometryTypes.Points
+# # --------------------------------------------------------------------
+#
+
+@recipe f(v::AVec{<:Tuple})               = unzip(v)
+@recipe f(v::AVec{<:GeometryTypes.Point}) = unzip(v)
+@recipe f(tup::Tuple)             = [tup]
+@recipe f(p::GeometryTypes.Point) = [p]
+
+# Special case for 4-tuples in :ohlc series
+@recipe f(xyuv::AVec{<:Tuple{R1,R2,R3,R4}}) where {R1,R2,R3,R4} = get(plotattributes,:seriestype,:path)==:ohlc ? OHLC[OHLC(t...) for t in xyuv] : unzip(xyuv)
+
+#
+# # --------------------------------------------------------------------
+# # handle grouping
+# # --------------------------------------------------------------------
+
+# @recipe function f(groupby::GroupBy, args...)
+#     for (i,glab) in enumerate(groupby.groupLabels)
+#         # create a new series, with the label of the group, and an idxfilter (to be applied in slice_and_dice)
+#         # TODO: use @series instead
+#         @show i, glab, groupby.groupIds[i]
+#         di = copy(plotattributes)
+#         get!(di, :label, string(glab))
+#         get!(di, :idxfilter, groupby.groupIds[i])
+#         push!(series_list, RecipeData(di, args))
+#     end
+#     nothing
+# end
+
+splittable_kw(key, val, lengthGroup) = false
+splittable_kw(key, val::AbstractArray, lengthGroup) = !(key in (:group, :color_palette)) && size(val,1) == lengthGroup
+splittable_kw(key, val::Tuple, lengthGroup) = all(splittable_kw.(key, val, lengthGroup))
+splittable_kw(key, val::SeriesAnnotations, lengthGroup) = splittable_kw(key, val.strs, lengthGroup)
+
+split_kw(key, val::AbstractArray, indices) = val[indices, fill(Colon(), ndims(val)-1)...]
+split_kw(key, val::Tuple, indices) = Tuple(split_kw(key, v, indices) for v in val)
+function split_kw(key, val::SeriesAnnotations, indices)
+    split_strs = split_kw(key, val.strs, indices)
+    return SeriesAnnotations(split_strs, val.font, val.baseshape, val.scalefactor)
+end
+
+function groupedvec2mat(x_ind, x, y::AbstractArray, groupby, def_val = y[1])
+    y_mat = Array{promote_type(eltype(y), typeof(def_val))}(undef, length(keys(x_ind)), length(groupby.groupLabels))
+    fill!(y_mat, def_val)
+    for i in 1:length(groupby.groupLabels)
+        xi = x[groupby.groupIds[i]]
+        yi = y[groupby.groupIds[i]]
+        y_mat[getindex.(Ref(x_ind), xi), i] = yi
+    end
+    return y_mat
+end
+
+groupedvec2mat(x_ind, x, y::Tuple, groupby) = Tuple(groupedvec2mat(x_ind, x, v, groupby) for v in y)
+
+group_as_matrix(t) = false
+
+# split the group into 1 series per group, and set the label and idxfilter for each
+@recipe function f(groupby::GroupBy, args...)
+    lengthGroup = maximum(union(groupby.groupIds...))
+    if !(group_as_matrix(args[1]))
+        for (i,glab) in enumerate(groupby.groupLabels)
+            @series begin
+                label     --> string(glab)
+                idxfilter --> groupby.groupIds[i]
+                for (key,val) in plotattributes
+                    if splittable_kw(key, val, lengthGroup)
+                        :($key) := split_kw(key, val, groupby.groupIds[i])
+                    end
+                end
+                args
+            end
+        end
+    else
+        g = args[1]
+        if length(g.args) == 1
+            x = zeros(Int, lengthGroup)
+            for indexes in groupby.groupIds
+                x[indexes] = 1:length(indexes)
+            end
+            last_args = g.args
+        else
+            x = g.args[1]
+            last_args = g.args[2:end]
+        end
+        x_u = unique(sort(x))
+        x_ind = Dict(zip(x_u, 1:length(x_u)))
+        for (key,val) in plotattributes
+            if splittable_kw(key, val, lengthGroup)
+                :($key) := groupedvec2mat(x_ind, x, val, groupby)
+            end
+        end
+        label --> reshape(groupby.groupLabels, 1, :)
+        typeof(g)((x_u, (groupedvec2mat(x_ind, x, arg, groupby, NaN) for arg in last_args)...))
+    end
+end

src/shorthands.jl

@@ -1,5 +1,3 @@
-@nospecialize
-
 """
     scatter(x,y)
     scatter!(x,y)
@@ -57,7 +55,6 @@ Plot a histogram.
 # Example
 ```julia-repl
 julia> histogram([1,2,1,1,4,3,8],bins=0:8)
-julia> histogram([1,2,1,1,4,3,8],bins=0:8,weights=weights([4,7,3,9,12,2,6]))
 ```
 """
 @shorthands histogram
@@ -72,7 +69,7 @@ Make a histogram bar plot. See `histogram`.
 
 """
     stephist(x)
-    stephist!(x)
+    stephist(x)
 
 Make a histogram step plot (bin counts are represented using horizontal lines
 instead of bars). See `histogram`.
@@ -241,6 +238,7 @@ julia> ohlc(y)
 """
 @shorthands ohlc
 
+
 """
     contour(x,y,z)
     contour!(x,y,z)
@@ -253,7 +251,7 @@ Draw contour lines of the `Surface` z.
 
 # Example
 ```julia-repl
-julia> x = y = range(-20, stop = 20, length = 100)
+julia> x = y = range(-20, 20, length = 100)
 julia> contour(x, y, (x, y) -> x^2 + y^2)
 ```
 """
@@ -262,6 +260,7 @@ julia> contour(x, y, (x, y) -> x^2 + y^2)
 "An alias for `contour` with fill = true."
 @shorthands contourf
 
+
 @shorthands contour3d
 
 """
@@ -272,8 +271,7 @@ Draw a 3D surface plot.
 
 # Example
 ```julia-repl
-julia> using LinearAlgebra
+julia> x = y = range(-3, 3, length = 100)
-julia> x = y = range(-3, stop = 3, length = 100)
 julia> surface(x, y, (x, y) -> sinc(norm([x, y])))
 ```
 """
@@ -319,27 +317,6 @@ julia> scatter3d([0,1,2,3],[0,1,4,9],[0,1,8,27])
 """
 @shorthands scatter3d
 
-"""
-    mesh3d(x,y,z)
-    mesh3d(x,y,z; connections)
-
-Plot a 3d mesh. On Plotly the triangles can be specified using the connections argument.
-
-# Example
-```Julia
-x=[0, 1, 2, 0]
-y=[0, 0, 1, 2]
-z=[0, 2, 0, 1]
-
-i=[0, 0, 0, 1]
-j=[1, 2, 3, 2]
-k=[2, 3, 1, 3]
-
-plot(x,y,z,seriestype=:mesh3d;connections=(i,j,k))
-```
-"""
-@shorthands mesh3d
-
 """
     boxplot(x, y)
     boxplot!(x, y)
@@ -348,10 +325,10 @@ Make a box and whisker plot.
 
 # Keyword arguments
 - `notch`: Bool. Notch the box plot? (false)
-- `whisker_range`: Real. Whiskers extend `whisker_range`*IQR below the first quartile
+- `range`: Real. Values more than range*IQR below the first quartile
-           and above the third quartile. Values outside this range are shown as outliers (1.5)
+           or above the third quartile are shown as outliers (1.5)
 - `outliers`: Bool. Show outliers? (true)
-- `whisker_width`: Real or Symbol. Length of whiskers; the options are `:match` to match the box width, `:half`, or a number to indicate the total length. (:half)
+- `whisker_width`: Real or Symbol. Length of whiskers (:match)
 
 # Example
 ```julia-repl
@@ -403,44 +380,46 @@ julia> curves([1,2,3,4],[1,1,2,4])
 @shorthands curves
 
 "Plot a pie diagram"
-@shorthands pie
+pie(args...; kw...)        = plot(args...; kw...,  seriestype = :pie, aspect_ratio = :equal, grid=false, xticks=nothing, yticks=nothing)
+pie!(args...; kw...)       = plot!(args...; kw..., seriestype = :pie, aspect_ratio = :equal, grid=false, xticks=nothing, yticks=nothing)
 
 "Plot with seriestype :path3d"
-plot3d(args...; kw...) = plot(args...; kw..., seriestype = :path3d)
+plot3d(args...; kw...)     = plot(args...; kw...,  seriestype = :path3d)
-plot3d!(args...; kw...) = plot!(args...; kw..., seriestype = :path3d)
+plot3d!(args...; kw...)    = plot!(args...; kw..., seriestype = :path3d)
 
 "Add title to an existing plot"
-title!(s::AbstractString; kw...) = plot!(; title = s, kw...)
+title!(s::AbstractString; kw...)                 = plot!(; title = s, kw...)
 
 "Add xlabel to an existing plot"
-xlabel!(s::AbstractString; kw...) = plot!(; xlabel = s, kw...)
+xlabel!(s::AbstractString; kw...)                = plot!(; xlabel = s, kw...)
 
 "Add ylabel to an existing plot"
-ylabel!(s::AbstractString; kw...) = plot!(; ylabel = s, kw...)
+ylabel!(s::AbstractString; kw...)                = plot!(; ylabel = s, kw...)
 
 "Set xlims for an existing plot"
-xlims!(lims::Tuple; kw...) = plot!(; xlims = lims, kw...)
+xlims!(lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real} = plot!(; xlims = lims, kw...)
 
 "Set ylims for an existing plot"
-ylims!(lims::Tuple; kw...) = plot!(; ylims = lims, kw...)
+ylims!(lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real} = plot!(; ylims = lims, kw...)
 
 "Set zlims for an existing plot"
-zlims!(lims::Tuple; kw...) = plot!(; zlims = lims, kw...)
+zlims!(lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real} = plot!(; zlims = lims, kw...)
+
+xlims!(xmin::Real, xmax::Real; kw...)                     = plot!(; xlims = (xmin,xmax), kw...)
+ylims!(ymin::Real, ymax::Real; kw...)                     = plot!(; ylims = (ymin,ymax), kw...)
+zlims!(zmin::Real, zmax::Real; kw...)                     = plot!(; zlims = (zmin,zmax), kw...)
 
-xlims!(xmin::Real, xmax::Real; kw...) = plot!(; xlims = (xmin, xmax), kw...)
-ylims!(ymin::Real, ymax::Real; kw...) = plot!(; ylims = (ymin, ymax), kw...)
-zlims!(zmin::Real, zmax::Real; kw...) = plot!(; zlims = (zmin, zmax), kw...)
 
 "Set xticks for an existing plot"
-xticks!(v::TicksArgs; kw...) = plot!(; xticks = v, kw...)
+xticks!(v::TicksArgs; kw...) where {T<:Real}                       = plot!(; xticks = v, kw...)
 
 "Set yticks for an existing plot"
-yticks!(v::TicksArgs; kw...) = plot!(; yticks = v, kw...)
+yticks!(v::TicksArgs; kw...) where {T<:Real}                       = plot!(; yticks = v, kw...)
 
-xticks!(ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString} =
+xticks!(
-    plot!(; xticks = (ticks, labels), kw...)
+ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString}     = plot!(; xticks = (ticks,labels), kw...)
-yticks!(ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString} =
+yticks!(
-    plot!(; yticks = (ticks, labels), kw...)
+ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString}     = plot!(; yticks = (ticks,labels), kw...)
 
 """
     annotate!(anns...)
@@ -449,56 +428,28 @@ Add annotations to an existing plot.
 
 # Arguments
 
-- `anns`: An `AbstractVector` of tuples of the form `(x,y,text)`. The `text` object
+- `anns`: An `AbstractVector` of tuples of the form (x,y,text). The text object
-          can be a `String`, `PlotText` PlotText (created with `text(args...)`),
+          can be an String or PlotText
-          or a tuple of arguments to `text` (e.g., `("Label", 8, :red, :top)`).
 
 # Example
 ```julia-repl
 julia> plot(1:10)
 julia> annotate!([(7,3,"(7,3)"),(3,7,text("hey", 14, :left, :top, :green))])
-julia> annotate!([(4, 4, ("More text", 8, 45.0, :bottom, :red))])
 ```
 """
-annotate!(anns...; kw...) = plot!(; annotation = anns, kw...)
+annotate!(anns...; kw...)                                        = plot!(; annotation = anns, kw...)
-annotate!(anns::Tuple...; kw...)      = plot!(; annotation = collect(anns), kw...)
+annotate!(anns::AVec{T}; kw...) where {T<:Tuple}                 = plot!(; annotation = anns, kw...)
-annotate!(anns::AVec{<:Tuple}; kw...) = plot!(; annotation = anns, kw...)
 
 "Flip the current plots' x axis"
-xflip!(flip::Bool = true; kw...) = plot!(; xflip = flip, kw...)
+xflip!(flip::Bool = true; kw...)                          = plot!(; xflip = flip, kw...)
 
 "Flip the current plots' y axis"
-yflip!(flip::Bool = true; kw...) = plot!(; yflip = flip, kw...)
+yflip!(flip::Bool = true; kw...)                          = plot!(; yflip = flip, kw...)
 
 "Specify x axis attributes for an existing plot"
-xaxis!(args...; kw...) = plot!(; xaxis = args, kw...)
+xaxis!(args...; kw...)                                    = plot!(; xaxis = args, kw...)
-xgrid!(args...; kw...) = plot!(; xgrid = args, kw...)
 
 "Specify y axis attributes for an existing plot"
-yaxis!(args...; kw...) = plot!(; yaxis = args, kw...)
+yaxis!(args...; kw...)                                    = plot!(; yaxis = args, kw...)
-ygrid!(args...; kw...) = plot!(; ygrid = args, kw...)
+xgrid!(args...; kw...)                                    = plot!(; xgrid = args, kw...)
-
+ygrid!(args...; kw...)                                    = plot!(; ygrid = args, kw...)
-@doc """
-   abline!([plot,] a, b; kwargs...)
-
-Adds ax+b... straight line over the current plot, without changing the axis limits
-""" abline!
-
-@doc """
-    areaplot([x,] y)
-    areaplot!([x,] y)
-
-Draw a stacked area plot of the matrix y.
-# Examples
-```julia-repl
-julia> areaplot(1:3, [1 2 3; 7 8 9; 4 5 6], seriescolor = [:red :green :blue], fillalpha = [0.2 0.3 0.4])
-```
-""" areaplot
-
-@doc """
-    lens!([plot,] x, y, inset = (sp_index, bbox(x1, x2, y1, y2)))
-
-Magnify a region of a plot given by `x` and `y`.
-`sp_index` is the index of the subplot and `x1`, `x2`, `y1` and `y2` should be between `0` and `1`.
-""" lens!
-@specialize

src/subplots.jl

@@ -1,14 +1,15 @@
 
-function Subplot(::T; parent = RootLayout()) where {T<:AbstractBackend}
+
+function Subplot(::T; parent = RootLayout()) where T<:AbstractBackend
     Subplot{T}(
         parent,
         Series[],
         (20mm, 5mm, 2mm, 10mm),
         defaultbox,
         defaultbox,
-        DefaultsDict(KW(), _subplot_defaults),
+        KW(),
-        nothing,
         nothing,
+        nothing
     )
 end
 
@@ -20,7 +21,8 @@ Return the bounding box of a subplot
 plotarea(sp::Subplot) = sp.plotarea
 plotarea!(sp::Subplot, bbox::BoundingBox) = (sp.plotarea = bbox)
 
-Base.size(sp::Subplot) = (1, 1)
+
+Base.size(sp::Subplot) = (1,1)
 Base.length(sp::Subplot) = 1
 Base.getindex(sp::Subplot, r::Int, c::Int) = sp
 
@@ -40,24 +42,12 @@ get_subplot_index(plt::Plot, sp::Subplot) = findfirst(x -> x === sp, plt.subplot
 series_list(sp::Subplot) = sp.series_list # filter(series -> series.plotattributes[:subplot] === sp, sp.plt.series_list)
 
 function should_add_to_legend(series::Series)
-    series.plotattributes[:primary] &&
+    series.plotattributes[:primary] && series.plotattributes[:label] != "" &&
-        series.plotattributes[:label] != "" &&
+        !(series.plotattributes[:seriestype] in (
-        !(
+            :hexbin,:bins2d,:histogram2d,:hline,:vline,
-            series.plotattributes[:seriestype] in (
+            :contour,:contourf,:contour3d,:surface,:wireframe,
-                :hexbin,
+            :heatmap, :pie, :image
-                :bins2d,
+        ))
-                :histogram2d,
-                :hline,
-                :vline,
-                :contour,
-                :contourf,
-                :contour3d,
-                :surface,
-                :wireframe,
-                :heatmap,
-                :image,
-            )
-        )
 end
 
 # ----------------------------------------------------------------------

src/themes.jl

@@ -4,25 +4,55 @@
 Specify the colour theme for plots.
 """
 function theme(s::Symbol; kw...)
-    defaults = copy(PlotThemes._themes[s].defaults)
+    defaults = _get_defaults(s)
     _theme(s, defaults; kw...)
 end
 
-function _theme(s::Symbol, defaults::AKW; kw...)
+function _get_defaults(s::Symbol)
+    thm = PlotThemes._themes[s]
+    if :defaults in fieldnames(typeof(thm))
+        return thm.defaults
+    else # old PlotTheme type
+        defaults = KW(
+            :bg       => thm.bg_secondary,
+            :bginside => thm.bg_primary,
+            :fg       => thm.lines,
+            :fgtext   => thm.text,
+            :fgguide  => thm.text,
+            :fglegend => thm.text,
+            :palette  => thm.palette,
+        )
+        if thm.gradient !== nothing
+            push!(defaults, :gradient => thm.gradient)
+        end
+        return defaults
+    end
+end
+
+function _theme(s::Symbol, defaults::KW; kw...)
     # Reset to defaults to overwrite active theme
     reset_defaults()
 
     # Set the theme's gradient as default
-    if haskey(defaults, :colorgradient)
+    if haskey(defaults, :gradient)
-        PlotUtils.default_cgrad(pop!(defaults, :colorgradient))
+        PlotUtils.clibrary(:misc)
+        PlotUtils.default_cgrad(default = :sequential, sequential = PlotThemes.gradient_name(s))
     else
-        PlotUtils.default_cgrad(:default)
+        PlotUtils.clibrary(:Plots)
+        PlotUtils.default_cgrad(default = :sequential, sequential = :inferno)
     end
 
     # maybe overwrite the theme's gradient
     kw = KW(kw)
-    if haskey(kw, :colorgradient)
+    if haskey(kw, :gradient)
-        PlotUtils.default_cgrad(pop!(kw, :colorgradient))
+        kwgrad = pop!(kw, :gradient)
+        for clib in clibraries()
+            if kwgrad in cgradients(clib)
+                PlotUtils.clibrary(clib)
+                PlotUtils.default_cgrad(default = :sequential, sequential = kwgrad)
+                break
+            end
+        end
     end
 
     # Set the theme's defaults
@@ -34,26 +64,29 @@ end
 
 @userplot ShowTheme
 
-_color_functions =
+_color_functions = KW(
-    KW(:protanopic => protanopic, :deuteranopic => deuteranopic, :tritanopic => tritanopic)
+    :protanopic => protanopic,
+    :deuteranopic => deuteranopic,
+    :tritanopic => tritanopic,
+)
 _get_showtheme_args(thm::Symbol) = thm, identity
 _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func, identity)
 
 @recipe function showtheme(st::ShowTheme)
     thm, cfunc = _get_showtheme_args(st.args...)
-    defaults = PlotThemes._themes[thm].defaults
+    defaults = _get_defaults(thm)
 
     # get the gradient
-    gradient_colors = color_list(cgrad(get(defaults, :colorgradient, :default)))
+    gradient_colors = get(defaults, :gradient, cgrad(:inferno).colors)
-    colorgradient = cgrad(cfunc.(RGB.(gradient_colors)))
+    gradient = cgrad(cfunc.(RGB.(gradient_colors)))
 
     # get the palette
-    cp = color_list(palette(get(defaults, :palette, :default)))
+    palette = get(defaults, :palette, get_color_palette(:auto, plot_color(:white), 17))
-    cp = cfunc.(RGB.(cp))
+    palette = cfunc.(RGB.(palette))
 
     # apply the theme
     for k in keys(defaults)
-        k in (:colorgradient, :palette) && continue
+        k in (:gradient, :palette) && continue
         def = defaults[k]
         arg = get(_keyAliases, k, k)
         plotattributes[arg] = if typeof(def) <: Colorant
@@ -76,7 +109,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
     for j in 1:4
         @series begin
             subplot := 1
-            color_palette := cp
+            palette := palette
             seriestype := :path
             cumsum(randn(50))
         end
@@ -84,7 +117,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
         @series begin
             subplot := 2
             seriestype := :scatter
-            color_palette := cp
+            palette := palette
             marker := (:circle, :diamond, :star5, :square)[j]
             randn(10), randn(10)
         end
@@ -93,7 +126,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
     @series begin
         subplot := 3
         seriestype := :histogram
-        color_palette := cp
+        palette := palette
         randn(1000) .+ (0:2:4)'
     end
 
@@ -106,32 +139,30 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
     @series begin
         subplot := 4
         seriestype := :heatmap
-        seriescolor := colorgradient
+        seriescolor := gradient
-        xticks := ((-2π):(2π):(2π), string.(-2:2:2, "π"))
+        ticks := -5:5:5
-        yticks := ((-2π):(2π):(2π), string.(-2:2:2, "π"))
         x, y, z
     end
 
     @series begin
         subplot := 5
         seriestype := :surface
-        seriescolor := colorgradient
+        seriescolor := gradient
-        xticks := ((-2π):(2π):(2π), string.(-2:2:2, "π"))
-        yticks := ((-2π):(2π):(2π), string.(-2:2:2, "π"))
         x, y, z
     end
 
     n = 100
     ts = range(0, stop = 10π, length = n)
-    x = (0.1ts) .* cos.(ts)
+    x = ts .* cos.(ts)
     y = (0.1ts) .* sin.(ts)
     z = 1:n
 
     @series begin
         subplot := 6
-        seriescolor := colorgradient
+        seriescolor := gradient
         linewidth := 3
         line_z := z
         x, y, z
     end
+
 end

src/types.jl

@@ -5,9 +5,7 @@
 const AVec = AbstractVector
 const AMat = AbstractMatrix
 const KW = Dict{Symbol,Any}
-const AKW = AbstractDict{Symbol,Any}
+const TicksArgs = Union{AVec{T}, Tuple{AVec{T}, AVec{S}}, Symbol} where {T<:Real, S<:AbstractString}
-const TicksArgs =
-    Union{AVec{T},Tuple{AVec{T},AVec{S}},Symbol} where {T<:Real,S<:AbstractString}
 
 struct PlotsDisplay <: AbstractDisplay end
 
@@ -19,10 +17,11 @@ end
 wrap(obj::T) where {T} = InputWrapper{T}(obj)
 Base.isempty(wrapper::InputWrapper) = false
 
+
 # -----------------------------------------------------------
 
 mutable struct Series
-    plotattributes::DefaultsDict
+    plotattributes::KW
 end
 
 attr(series::Series, k::Symbol) = series.plotattributes[k]
@@ -32,12 +31,12 @@ attr!(series::Series, v, k::Symbol) = (series.plotattributes[k] = v)
 
 # a single subplot
 mutable struct Subplot{T<:AbstractBackend} <: AbstractLayout
-    parent::AbstractLayout
+    parent
     series_list::Vector{Series}  # arguments for each series
-    minpad::Tuple # leftpad, toppad, rightpad, bottompad
+    minpad::Tuple{AbsoluteLength,AbsoluteLength,AbsoluteLength,AbsoluteLength} # leftpad, toppad, rightpad, bottompad
-    bbox::BoundingBox  # the canvas area which is available to this subplot
+    bbox#::BoundingBox  # the canvas area which is available to this subplot
-    plotarea::BoundingBox  # the part where the data goes
+    plotarea#::BoundingBox  # the part where the data goes
-    attr::DefaultsDict  # args specific to this subplot
+    attr::KW  # args specific to this subplot
     o  # can store backend-specific data... like a pyplot ax
     plt  # the enclosing Plot object (can't give it a type because of no forward declarations)
 end
@@ -49,7 +48,7 @@ Base.show(io::IO, sp::Subplot) = print(io, "Subplot{$(sp[:subplot_index])}")
 # simple wrapper around a KW so we can hold all attributes pertaining to the axis in one place
 mutable struct Axis
     sps::Vector{Subplot}
-    plotattributes::DefaultsDict
+    plotattributes::KW
 end
 
 mutable struct Extrema
@@ -60,36 +59,25 @@ Extrema() = Extrema(Inf, -Inf)
 
 # -----------------------------------------------------------
 
-const SubplotMap = Dict{Any,Subplot}
-
-# -----------------------------------------------------------
 
 mutable struct Plot{T<:AbstractBackend} <: AbstractPlot{T}
     backend::T                   # the backend type
     n::Int                       # number of series
-    attr::DefaultsDict            # arguments for the whole plot
+    attr::KW                     # arguments for the whole plot
+    user_attr::KW                # raw arg inputs (after aliases).  these are used as the input dict in `_plot!`
     series_list::Vector{Series}  # arguments for each series
     o                            # the backend's plot object
-    subplots::Vector{Subplot}
+    subplots::Vector{Subplot{T}}
-    spmap::SubplotMap            # provide any label as a map to a subplot
+    spmap::KW            # provide any label as a map to a subplot
-    layout::AbstractLayout
+    layout
-    inset_subplots::Vector{Subplot}  # list of inset subplots
+    inset_subplots::Vector{Subplot{T}}  # list of inset subplots
     init::Bool
 end
 
-function Plot()
+function Plot(_backend = CURRENT_BACKEND)
-    Plot(
+    Plot(_backend.pkg, 0, KW(), KW(), Series[], nothing,
-        backend(),
+         Subplot{typeof(_backend.pkg)}[], KW(), EmptyLayout(),
-        0,
+         Subplot{typeof(_backend.pkg)}[], false)
-        DefaultsDict(KW(), _plot_defaults),
-        Series[],
-        nothing,
-        Subplot[],
-        SubplotMap(),
-        EmptyLayout(),
-        Subplot[],
-        false,
-    )
 end
 
 # -----------------------------------------------------------------------
@@ -98,7 +86,7 @@ Base.getindex(plt::Plot, i::Integer) = plt.subplots[i]
 Base.length(plt::Plot) = length(plt.subplots)
 Base.lastindex(plt::Plot) = length(plt)
 
-Base.getindex(plt::Plot, r::Integer, c::Integer) = plt.layout[r, c]
+Base.getindex(plt::Plot, r::Integer, c::Integer) = plt.layout[r,c]
 Base.size(plt::Plot) = size(plt.layout)
 Base.size(plt::Plot, i::Integer) = size(plt.layout)[i]
 Base.ndims(plt::Plot) = 2

test/imgcomp.jl

@@ -1,71 +1,105 @@
 import Plots._current_plots_version
 
-# replace `f(args...)` with `f(rng, args...)` for `f ∈ (rand, randn)`
+# Taken from MakieGallery
-function replace_rand!(ex) end
+"""
-function replace_rand!(ex::Expr)
+Downloads the reference images from ReferenceImages for a specific version
-    for arg in ex.args
+"""
-        replace_rand!(arg)
+function download_reference(version = v"0.0.1")
+    download_dir = abspath(@__DIR__, "reference_images")
+    isdir(download_dir) || mkpath(download_dir)
+    tarfile = joinpath(download_dir, "reference_images.zip")
+    url = "https://github.com/JuliaPlots/PlotReferenceImages.jl/archive/v$(version).tar.gz"
+    refpath = joinpath(download_dir, "PlotReferenceImages.jl-$(version)")
+    if !isdir(refpath) # if not yet downloaded
+        @info "downloading reference images for version $version"
+        download(url, tarfile)
+        BinaryProvider.unpack(tarfile, download_dir)
+        # check again after download
+        if !isdir(refpath)
+            error("Something went wrong while downloading reference images. Plots can't be compared to references")
+        else
+            rm(tarfile, force = true)
+        end
+    else
+        @info "using reference images for version $version (already downloaded)"
     end
-    if ex.head === :call && ex.args[1] ∈ (:rand, :randn, :(Plots.fakedata))
+    refpath
-        pushfirst!(ex.args, ex.args[1])
-        ex.args[2] = :rng
-    end
-end
-function fix_rand!(ex)
-    replace_rand!(ex)
 end
 
-function image_comparison_tests(
+const ref_image_dir = download_reference()
-    pkg::Symbol,
+
-    idx::Int;
+function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = isinteractive(), sigma = [1,1], tol = 1e-2)
-    debug = false,
-    popup = !is_ci(),
-    sigma = [1, 1],
-    tol = 1e-2,
-)
     Plots._debugMode.on = debug
     example = Plots._examples[idx]
     Plots.theme(:default)
     @info("Testing plot: $pkg:$idx:$(example.header)")
     backend(pkg)
     backend()
-    default(size = (500, 300))
+    default(size=(500,300))
+    # ensure consistent results
+    Random.seed!(1234)
 
+    # reference image directory setup
+    refdir = joinpath(ref_image_dir, "Plots", string(pkg))
     fn = "ref$idx.png"
-    reffn = reference_file(pkg, idx, _current_plots_version)
+
-    newfn = joinpath(reference_path(pkg, _current_plots_version), fn)
+    # firgure out version info
-    @debug example.exprs
+    vns = filter(x->x[1] != '.', readdir(refdir))
+    versions = sort(VersionNumber.(vns), rev = true)
+    versions = filter(v -> v <= _current_plots_version, versions)
+    # @show refdir fn versions
+
+    newdir = joinpath(refdir, string(_current_plots_version))
+    newfn = joinpath(newdir, fn)
+
+    # figure out which reference file we should compare to, by finding the highest versioned file
+    reffn = nothing
+    for v in versions
+        tmpfn = joinpath(refdir, string(v), fn)
+        if isfile(tmpfn)
+            reffn = tmpfn
+            break
+        end
+    end
+
+    # now we have the fn (if any)... do the comparison
+    # @show reffn
+    if reffn === nothing
+        reffn = newfn
+    end
+    # @show reffn
+    # return
 
     # test function
     func = (fn, idx) -> begin
-        eval(:(rng = StableRNG(PLOTS_SEED)))
+        expr = Expr(:block)
-        for the_expr in example.exprs
+        append!(expr.args, example.exprs)
-            expr = Expr(:block)
+        eval(expr)
-            push!(expr.args, the_expr)
-            fix_rand!(expr)
-            eval(expr)
-        end
         png(fn)
     end
 
+    # try
+    #     run(`mkdir -p $newdir`)
+    # catch err
+    #     display(err)
+    # end
+    # # reffn = joinpath(refdir, "ref$idx.png")
+
     # the test
     vtest = VisualTest(func, reffn, idx)
-    test_images(vtest, popup = popup, sigma = sigma, tol = tol, newfn = newfn)
+    test_images(vtest, popup=popup, sigma=sigma, tol=tol, newfn = newfn)
 end
 
-function image_comparison_facts(
+function image_comparison_facts(pkg::Symbol;
-    pkg::Symbol;
+                                skip = [],      # skip these examples (int index)
-    skip = [],      # skip these examples (int index)
+                                only = nothing, # limit to these examples (int index)
-    only = nothing, # limit to these examples (int index)
+                                debug = false,  # print debug information?
-    debug = false,  # print debug information?
+                                sigma = [1,1],  # number of pixels to "blur"
-    sigma = [1, 1],  # number of pixels to "blur"
+                                tol = 1e-2)     # acceptable error (percent)
-    tol = 1e-2,
+  for i in 1:length(Plots._examples)
-)     # acceptable error (percent)
+    i in skip && continue
-    for i in 1:length(Plots._examples)
+    if only === nothing || i in only
-        i in skip && continue
+      @test image_comparison_tests(pkg, i, debug=debug, sigma=sigma, tol=tol) |> success == true
-        if only === nothing || i in only
-            @test image_comparison_tests(pkg, i, debug = debug, sigma = sigma, tol = tol) |>
-                  success == true
-        end
     end
+  end
 end

test/integration_dates.jl

@@ -1,60 +0,0 @@
-using Plots, Test, Dates
-
-@testset "Limits" begin
-    y = [1.0 * i * i for i in 1:10]
-    x = [Date(2019, 11, i) for i in 1:10]
-
-    rx = [x[3], x[5]]
-
-    p = plot(x, y, widen = false)
-    vspan!(p, rx, label = "", alpha = 0.2)
-
-    ref_ylims = (y[1], y[end])
-    ref_xlims = (x[1].instant.periods.value, x[end].instant.periods.value)
-    @test Plots.ylims(p) == ref_ylims
-    @test Plots.xlims(p) == ref_xlims
-    #@static if (haskey(ENV, "APPVEYOR") || haskey(ENV, "CI"))
-    @static if haskey(ENV, "APPVEYOR")
-        @info "Skipping display tests on AppVeyor"
-    else
-        @test isa(display(p), Nothing) == true
-        closeall()
-    end
-end # testset
-
-@testset "Date xlims" begin
-    y = [1.0 * i * i for i in 1:10]
-    x = [Date(2019, 11, i) for i in 1:10]
-    span = (Date(2019, 10, 31), Date(2019, 11, 11))
-
-    ref_xlims = map(date -> date.instant.periods.value, span)
-
-    p = plot(x, y, xlims = span, widen = false)
-
-    @test Plots.xlims(p) == ref_xlims
-    #@static if (haskey(ENV, "APPVEYOR") || haskey(ENV, "CI"))
-    @static if haskey(ENV, "APPVEYOR")
-        @info "Skipping display tests on AppVeyor"
-    else
-        @test isa(display(p), Nothing) == true
-        closeall()
-    end
-end # testset
-
-@testset "DateTime xlims" begin
-    y = [1.0 * i * i for i in 1:10]
-    x = [DateTime(2019, 11, i, 11) for i in 1:10]
-    span = (DateTime(2019, 10, 31, 11, 59, 59), DateTime(2019, 11, 11, 12, 01, 15))
-
-    ref_xlims = map(date -> date.instant.periods.value, span)
-
-    p = plot(x, y, xlims = span, widen = false)
-    @test Plots.xlims(p) == ref_xlims
-    #@static if (haskey(ENV, "APPVEYOR") || haskey(ENV, "CI"))
-    @static if haskey(ENV, "APPVEYOR")
-        @info "Skipping display tests on AppVeyor"
-    else
-        @test isa(display(p), Nothing) == true
-        closeall()
-    end
-end # testset

test/runtests.jl

@@ -1,155 +1,40 @@
-using Plots: guidefont, series_annotations, PLOTS_SEED
-
 using VisualRegressionTests
-using RecipesBase
-using StableRNGs
-using TestImages
-using LibGit2
-using Random
-using FileIO
 using Plots
-using Dates
+using Random
-using JSON
+using BinaryProvider
 using Test
-using Gtk
+using FileIO
+using GeometryTypes
 
-import GeometryBasics
+include("imgcomp.jl")
-import ImageMagick
+# don't actually show the plots
+Random.seed!(1234)
+default(show=false, reuse=true)
+img_tol = isinteractive() ? 1e-2 : 10e-2
 
-@testset "Infrastructure" begin
+@testset "GR" begin
-    @test_nowarn JSON.Parser.parse(
+    ENV["PLOTS_TEST"] = "true"
-        String(read(joinpath(dirname(pathof(Plots)), "..", ".zenodo.json"))),
+    ENV["GKSwstype"] = "100"
-    )
+    @test gr() == Plots.GRBackend()
+    @test backend() == Plots.GRBackend()
+
+    @static if Sys.islinux()
+        image_comparison_facts(:gr, tol=img_tol, skip = [25, 30])
+    end
 end
 
-@testset "Plotly standalone" begin
-    @test_nowarn Plots._init_ijulia_plotting()
-    @test Plots.plotly_local_file_path[] === nothing
-    temp = Plots.use_local_dependencies[]
-    withenv("PLOTS_HOST_DEPENDENCY_LOCAL" => true) do
-        Plots.__init__()
-        @test Plots.plotly_local_file_path[] isa String
-        @test isfile(Plots.plotly_local_file_path[])
-        @test Plots.use_local_dependencies[] = true
-        @test_nowarn Plots._init_ijulia_plotting()
-    end
-    Plots.plotly_local_file_path[] = nothing
-    Plots.use_local_dependencies[] = temp
-end
 
-@testset "Utils" begin
+@testset "UnicodePlots" begin
-    zipped = (
+    @test unicodeplots() == Plots.UnicodePlotsBackend()
-        [(1, 2)],
+    @test backend() == Plots.UnicodePlotsBackend()
-        [("a", "b")],
-        [(1, "a"), (2, "b")],
-        [(1, 2), (3, 4)],
-        [(1, 2, 3), (3, 4, 5)],
-        [(1, 2, 3, 4), (3, 4, 5, 6)],
-        [(1, 2.0), (missing, missing)],
-        [(1, missing), (missing, "a")],
-        [(missing, missing)],
-        [(missing, missing, missing), ("a", "b", "c")],
-    )
-    for z in zipped
-        @test isequal(collect(zip(Plots.RecipesPipeline.unzip(z)...)), z)
-        @test isequal(
-            collect(zip(Plots.RecipesPipeline.unzip(GeometryBasics.Point.(z))...)),
-            z,
-        )
-    end
-    op1 = Plots.process_clims((1.0, 2.0))
-    op2 = Plots.process_clims((1, 2.0))
-    data = randn(100, 100)
-    @test op1(data) == op2(data)
-    @test Plots.process_clims(nothing) ==
-          Plots.process_clims(missing) ==
-          Plots.process_clims(:auto)
 
-    @test (==)(
+    # lets just make sure it runs without error
-        Plots.texmath2unicode(
+    p = plot(rand(10))
-            raw"Equation $y = \alpha \cdot x + \beta$ and eqn $y = \sin(x)^2$",
+    @test isa(p, Plots.Plot) == true
-        ),
+    @test isa(display(p), Nothing) == true
-        raw"Equation y = α ⋅ x + β and eqn y = sin(x)²",
+    p = bar(randn(10))
-    )
+    @test isa(p, Plots.Plot) == true
-
+    @test isa(display(p), Nothing) == true
-    @test Plots.isvector([1, 2])
-    @test !Plots.isvector(nothing)
-    @test Plots.ismatrix([1 2; 3 4])
-    @test !Plots.ismatrix(nothing)
-    @test Plots.isscalar(1.0)
-    @test !Plots.isscalar(nothing)
-    @test Plots.tovec([]) isa AbstractVector
-    @test Plots.tovec(nothing) isa AbstractVector
-    @test Plots.anynan(1, 3, (1, NaN, 3))
-    @test Plots.allnan(1, 2, (NaN, NaN, 1))
-    @test Plots.makevec([]) isa AbstractVector
-    @test Plots.makevec(1) isa AbstractVector
-    @test Plots.maketuple(1) == (1, 1)
-    @test Plots.maketuple((1, 1)) == (1, 1)
-    @test Plots.ok(1, 2)
-    @test !Plots.ok(1, 2, NaN)
-    @test Plots.ok((1, 2, 3))
-    @test !Plots.ok((1, 2, NaN))
-    @test Plots.nansplit([1, 2, NaN, 3, 4]) == [[1.0, 2.0], [3.0, 4.0]]
-    @test Plots.nanvcat([1, NaN]) |> length == 4
-
-    @test Plots.nop() === nothing
-    @test_throws ErrorException Plots.notimpl()
-
-    @test Plots.inch2px(1) isa AbstractFloat
-    @test Plots.px2inch(1) isa AbstractFloat
-    @test Plots.inch2mm(1) isa AbstractFloat
-    @test Plots.mm2inch(1) isa AbstractFloat
-    @test Plots.px2mm(1) isa AbstractFloat
-    @test Plots.mm2px(1) isa AbstractFloat
-
-    p = plot()
-    @test xlims() isa Tuple
-    @test ylims() isa Tuple
-    @test zlims() isa Tuple
-
-    Plots.makekw(foo = 1, bar = 2) isa Dict
-
-    @test_throws ErrorException Plots.inline()
-    @test_throws ErrorException Plots._do_plot_show(plot(), :inline)
-    @test_throws ErrorException Plots.dumpcallstack()
-
-    Plots.debugplots(true)
-    Plots.debugplots(false)
-    Plots.debugshow(devnull, nothing)
-    Plots.debugshow(devnull, [1])
-
-    p = plot(1)
-    push!(p, 1.5)
-    push!(p, 1, 1.5)
-    # append!(p, [1., 2.])
-    append!(p, 1, 2.5, 2.5)
-    push!(p, (1.5, 2.5))
-    push!(p, 1, (1.5, 2.5))
-    append!(p, (1.5, 2.5))
-    append!(p, 1, (1.5, 2.5))
-
-    p = plot([1, 2, 3], [4, 5, 6])
-    @test Plots.xmin(p) == 1
-    @test Plots.xmax(p) == 3
-    @test Plots.ignorenan_extrema(p) == (1, 3)
-
-    @test Plots.get_attr_symbol(:x, "lims") == :xlims
-    @test Plots.get_attr_symbol(:x, :lims) == :xlims
-
-    @testset "NaN-separated Segments" begin
-        segments(args...) = collect(iter_segments(args...))
-
-        nan10 = fill(NaN, 10)
-        @test segments(11:20) == [1:10]
-        @test segments([NaN]) == []
-        @test segments(nan10) == []
-        @test segments([nan10; 1:5]) == [11:15]
-        @test segments([1:5; nan10]) == [1:5]
-        @test segments([nan10; 1:5; nan10; 1:5; nan10]) == [11:15, 26:30]
-        @test segments([NaN; 1], 1:10) == [2:2, 4:4, 6:6, 8:8, 10:10]
-        @test segments([nan10; 1:15], [1:15; nan10]) == [11:15]
-    end
 end
 
 @testset "Axes" begin
@@ -158,326 +43,60 @@ end
     @test typeof(axis) == Plots.Axis
     @test Plots.discrete_value!(axis, "HI") == (0.5, 1)
     @test Plots.discrete_value!(axis, :yo) == (1.5, 2)
-    @test Plots.ignorenan_extrema(axis) == (0.5, 1.5)
+    @test Plots.ignorenan_extrema(axis) == (0.5,1.5)
-    @test axis[:discrete_map] == Dict{Any,Any}(:yo => 2, "HI" => 1)
+    @test axis[:discrete_map] == Dict{Any,Any}(:yo  => 2, "HI" => 1)
 
-    Plots.discrete_value!(axis, ["x$i" for i in 1:5])
+    Plots.discrete_value!(axis, ["x$i" for i=1:5])
-    Plots.discrete_value!(axis, ["x$i" for i in 0:2])
+    Plots.discrete_value!(axis, ["x$i" for i=0:2])
     @test Plots.ignorenan_extrema(axis) == (0.5, 7.5)
 end
 
 @testset "NoFail" begin
-    # ensure backend with tested display
+    plots = [histogram([1, 0, 0, 0, 0, 0]),
-    @test unicodeplots() == Plots.UnicodePlotsBackend()
+             plot([missing]),
-    @test backend() == Plots.UnicodePlotsBackend()
+             plot([missing; 1:4]),
-
+             plot([fill(missing,10); 1:4]),
-    dsp = TextDisplay(IOContext(IOBuffer(), :color => true))
+             plot([1 1; 1 missing]),
-
+             plot(["a" "b"; missing "d"], [1 2; 3 4])]
-    @testset "plot" begin
+    for plt in plots
-        for plt in [
+        display(plt)
-            histogram([1, 0, 0, 0, 0, 0]),
-            plot([missing]),
-            plot([missing, missing]),
-            plot(fill(missing, 10)),
-            plot([missing; 1:4]),
-            plot([fill(missing, 10); 1:4]),
-            plot([1 1; 1 missing]),
-            plot(["a" "b"; missing "d"], [1 2; 3 4]),
-        ]
-            display(dsp, plt)
-        end
-        @test_nowarn plot(x -> x^2, 0, 2)
-    end
-
-    @testset "bar" begin
-        p = bar([3, 2, 1], [1, 2, 3])
-        @test p isa Plots.Plot
-        @test display(dsp, p) isa Nothing
-    end
-
-    @testset "gui" begin
-        open(tempname(), "w") do io
-            redirect_stdout(io) do
-                gui(plot())
-            end
-        end
     end
 end
 
-@testset "Coverage" begin
+@testset "EmptyAnim" begin
-    @testset "themes" begin
+    anim = @animate for i in []
-        p = showtheme(:dark)
-        @test p isa Plots.Plot
     end
 
-    @testset "plotattr" begin
+    @test_throws ArgumentError gif(anim)
-        tmp = tempname()
+end
-        open(tmp, "w") do io
+
-            redirect_stdout(io) do
+@testset "Segments" begin
-                plotattr("seriestype")
+    function segments(args...)
-                plotattr(:Plot)
+        segs = UnitRange{Int}[]
-                plotattr()
+        for seg in iter_segments(args...)
-            end
+            push!(segs,seg)
         end
-        str = join(readlines(tmp), "")
+        segs
-        @test occursin("seriestype", str)
-        @test occursin("Plot attributes", str)
     end
 
-    @testset "legend" begin
+    nan10 = fill(NaN,10)
-        @test isa(
+    @test segments(11:20) == [1:10]
-            Plots.legend_pos_from_angle(20, 0.0, 0.5, 1.0, 0.0, 0.5, 1.0),
+    @test segments([NaN]) == []
-            NTuple{2,<:AbstractFloat},
+    @test segments(nan10) == []
-        )
+    @test segments([nan10; 1:5]) == [11:15]
-        @test Plots.legend_anchor_index(-1) == 1
+    @test segments([1:5;nan10]) == [1:5]
-        @test Plots.legend_anchor_index(+0) == 2
+    @test segments([nan10; 1:5; nan10; 1:5; nan10]) == [11:15, 26:30]
-        @test Plots.legend_anchor_index(+1) == 3
+    @test segments([NaN; 1], 1:10) == [2:2, 4:4, 6:6, 8:8, 10:10]
-
+    @test segments([nan10; 1:15], [1:15; nan10]) == [11:15]
-        @test Plots.legend_angle(:foo_bar) == (45, :inner)
-        @test Plots.legend_angle(20.0) ==
-              Plots.legend_angle((20.0, :inner)) ==
-              (20.0, :inner)
-        @test Plots.legend_angle((20.0, 10.0)) == (20.0, 10.0)
-    end
 end
 
-@testset "Output" begin
+@testset "Utils" begin
-    @test Plots.defaultOutputFormat(plot()) == "png"
+    zipped = ([(1,2)], [("a","b")], [(1,"a"),(2,"b")],
-    @test Plots.addExtension("foo", "bar") == "foo.bar"
+              [(1,2),(3,4)], [(1,2,3),(3,4,5)], [(1,2,3,4),(3,4,5,6)],
-
+              [(1,2.0),(missing,missing)], [(1,missing),(missing,"a")],
-    fn = tempname()
+              [(missing,missing)], [(missing,missing,missing),("a","b","c")])
-    gr()
+    for z in zipped
-    let p = plot()
+        @test isequal(collect(zip(Plots.unzip(z)...)), z)
-        Plots.png(p, fn)
+        @test isequal(collect(zip(Plots.unzip(Point.(z))...)), z)
-        Plots.png(fn)
-        savefig(p, "$fn.png")
-        savefig("$fn.png")
-
-        Plots.pdf(p, fn)
-        Plots.pdf(fn)
-        savefig(p, "$fn.pdf")
-        savefig("$fn.pdf")
-
-        Plots.ps(p, fn)
-        Plots.ps(fn)
-        savefig(p, "$fn.ps")
-        savefig("$fn.ps")
-
-        Plots.svg(p, fn)
-        Plots.svg(fn)
-        savefig(p, "$fn.svg")
-        savefig("$fn.svg")
-    end
-
-    if Sys.islinux()
-        pgfplotsx()
-        let p = plot()
-            Plots.tex(p, fn)
-            Plots.tex(fn)
-            savefig(p, "$fn.tex")
-            savefig("$fn.tex")
-        end
-    end
-
-    unicodeplots()
-    let p = plot()
-        Plots.txt(p, fn)
-        Plots.txt(fn)
-        savefig(p, "$fn.txt")
-        savefig("$fn.txt")
-    end
-
-    plotlyjs()
-    let p = plot()
-        Plots.html(p, fn)
-        Plots.html(fn)
-        savefig(p, "$fn.html")
-        savefig("$fn.html")
-
-        if Sys.islinux()
-            Plots.eps(p, fn)
-            Plots.eps(fn)
-            savefig(p, "$fn.eps")
-            savefig("$fn.eps")
-        end
-    end
-
-    @test_throws ErrorException savefig("$fn.foo")
-end
-
-gr()  # reset to default backend
-
-for fn in (
-    "test_args.jl",
-    "test_defaults.jl",
-    "test_pipeline.jl",
-    "test_axes.jl",
-    "test_layouts.jl",
-    "test_contours.jl",
-    "test_axis_letter.jl",
-    "test_components.jl",
-    "test_shorthands.jl",
-    "integration_dates.jl",
-    "test_recipes.jl",
-    "test_hdf5plots.jl",
-    "test_pgfplotsx.jl",
-    "test_plotly.jl",
-    "test_animations.jl",
-)
-    @testset "$fn" begin
-        include(fn)
-    end
-end
-
-reference_dir(args...) =
-    joinpath(homedir(), ".julia", "dev", "PlotReferenceImages", args...)
-
-function reference_file(backend, i, version)
-    refdir = reference_dir("Plots", string(backend))
-    fn = "ref$i.png"
-    versions = sort(VersionNumber.(readdir(refdir)), rev = true)
-    reffn = joinpath(refdir, string(version), fn)
-    for v in versions
-        tmpfn = joinpath(refdir, string(v), fn)
-        if isfile(tmpfn)
-            reffn = tmpfn
-            break
-        end
-    end
-    return reffn
-end
-
-reference_path(backend, version) = reference_dir("Plots", string(backend), string(version))
-
-if !isdir(reference_dir())
-    mkpath(reference_dir())
-    LibGit2.clone(
-        "https://github.com/JuliaPlots/PlotReferenceImages.jl.git",
-        reference_dir(),
-    )
-end
-
-include("imgcomp.jl")
-Random.seed!(PLOTS_SEED)
-
-default(show = false, reuse = true)  # don't actually show the plots
-
-is_ci() = get(ENV, "CI", "false") == "true"
-const PLOTS_IMG_TOL = parse(
-    Float64,
-    get(ENV, "PLOTS_IMG_TOL", is_ci() ? Sys.iswindows() ? "2e-4" : "1e-4" : "1e-5"),
-)
-
-## Uncomment the following lines to update reference images for different backends
-
-# @testset "GR" begin
-#     image_comparison_facts(:gr, tol=PLOTS_IMG_TOL, skip = Plots._backend_skips[:gr])
-# end
-#
-# plotly()
-# @testset "Plotly" begin
-#     image_comparison_facts(:plotly, tol=PLOTS_IMG_TOL, skip = Plots._backend_skips[:plotlyjs])
-# end
-#
-# pyplot()
-# @testset "PyPlot" begin
-#     image_comparison_facts(:pyplot, tol=PLOTS_IMG_TOL, skip = Plots._backend_skips[:pyplot])
-# end
-#
-# pgfplotsx()
-# @testset "PGFPlotsX" begin
-#     image_comparison_facts(:pgfplotsx, tol=PLOTS_IMG_TOL, skip = Plots._backend_skips[:pgfplotsx])
-# end
-
-##
-
-@testset "Examples" begin
-    if Sys.islinux()
-        backends = (
-            :unicodeplots,
-            :pgfplotsx,
-            :inspectdr,
-            :plotlyjs,
-            :gaston,
-            # :pyplot,  # FIXME: fails with system matplotlib
-        )
-        only = setdiff(
-            1:length(Plots._examples),
-            (Plots._backend_skips[be] for be in backends)...,
-        )
-        for be in backends
-            @info be
-            for (i, p) in Plots.test_examples(be, only = only, disp = false)
-                fn = tempname() * ".png"
-                png(p, fn)
-                @test filesize(fn) > 1_000
-            end
-        end
-    end
-end
-
-@testset "Backends" begin
-    @testset "UnicodePlots" begin
-        @test unicodeplots() == Plots.UnicodePlotsBackend()
-        @test backend() == Plots.UnicodePlotsBackend()
-
-        io = IOContext(IOBuffer(), :color => true)
-
-        # lets just make sure it runs without error
-        p = plot(rand(10))
-        @test p isa Plots.Plot
-        @test show(io, p) isa Nothing
-
-        p = bar(randn(10))
-        @test p isa Plots.Plot
-        @test show(io, p) isa Nothing
-
-        p = plot([1, 2], [3, 4])
-        annotate!(p, [(1.5, 3.2, Plots.text("Test", :red, :center))])
-        hline!(p, [3.1])
-        @test p isa Plots.Plot
-        @test show(io, p) isa Nothing
-
-        p = plot([Dates.Date(2019, 1, 1), Dates.Date(2019, 2, 1)], [3, 4])
-        hline!(p, [3.1])
-        annotate!(p, [(Dates.Date(2019, 1, 15), 3.2, Plots.text("Test", :red, :center))])
-        @test p isa Plots.Plot
-        @test show(io, p) isa Nothing
-
-        p = plot([Dates.Date(2019, 1, 1), Dates.Date(2019, 2, 1)], [3, 4])
-        annotate!(p, [(Dates.Date(2019, 1, 15), 3.2, :auto)])
-        hline!(p, [3.1])
-        @test p isa Plots.Plot
-        @test show(io, p) isa Nothing
-
-        p = plot((plot(i) for i in 1:4)..., layout = (2, 2))
-        @test p isa Plots.Plot
-        @test show(io, p) isa Nothing
-    end
-
-    @testset "GR" begin
-        ENV["PLOTS_TEST"] = "true"
-        ENV["GKSwstype"] = "100"
-        @test gr() == Plots.GRBackend()
-        @test backend() == Plots.GRBackend()
-
-        @static if haskey(ENV, "APPVEYOR")
-            @info "Skipping GR image comparison tests on AppVeyor"
-        else
-            image_comparison_facts(
-                :gr,
-                tol = PLOTS_IMG_TOL,
-                skip = Plots._backend_skips[:gr],
-            )
-        end
-    end
-
-    @testset "PlotlyJS" begin
-        @test plotlyjs() == Plots.PlotlyJSBackend()
-        @test backend() == Plots.PlotlyJSBackend()
-
-        p = plot(rand(10))
-        @test p isa Plots.Plot
-        @test_broken display(p) isa Nothing
     end
 end

test/test_animations.jl

@@ -1,61 +0,0 @@
-
-@testset "Empty anim" begin
-    anim = @animate for i in []
-    end
-    @test_throws ArgumentError gif(anim)
-end
-
-@userplot CirclePlot
-@recipe function f(cp::CirclePlot)
-    x, y, i = cp.args
-    n = length(x)
-    inds = circshift(1:n, 1 - i)
-    linewidth --> range(0, 10, length = n)
-    seriesalpha --> range(0, 1, length = n)
-    aspect_ratio --> 1
-    label --> false
-    x[inds], y[inds]
-end
-
-@testset "Circle plot" begin
-    n = 10
-    t = range(0, 2π, length = n)
-    x = sin.(t)
-    y = cos.(t)
-
-    anim = @animate for i in 1:n
-        circleplot(x, y, i)
-    end
-    @test filesize(gif(anim).filename) > 10_000
-    @test filesize(mov(anim).filename) > 10_000
-    @test filesize(mp4(anim).filename) > 10_000
-    @test filesize(webm(anim).filename) > 10_000
-
-    @gif for i in 1:n
-        circleplot(x, y, i, line_z = 1:n, cbar = false, framestyle = :zerolines)
-    end every 5
-end
-
-@testset "html" begin
-    p = plot([sin, cos], zeros(0), leg = false, xlims = (0, 2π), ylims = (-1, 1))
-    anim = Animation()
-    for x in range(0, stop = 2π, length = 10)
-        push!(p, x, Float64[sin(x), cos(x)])
-        frame(anim)
-    end
-
-    agif = gif(anim)
-    html = tempname() * ".html"
-    open(html, "w") do io
-        show(io, MIME("text/html"), agif)
-    end
-    @test filesize(html) > 10_000
-    @test showable(MIME("image/gif"), agif)
-
-    agif = mp4(anim)
-    html = tempname() * ".html"
-    open(html, "w") do io
-        show(io, MIME("text/html"), agif)
-    end
-    @test filesize(html) > 10_000
-end

test/test_args.jl

@@ -1,27 +0,0 @@
-using Plots, Test
-
-@testset "Series Attributes" begin
-    pl = plot([[1, 2, 3], [2, 3, 4]], lw = 5)
-    @test hline!(deepcopy(pl), [1.75])[1].series_list[3][:label] ==
-          hline!(deepcopy(pl), [1.75], z_order = :front)[1].series_list[3][:label] ==
-          "y3"
-    @test hline!(deepcopy(pl), [1.75], z_order = :back)[1].series_list[1][:label] == "y3"
-    @test hline!(deepcopy(pl), [1.75], z_order = 2)[1].series_list[2][:label] == "y3"
-end
-
-@testset "Axis Attributes" begin
-    pl = @test_nowarn plot(; tickfont = font(10, "Times"))
-    for axis in (:xaxis, :yaxis, :zaxis)
-        @test pl[1][axis][:tickfontsize] == 10
-        @test pl[1][axis][:tickfontfamily] == "Times"
-    end
-end
-
-@testset "Permute recipes" begin
-    pl = bar(["a", "b", "c"], [1, 2, 3])
-    ppl = bar(["a", "b", "c"], [1, 2, 3], permute = (:x, :y))
-    @test xticks(ppl) == yticks(pl)
-    @test yticks(ppl) == xticks(pl)
-    @test filter(isfinite, pl[1][1][:x]) == filter(isfinite, ppl[1][1][:y])
-    @test filter(isfinite, pl[1][1][:y]) == filter(isfinite, ppl[1][1][:x])
-end

test/test_axes.jl

@@ -1,122 +0,0 @@
-using Plots, Test
-
-@testset "Showaxis" begin
-    for value in Plots._allShowaxisArgs
-        @test plot(1:5, showaxis = value)[1][:yaxis][:showaxis] isa Bool
-    end
-    @test plot(1:5, showaxis = :y)[1][:yaxis][:showaxis] == true
-    @test plot(1:5, showaxis = :y)[1][:xaxis][:showaxis] == false
-end
-
-@testset "Magic axis" begin
-    @test plot(1, axis = nothing)[1][:xaxis][:ticks] == []
-    @test plot(1, axis = nothing)[1][:yaxis][:ticks] == []
-end # testset
-
-@testset "Categorical ticks" begin
-    p1 = plot('A':'M', 1:13)
-    p2 = plot('A':'Z', 1:26)
-    p3 = plot('A':'Z', 1:26, ticks = :all)
-    @test Plots.get_ticks(p1[1], p1[1][:xaxis])[2] == string.('A':'M')
-    @test Plots.get_ticks(p2[1], p2[1][:xaxis])[2] == string.('C':3:'Z')
-    @test Plots.get_ticks(p3[1], p3[1][:xaxis])[2] == string.('A':'Z')
-end
-
-@testset "Ticks getter functions" begin
-    ticks1 = ([1, 2, 3], ("a", "b", "c"))
-    ticks2 = ([4, 5], ("e", "f"))
-    p1 = plot(1:5, 1:5, 1:5, xticks = ticks1, yticks = ticks1, zticks = ticks1)
-    p2 = plot(1:5, 1:5, 1:5, xticks = ticks2, yticks = ticks2, zticks = ticks2)
-    p = plot(p1, p2)
-    @test xticks(p) == yticks(p) == zticks(p) == [ticks1, ticks2]
-    @test xticks(p[1]) == yticks(p[1]) == zticks(p[1]) == ticks1
-end
-
-@testset "Axis limits" begin
-    pl = plot(1:5, xlims = :symmetric, widen = false)
-    @test Plots.xlims(pl) == (-5, 5)
-
-    pl = plot(1:3)
-    @test Plots.xlims(pl) == Plots.widen(1, 3)
-
-    pl = plot([1.05, 2.0, 2.95], ylims = :round)
-    @test Plots.ylims(pl) == (1, 3)
-
-    pl = plot(1:3, xlims = (1, 5))
-    @test Plots.xlims(pl) == (1, 5)
-
-    pl = plot(1:3, xlims = (1, 5), widen = true)
-    @test Plots.xlims(pl) == Plots.widen(1, 5)
-end
-
-@testset "3D Axis" begin
-    ql = quiver([1, 2], [2, 1], [3, 4], quiver = ([1, -1], [0, 0], [1, -0.5]), arrow = true)
-    @test ql[1][:projection] == "3d"
-end
-
-@testset "twinx" begin
-    pl = plot(1:10, margin = 2Plots.cm)
-    twpl = twinx(pl)
-    pl! = plot!(twinx(), -(1:10))
-    @test twpl[:right_margin] == 2Plots.cm
-    @test twpl[:left_margin] == 2Plots.cm
-    @test twpl[:top_margin] == 2Plots.cm
-    @test twpl[:bottom_margin] == 2Plots.cm
-end
-
-@testset "axis-aliases" begin
-    @test haskey(Plots._keyAliases, :xguideposition)
-    @test haskey(Plots._keyAliases, :x_guide_position)
-    @test !haskey(Plots._keyAliases, :xguide_position)
-    p = plot(1:2, xl = "x label")
-    @test p[1][:xaxis][:guide] === "x label"
-    p = plot(1:2, xrange = (0, 3))
-    @test xlims(p) === (0, 3)
-    p = plot(1:2, xtick = [1.25, 1.5, 1.75])
-    @test p[1][:xaxis][:ticks] == [1.25, 1.5, 1.75]
-    p = plot(1:2, xlabelfontsize = 4)
-    @test p[1][:xaxis][:guidefontsize] == 4
-    p = plot(1:2, xgα = 0.07)
-    @test p[1][:xaxis][:gridalpha] ≈ 0.07
-    p = plot(1:2, xgridls = :dashdot)
-    @test p[1][:xaxis][:gridstyle] === :dashdot
-    p = plot(1:2, xgridcolor = :red)
-    @test p[1][:xaxis][:foreground_color_grid] === RGBA{Float64}(1.0, 0.0, 0.0, 1.0)
-    p = plot(1:2, xminorgridcolor = :red)
-    @test p[1][:xaxis][:foreground_color_minor_grid] === RGBA{Float64}(1.0, 0.0, 0.0, 1.0)
-    p = plot(1:2, xgrid_lw = 0.01)
-    @test p[1][:xaxis][:gridlinewidth] ≈ 0.01
-    p = plot(1:2, xminorgrid_lw = 0.01)
-    @test p[1][:xaxis][:minorgridlinewidth] ≈ 0.01
-    p = plot(1:2, xtickor = :out)
-    @test p[1][:xaxis][:tick_direction] === :out
-end
-
-@testset "aliases" begin
-    compare(p::Plots.Plot, s::Symbol, val, op) =
-        op(p[1][:xaxis][s], val) && op(p[1][:yaxis][s], val) && op(p[1][:zaxis][s], val)
-    p = plot(1:2, guide = "all labels")
-    @test compare(p, :guide, "all labels", ===)
-    p = plot(1:2, label = "test")
-    @test compare(p, :guide, "", ===)
-    p = plot(1:2, lim = (0, 3))
-    @test xlims(p) === ylims(p) === zlims(p) === (0, 3)
-    p = plot(1:2, tick = [1.25, 1.5, 1.75])
-    @test compare(p, :ticks, [1.25, 1.5, 1.75], ==)
-    p = plot(1:2, labelfontsize = 4)
-    @test compare(p, :guidefontsize, 4, ==)
-    p = plot(1:2, gα = 0.07)
-    @test compare(p, :gridalpha, 0.07, ≈)
-    p = plot(1:2, gridls = :dashdot)
-    @test compare(p, :gridstyle, :dashdot, ===)
-    p = plot(1:2, gridcolor = :red)
-    @test compare(p, :foreground_color_grid, RGBA{Float64}(1.0, 0.0, 0.0, 1.0), ===)
-    p = plot(1:2, minorgridcolor = :red)
-    @test compare(p, :foreground_color_minor_grid, RGBA{Float64}(1.0, 0.0, 0.0, 1.0), ===)
-    p = plot(1:2, grid_lw = 0.01)
-    @test compare(p, :gridlinewidth, 0.01, ≈)
-    p = plot(1:2, minorgrid_lw = 0.01)
-    @test compare(p, :minorgridlinewidth, 0.01, ≈)
-    p = plot(1:2, tickor = :out)
-    @test compare(p, :tick_direction, :out, ===)
-end

test/test_axis_letter.jl

@@ -1,28 +0,0 @@
-using Plots, Test
-
-@testset "axis letter" begin
-    using Plots, RecipesBase
-    # a custom type for dispacthing the axis-letter-testing recipe
-    struct MyType <: Number
-        val::Float64
-    end
-    value(m::MyType) = m.val
-    data = MyType.(sort(randn(20)))
-    # A recipe that puts the axis letter in the title
-    @recipe function f(::Type{T}, m::T) where {T<:AbstractArray{<:MyType}}
-        title --> string(plotattributes[:letter])
-        value.(m)
-    end
-    @testset "$f (orientation = $o)" for f in [histogram, barhist, stephist, scatterhist],
-        o in [:vertical, :horizontal]
-
-        @test f(data, orientation = o).subplots[1].attr[:title] ==
-              (o == :vertical ? "x" : "y")
-    end
-    @testset "$f" for f in [hline, hspan]
-        @test f(data).subplots[1].attr[:title] == "y"
-    end
-    @testset "$f" for f in [vline, vspan]
-        @test f(data).subplots[1].attr[:title] == "x"
-    end
-end

test/test_components.jl

@@ -1,221 +0,0 @@
-using Plots, Test
-
-@testset "Shapes" begin
-    @testset "Type" begin
-        square = Shape([(0, 0.0), (1, 0.0), (1, 1.0), (0, 1.0)])
-        @test Plots.get_xs(square) == [0, 1, 1, 0]
-        @test Plots.get_ys(square) == [0, 0, 1, 1]
-        @test Plots.vertices(square) == [(0, 0), (1, 0), (1, 1), (0, 1)]
-        @test isa(square, Shape{Int64,Float64})
-        @test coords(square) isa Tuple{Vector{S},Vector{T}} where {T,S}
-    end
-
-    @testset "Copy" begin
-        square = Shape([(0, 0), (1, 0), (1, 1), (0, 1)])
-        square2 = Shape(square)
-        @test square2.x == square.x
-        @test square2.y == square.y
-    end
-
-    @testset "Center" begin
-        square = Shape([(0, 0), (1, 0), (1, 1), (0, 1)])
-        @test Plots.center(square) == (0.5, 0.5)
-    end
-
-    @testset "Translate" begin
-        square = Shape([(0, 0), (1, 0), (1, 1), (0, 1)])
-        squareUp = Shape([(0, 1), (1, 1), (1, 2), (0, 2)])
-        squareUpRight = Shape([(1, 1), (2, 1), (2, 2), (1, 2)])
-
-        @test Plots.translate(square, 0, 1).x == squareUp.x
-        @test Plots.translate(square, 0, 1).y == squareUp.y
-
-        @test Plots.center(translate!(square, 1)) == (1.5, 1.5)
-    end
-
-    @testset "Rotate" begin
-        # 2 radians rotation matrix
-        R2 = [cos(2) sin(2); -sin(2) cos(2)]
-        coords = [0 0; 1 0; 1 1; 0 1]'
-        coordsRotated2 = R2 * (coords .- 0.5) .+ 0.5
-
-        square = Shape([(0, 0), (1, 0), (1, 1), (0, 1)])
-
-        # make a new, rotated square
-        square2 = Plots.rotate(square, -2)
-        @test square2.x ≈ coordsRotated2[1, :]
-        @test square2.y ≈ coordsRotated2[2, :]
-
-        # unrotate the new square in place
-        rotate!(square2, 2)
-        @test square2.x ≈ coords[1, :]
-        @test square2.y ≈ coords[2, :]
-    end
-
-    @testset "Plot" begin
-        ang = range(0, 2π, length = 60)
-        ellipse(x, y, w, h) = Shape(w * sin.(ang) .+ x, h * cos.(ang) .+ y)
-        myshapes = [ellipse(x, rand(), rand(), rand()) for x in 1:4]
-        @test coords(myshapes) isa Tuple{Vector{Vector{S}},Vector{Vector{T}}} where {T,S}
-        local p
-        @test_nowarn p = plot(myshapes)
-        @test p[1][1][:seriestype] == :shape
-    end
-
-    @testset "Misc" begin
-        @test Plots.weave([1, 3], [2, 4]) == collect(1:4)
-        @test Plots.makeshape(3) isa Plots.Shape
-        @test Plots.makestar(3) isa Plots.Shape
-        @test Plots.makecross() isa Plots.Shape
-        @test Plots.makearrowhead(10.0) isa Plots.Shape
-
-        @test Plots.rotate(1.0, 2.0, 5.0, (0, 0)) isa Tuple
-
-        star = Plots.makestar(3)
-        star_scaled = Plots.scale(star, 0.5)
-
-        Plots.scale!(star, 0.5)
-        @test Plots.get_xs(star) == Plots.get_xs(star_scaled)
-        @test Plots.get_ys(star) == Plots.get_ys(star_scaled)
-
-        @test Plots.extrema_plus_buffer([1, 2], 0.1) == (0.9, 2.1)
-    end
-end
-
-@testset "Brush" begin
-    @testset "Colors" begin
-        baseline = brush(1, RGB(0, 0, 0))
-        @test brush(:black) == baseline
-        @test brush("black") == baseline
-    end
-    @testset "Weight" begin
-        @test brush(10).size == 10
-        @test brush(0.1).size == 1
-    end
-    @testset "Alpha" begin
-        @test brush(0.4).alpha == 0.4
-        @test brush(20).alpha == nothing
-    end
-    @testset "Bad Argument" begin
-        # using test_logs because test_warn seems to not work anymore
-        @test_logs (:warn, "Unused brush arg: nothing (Nothing)") begin
-            brush(nothing)
-        end
-    end
-end
-
-@testset "Text" begin
-    t = Plots.PlotText("foo")
-    f = Plots.font()
-
-    @test Plots.PlotText(nothing).str == "nothing"
-    @test length(t) == 3
-    @test text(t).str == "foo"
-    @test text(t, f).str == "foo"
-    @test text("bar", f).str == "bar"
-    @test text(true).str == "true"
-end
-
-@testset "Annotations" begin
-    ann = Plots.series_annotations(missing)
-
-    @test Plots.series_annotations(["1" "2"; "3" "4"]) isa AbstractMatrix
-    @test Plots.series_annotations(10).strs[1].str == "10"
-    @test Plots.series_annotations(nothing) === nothing
-    @test Plots.series_annotations(ann) == ann
-
-    @test Plots.annotations(["1" "2"; "3" "4"]) isa AbstractMatrix
-    @test Plots.annotations(ann) == ann
-    @test Plots.annotations([ann]) == [ann]
-    @test Plots.annotations(nothing) == []
-
-    t = Plots.text("foo")
-    sp = plot(1)[1]
-    @test Plots.locate_annotation(sp, 1, 2, t) == (1, 2, t)
-    @test Plots.locate_annotation(sp, 1, 2, 3, t) == (1, 2, 3, t)
-    @test Plots.locate_annotation(sp, (0.1, 0.2), t) isa Tuple
-    @test Plots.locate_annotation(sp, (0.1, 0.2, 0.3), t) isa Tuple
-end
-
-@testset "Fonts" begin
-    @testset "Scaling" begin
-        sizesToCheck = [
-            :titlefontsize,
-            :legendfontsize,
-            :legendtitlefontsize,
-            :xtickfontsize,
-            :ytickfontsize,
-            :ztickfontsize,
-            :xguidefontsize,
-            :yguidefontsize,
-            :zguidefontsize,
-        ]
-        # get inital font sizes
-        initialSizes = [Plots.default(s) for s in sizesToCheck]
-
-        #scale up font sizes
-        scalefontsizes(2)
-
-        # get inital font sizes
-        doubledSizes = [Plots.default(s) for s in sizesToCheck]
-
-        @test doubledSizes == initialSizes * 2
-
-        # reset font sizes
-        resetfontsizes()
-
-        finalSizes = [Plots.default(s) for s in sizesToCheck]
-
-        @test finalSizes == initialSizes
-    end
-end
-
-@testset "Series Annotations" begin
-    square = Shape([(0.0, 0.0), (1.0, 0.0), (1.0, 1.0), (0.0, 1.0)])
-    @test_logs (:warn, "Unused SeriesAnnotations arg: triangle (Symbol)") begin
-        p = plot(
-            [1, 2, 3],
-            series_annotations = (
-                ["a"],
-                2,    # pass a scale factor
-                (1, 4), # pass two scale factors (overwrites first one)
-                square, # pass a shape
-                font(:courier), # pass an annotation font
-                :triangle,  # pass an incorrect argument
-            ),
-        )
-        sa = p.series_list[1].plotattributes[:series_annotations]
-        @test only(sa.strs).str == "a"
-        @test sa.font.family == "courier"
-        @test sa.baseshape == square
-        @test sa.scalefactor == (1, 4)
-    end
-    spl = scatter(
-        4.53 .* [1 / 1 1 / 2 1 / 3 1 / 4 1 / 5],
-        [0 0 0 0 0],
-        layout = (5, 1),
-        ylims = (-1.1, 1.1),
-        xlims = (0, 5),
-        series_annotations = permutedims([["1/1"], ["1/2"], ["1/3"], ["1/4"], ["1/5"]]),
-    )
-    for i in 1:5
-        @test only(spl.series_list[i].plotattributes[:series_annotations].strs).str ==
-              "1/$i"
-    end
-
-    p = plot([1, 2], annotations = (1.5, 2, text("foo", :left)))
-    x, y, txt = only(p.subplots[end][:annotations])
-    @test (x, y) == (1.5, 2)
-    @test txt.str == "foo"
-
-    p = plot([1, 2], annotations = ((0.1, 0.5), :auto))
-    pos, txt = only(p.subplots[end][:annotations])
-    @test pos == (0.1, 0.5)
-    @test txt.str == "(a)"
-end
-
-@testset "Bezier" begin
-    curve = Plots.BezierCurve([Plots.P2(0.0, 0.0), Plots.P2(0.5, 1.0), Plots.P2(1.0, 0.0)])
-    @test curve(0.75) == Plots.P2(0.75, 0.375)
-    @test length(coords(curve, 10)) == 10
-end

test/test_contours.jl

@@ -1,68 +0,0 @@
-using Plots, Test
-import RecipesPipeline
-
-@testset "Contours" begin
-    @testset "check_contour_levels" begin
-        @test Plots.check_contour_levels(2) === nothing
-        @test Plots.check_contour_levels(-1.0:0.2:10.0) === nothing
-        @test Plots.check_contour_levels([-100, -2, -1, 0, 1, 2, 100]) === nothing
-        @test_throws ArgumentError Plots.check_contour_levels(1.0)
-        @test_throws ArgumentError Plots.check_contour_levels((1, 2, 3))
-        @test_throws ArgumentError Plots.check_contour_levels(-3)
-    end
-
-    @testset "RecipesPipeline.preprocess_attributes!" begin
-        function equal_after_pipeline(kw)
-            kw′ = deepcopy(kw)
-            RecipesPipeline.preprocess_attributes!(kw′)
-            kw == kw′
-        end
-
-        @test equal_after_pipeline(KW(:levels => 1))
-        @test equal_after_pipeline(KW(:levels => 1:10))
-        @test equal_after_pipeline(KW(:levels => [1.0, 3.0, 5.0]))
-        @test_throws ArgumentError RecipesPipeline.preprocess_attributes!(
-            KW(:levels => 1.0),
-        )
-        @test_throws ArgumentError RecipesPipeline.preprocess_attributes!(
-            KW(:levels => (1, 2, 3)),
-        )
-        @test_throws ArgumentError RecipesPipeline.preprocess_attributes!(KW(:levels => -3))
-    end
-
-    @testset "contour[f]" begin
-        x = (-2π):0.1:(2π)
-        y = (-π):0.1:π
-        z = cos.(y) .* sin.(x')
-
-        @testset "Incorrect input" begin
-            @test_throws ArgumentError contour(x, y, z, levels = 1.0)
-            @test_throws ArgumentError contour(x, y, z, levels = (1, 2, 3))
-            @test_throws ArgumentError contour(x, y, z, levels = -3)
-        end
-
-        @testset "Default number" begin
-            @test contour(x, y, z)[1][1].plotattributes[:levels] ==
-                  Plots._series_defaults[:levels]
-        end
-
-        @testset "Number" begin
-            @testset "$n contours" for n in (2, 5, 100)
-                p = contour(x, y, z, levels = n)
-                attr = p[1][1].plotattributes
-                @test attr[:seriestype] == :contour
-                @test attr[:levels] == n
-            end
-        end
-
-        @testset "Range" begin
-            levels = -1:0.5:1
-            @test contour(x, y, z, levels = levels)[1][1].plotattributes[:levels] == levels
-        end
-
-        @testset "Set of levels" begin
-            levels = [-1, 0.25, 0, 0.25, 1]
-            @test contour(x, y, z, levels = levels)[1][1].plotattributes[:levels] == levels
-        end
-    end
-end

test/test_defaults.jl

@@ -1,101 +0,0 @@
-using Plots, Test, Plots.Colors
-
-const PLOTS_DEFAULTS = Dict(:theme => :wong2, :fontfamily => :palantino)
-Plots.__init__()
-
-@testset "Loading theme" begin
-    pl = plot(1:5)
-    @test pl[1][1][:seriescolor] == RGBA(colorant"black")
-    @test Plots.guidefont(pl[1][:xaxis]).family == "palantino"
-end
-
-empty!(PLOTS_DEFAULTS)
-Plots.__init__()
-
-@testset "default" begin
-    default(fillrange = 0)
-    @test Plots._series_defaults[:fillrange] == 0
-    pl = plot(1:5)
-    @test pl[1][1][:fillrange] == 0
-    default()
-end
-
-@testset "Legend defaults" begin
-    p = plot()
-    @test p[1][:legend_font_family] == "sans-serif"
-    @test p[1][:legend_font_pointsize] == 8
-    @test p[1][:legend_font_halign] == :hcenter
-    @test p[1][:legend_font_valign] == :vcenter
-    @test p[1][:legend_font_rotation] == 0.0
-    @test p[1][:legend_font_color] == RGB{Colors.N0f8}(0.0, 0.0, 0.0)
-    @test p[1][:legend_position] == :best
-    @test p[1][:legend_title] == nothing
-    @test p[1][:legend_title_font_family] == "sans-serif"
-    @test p[1][:legend_title_font_pointsize] == 11
-    @test p[1][:legend_title_font_halign] == :hcenter
-    @test p[1][:legend_title_font_valign] == :vcenter
-    @test p[1][:legend_title_font_rotation] == 0.0
-    @test p[1][:legend_title_font_color] == RGB{Colors.N0f8}(0.0, 0.0, 0.0)
-    @test p[1][:legend_background_color] == RGBA{Float64}(1.0, 1.0, 1.0, 1.0)
-    @test p[1][:legend_foreground_color] == RGB{Colors.N0f8}(0.0, 0.0, 0.0)
-end # testset
-
-@testset "Legend API" begin
-    p = plot(;
-        legendfontfamily = "serif",
-        legendfontsize = 12,
-        legendfonthalign = :left,
-        legendfontvalign = :top,
-        legendfontrotation = 1,
-        legendfontcolor = :red,
-        legend = :outertopleft,
-        legendtitle = "The legend",
-        legendtitlefontfamily = "helvetica",
-        legendtitlefontsize = 3,
-        legendtitlefonthalign = :right,
-        legendtitlefontvalign = :bottom,
-        legendtitlefontrotation = -5.2,
-        legendtitlefontcolor = :blue,
-        background_color_legend = :cyan,
-        foreground_color_legend = :green,
-    )
-    @test p[1][:legend_font_family] == "serif"
-    @test p[1][:legend_font_pointsize] == 12
-    @test p[1][:legend_font_halign] == :left
-    @test p[1][:legend_font_valign] == :top
-    @test p[1][:legend_font_rotation] == 1.0
-    @test p[1][:legend_font_color] == :red
-    @test p[1][:legend_position] == :outertopleft
-    @test p[1][:legend_title] == "The legend"
-    @test p[1][:legend_title_font_family] == "helvetica"
-    @test p[1][:legend_title_font_pointsize] == 3
-    @test p[1][:legend_title_font_halign] == :right
-    @test p[1][:legend_title_font_valign] == :bottom
-    @test p[1][:legend_title_font_rotation] == -5.2
-    @test p[1][:legend_title_font_color] == :blue
-    @test p[1][:legend_background_color] == RGBA{Float64}(0.0, 1.0, 1.0, 1.0)
-    @test p[1][:legend_foreground_color] == RGBA{Float64}(0.0, 0.5019607843137255, 0.0, 1.0)
-
-    #remember settings
-    plot(legend_font_pointsize = 20)
-    sp = plot!(label = "R")[1]
-    @test Plots.legendfont(sp).pointsize == 20
-
-    #setting whole font
-    sp = plot(
-        1:5,
-        legendfont = font(12),
-        legend_font_halign = :left,
-        foreground_color_subplot = :red,
-    )[1]
-    @test Plots.legendfont(sp).pointsize == 12
-    @test Plots.legendfont(sp).halign == :left
-    # match mechanism
-    @test sp[:legend_font_color] == sp[:foreground_color_subplot]
-    @test Plots.legendfont(sp).color == sp[:foreground_color_subplot]
-
-    # magic invocation
-    @test_nowarn sp = plot(; legendfont = 12)[1]
-    @test sp[:legend_font_pointsize] == 12
-    @test Plots.legendfont(sp).pointsize == 12
-end # testset

test/test_hdf5plots.jl

@@ -1,20 +0,0 @@
-using Plots, HDF5
-
-@testset "HDF5_Plots" begin
-    fname = "tmpplotsave.hdf5"
-    hdf5()
-
-    x = 1:10
-    psrc = plot(x, x .* x) #Create some plot
-    Plots.hdf5plot_write(psrc, fname)
-
-    #Read back file:
-    gr() #Choose some fast backend likely to work in test environment.
-    pread = Plots.hdf5plot_read(fname)
-
-    #Make sure data made it through:
-    @test psrc.subplots[1].series_list[1][:x] == pread.subplots[1].series_list[1][:x]
-    @test psrc.subplots[1].series_list[1][:y] == pread.subplots[1].series_list[1][:y]
-
-    #display(pread) #Don't display. Regression env might not support
-end #testset

test/test_layouts.jl

@@ -1,98 +0,0 @@
-using Plots, Test
-
-@testset "Subplot sclicing" begin
-    pl = @test_nowarn plot(
-        rand(4, 8),
-        layout = 4,
-        yscale = [:identity :identity :log10 :log10],
-    )
-    @test pl[1][:yaxis][:scale] == :identity
-    @test pl[2][:yaxis][:scale] == :identity
-    @test pl[3][:yaxis][:scale] == :log10
-    @test pl[4][:yaxis][:scale] == :log10
-end
-
-@testset "Plot title" begin
-    pl = plot(rand(4, 8), layout = 4, plot_title = "My title")
-    @test pl[:plot_title] == "My title"
-    @test pl[:plot_titleindex] == 5
-
-    plot!(pl)
-    @test pl[:plot_title] == "My title"
-    @test pl[:plot_titleindex] == 5
-
-    plot!(pl, plot_title = "My new title")
-    @test pl[:plot_title] == "My new title"
-    @test pl[:plot_titleindex] == 5
-end
-
-@testset "Plots.jl/issues/4083" begin
-    p = plot(plot(1:2), plot(1:2); border = :grid, plot_title = "abc")
-    @test p[1][:framestyle] === :grid
-    @test p[2][:framestyle] === :grid
-    @test p[3][:framestyle] === :none
-end
-
-@testset "Coverage" begin
-    p = plot((plot(i) for i in 1:4)..., layout = (2, 2))
-
-    sp = p[end]
-    @test sp isa Plots.Subplot
-    @test size(sp) == (1, 1)
-    @test length(sp) == 1
-    @test sp[1, 1] == sp
-    @test Plots.get_subplot(p, UInt32(4)) == sp
-    @test Plots.series_list(sp) |> first |> Plots.get_subplot isa Plots.Subplot
-    @test Plots.get_subplot(p, keys(p.spmap) |> first) isa Plots.Subplot
-
-    gl = p[2, 2]
-    @test gl isa Plots.GridLayout
-    @test length(gl) == 1
-    @test size(gl) == (1, 1)
-    @test Plots.layout_args(gl) == (gl, 1)
-
-    @test size(p, 1) == 2
-    @test size(p, 2) == 2
-    @test size(p) === (2, 2)
-    @test ndims(p) == 2
-
-    @test p[1][end] isa Plots.Series
-    show(devnull, p[1])
-
-    @test Plots.getplot(p) == p
-    @test Plots.getattr(p) == p.attr
-    @test Plots.backend_object(p) == p.o
-    @test occursin("Plot", string(p))
-    print(devnull, p)
-
-    @test Plots.to_pixels(1Plots.mm) isa AbstractFloat
-    @test Plots.ispositive(1Plots.mm)
-    @test size(Plots.defaultbox) == (0Plots.mm, 0Plots.mm)
-    show(devnull, Plots.defaultbox)
-    show(devnull, p.layout)
-
-    @test Plots.make_measure_hor(1Plots.mm) == 1Plots.mm
-    @test Plots.make_measure_vert(1Plots.mm) == 1Plots.mm
-
-    @test Plots.parent(p.layout) isa Plots.RootLayout
-    show(devnull, Plots.parent_bbox(p.layout))
-
-    rl = Plots.RootLayout()
-    show(devnull, rl)
-    @test parent(rl) === nothing
-    @test Plots.parent_bbox(rl) == Plots.defaultbox
-    @test Plots.bbox(rl) == Plots.defaultbox
-
-    el = Plots.EmptyLayout()
-    @test Plots.update_position!(el) === nothing
-    @test size(el) == (0, 0)
-    @test length(el) == 0
-    @test el[1, 1] === nothing
-
-    @test Plots.left(el) == 0Plots.mm
-    @test Plots.top(el) == 0Plots.mm
-    @test Plots.right(el) == 0Plots.mm
-    @test Plots.bottom(el) == 0Plots.mm
-
-    @test_throws ErrorException Plots.layout_args(nothing)
-end

test/test_pgfplotsx.jl

@@ -1,411 +0,0 @@
-using Plots, Test
-pgfplotsx()
-
-function create_plot(args...; kwargs...)
-    pgfx_plot = plot(args...; kwargs...)
-    return pgfx_plot, repr("application/x-tex", pgfx_plot)
-end
-
-function create_plot!(args...; kwargs...)
-    pgfx_plot = plot!(args...; kwargs...)
-    return pgfx_plot, repr("application/x-tex", pgfx_plot)
-end
-
-@testset "PGFPlotsX" begin
-    pgfx_plot = plot(1:5)
-    Plots._update_plot_object(pgfx_plot)
-    @test pgfx_plot.o.the_plot isa PGFPlotsX.TikzDocument
-    @test pgfx_plot.series_list[1].plotattributes[:quiver] === nothing
-    axis = Plots.pgfx_axes(pgfx_plot.o)[1]
-    @test count(x -> x isa PGFPlotsX.Plot, axis.contents) == 1
-    @test !haskey(axis.contents[1].options.dict, "fill")
-
-    @testset "Legends" begin
-        legends_plot = plot(rand(5, 2), lab = ["1" ""], arrow = true)
-        scatter!(legends_plot, rand(5))
-        Plots._update_plot_object(legends_plot)
-        axis_contents = Plots.pgfx_axes(legends_plot.o)[1].contents
-        leg_entries = filter(x -> x isa PGFPlotsX.LegendEntry, axis_contents)
-        series = filter(x -> x isa PGFPlotsX.Plot, axis_contents)
-        @test length(leg_entries) == 2
-        @test length(series) == 5
-        @test !haskey(series[1].options.dict, "forget plot")
-        @test haskey(series[2].options.dict, "forget plot")
-        @test haskey(series[3].options.dict, "forget plot")
-        @test haskey(series[4].options.dict, "forget plot")
-        @test !haskey(series[5].options.dict, "forget plot")
-    end # testset
-
-    @testset "3D docs example" begin
-        n = 100
-        ts = range(0, stop = 8π, length = n)
-        x = ts .* map(cos, ts)
-        y = (0.1ts) .* map(sin, ts)
-        z = 1:n
-        pl = plot(
-            x,
-            y,
-            z,
-            zcolor = reverse(z),
-            m = (10, 0.8, :blues, Plots.stroke(0)),
-            leg = false,
-            cbar = true,
-            w = 5,
-        )
-        pgfx_plot = plot!(pl, zeros(n), zeros(n), 1:n, w = 10)
-        Plots._update_plot_object(pgfx_plot)
-        if @test_nowarn(
-            haskey(Plots.pgfx_axes(pgfx_plot.o)[1].options.dict, "colorbar") == true
-        )
-            @test Plots.pgfx_axes(pgfx_plot.o)[1]["colorbar"] === nothing
-        end
-    end # testset
-    @testset "Color docs example" begin
-        y = rand(100)
-        plot(
-            0:10:100,
-            rand(11, 4),
-            lab = "lines",
-            w = 3,
-            palette = :grays,
-            fill = 0,
-            α = 0.6,
-        )
-        pl = scatter!(
-            y,
-            zcolor = abs.(y .- 0.5),
-            m = (:hot, 0.8, Plots.stroke(1, :green)),
-            ms = 10 * abs.(y .- 0.5) .+ 4,
-            lab = ["grad", "", "ient"],
-        )
-        Plots._update_plot_object(pl)
-        axis = Plots.pgfx_axes(pl.o)[1]
-        @test count(x -> x isa PGFPlotsX.LegendEntry, axis.contents) == 6
-        @test count(x -> x isa PGFPlotsX.Plot, axis.contents) == 108 # each marker is its own plot, fillranges create 2 plot-objects
-        marker = axis.contents[15]
-        @test marker isa PGFPlotsX.Plot
-        @test marker.options["mark"] == "*"
-        @test marker.options["mark options"]["color"] == RGBA{Float64}(colorant"green", 0.8)
-        @test marker.options["mark options"]["line width"] == 0.75 # 1px is 0.75pt
-    end # testset
-    @testset "Plot in pieces" begin
-        pic = plot(rand(100) / 3, reg = true, fill = (0, :green))
-        scatter!(pic, rand(100), markersize = 6, c = :orange)
-        Plots._update_plot_object(pic)
-        axis_contents = Plots.pgfx_axes(pic.o)[1].contents
-        leg_entries = filter(x -> x isa PGFPlotsX.LegendEntry, axis_contents)
-        series = filter(x -> x isa PGFPlotsX.Plot, axis_contents)
-        @test length(leg_entries) == 2
-        @test length(series) == 4
-        @test haskey(series[1].options.dict, "forget plot")
-        @test !haskey(series[2].options.dict, "forget plot")
-        @test haskey(series[3].options.dict, "forget plot")
-        @test !haskey(series[4].options.dict, "forget plot")
-    end # testset
-    @testset "Marker types" begin
-        markers = filter((m -> begin
-            m in Plots.supported_markers()
-        end), Plots._shape_keys)
-        markers = reshape(markers, 1, length(markers))
-        n = length(markers)
-        x = (range(0, stop = 10, length = n + 2))[2:(end - 1)]
-        y = repeat(reshape(reverse(x), 1, :), n, 1)
-        scatter(
-            x,
-            y,
-            m = (8, :auto),
-            lab = map(string, markers),
-            bg = :linen,
-            xlim = (0, 10),
-            ylim = (0, 10),
-        )
-    end # testset
-    @testset "Layout" begin
-        plot(
-            Plots.fakedata(100, 10),
-            layout = 4,
-            palette = [:grays :blues :hot :rainbow],
-            bg_inside = [:orange :pink :darkblue :black],
-        )
-    end # testset
-    @testset "Polar plots" begin
-        Θ = range(0, stop = 1.5π, length = 100)
-        r = abs.(0.1 * randn(100) + sin.(3Θ))
-        plot(Θ, r, proj = :polar, m = 2)
-    end # testset
-    @testset "Drawing shapes" begin
-        verts = [
-            (-1.0, 1.0),
-            (-1.28, 0.6),
-            (-0.2, -1.4),
-            (0.2, -1.4),
-            (1.28, 0.6),
-            (1.0, 1.0),
-            (-1.0, 1.0),
-            (-0.2, -0.6),
-            (0.0, -0.2),
-            (-0.4, 0.6),
-            (1.28, 0.6),
-            (0.2, -1.4),
-            (-0.2, -1.4),
-            (0.6, 0.2),
-            (-0.2, 0.2),
-            (0.0, -0.2),
-            (0.2, 0.2),
-            (-0.2, -0.6),
-        ]
-        x = 0.1:0.2:0.9
-        y = 0.7 * rand(5) .+ 0.15
-        plot(
-            x,
-            y,
-            line = (3, :dash, :lightblue),
-            marker = (Shape(verts), 30, RGBA(0, 0, 0, 0.2)),
-            bg = :pink,
-            fg = :darkblue,
-            xlim = (0, 1),
-            ylim = (0, 1),
-            leg = false,
-        )
-    end # testset
-    @testset "Histogram 2D" begin
-        histogram2d(randn(10000), randn(10000), nbins = 20)
-    end # testset
-    @testset "Heatmap-like" begin
-        xs = [string("x", i) for i in 1:10]
-        ys = [string("y", i) for i in 1:4]
-        z = float((1:4) * reshape(1:10, 1, :))
-        pgfx_plot = heatmap(xs, ys, z, aspect_ratio = 1)
-        Plots._update_plot_object(pgfx_plot)
-        if @test_nowarn(
-            haskey(Plots.pgfx_axes(pgfx_plot.o)[1].options.dict, "colorbar") == true
-        )
-            @test Plots.pgfx_axes(pgfx_plot.o)[1]["colorbar"] === nothing
-            @test Plots.pgfx_axes(pgfx_plot.o)[1]["colormap name"] == "plots1"
-        end
-
-        pgfx_plot = wireframe(xs, ys, z, aspect_ratio = 1)
-        # TODO: clims are wrong
-    end # testset
-    @testset "Contours" begin
-        x = 1:0.5:20
-        y = 1:0.5:10
-        f(x, y) = begin
-            (3x + y^2) * abs(sin(x) + cos(y))
-        end
-        X = repeat(reshape(x, 1, :), length(y), 1)
-        Y = repeat(y, 1, length(x))
-        Z = map(f, X, Y)
-        p2 = contour(x, y, Z)
-        p1 = contour(x, y, f, fill = true)
-        plot(p1, p2)
-        # TODO: colorbar for filled contours
-    end # testset
-    @testset "Varying colors" begin
-        t = range(0, stop = 1, length = 100)
-        θ = (6π) .* t
-        x = t .* cos.(θ)
-        y = t .* sin.(θ)
-        p1 = plot(x, y, line_z = t, linewidth = 3, legend = false)
-        p2 = scatter(x, y, marker_z = ((x, y) -> begin
-            x + y
-        end), color = :bwr, legend = false)
-        plot(p1, p2)
-    end # testset
-    @testset "Framestyles" begin
-        scatter(
-            fill(randn(10), 6),
-            fill(randn(10), 6),
-            framestyle = [:box :semi :origin :zerolines :grid :none],
-            title = [":box" ":semi" ":origin" ":zerolines" ":grid" ":none"],
-            color = permutedims(1:6),
-            layout = 6,
-            label = "",
-            markerstrokewidth = 0,
-            ticks = -2:2,
-        )
-        # TODO: support :semi
-    end # testset
-    @testset "Quiver" begin
-        x = (-2pi):0.2:(2 * pi)
-        y = sin.(x)
-
-        u = ones(length(x))
-        v = cos.(x)
-        arrow_plot = plot(x, y, quiver = (u, v), arrow = true)
-        # TODO: could adjust limits to fit arrows if too long, but how?
-        # TODO: get latex available on CI
-        # mktempdir() do path
-        #    @test_nowarn savefig(arrow_plot, path*"arrow.pdf")
-        # end
-    end # testset
-    @testset "Annotations" begin
-        y = rand(10)
-        pgfx_plot =
-            plot(y, annotations = (3, y[3], Plots.text("this is \\#3", :left)), leg = false)
-        Plots._update_plot_object(pgfx_plot)
-        axis_content = Plots.pgfx_axes(pgfx_plot.o)[1].contents
-        nodes = filter(x -> !isa(x, PGFPlotsX.Plot), axis_content)
-        @test length(nodes) == 1
-        mktempdir() do path
-            file_path = joinpath(path, "annotations.tex")
-            @test_nowarn savefig(pgfx_plot, file_path)
-            open(file_path) do io
-                lines = readlines(io)
-                @test count(s -> occursin("node", s), lines) == 1
-            end
-        end
-        annotate!([
-            (5, y[5], Plots.text("this is \\#5", 16, :red, :center)),
-            (10, y[10], Plots.text("this is \\#10", :right, 20, "courier")),
-        ])
-        Plots._update_plot_object(pgfx_plot)
-        axis_content = Plots.pgfx_axes(pgfx_plot.o)[1].contents
-        nodes = filter(x -> !isa(x, PGFPlotsX.Plot), axis_content)
-        @test length(nodes) == 3
-        mktempdir() do path
-            file_path = joinpath(path, "annotations.tex")
-            @test_nowarn savefig(pgfx_plot, file_path)
-            open(file_path) do io
-                lines = readlines(io)
-                @test count(s -> occursin("node", s), lines) == 3
-            end
-        end
-        annotation_plot = scatter!(
-            range(2, stop = 8, length = 6),
-            rand(6),
-            marker = (50, 0.2, :orange),
-            series_annotations = [
-                "series",
-                "annotations",
-                "map",
-                "to",
-                "series",
-                Plots.text("data", :green),
-            ],
-        )
-        Plots._update_plot_object(annotation_plot)
-        axis_content = Plots.pgfx_axes(annotation_plot.o)[1].contents
-        nodes = filter(x -> !isa(x, PGFPlotsX.Plot), axis_content)
-        @test length(nodes) == 9
-        mktempdir() do path
-            file_path = joinpath(path, "annotations.tex")
-            @test_nowarn savefig(annotation_plot, file_path)
-            open(file_path) do io
-                lines = readlines(io)
-                @test count(s -> occursin("node", s), lines) == 9
-            end
-            # test .tikz extension
-            file_path = joinpath(path, "annotations.tikz")
-            @test_nowarn savefig(annotation_plot, file_path)
-            @test_nowarn open(file_path) do io
-            end
-        end
-    end # testset
-    @testset "Ribbon" begin
-        aa = rand(10)
-        bb = rand(10)
-        cc = rand(10)
-        conf = [aa - cc bb - cc]
-        ribbon_plot = plot(collect(1:10), fill(1, 10), ribbon = (conf[:, 1], conf[:, 2]))
-        Plots._update_plot_object(ribbon_plot)
-        axis = Plots.pgfx_axes(ribbon_plot.o)[1]
-        plots = filter(x -> x isa PGFPlotsX.Plot, axis.contents)
-        @test length(plots) == 3
-        @test haskey(plots[1].options.dict, "fill")
-        @test haskey(plots[2].options.dict, "fill")
-        @test !haskey(plots[3].options.dict, "fill")
-        @test ribbon_plot.o !== nothing
-        @test ribbon_plot.o.the_plot !== nothing
-    end # testset
-    @testset "Markers and Paths" begin
-        pl = plot(
-            5 .- ones(9),
-            markershape = [:utriangle, :rect],
-            markersize = 8,
-            color = [:red, :black],
-        )
-        Plots._update_plot_object(pl)
-        axis = Plots.pgfx_axes(pl.o)[1]
-        plots = filter(x -> x isa PGFPlotsX.Plot, axis.contents)
-        @test length(plots) == 9
-    end # testset
-    @testset "Groups and Subplots" begin
-        group = rand(map((i -> begin
-            "group $(i)"
-        end), 1:4), 100)
-        pl = plot(
-            rand(100),
-            layout = @layout([a b; c]),
-            group = group,
-            linetype = [:bar :scatter :steppre],
-            linecolor = :match,
-        )
-        Plots._update_plot_object(pl)
-        axis = Plots.pgfx_axes(pl.o)[1]
-        legend_entries = filter(x -> x isa PGFPlotsX.LegendEntry, axis.contents)
-        @test length(legend_entries) == 2
-    end
-end # testset
-
-@testset "Extra kwargs" begin
-    pl = plot(1:5, test = "me")
-    @test pl[1][1].plotattributes[:extra_kwargs][:test] == "me"
-    pl = plot(1:5, test = "me", extra_kwargs = :subplot)
-    @test pl[1].attr[:extra_kwargs][:test] == "me"
-    pl = plot(1:5, test = "me", extra_kwargs = :plot)
-    @test pl.attr[:extra_plot_kwargs][:test] == "me"
-    pl = plot(
-        1:5,
-        extra_kwargs = Dict(
-            :plot => Dict(:test => "me"),
-            :series => Dict(:and => "me too"),
-        ),
-    )
-    @test pl.attr[:extra_plot_kwargs][:test] == "me"
-    @test pl[1][1].plotattributes[:extra_kwargs][:and] == "me too"
-    pl = plot(
-        plot(1:5, title = "Line"),
-        scatter(
-            1:5,
-            title = "Scatter",
-            extra_kwargs = Dict(:subplot => Dict("axis line shift" => "10pt")),
-        ),
-    )
-    Plots._update_plot_object(pl)
-    axes = Plots.pgfx_axes(pl.o)
-    @test !haskey(axes[1].options.dict, "axis line shift")
-    @test haskey(axes[2].options.dict, "axis line shift")
-    pl =
-        plot(x -> x, -1:1; add = raw"\node at (0,0.5) {\huge hi};", extra_kwargs = :subplot)
-    @test pl[1][:extra_kwargs] == Dict(:add => raw"\node at (0,0.5) {\huge hi};")
-    Plots._update_plot_object(pl)
-    axes = Plots.pgfx_axes(pl.o)
-    @test filter(x -> x isa String, axes[1].contents)[1] ==
-          raw"\node at (0,0.5) {\huge hi};"
-    plot!(pl)
-    @test pl[1][:extra_kwargs] == Dict(:add => raw"\node at (0,0.5) {\huge hi};")
-    Plots._update_plot_object(pl)
-    axes = Plots.pgfx_axes(pl.o)
-    @test filter(x -> x isa String, axes[1].contents)[1] ==
-          raw"\node at (0,0.5) {\huge hi};"
-end # testset
-
-@testset "Titlefonts" begin
-    pl = plot(1:5, title = "Test me", titlefont = (2, :left))
-    @test pl[1][:title] == "Test me"
-    @test pl[1][:titlefontsize] == 2
-    @test pl[1][:titlefonthalign] == :left
-    Plots._update_plot_object(pl)
-    ax_opt = Plots.pgfx_axes(pl.o)[1].options
-    @test ax_opt["title"] == "Test me"
-    @test(haskey(ax_opt.dict, "title style")) isa Test.Pass
-    pl = plot(1:5, plot_title = "Test me", plot_titlefont = (2, :left))
-    @test pl[:plot_title] == "Test me"
-    @test pl[:plot_titlefontsize] == 2
-    @test pl[:plot_titlefonthalign] == :left
-    pl = heatmap(rand(3, 3), colorbar_title = "Test me", colorbar_titlefont = (12, :right))
-    @test pl[1][:colorbar_title] == "Test me"
-    @test pl[1][:colorbar_titlefontsize] == 12
-    @test pl[1][:colorbar_titlefonthalign] == :right
-end # testset

test/test_pipeline.jl

@@ -1,38 +0,0 @@
-using Plots, Test
-using RecipesPipeline
-
-@testset "plot" begin
-    pl = plot(1:5)
-    pl2 = plot(pl, tex_output_standalone = true)
-    @test pl[:tex_output_standalone] == false
-    @test pl2[:tex_output_standalone] == true
-    plot!(pl, tex_output_standalone = true)
-    @test pl[:tex_output_standalone] == true
-end
-
-@testset "get_axis_limits" begin
-    x = [0.1, 5]
-    p1 = plot(x, [5, 0.1], yscale = :log10)
-    p2 = plot!(identity)
-    @test all(RecipesPipeline.get_axis_limits(p1, :x) .== x)
-    @test all(RecipesPipeline.get_axis_limits(p2, :x) .== x)
-end
-
-@testset "Slicing" begin
-    @test plot(1:5, fillrange = 0)[1][1][:fillrange] == 0
-    data4 = rand(4, 4)
-    mat = reshape(1:8, 2, 4)
-    for i in axes(data4, 1)
-        for attribute in (:fillrange, :ribbon)
-            @test plot(data4; NamedTuple{tuple(attribute)}(0)...)[1][i][attribute] == 0
-            @test plot(data4; NamedTuple{tuple(attribute)}(Ref([1, 2]))...)[1][i][attribute] ==
-                  [1.0, 2.0]
-            @test plot(data4; NamedTuple{tuple(attribute)}(Ref([1 2]))...)[1][i][attribute] ==
-                  (iseven(i) ? 2 : 1)
-            @test plot(data4; NamedTuple{tuple(attribute)}(Ref(mat))...)[1][i][attribute] ==
-                  [2(i - 1) + 1, 2i]
-        end
-        @test plot(data4, ribbon = (mat, mat))[1][i][:ribbon] ==
-              ([2(i - 1) + 1, 2i], [2(i - 1) + 1, 2i])
-    end
-end

test/test_plotly.jl

@@ -1,64 +0,0 @@
-using Plots, Test
-
-@testset "Plotly" begin
-    @testset "Basic" begin
-        @test plotly() == Plots.PlotlyBackend()
-        @test backend() == Plots.PlotlyBackend()
-
-        p = plot(rand(10))
-        @test isa(p, Plots.Plot) == true
-        @test_nowarn Plots.plotly_series(plot())
-    end
-
-    @testset "Contours" begin
-        x = (-2π):0.1:(2π)
-        y = (-π):0.1:π
-        z = cos.(y) .* sin.(x')
-
-        @testset "Contour numbers" begin
-            @testset "Default" begin
-                @test Plots.plotly_series(contour(x, y, z))[1][:ncontours] ==
-                      Plots._series_defaults[:levels] + 2
-            end
-            @testset "Specified number" begin
-                @test Plots.plotly_series(contour(x, y, z, levels = 10))[1][:ncontours] ==
-                      12
-            end
-        end
-
-        @testset "Contour values" begin
-            @testset "Range" begin
-                levels = -1:0.5:1
-                p = contour(x, y, z, levels = levels)
-                @test p[1][1].plotattributes[:levels] == levels
-                @test Plots.plotly_series(p)[1][:contours][:start] == first(levels)
-                @test Plots.plotly_series(p)[1][:contours][:end] == last(levels)
-                @test Plots.plotly_series(p)[1][:contours][:size] == step(levels)
-            end
-
-            @testset "Set of contours" begin
-                levels = [-1, -0.25, 0, 0.25, 1]
-                levels_range =
-                    range(first(levels), stop = last(levels), length = length(levels))
-                p = contour(x, y, z, levels = levels)
-                @test p[1][1].plotattributes[:levels] == levels
-                series_dict = @test_logs (
-                    :warn,
-                    "setting arbitrary contour levels with Plotly backend " *
-                    "is not supported; use a range to set equally-spaced contours or an " *
-                    "integer to set the approximate number of contours with the keyword " *
-                    "`levels`. Setting levels to -1.0:0.5:1.0",
-                ) Plots.plotly_series(p)
-                @test series_dict[1][:contours][:start] == first(levels_range)
-                @test series_dict[1][:contours][:end] == last(levels_range)
-                @test series_dict[1][:contours][:size] == step(levels_range)
-            end
-        end
-    end
-    @testset "Extra kwargs" begin
-        pl = plot(1:5, test = "me")
-        @test Plots.plotly_series(pl)[1][:test] == "me"
-        pl = plot(1:5, test = "me", extra_kwargs = :plot)
-        @test Plots.plotly_layout(pl)[:test] == "me"
-    end
-end

test/test_recipes.jl

@@ -1,61 +0,0 @@
-using Plots, Test
-using OffsetArrays
-
-@testset "User recipes" begin
-    struct LegendPlot end
-    @recipe function f(plot::LegendPlot)
-        legend --> :topleft
-        (1:3, 1:3)
-    end
-    pl = plot(LegendPlot(); legend = :right)
-    @test pl[1][:legend_position] == :right
-    pl = plot(LegendPlot())
-    @test pl[1][:legend_position] == :topleft
-end
-
-@testset "lens!" begin
-    pl = plot(1:5)
-    lens!(pl, [1, 2], [1, 2], inset = (1, bbox(0.0, 0.0, 0.2, 0.2)), colorbar = false)
-    @test length(pl.series_list) == 4
-    @test pl[2][:colorbar] == :none
-end # testset
-
-@testset "vline, vspan" begin
-    vl = vline([1], widen = false)
-    @test Plots.xlims(vl) == (1, 2)
-    @test Plots.ylims(vl) == (1, 2)
-    vl = vline([1], xlims = (0, 2), widen = false)
-    @test Plots.xlims(vl) == (0, 2)
-    vl = vline([1], ylims = (-3, 5), widen = false)
-    @test Plots.ylims(vl) == (-3, 5)
-
-    vsp = vspan([1, 3], widen = false)
-    @test Plots.xlims(vsp) == (1, 3)
-    @test Plots.ylims(vsp) == (0, 1) # TODO: might be problematic on log-scales
-    vsp = vspan([1, 3], xlims = (-2, 5), widen = false)
-    @test Plots.xlims(vsp) == (-2, 5)
-    vsp = vspan([1, 3], ylims = (-2, 5), widen = false)
-    @test Plots.ylims(vsp) == (-2, 5)
-end # testset
-
-@testset "offset axes" begin
-    tri = OffsetVector(vcat(1:5, 4:-1:1), 11:19)
-    sticks = plot(tri, seriestype = :sticks)
-    @test length(sticks) == 1
-end
-
-@testset "framestyle axes" begin
-    pl = plot(-1:1, -1:1, -1:1)
-    sp = pl.subplots[1]
-    defaultret = Plots.axis_drawing_info_3d(sp, :x)
-    for letter in [:x, :y, :z]
-        for fr in [:box :semi :origin :zerolines :grid :none]
-            prevha = UInt64(0)
-            push!(sp.attr, :framestyle => fr)
-            ret = Plots.axis_drawing_info_3d(sp, letter)
-            ha = hash(string(ret))
-            @test ha != prevha
-            prevha = ha
-        end
-    end
-end

test/test_shorthands.jl

@@ -1,138 +0,0 @@
-using Plots, Test
-
-@testset "Shorthands" begin
-    @testset "Set Lims" begin
-        p = plot(rand(10))
-
-        xlims!((1, 20))
-        @test xlims(p) == (1, 20)
-
-        xlims!(p, (1, 21))
-        @test xlims(p) == (1, 21)
-
-        ylims!((-1, 1))
-        @test ylims(p) == (-1, 1)
-
-        ylims!(p, (-2, 2))
-        @test ylims(p) == (-2, 2)
-
-        zlims!((-1, 1))
-        @test zlims(p) == (-1, 1)
-
-        zlims!(p, (-2, 2))
-        @test zlims(p) == (-2, 2)
-
-        xlims!(-1, 11)
-        @test xlims(p) == (-1, 11)
-
-        xlims!(p, -2, 12)
-        @test xlims(p) == (-2, 12)
-
-        ylims!((-10, 10))
-        @test ylims(p) == (-10, 10)
-
-        ylims!(p, (-11, 9))
-        @test ylims(p) == (-11, 9)
-
-        zlims!((-10, 10))
-        @test zlims(p) == (-10, 10)
-
-        zlims!(p, (-9, 8))
-        @test zlims(p) == (-9, 8)
-    end
-
-    @testset "Set Title / Labels" begin
-        p = plot()
-        title!(p, "Foo")
-        sp = p[1]
-        @test sp[:title] == "Foo"
-        xlabel!(p, "xlabel")
-        @test sp[:xaxis][:guide] == "xlabel"
-        ylabel!(p, "ylabel")
-        @test sp[:yaxis][:guide] == "ylabel"
-    end
-
-    @testset "Misc" begin
-        p = plot()
-        sp = p[1]
-
-        xflip!(p)
-        @test sp[:xaxis][:flip]
-
-        yflip!(p)
-        @test sp[:yaxis][:flip]
-
-        xgrid!(p, true)
-        @test sp[:xaxis][:grid]
-
-        xgrid!(p, false)
-        @test !sp[:xaxis][:grid]
-
-        ygrid!(p, true)
-        @test sp[:yaxis][:grid]
-
-        ygrid!(p, false)
-        @test !sp[:yaxis][:grid]
-
-        ann = [(7, 3, "(7,3)"), (3, 7, text("hey", 14, :left, :top, :green))]
-        annotate!(p, ann)
-        annotate!(p, ann...)
-
-        xaxis!(p, true)
-        @test sp[:xaxis][:showaxis]
-
-        xaxis!(p, false)
-        @test !sp[:xaxis][:showaxis]
-
-        yaxis!(p, true)
-        @test sp[:yaxis][:showaxis]
-
-        yaxis!(p, false)
-        @test !sp[:yaxis][:showaxis]
-
-        p = plot3d([1, 2], [1, 2], [1, 2])
-        plot3d!(p, [3, 4], [3, 4], [3, 4])
-        @test Plots.series_list(p[1])[1][:seriestype] == :path3d
-    end
-
-    @testset "Set Ticks" begin
-        p = plot([0, 2, 3, 4, 5, 6, 7, 8, 9, 10])
-        sp = p[1]
-
-        xticks = 2:6
-        xticks!(xticks)
-        @test sp.attr[:xaxis][:ticks] == xticks
-
-        xticks = 1:5
-        xticks!(p, xticks)
-        @test sp.attr[:xaxis][:ticks] == xticks
-
-        yticks = 0.2:0.1:0.7
-        yticks!(yticks)
-        @test sp.attr[:yaxis][:ticks] == yticks
-
-        yticks = 0.1:0.5
-        yticks!(p, yticks)
-        @test sp.attr[:yaxis][:ticks] == yticks
-
-        xticks = [5, 6, 7.5]
-        xlabels = ["a", "b", "c"]
-        xticks!(xticks, xlabels)
-        @test sp.attr[:xaxis][:ticks] == (xticks, xlabels)
-
-        xticks = [5, 2]
-        xlabels = ["b", "a"]
-        xticks!(p, xticks, xlabels)
-        @test sp.attr[:xaxis][:ticks] == (xticks, xlabels)
-
-        yticks = [0.5, 0.6, 0.75]
-        ylabels = ["z", "y", "x"]
-        yticks!(yticks, ylabels)
-        @test sp.attr[:yaxis][:ticks] == (yticks, ylabels)
-
-        yticks = [0.5, 0.1]
-        ylabels = ["z", "y"]
-        yticks!(p, yticks, ylabels)
-        @test sp.attr[:yaxis][:ticks] == (yticks, ylabels)
-    end
-end